From 8dcb5173a750127be3cf1c662f55dab878102987 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 22 Feb 2014 16:26:41 +0100 Subject: bug 649: create menu entry --- includes/account_stuff.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/account_stuff.php b/includes/account_stuff.php index dbebf6a..46a499e 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -96,7 +96,8 @@ case 509: case 510: case 511: - case 512: $expand = " explode('WoT');"; break; + case 512: + case 516: $expand = " explode('WoT');"; break; //Assurer check case 1000: case 1001: case 1002: @@ -217,7 +218,7 @@ function hideall() {

+

- +

+

Date: Sat, 22 Feb 2014 19:17:51 +0100 Subject: bug 649: added page wot/16.php and implemented the call of this page --- includes/general.php | 18 ++++++------ pages/wot/16.php | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ www/wot.php | 14 ++++++++++ 3 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 pages/wot/16.php diff --git a/includes/general.php b/includes/general.php index d89c0e6..be94549 100644 --- a/includes/general.php +++ b/includes/general.php @@ -57,7 +57,7 @@ exit; } - if(array_key_exists('HTTP_HOST',$_SERVER) && + if(array_key_exists('HTTP_HOST',$_SERVER) && ($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] || $_SERVER['HTTP_HOST'] == $_SESSION['_config']['tverify'])) { @@ -169,19 +169,19 @@ $points++; //echo "Points due to length and charset: $points
"; - + // check for historical password proposal if ($pwd === "Fr3d Sm|7h") { return 0; } - + return $points; } function checkpw($pwd, $email, $fname, $mname, $lname, $suffix) { $points = checkpwlight($pwd); - + if(@strstr(strtolower($pwd), strtolower($email))) $points--; @@ -232,7 +232,7 @@ { $bits = explode(": ", $_SESSION['_config']['subject'], 2); $bits = str_replace(", ", "|", str_replace("/", "|", array_key_exists('1',$bits)?$bits['1']:"")); - $bits = explode("|", $bits); + $bits = explode("|", $bits); $_SESSION['_config']['cnc'] = $_SESSION['_config']['subaltc'] = 0; $_SESSION['_config']['OU'] = ""; @@ -557,7 +557,7 @@ $fp = @fsockopen($domain,25,$errno,$errstr,5); if($fp) { - + $line = fgets($fp, 4096); while(substr($line, 0, 4) == "220-") $line = fgets($fp, 4096); @@ -662,7 +662,7 @@ return $ticket; } - function sanitizeHTML($input) + function sanitizeHTML($input) { return htmlentities(strip_tags($input), ENT_QUOTES); //In case of problems, please use the following line again: @@ -732,7 +732,7 @@ $text=preg_replace("/[^\w-.@]/","",$text); return($text); } - + // returns text message to be shown to the user given the result of is_no_assurer function no_assurer_text($Status) @@ -775,7 +775,7 @@ $name="../$type/$kind/".intval($id/1000)."/$kind-".intval($id).".$type"; if (!is_dir("../csr")) { mkdir("../csr",0777); } if (!is_dir("../crt")) { mkdir("../crt",0777); } - + if (!is_dir("../csr/$kind")) { mkdir("../csr/$kind",0777); } if (!is_dir("../crt/$kind")) { mkdir("../crt/$kind",0777); } if (!is_dir("../csr/$kind/".intval($id/1000))) { mkdir("../csr/$kind/".intval($id/1000)); } diff --git a/pages/wot/16.php b/pages/wot/16.php new file mode 100644 index 0000000..c9a9806 --- /dev/null +++ b/pages/wot/16.php @@ -0,0 +1,78 @@ + + + + + + + + +
+ + + + + + + + + + + + + + + +
:">
">
+ +
+ \ No newline at end of file diff --git a/www/wot.php b/www/wot.php index 7200517..240f21f 100644 --- a/www/wot.php +++ b/www/wot.php @@ -80,6 +80,9 @@ function show_page($target,$message,$error) case '15': case 'MyPointsNew': includeit(15, "wot"); break; + case '16': + case 'AssurerCheck': includeit(16, "wot"); + break; } showfooter(); @@ -122,6 +125,7 @@ function send_reminder() if(array_key_exists('location',$_POST) && $_POST['location'] != "") $_SESSION['_config']['location'] = $_POST['location']; + $id=array_key_exists('id',$_REQUEST)?intval($_REQUEST['id']):0; $oldid=array_key_exists('oldid',$_REQUEST)?intval($_REQUEST['oldid']):0; if($oldid == 12) @@ -566,6 +570,16 @@ $iecho= "c"; exit; } + echo "passt 1"; + + if($oldid == 16 ) + { + $oldid=0; + $id = 16; + + show_page("AssurerCheck","",_("There was an error and I couldn't proceed")); + exit; + } // showheader(_("My CAcert.org Account!")); // echo "ID now = ".$id."/".$oldid.">>".$iecho; // includeit($id, "wot"); -- cgit v1.2.1 From 25f321c0992525b3b52570ab35ba0ad28a399cd8 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 22 Feb 2014 20:34:16 +0100 Subject: bug 649: implemented the is_assurer check and the mailing of the result. --- includes/notary.inc.php | 9 +++++++ www/wot.php | 66 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index b34b2f4..0da855f 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1125,3 +1125,12 @@ function check_date_difference($date, $diff=1){ return (strtotime($date)<=time()+$diff*86400); } + + //user function + function get_user_id_from_mail($email){ + $email = trim(mysql_real_escape_string($email)); + $res = query_init ("select `id` from `users` where `email` = '" . $email . "'"); + $row = query_getnextrow($res); + + return intval($row['id']); + } diff --git a/www/wot.php b/www/wot.php index 240f21f..4a255d1 100644 --- a/www/wot.php +++ b/www/wot.php @@ -569,15 +569,69 @@ $iecho= "c"; show_page("ContactAssurer","",_("There was an error and I couldn't proceed")); exit; } - - echo "passt 1"; - +// Assurer Check if($oldid == 16 ) { $oldid=0; - $id = 16; - - show_page("AssurerCheck","",_("There was an error and I couldn't proceed")); + $id = 0; + $email = trim(mysql_real_escape_string($_REQUEST['email'])); + $uid = get_user_id_from_mail($email); + if ($uid == 0) { + show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); + exit; + } + if (is_assurer($uid)) { + $status = _('is assurer'); + } else { + $status = _('is no assurer'); + } + $assurer = get_user($uid); + //mail to assurer + $my_translation = L10n::get_translation(); + L10n::set_translation($assurer['language']); + + $subject = "[CAcert.org] ".sprintf(_("Assurer status report for you")); + + $body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n"; + $body .= sprintf(_("%s %s (%s) has requested your assurer status."), + $_SESSION['profile']['fname'], + $_SESSION['profile']['lname'], + $_SESSION['profile']['email'])."\n\n"; + $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; + $body .= _("Best regards")."\n"; + $body .= _("CAcert Support Team"); + + //sendmail($assurer['email'], "[CAcert.org] " . $subject, $body, "support@cacert.org", "", "", "CAcert Support"); + sendmail($assurer['email'], "[CAcert.org] ". $subject, $body, + "support@cacert.org", //from + "", //replyto + "", //toname + "CAcert Support"); //fromname + //mail to requestor + L10n::set_translation($my_translation); + + // $subject = "[CAcert.org] ".sprintf(_("Assurer status report that you requested")); +// +// $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; +// $body .= sprintf(_("you requested the assurer status of %s %s (%s)."), +// $assurer['fname'], +// $assurer['lname'], +// $assurer['email'])."\n\n"; +// $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; +// $body .= _("Best regards")."\n"; +// $body .= _("CAcert Support Team"); + + sendmail($_SESSION['profile']['email'], "[CAcert.org] ". $subject, $body, + "support@cacert.org", //from + "", //replyto + "", //toname + "CAcert Support"); //fromname + showheader(_("My CAcert.org Account!"));?> +

