aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/functions_mail.inc.php13
-rw-r--r--themes/default/template/password.tpl4
-rw-r--r--themes/default/theme.css14
3 files changed, 11 insertions, 20 deletions
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 265ed13b8..51858cf33 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -539,8 +539,6 @@ function pwg_mail($to, $args = array())
if (!empty($args['Bcc']))
{
- $headers.= 'Bcc: '.implode(',', $args['Bcc'])."\n";
-
foreach ($args['Bcc'] as $bcc)
{
$mail->addBCC($bcc);
@@ -704,14 +702,13 @@ function pwg_mail($to, $args = array())
$mail->Password = $conf_mail['smtp_password'];
}
}
-
- if(!$mail->send())
+
+ $ret = $mail->send();
+ if(!$ret)
{
- // TODO use standard error
- echo 'Message could not be sent.';
- echo 'Mailer Error: ' . $mail->ErrorInfo;
- exit;
+ trigger_error( 'Mailer Error: ' . $mail->ErrorInfo, E_USER_WARNING);
}
+ return $ret;
}
/* DEPRECATED
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl
index 260830cdf..7b6a389ae 100644
--- a/themes/default/template/password.tpl
+++ b/themes/default/template/password.tpl
@@ -11,6 +11,8 @@
{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}">
{if $action eq 'lost'}
@@ -44,7 +46,7 @@
<input type="password" name="passwordConf" id="passwordConf" value="">
</label>
</p>
-
+</fieldset>
<p class="bottomButtons"><input type="submit" name="submit" value="{'Submit'|@translate}"></p>
{/if}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index f787090bf..de7f2bafa 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -136,7 +136,6 @@
/* begin chronology/calendar elements*/
.calendarViews {
- display: block;
float: right;
margin: 5px 5px 0 0;
}
@@ -147,11 +146,10 @@
border: 1px solid gray;
}
-.calItem A { border:0 }
+.calItem A { text-decoration:none }
.calendarCalBar {
margin: 10px;
- text-align: left;
}
.calCalHead {
@@ -580,14 +578,12 @@ FIELDSET {
}
.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;
}
@@ -759,10 +755,6 @@ LEGEND {
border-radius: 3px;
}
-#lostPassword {
- padding: 1em;
-}
-
#lostPassword p {
text-align: left;
margin: 1.5em 0;