summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordirk <beliebige_email_adresse@fidocon.de>2011-10-25 23:41:03 +0200
committerdirk <beliebige_email_adresse@fidocon.de>2011-10-25 23:41:03 +0200
commit490f6a8d248599e2fd14ef8dd82de6e58ca3c503 (patch)
tree029983762d241785c517723ac3827e13c762e55b
parentebe60f6955d40ca78c5a06fceffe940e92298f6b (diff)
parentefe894174daea27745c2db57279972174f3f387a (diff)
downloadcacert-devel-490f6a8d248599e2fd14ef8dd82de6e58ca3c503.tar.gz
cacert-devel-490f6a8d248599e2fd14ef8dd82de6e58ca3c503.tar.xz
cacert-devel-490f6a8d248599e2fd14ef8dd82de6e58ca3c503.zip
Merge commit 'origin/bug-894' into bug-894
-rw-r--r--pages/wot/5.php14
-rw-r--r--www/wot.php29
2 files changed, 15 insertions, 28 deletions
diff --git a/pages/wot/5.php b/pages/wot/5.php
index 6c53d00..f717870 100644
--- a/pages/wot/5.php
+++ b/pages/wot/5.php
@@ -20,16 +20,10 @@
<?
if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "")
{
- if(array_key_exists('reminderset',$_SESSION['_config']) && $_SESSION['_config']['remindersent'] == 1)
- {
- ?><font color="orange" size="+1"><?
- }
- else
- {
- ?><font color="orange" size="+1"><?=_("ERROR")?>: <?
- }
- echo $_SESSION['_config']['error']."</font>";
- unset($_SESSION['_config']['error']);
+ ?><font color="orange" size="+1">
+ <? echo _("ERROR").": ".$_SESSION['_config']['error'] ?>
+ </font>
+ <?unset($_SESSION['_config']['error']);
}
?>
<? if(array_key_exists('noemailfound',$_SESSION['_config']) && $_SESSION['_config']['noemailfound'] == 1) { ?>
diff --git a/www/wot.php b/www/wot.php
index b975e14..61fbc1b 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -112,7 +112,6 @@ function send_reminder()
}
$_SESSION['_config']['remindersent'] = 1;
- $_SESSION['_config']['error'] = _("A reminder notice has been sent.");
}
@@ -142,13 +141,13 @@ function send_reminder()
if($oldid == 6 && intval($_SESSION['_config']['notarise']['id']) <= 0)
{
- show_page ("EnterEmail","","You are not an Assurer");
+ show_page ("EnterEmail","",_("Something went wrong. Please enter the email address again"));
exit;
}
if($oldid == 5 && array_key_exists('reminder',$_POST) && $_POST['reminder'] != "")
{
send_reminder();
- show_page ("EnterEmail","Reminder sent","");
+ show_page ("EnterEmail",_("A reminder notice has been sent."),"");
exit;
}
@@ -163,19 +162,14 @@ function send_reminder()
exit;
} else
{
- $_SESSION['_config']['notarise'] = mysql_fetch_assoc($res);
$_SESSION['_config']['noemailfound'] = 0;
+ $_SESSION['_config']['notarise'] = mysql_fetch_assoc($res);
+ if ($_SESSION['_config']['notarise']['verified'] == 0)
+ {
+ show_page("EnterEmail","",_("User is not yet verified. Please try again in 24 hours!"));
+ exit;
+ }
}
-
- $query = "select `verified` from `users` where `id`='".$_SESSION['_config']['notarise']['id']."'";
- $res = mysql_query($query);
- $drow = mysql_fetch_assoc($res);
- if ($drow['verified'] = 0)
- {
- show_page("EnterEmail","",_("User is not yet verified. Please try again in 24 hours!"));
- exit;
- }
-
}
if($oldid == 5 || $oldid == 6)
@@ -252,20 +246,19 @@ $iecho= "c";
if($newpoints < 0)
$newpoints = $awarded = 0;
-$query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`";
+ $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['_config']['notarise']['id']."' group by `to`";
$res = mysql_query($query);
$drow = mysql_fetch_assoc($res);
$_POST['expire'] = 0;
-/* should not be necessary when 15.php is being used
if(($drow['total'] + $newpoints) > 100 && $max < 100)
$newpoints = 100 - $drow['total'];
if(($drow['total'] + $newpoints) > $max && $max >= 100)
$newpoints = $max - $drow['total'];
if($newpoints < 0)
$newpoints = 0;
-*/
+
if(mysql_escape_string(stripslashes($_POST['date'])) == "")
$_POST['date'] = date("Y-m-d H:i:s");
@@ -454,7 +447,7 @@ $query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION[
{
sendmail($user['email'], "[CAcert.org] ".$_REQUEST['subject'], $_REQUEST['message'],
$_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']);
- show_page("ContactAssurer",_("Your email has been sent to")." ".$user['fname'].".<br />[ <a href='javascript:history.go(-2)'>Go Back</a> ]","");
+ show_page("ContactAssurer",_("Your email has been sent to")." ".$user['fname'].".<br />[ <a href='javascript:history.go(-2)'>"._("Go Back")."</a> ]","");
exit;
} else {
show_page(0,"",_("Sorry, I was unable to locate that user."));