We use cookies to ensure you get the best experience on our website
Почетна Преглед Помоћ
Регистрација Пријавите се
0ct0pu5
/
squirrelmail
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

Slight adjustment. Plugins create their own table row for login_form hook; core sets 'extra' variables separate from plugin data

pdontthink пре 19 година
родитељ
74583c68c5
комит
76ffcf18ed
3 измењених фајлова са 13 додато и 14 уклоњено
Један поглед Покажи статистику Diff
  1. 3 2
      src/login.php
  2. 5 6
      templates/default/login.tpl
  3. 5 6
      templates/default_advanced/login.tpl

+ 3 - 2
src/login.php
Прегледај датотеку 

@@ -164,8 +164,8 @@ if(sqgetGlobalVar('mailto', $mailto)) {
 
 $password_field = addPwField('secretkey');
 
 $password_field = addPwField('secretkey');
 
 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
 
 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
 
                $rcptaddress .
 
                $rcptaddress .
 
-               addHidden('just_logged_in', '1') .
 
-               concat_hook_function('login_form');
 
+               addHidden('just_logged_in', '1');
 
+$plugin_extra = concat_hook_function('login_form');
 
 
 
 session_write_close();
 
 session_write_close();
 
 
 
@@ -175,6 +175,7 @@ $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
 
 $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
 
 $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
 
 $oTemplate->assign('login_field_value', $loginname_value);
 
 $oTemplate->assign('login_field_value', $loginname_value);
 
 $oTemplate->assign('login_extra', $login_extra);
 
 $oTemplate->assign('login_extra', $login_extra);
 
+$oTemplate->assign('plugin_extra', $plugin_extra);
 
 
 
 echo '<body onLoad="squirrelmail_loginpage_onload()">'."\n";
 
 echo '<body onLoad="squirrelmail_loginpage_onload()">'."\n";
 
 echo '<form action="redirect.php" method="post" onSubmit="document.forms[0].js_autodetect_results.value='. SMPREF_JS_ON .'">'."\n";
 
 echo '<form action="redirect.php" method="post" onSubmit="document.forms[0].js_autodetect_results.value='. SMPREF_JS_ON .'">'."\n";

+ 5 - 6
templates/default/login.tpl
Прегледај датотеку 

@@ -12,8 +12,10 @@
 
  *                            this has been disabled by the admin.
 
  *                            this has been disabled by the admin.
 
  *      $org_name_str       - translated string containing orginization's name
 
  *      $org_name_str       - translated string containing orginization's name
 
  *      $login_field_value  - default value for the user name field
 
  *      $login_field_value  - default value for the user name field
 
- *      $login_extra        - Some extra fields needed by SquirrelMail for the 
- *                            login.  YOU SHOULD ALWAYS INCLUDE THIS FIELD!!
 
+ *      $login_extra        - Some extra form fields needed by SquirrelMail
 
+ *                            for the login.  Template designers SHOULD ALWAYS
 
+ *                            INCLUDE this value somewhere in the form.
 
+ *      $plugin_extra       - Extra table row(s) that may be added by plugin(s).
 
  * 
  * 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
 
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 
@@ -53,13 +55,10 @@ extract($t);
 
   </td>
 
   </td>
 
   <td class="sqm_loginFieldInput">
 
   <td class="sqm_loginFieldInput">
 
    <input type="password" name="secretkey" value="" id="secretkey" />
 
    <input type="password" name="secretkey" value="" id="secretkey" />
 
-  </td>
 
- </tr>
 
- <tr>
 
-  <td colspan="2">
 
    <?php echo $login_extra; ?>
 
    <?php echo $login_extra; ?>
 
   </td>
 
   </td>
 
  </tr>
 
  </tr>
 
+ <?php echo $plugin_extra; ?>
 
  <tr>
 
  <tr>
 
   <td class="sqm_loginSubmit" colspan="2">
 
   <td class="sqm_loginSubmit" colspan="2">
 
    <input type="submit" value="<?php echo _("Login"); ?>" />
 
    <input type="submit" value="<?php echo _("Login"); ?>" />

+ 5 - 6
templates/default_advanced/login.tpl
Прегледај датотеку 

@@ -12,8 +12,10 @@
 
  *                            this has been disabled by the admin.
 
  *                            this has been disabled by the admin.
 
  *      $org_name_str       - translated string containing orginization's name
 
  *      $org_name_str       - translated string containing orginization's name
 
  *      $login_field_value  - default value for the user name field
 
  *      $login_field_value  - default value for the user name field
 
- *      $login_extra        - Some extra fields needed by SquirrelMail for the 
- *                            login.  YOU SHOULD ALWAYS INCLUDE THIS FIELD!!
 
+ *      $login_extra        - Some extra form fields needed by SquirrelMail
 
+ *                            for the login.  Template designers SHOULD ALWAYS
 
+ *                            INCLUDE this value somewhere in the form.
 
+ *      $plugin_extra       - Extra table row(s) that may be added by plugin(s).
 
  * 
  * 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
 
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 
@@ -66,13 +68,10 @@ extract($t);
 
      </td>
 
      </td>
 
      <td class="fieldInput">
 
      <td class="fieldInput">
 
       <input type="password" name="secretkey" value="" id="secretkey" class="input" />
 
       <input type="password" name="secretkey" value="" id="secretkey" class="input" />
 
-     </td>
 
-    </tr>
 
-    <tr>
 
-     <td colspan="2">
 
       <?php echo $login_extra; ?>
 
       <?php echo $login_extra; ?>
 
      </td>
 
      </td>
 
     </tr>
 
     </tr>
 
+    <?php echo $plugin_extra; ?>
 
     <tr>
 
     <tr>
 
      <td class="loginSubmit" colspan="2">
 
      <td class="loginSubmit" colspan="2">
 
       <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png'); ?>" alt="<?php echo _("Login"); ?>" />
 
       <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png'); ?>" alt="<?php echo _("Login"); ?>" />

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5