Move HTML part of oid to template + replace outside the tpl

diff --git a/mod/register.php b/mod/register.php
index 1712ee84fb03ff17429342ace1bb6bbea61f1f74..df46eca4311c98f3594348f4dc29f695e180fc12 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -253,7 +253,6 @@ function register_content(&$a) {
 
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
-               '$oidhtml_old' => $oidhtml_old,
                '$invitations' => get_config('system','invitation_only'),
                '$invite_desc' => t('Membership on this site is by invitation only.'),
                '$invite_label' => t('Your invitation ID: '),
@@ -269,7 +268,7 @@ function register_content(&$a) {
                '$openid'    => $openid_url,
                '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
                '$addrlabel' => t('Your Email Address: '),
-               '$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
+               '$nickdesc'  => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
                '$nicklabel' => t('Choose a nickname: '),
                '$photo'     => $photo,
                '$publish'   => $profile_publish,

diff --git a/view/register.tpl b/view/register.tpl
index ed96f969b89d59e0564ddb68c0c6b6d0bb156a83..2275356a21b6b1dbe96d5b2edf962b4b1172c69f 100644 (file)
--- a/view/register.tpl
+++ b/view/register.tpl
@@ -11,10 +11,12 @@
        <p id="register-fill-desc">$fillwith</p>
        <p id="register-fill-ext">$fillext</p>
 
+{{ if $oidlabel }}
        <div id="register-openid-wrapper" >
-                       $oidhtml_old
+       <label for="register-openid" id="label-register-openid" >$oidlabel</label><input        type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
        </div>
        <div id="register-openid-end" ></div>
+{{ endif }}
 
 {{ if $invitations }}
 

diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
index 899a9a25a5b292936e3bb31f4028e6e081a8d339..6e20bea39e8f456e98caf694ee1c013b65adb263 100644 (file)
--- a/view/smarty3/register.tpl
+++ b/view/smarty3/register.tpl
@@ -11,10 +11,12 @@
        <p id="register-fill-desc">{{$fillwith}}</p>
        <p id="register-fill-ext">{{$fillext}}</p>
 
+{{if $oidlabel }}
        <div id="register-openid-wrapper" >
-                       {{$oidhtml|sprintf:$oidlabel:$openid}}
+       <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid"      id="register-openid" value="{{$openid}}" >
        </div>
        <div id="register-openid-end" ></div>
+{{/if}}
 
 {{if $invitations}}