+ '.$subject. '
'.$body); ?> +

+ Date: Sat, 22 Feb 2014 21:01:29 +0100 Subject: bug 649: small typo fix --- www/wot.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/www/wot.php b/www/wot.php index 4a255d1..e6efc46 100644 --- a/www/wot.php +++ b/www/wot.php @@ -581,9 +581,9 @@ $iecho= "c"; exit; } if (is_assurer($uid)) { - $status = _('is assurer'); + $status = _('Is assurer'); } else { - $status = _('is no assurer'); + $status = _('Is no assurer'); } $assurer = get_user($uid); //mail to assurer @@ -610,16 +610,16 @@ $iecho= "c"; //mail to requestor L10n::set_translation($my_translation); - // $subject = "[CAcert.org] ".sprintf(_("Assurer status report that you requested")); -// -// $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; -// $body .= sprintf(_("you requested the assurer status of %s %s (%s)."), -// $assurer['fname'], -// $assurer['lname'], -// $assurer['email'])."\n\n"; -// $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; -// $body .= _("Best regards")."\n"; -// $body .= _("CAcert Support Team"); + $subject = "[CAcert.org] ".sprintf(_("Assurer status report that you requested")); + + $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; + $body .= sprintf(_("you requested the assurer status of %s %s (%s)."), + $assurer['fname'], + $assurer['lname'], + $assurer['email'])."\n\n"; + $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; + $body .= _("Best regards")."\n"; + $body .= _("CAcert Support Team"); sendmail($_SESSION['profile']['email'], "[CAcert.org] ". $subject, $body, "support@cacert.org", //from @@ -628,7 +628,7 @@ $iecho= "c"; "CAcert Support"); //fromname showheader(_("My CAcert.org Account!"));?>

