mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-28 04:09:56 +03:00
removed unused css rules, password recover form has a fieldset as all other forms, no exit if mail send fails
git-svn-id: http://piwigo.org/svn/trunk@24966 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
bb083e63d0
commit
5abcfccff0
3 changed files with 11 additions and 20 deletions
|
@ -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);
|
||||
|
@ -705,13 +703,12 @@ function pwg_mail($to, $args = array())
|
|||
}
|
||||
}
|
||||
|
||||
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
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
|
||||
{if $action ne 'none'}
|
||||
<form id="lostPassword" action="{$form_action}?action={$action}{if isset($key)}&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}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue