projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2e3189)
Remove a spec of HTML from login.php
authorpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 15 Jan 2007 07:46:53 +0000 (07:46 +0000)
committerpdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 15 Jan 2007 07:46:53 +0000 (07:46 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12131 7612ce4b-ef26-0410-bec9-ea0150e637f0

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

diff --git a/src/login.php b/src/login.php
index 88bb4a65e7ecc4092fb12b07199778dc1ff0ff36..d3b137d4bb9d4729d9d0bd818a7cff1d1732d5ba 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -144,9 +144,8 @@ if (isset($org_logo) && $org_logo) {
 
 $sm_attribute_str = '';
 if (isset($hide_sm_attributions) && !$hide_sm_attributions) {
-//FIXME: need to remove *ALL* HTML from this file!
-    $sm_attribute_str = _("SquirrelMail Webmail Application")."<br />\n" .
-                        _("By the SquirrelMail Project Team")."<br />\n";
+    $sm_attribute_str = _("SquirrelMail Webmail Application")."\n" .
+                        _("By the SquirrelMail Project Team");
 }
 
 if(sqgetGlobalVar('mailtodata', $mailtodata)) {
@@ -162,12 +161,12 @@ $login_extra = addHidden('js_autodetect_results', SMPREF_JS_OFF).
 
 session_write_close();
 
-$oTemplate->assign('logo_str', $logo_str);
+$oTemplate->assign('logo_str', $logo_str, FALSE);
 $oTemplate->assign('logo_path', $org_logo);
 $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('login_extra', $login_extra, FALSE);
 
 //FIXME: need to remove *ALL* HTML from this file!
 echo '<body onLoad="squirrelmail_loginpage_onload()">'."\n";
diff --git a/templates/default/login.tpl b/templates/default/login.tpl
index ff1718adb1cd84f13254f5a859a07c66cd9793d4..d06030570ddc550036d2c5c8a3364ff42a27f256 100644 (file)
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -34,7 +34,7 @@ extract($t);
  <tr>
   <td class="sqm_loginTop" colspan="2">
    <?php echo $logo_str; if (!empty($logo_str)) echo '<br />'; ?>
-   <?php echo $sm_attribute_str; ?>
+   <?php echo nl2br($sm_attribute_str); ?>
   </td>
  </tr>
  <tr>
Unnamed repository; edit this file 'description' to name the repository.