projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fc03e8b)
Removing login_form hook, plugins can now use template_construct hook and add an...
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 21 Sep 2006 15:19:44 +0000 (15:19 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 21 Sep 2006 15:19:44 +0000 (15:19 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11730 7612ce4b-ef26-0410-bec9-ea0150e637f0

src/login.php patch | blob | blame | history
templates/default/login.tpl patch | blob | blame | history
templates/default_advanced/login.tpl patch | blob | blame | history

diff --git a/src/login.php b/src/login.php
index 1a3486172fc1303bb5516196f63ee37fd5b3f7b3..50efeb3f795f0b104e3b693c78002a38269b453e 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -158,7 +158,6 @@ $password_field = addPwField('secretkey');
 $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
                $rcptaddress .
                addHidden('just_logged_in', '1');
-$plugin_extra = concat_hook_function('login_form');
 
 session_write_close();
 
@@ -168,7 +167,6 @@ $oTemplate->assign('sm_attribute_str', $sm_attribute_str);
 $oTemplate->assign('org_name_str', sprintf (_("%s Login"), $org_name));
 $oTemplate->assign('login_field_value', $loginname_value);
 $oTemplate->assign('login_extra', $login_extra);
-$oTemplate->assign('plugin_extra', $plugin_extra);
 
 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";
diff --git a/templates/default/login.tpl b/templates/default/login.tpl
index abe9c58e4f3b17089d427315321be1ff4f2603eb..421b1d69e96f24c9e9da58114a5981bfe87d8e5d 100644 (file)
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -15,7 +15,8 @@
  *      $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).
+ *      $plugin_output      - An array of extra output that may be added by 
+ *                            plugin(s).
  * 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -58,7 +59,7 @@ extract($t);
    <?php echo $login_extra; ?>
   </td>
  </tr>
- <?php echo $plugin_extra; ?>
+ <?php if (!empty($plugin_output['login_form'])) echo $plugin_output['login_form']; ?>
  <tr>
   <td class="sqm_loginSubmit" colspan="2">
    <input type="submit" value="<?php echo _("Login"); ?>" />
diff --git a/templates/default_advanced/login.tpl b/templates/default_advanced/login.tpl
index cf3441ccc241de4d97ff63946f84e0accfe50074..d7f966a3d27feee61af1ade9d479e3c1087ca024 100644 (file)
--- a/templates/default_advanced/login.tpl
+++ b/templates/default_advanced/login.tpl
@@ -15,7 +15,8 @@
  *      $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).
+ *      $plugin_output      - An array of extra output that may be added by 
+ *                            plugin(s).
  * 
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -71,7 +72,7 @@ extract($t);
       <?php echo $login_extra; ?>
      </td>
     </tr>
-    <?php echo $plugin_extra; ?>
+    <?php if (!empty($plugin_output['login_form'])) echo $plugin_output['login_form']; ?>
     <tr>
      <td class="loginSubmit" colspan="2">
       <input type="image" src="<?php echo getIconPath($icon_theme_path, 'login_submit.png', _("Login"), _("Login")); ?>" alt="<?php echo _("Login"); ?>" />
Unnamed repository; edit this file 'description' to name the repository.