- '.$subject. '
'.$body); ?> +

Date: Sat, 22 Feb 2014 21:58:21 +0100 Subject: bug 649: added a dropdown box for the reason why the assurance check is needed. --- pages/wot/16.php | 32 ++++++++++++++------------------ www/wot.php | 15 +++++++++++---- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/pages/wot/16.php b/pages/wot/16.php index c9a9806..cf88c9a 100644 --- a/pages/wot/16.php +++ b/pages/wot/16.php @@ -28,24 +28,6 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error } ?> -
@@ -60,6 +42,20 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error + + + + + + + diff --git a/www/wot.php b/www/wot.php index e6efc46..8085749 100644 --- a/www/wot.php +++ b/www/wot.php @@ -575,11 +575,16 @@ $iecho= "c"; $oldid=0; $id = 0; $email = trim(mysql_real_escape_string($_REQUEST['email'])); + $reason = trim(mysql_real_escape_string($_REQUEST['reason'])); $uid = get_user_id_from_mail($email); if ($uid == 0) { show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); exit; } + if ($reason == "--") { + show_page("AssurerCheck","",_("I'm sorry, there was no reason given why you need to check the assurer status.")); + exit; + } if (is_assurer($uid)) { $status = _('Is assurer'); } else { @@ -593,10 +598,11 @@ $iecho= "c"; $subject = "[CAcert.org] ".sprintf(_("Assurer status report for you")); $body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n"; - $body .= sprintf(_("%s %s (%s) has requested your assurer status."), + $body .= sprintf(_("%s %s (%s) has requested your assurer status for %s."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], - $_SESSION['profile']['email'])."\n\n"; + $_SESSION['profile']['email'], + $reason)."\n\n"; $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; $body .= _("Best regards")."\n"; $body .= _("CAcert Support Team"); @@ -613,10 +619,11 @@ $iecho= "c"; $subject = "[CAcert.org] ".sprintf(_("Assurer status report that you requested")); $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; - $body .= sprintf(_("you requested the assurer status of %s %s (%s)."), + $body .= sprintf(_("you requested the assurer status of %s %s (%s) for %s."), $assurer['fname'], $assurer['lname'], - $assurer['email'])."\n\n"; + $assurer['email'], + $reason)."\n\n"; $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; $body .= _("Best regards")."\n"; $body .= _("CAcert Support Team"); -- cgit v1.2.1 From 3a90b15174698b6b17ffb9ca183472ea1cfec3e1 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 28 Feb 2014 08:52:13 +0100 Subject: bug 649: changed name of function get_user_id_from_mail to get_user_id_from_email and corrected trim function call --- includes/notary.inc.php | 4 ++-- www/wot.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index 0da855f..2a64b7c 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1127,8 +1127,8 @@ } //user function - function get_user_id_from_mail($email){ - $email = trim(mysql_real_escape_string($email)); + function get_user_id_from_email($email){ + $email = mysql_real_escape_string(trim($email)); $res = query_init ("select `id` from `users` where `email` = '" . $email . "'"); $row = query_getnextrow($res); diff --git a/www/wot.php b/www/wot.php index 8085749..5b82d23 100644 --- a/www/wot.php +++ b/www/wot.php @@ -576,7 +576,7 @@ $iecho= "c"; $id = 0; $email = trim(mysql_real_escape_string($_REQUEST['email'])); $reason = trim(mysql_real_escape_string($_REQUEST['reason'])); - $uid = get_user_id_from_mail($email); + $uid = get_user_id_from_email($email); if ($uid == 0) { show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); exit; -- cgit v1.2.1 From 643222269fab0bd19f765ccbef4e199b047c549e Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 28 Feb 2014 09:08:47 +0100 Subject: bug 649: indented html part --- pages/wot/16.php | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pages/wot/16.php b/pages/wot/16.php index cf88c9a..a5a31fa 100644 --- a/pages/wot/16.php +++ b/pages/wot/16.php @@ -22,7 +22,7 @@ require_once("../includes/lib/l10n.php"); if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error'] != "") { ?> - +
">
:
">
- - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
: ">
:
">
">
:
">
\ No newline at end of file -- cgit v1.2.1 From 682c6e71607dcf51f5b14cf41b5b21d03fceb62e Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 28 Feb 2014 10:01:22 +0100 Subject: bug 649: moved trim function --- www/wot.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/wot.php b/www/wot.php index 5b82d23..d4434a5 100644 --- a/www/wot.php +++ b/www/wot.php @@ -574,8 +574,8 @@ $iecho= "c"; { $oldid=0; $id = 0; - $email = trim(mysql_real_escape_string($_REQUEST['email'])); - $reason = trim(mysql_real_escape_string($_REQUEST['reason'])); + $email = mysql_real_escape_string(trim($_REQUEST['email'])); + $reason = mysql_real_escape_string(trim($_REQUEST['reason'])); $uid = get_user_id_from_email($email); if ($uid == 0) { show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); @@ -595,7 +595,7 @@ $iecho= "c"; $my_translation = L10n::get_translation(); L10n::set_translation($assurer['language']); - $subject = "[CAcert.org] ".sprintf(_("Assurer status report for you")); + $subject = "[CAcert.org] ". _("Assurer status report for you"); $body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n"; $body .= sprintf(_("%s %s (%s) has requested your assurer status for %s."), @@ -616,7 +616,7 @@ $iecho= "c"; //mail to requestor L10n::set_translation($my_translation); - $subject = "[CAcert.org] ".sprintf(_("Assurer status report that you requested")); + $subject = "[CAcert.org] " . _("Assurer status report that you requested"); $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; $body .= sprintf(_("you requested the assurer status of %s %s (%s) for %s."), -- cgit v1.2.1 From 7ae35c299cb54f23c45de78382a279ccb075ebb9 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 28 Feb 2014 17:18:47 +0100 Subject: bug 649: added function to get number of activity --- includes/notary.inc.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index 2a64b7c..7286186 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1134,3 +1134,14 @@ return intval($row['id']); } + + function get_number_of_adminlog_entries($uid, $typeid, $hours=1){ + $uid = intval($uid); + $typeid = intval($typeid); + $hours = intval($hours); + $res = query_init ("SELECT count(*) AS `no` FROM `adminlog` + WHERE `adminid` = " . $uid . " AND `admintypeid`=" . $typeid . " and `when` > NOW() - INTERVAL " . $hours . " HOUR " ); + $row = query_getnextrow($res); + + return intval($row['id']); + } -- cgit v1.2.1 From 38e62d200f790a72d6d5b097917132f6e5e36f5b Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Fri, 28 Feb 2014 17:50:38 +0100 Subject: bug 649: added function for write_se_log for assurer status --- includes/notary.inc.php | 48 ++++++++++++++++++++++++++++++++++++------------ www/wot.php | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index 7286186..dbdbf80 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1128,20 +1128,44 @@ //user function function get_user_id_from_email($email){ - $email = mysql_real_escape_string(trim($email)); - $res = query_init ("select `id` from `users` where `email` = '" . $email . "'"); - $row = query_getnextrow($res); + $email = mysql_real_escape_string(trim($email)); + $res = query_init ("select `id` from `users` where `email` = '" . $email . "'"); + $row = query_getnextrow($res); - return intval($row['id']); + return intval($row['id']); } - function get_number_of_adminlog_entries($uid, $typeid, $hours=1){ - $uid = intval($uid); - $typeid = intval($typeid); - $hours = intval($hours); - $res = query_init ("SELECT count(*) AS `no` FROM `adminlog` + function get_number_of_adminlog_entries($uid, $typeid, $hours=1){ + $uid = intval($uid); + $typeid = intval($typeid); + $hours = intval($hours); + $res = query_init ("SELECT count(*) AS `no` FROM `adminlog` WHERE `adminid` = " . $uid . " AND `admintypeid`=" . $typeid . " and `when` > NOW() - INTERVAL " . $hours . " HOUR " ); - $row = query_getnextrow($res); + $row = query_getnextrow($res); + + return intval($row['id']); + } + +/** + * write_se_log() + * writes an information to the adminlog + * + * @param mixed $uid - id of the user account + * @param mixed $adminid - id of the admin + * @param mixed $type - what was changed + * @param mixed $info - the ticket / arbitration no or other information + * @return + */ +// function write_se_log needs to be adjusted after merge with bug 1138 +function write_se_log($uid, $adminid, $type, $info, $typeid=1){ + //records all support engineer actions changing a user account + $uid = intval($uid); + $adminid = intval($adminid); + $type = mysql_real_escape_string($type); + $info = mysql_real_escape_string($info); + $typeid = intval($typeid); + $query="insert into `adminlog` (`when`, `uid`, `adminid`,`type`,`information`,`actiontypeid`) values + (Now(), $uid, $adminid, '$type', '$info', '$typeid')"; + mysql_query($query); +} - return intval($row['id']); - } diff --git a/www/wot.php b/www/wot.php index d4434a5..949c18d 100644 --- a/www/wot.php +++ b/www/wot.php @@ -590,6 +590,7 @@ $iecho= "c"; } else { $status = _('Is no assurer'); } + write_se_log($uid, $_SESSION['profile']['id'], 'User Assurer status check', '', 1000); $assurer = get_user($uid); //mail to assurer $my_translation = L10n::get_translation(); @@ -614,28 +615,32 @@ $iecho= "c"; "", //toname "CAcert Support"); //fromname //mail to requestor - L10n::set_translation($my_translation); - - $subject = "[CAcert.org] " . _("Assurer status report that you requested"); - - $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; - $body .= sprintf(_("you requested the assurer status of %s %s (%s) for %s."), - $assurer['fname'], - $assurer['lname'], - $assurer['email'], - $reason)."\n\n"; - $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; - $body .= _("Best regards")."\n"; - $body .= _("CAcert Support Team"); - - sendmail($_SESSION['profile']['email'], "[CAcert.org] ". $subject, $body, - "support@cacert.org", //from - "", //replyto - "", //toname - "CAcert Support"); //fromname +// L10n::set_translation($my_translation); +// +// $subject = "[CAcert.org] " . _("Assurer status report that you requested"); +// +// $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; +// $body .= sprintf(_("you requested the assurer status of %s %s (%s) for %s."), +// $assurer['fname'], +// $assurer['lname'], +// $assurer['email'], +// $reason)."\n\n"; +// $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; +// $body .= _("Best regards")."\n"; +// $body .= _("CAcert Support Team"); +// +// sendmail($_SESSION['profile']['email'], "[CAcert.org] ". $subject, $body, +// "support@cacert.org", //from +// "", //replyto +// "", //toname +// "CAcert Support"); //fromname showheader(_("My CAcert.org Account!"));?>

- + '. _('The mail with the status request has been sent to the assurer.'); ?>

Date: Fri, 28 Feb 2014 18:07:55 +0100 Subject: bug 649: added check for numbers of assurer status request per hour --- includes/notary.inc.php | 4 ++-- www/wot.php | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index dbdbf80..da1b8c8 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1140,10 +1140,10 @@ $typeid = intval($typeid); $hours = intval($hours); $res = query_init ("SELECT count(*) AS `no` FROM `adminlog` - WHERE `adminid` = " . $uid . " AND `admintypeid`=" . $typeid . " and `when` > NOW() - INTERVAL " . $hours . " HOUR " ); + WHERE `adminid` = " . $uid . " AND `actiontypeid`=" . $typeid . " and `when` > NOW() - INTERVAL " . $hours . " HOUR " ); $row = query_getnextrow($res); - return intval($row['id']); + return intval($row['no']); } /** diff --git a/www/wot.php b/www/wot.php index 949c18d..bd04f4f 100644 --- a/www/wot.php +++ b/www/wot.php @@ -574,15 +574,20 @@ $iecho= "c"; { $oldid=0; $id = 0; + $number=5; $email = mysql_real_escape_string(trim($_REQUEST['email'])); $reason = mysql_real_escape_string(trim($_REQUEST['reason'])); $uid = get_user_id_from_email($email); if ($uid == 0) { - show_page("AssurerCheck","",_("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); + show_page("AssurerCheck", "", _("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); exit; } if ($reason == "--") { - show_page("AssurerCheck","",_("I'm sorry, there was no reason given why you need to check the assurer status.")); + show_page("AssurerCheck", "" ,_("I'm sorry, there was no reason given why you need to check the assurer status.")); + exit; + } + if (get_number_of_adminlog_entries($_SESSION['profile']['id'],1000,1) > $number) { + show_page("AssurerCheck", "", sprintf(_("I'm sorry, you reached the maximum requests of %s per hour. Please wait until you try it again."),$number)); exit; } if (is_assurer($uid)) { -- cgit v1.2.1 From ddd398e6dda266bd2f93c63a58273e797e401740 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 7 Jun 2014 19:01:53 +0200 Subject: bug 649: changed wot/16.php to wot/17.php --- includes/account_stuff.php | 3 +- pages/wot/16.php | 74 ---------------------------------------------- pages/wot/17.php | 74 ++++++++++++++++++++++++++++++++++++++++++++++ www/wot.php | 2 +- 4 files changed, 77 insertions(+), 76 deletions(-) delete mode 100644 pages/wot/16.php create mode 100644 pages/wot/17.php diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 46a499e..d0eee1a 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -97,7 +97,8 @@ case 510: case 511: case 512: - case 516: $expand = " explode('WoT');"; break; //Assurer check + case 516: // TTP form + case 517: $expand = " explode('WoT');"; break; //Assurer check case 1000: case 1001: case 1002: diff --git a/pages/wot/16.php b/pages/wot/16.php deleted file mode 100644 index a5a31fa..0000000 --- a/pages/wot/16.php +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
:">
:
">
- -
- \ No newline at end of file diff --git a/pages/wot/17.php b/pages/wot/17.php new file mode 100644 index 0000000..a5a31fa --- /dev/null +++ b/pages/wot/17.php @@ -0,0 +1,74 @@ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
:">
:
">
+ +
+ \ No newline at end of file diff --git a/www/wot.php b/www/wot.php index bd04f4f..7210661 100644 --- a/www/wot.php +++ b/www/wot.php @@ -80,7 +80,7 @@ function show_page($target,$message,$error) case '15': case 'MyPointsNew': includeit(15, "wot"); break; - case '16': + case '17': case 'AssurerCheck': includeit(16, "wot"); break; } -- cgit v1.2.1 From 980524caf80a3ab9008fd9d3d23275d6d08c0bda Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 7 Jun 2014 19:08:38 +0200 Subject: bug 649: some additional changes for the move from wot/16.php to wot/17.php --- includes/account_stuff.php | 2 +- www/wot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/account_stuff.php b/includes/account_stuff.php index d0eee1a..2973cb7 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -219,7 +219,7 @@ function hideall() {

+

- +

+

Date: Wed, 29 Oct 2014 08:23:30 +0100 Subject: bug 649: change of wording --- pages/wot/17.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/wot/17.php b/pages/wot/17.php index a5a31fa..d24c79b 100644 --- a/pages/wot/17.php +++ b/pages/wot/17.php @@ -54,7 +54,7 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error - + "> -- cgit v1.2.1 From 7c5a95f284ca997acf2b399f2d6874f0a61289b2 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 29 Oct 2014 08:25:56 +0100 Subject: bug 649: correction of id/oldid handling --- www/wot.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/wot.php b/www/wot.php index 53bf87d..a6637ac 100644 --- a/www/wot.php +++ b/www/wot.php @@ -570,11 +570,11 @@ $iecho= "c"; exit; } // Assurer Check - if($oldid == 16 ) + if($oldid == 17 ) { - $oldid=0; - $id = 0; - $number=5; + $oldid = 0; + $id = 17; + $number = 5; $email = mysql_real_escape_string(trim($_REQUEST['email'])); $reason = mysql_real_escape_string(trim($_REQUEST['reason'])); $uid = get_user_id_from_email($email); -- cgit v1.2.1 From fc2bcd51a207366f7013984bbc13672ce6c8c8f5 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Wed, 29 Oct 2014 08:26:38 +0100 Subject: bug 649: code cleanup --- www/wot.php | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/www/wot.php b/www/wot.php index a6637ac..f3f421d 100644 --- a/www/wot.php +++ b/www/wot.php @@ -597,7 +597,8 @@ $iecho= "c"; } write_se_log($uid, $_SESSION['profile']['id'], 'User Assurer status check', '', 1000); $assurer = get_user($uid); - //mail to assurer + + //mail to member $my_translation = L10n::get_translation(); L10n::set_translation($assurer['language']); @@ -613,47 +614,26 @@ $iecho= "c"; $body .= _("Best regards")."\n"; $body .= _("CAcert Support Team"); - //sendmail($assurer['email'], "[CAcert.org] " . $subject, $body, "support@cacert.org", "", "", "CAcert Support"); sendmail($assurer['email'], "[CAcert.org] ". $subject, $body, "support@cacert.org", //from "", //replyto "", //toname "CAcert Support"); //fromname - //mail to requestor -// L10n::set_translation($my_translation); -// -// $subject = "[CAcert.org] " . _("Assurer status report that you requested"); -// -// $body = sprintf(_("Hi %s,"), $_SESSION['profile']['fname'])."\n\n"; -// $body .= sprintf(_("you requested the assurer status of %s %s (%s) for %s."), -// $assurer['fname'], -// $assurer['lname'], -// $assurer['email'], -// $reason)."\n\n"; -// $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; -// $body .= _("Best regards")."\n"; -// $body .= _("CAcert Support Team"); -// -// sendmail($_SESSION['profile']['email'], "[CAcert.org] ". $subject, $body, -// "support@cacert.org", //from -// "", //replyto -// "", //toname -// "CAcert Support"); //fromname + + L10n::set_translation($my_translation); + showheader(_("My CAcert.org Account!"));?> -

- '. _('The mail with the status request has been sent to the assurer.'); ?> -

- + '. _('The mail with the status request has been sent to the email address above.'); ?> +

+ >".$iecho; -// includeit($id, "wot"); -// showfooter(); + show_page ($id,"",""); ?> -- cgit v1.2.1 From b8a6b8ef713931f46e25cf07faf25cb11c037ea4 Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Sun, 25 Jan 2015 12:48:41 +0100 Subject: bug 649: Fix incorrect HTML markup --- includes/account_stuff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 2973cb7..a26757a 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -219,7 +219,7 @@ function hideall() {

+

- +

+

Date: Sun, 25 Jan 2015 12:49:23 +0100 Subject: bug 649: Code formatting --- includes/notary.inc.php | 1 - pages/wot/17.php | 12 ++-- www/wot.php | 144 +++++++++++++++++++++++++----------------------- 3 files changed, 82 insertions(+), 75 deletions(-) diff --git a/includes/notary.inc.php b/includes/notary.inc.php index da1b8c8..a040771 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -1168,4 +1168,3 @@ function write_se_log($uid, $adminid, $type, $info, $typeid=1){ (Now(), $uid, $adminid, '$type', '$info', '$typeid')"; mysql_query($query); } - diff --git a/pages/wot/17.php b/pages/wot/17.php index d24c79b..657f990 100644 --- a/pages/wot/17.php +++ b/pages/wot/17.php @@ -17,8 +17,7 @@ */ include_once("../includes/shutdown.php"); require_once("../includes/lib/l10n.php"); -?> - @@ -26,9 +25,12 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error - -
@@ -71,4 +73,4 @@ if(array_key_exists('error',$_SESSION['_config']) && $_SESSION['_config']['error window.onload = my_init(); //]]> - \ No newline at end of file + diff --git a/www/wot.php b/www/wot.php index f3f421d..aa4f041 100644 --- a/www/wot.php +++ b/www/wot.php @@ -80,9 +80,9 @@ function show_page($target,$message,$error) case '15': case 'MyPointsNew': includeit(15, "wot"); break; - case '17': - case 'AssurerCheck': includeit(17, "wot"); - break; + case '17': + case 'AssurerCheck': includeit(17, "wot"); + break; } showfooter(); @@ -569,71 +569,77 @@ $iecho= "c"; show_page("ContactAssurer","",_("There was an error and I couldn't proceed")); exit; } -// Assurer Check - if($oldid == 17 ) - { - $oldid = 0; - $id = 17; - $number = 5; - $email = mysql_real_escape_string(trim($_REQUEST['email'])); - $reason = mysql_real_escape_string(trim($_REQUEST['reason'])); - $uid = get_user_id_from_email($email); - if ($uid == 0) { - show_page("AssurerCheck", "", _("I'm sorry, there was no email matching what you entered in the system. Please double check your information.")); - exit; - } - if ($reason == "--") { - show_page("AssurerCheck", "" ,_("I'm sorry, there was no reason given why you need to check the assurer status.")); - exit; - } - if (get_number_of_adminlog_entries($_SESSION['profile']['id'],1000,1) > $number) { - show_page("AssurerCheck", "", sprintf(_("I'm sorry, you reached the maximum requests of %s per hour. Please wait until you try it again."),$number)); - exit; - } - if (is_assurer($uid)) { - $status = _('Is assurer'); - } else { - $status = _('Is no assurer'); - } - write_se_log($uid, $_SESSION['profile']['id'], 'User Assurer status check', '', 1000); - $assurer = get_user($uid); - - //mail to member - $my_translation = L10n::get_translation(); - L10n::set_translation($assurer['language']); - - $subject = "[CAcert.org] ". _("Assurer status report for you"); - - $body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n"; - $body .= sprintf(_("%s %s (%s) has requested your assurer status for %s."), - $_SESSION['profile']['fname'], - $_SESSION['profile']['lname'], - $_SESSION['profile']['email'], - $reason)."\n\n"; - $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; - $body .= _("Best regards")."\n"; - $body .= _("CAcert Support Team"); - - sendmail($assurer['email'], "[CAcert.org] ". $subject, $body, - "support@cacert.org", //from - "", //replyto - "", //toname - "CAcert Support"); //fromname - - L10n::set_translation($my_translation); - - showheader(_("My CAcert.org Account!"));?> -

- '. _('The mail with the status request has been sent to the email address above.'); ?> -

- $number) { + show_page("AssurerCheck", "", sprintf(_("I'm sorry, you reached the maximum requests of %s per hour. Please wait until you try it again."),$number)); + exit; + } + + if (is_assurer($uid)) { + $status = _('Is assurer'); + } else { + $status = _('Is no assurer'); + } + + write_se_log($uid, $_SESSION['profile']['id'], 'User Assurer status check', '', 1000); + + $assurer = get_user($uid); + + //mail to member + $my_translation = L10n::get_translation(); + L10n::set_translation($assurer['language']); + + $subject = "[CAcert.org] ". _("Assurer status report for you"); + + $body = sprintf(_("Hi %s,"), $assurer['fname'])."\n\n"; + $body .= sprintf(_("%s %s (%s) has requested your assurer status for %s."), + $_SESSION['profile']['fname'], + $_SESSION['profile']['lname'], + $_SESSION['profile']['email'], + $reason)."\n\n"; + $body .= sprintf(_("The transmitted result: %s"), $status)."\n"; + $body .= _("Best regards")."\n"; + $body .= _("CAcert Support Team"); + + sendmail($assurer['email'], "[CAcert.org] ". $subject, $body, + "support@cacert.org", //from + "", //replyto + "", //toname + "CAcert Support"); //fromname + + L10n::set_translation($my_translation); + + showheader(_("My CAcert.org Account!"));?> +

+ '. _('The mail with the status request has been sent to the email address above.'); ?> +

+ -- cgit v1.2.1