Changeset 24966

Timestamp:

Oct 17, 2013, 9:38:06 PM (11 years ago)

Author:

rvelices

Message:

removed unused css rules, password recover form has a fieldset as all other forms, no exit if mail send fails

Location:

trunk

Files:

• include/functions_mail.inc.php (modified) (2 diffs)
• themes/default/template/password.tpl (modified) (2 diffs)
• themes/default/theme.css (modified) (4 diffs)

trunk/include/functions_mail.inc.php

@@ -540 +540 @@
   if (!empty($args['Bcc']))
   {
-    $headers.= 'Bcc: '.implode(',', $args['Bcc'])."\n";
-
     foreach ($args['Bcc'] as $bcc)
     {
@@ -705 +703 @@
     }
   }
-  
-  if(!$mail->send())
-  {
-    // TODO use standard error
-    echo 'Message could not be sent.';
-    echo 'Mailer Error: ' . $mail->ErrorInfo;
-    exit;
-  }
+
+  $ret = $mail->send();
+  if(!$ret)
+  {
+    trigger_error( 'Mailer Error: ' . $mail->ErrorInfo, E_USER_WARNING);
+  }
+  return $ret;
 }
 

trunk/themes/default/template/password.tpl

@@ -12 +12 @@
 {if $action ne 'none'}
 <form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post">
+<fieldset>
+        <legend>{'Forgot your password?'|translate}</legend>
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
@@ -45 +47 @@
     </label>
   </p>
-
+</fieldset>
   <p class="bottomButtons"><input type="submit" name="submit" value="{'Submit'|@translate}"></p>
   {/if}

trunk/themes/default/theme.css

@@ -137 +137 @@
 /* begin chronology/calendar elements*/
 .calendarViews {
-        display: block;
         float: right;
         margin: 5px 5px 0 0;
@@ -148 +147 @@
 }
 
-.calItem A { border:0 }
+.calItem A { text-decoration:none }
 
 .calendarCalBar {
         margin: 10px;
-        text-align: left;
 }
 
@@ -581 +579 @@
 
 .tagSelection {
-        width: 99%;
-        margin: 1em 0;
-        padding: 0;
+        margin: 1em 0 !important;
 }
 
 .tagSelection LI {
         display:inline-block;
-        width:150px!important;
+        width: 150px;
         overflow:hidden;
         white-space: nowrap;
@@ -760 +756 @@
 }
 
-#lostPassword {
-  padding: 1em;
-}
-
 #lostPassword p {
   text-align: left;