mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@24966 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2013-10-17 19:38:06 +00:00
parent bb083e63d0
commit 5abcfccff0
3 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/functions_mail.inc.php
View file

@ -539,8 +539,6 @@ function pwg_mail($to, $args = array())
if (!empty($args['Bcc'])) if (!empty($args['Bcc']))
{ {
$headers.= 'Bcc: '.implode(',', $args['Bcc'])."\n";
foreach ($args['Bcc'] as $bcc) foreach ($args['Bcc'] as $bcc)
{ {
$mail->addBCC($bcc); $mail->addBCC($bcc);
@ -704,14 +702,13 @@ function pwg_mail($to, $args = array())
$mail->Password = $conf_mail['smtp_password']; $mail->Password = $conf_mail['smtp_password'];
} }
} }
if(!$mail->send()) $ret = $mail->send();
if(!$ret)
{ {
// TODO use standard error trigger_error( 'Mailer Error: ' . $mail->ErrorInfo, E_USER_WARNING);
echo 'Message could not be sent.';
echo 'Mailer Error: ' . $mail->ErrorInfo;
exit;
} }
return $ret;
} }
/* DEPRECATED /* DEPRECATED

4
themes/default/template/password.tpl
View file

@ -11,6 +11,8 @@
{if $action ne 'none'} {if $action ne 'none'}
<form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&amp;key={$key}{/if}" method="post"> <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}"> <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
{if $action eq 'lost'} {if $action eq 'lost'}
@ -44,7 +46,7 @@
<input type="password" name="passwordConf" id="passwordConf" value=""> <input type="password" name="passwordConf" id="passwordConf" value="">
</label> </label>
</p> </p>
</fieldset>
<p class="bottomButtons"><input type="submit" name="submit" value="{'Submit'|@translate}"></p> <p class="bottomButtons"><input type="submit" name="submit" value="{'Submit'|@translate}"></p>
{/if} {/if}

14
themes/default/theme.css
View file

@ -136,7 +136,6 @@
/* begin chronology/calendar elements*/ /* begin chronology/calendar elements*/
.calendarViews { .calendarViews {
display: block;
float: right; float: right;
margin: 5px 5px 0 0; margin: 5px 5px 0 0;
} }
@ -147,11 +146,10 @@
border: 1px solid gray; border: 1px solid gray;
} }
.calItem A { border:0 } .calItem A { text-decoration:none }
.calendarCalBar { .calendarCalBar {
margin: 10px; margin: 10px;
text-align: left;
} }
.calCalHead { .calCalHead {
@ -580,14 +578,12 @@ FIELDSET {
} }
.tagSelection { .tagSelection {
width: 99%; margin: 1em 0 !important;
margin: 1em 0;
padding: 0;
} }
.tagSelection LI { .tagSelection LI {
display:inline-block; display:inline-block;
width:150px!important; width: 150px;
overflow:hidden; overflow:hidden;
white-space: nowrap; white-space: nowrap;
} }
@ -759,10 +755,6 @@ LEGEND {
border-radius: 3px; border-radius: 3px;
} }
#lostPassword {
padding: 1em;
}
#lostPassword p { #lostPassword p {
text-align: left; text-align: left;
margin: 1.5em 0; margin: 1.5em 0;