bug 1138: Removing dead code instead of only commenting it out helps
authorMichael Tänzer <neo@nhng.de>
Mon, 24 Mar 2014 16:29:39 +0000 (17:29 +0100)
committerMichael Tänzer <neo@nhng.de>
Mon, 24 Mar 2014 16:29:39 +0000 (17:29 +0100)
healthful code growth

(Reducing lines of code is good code growth)

Signed-off-by: Michael Tänzer <neo@nhng.de>
includes/account.php

index cb5ca9a..d7fd43d 100644 (file)
@@ -3137,121 +3137,6 @@ function buildSubjectFromSession() {
                exit;
        }
 
-       /* this area not needed as the The Tverify programme is Terminated as of 16th November 2010
-
-       if(($id == 51 || $id == 52 || $oldid == 52) && $_SESSION['profile']['tverify'] <= 0)
-       {
-               showheader(_("My CAcert.org Account!"));
-               echo _("You don't have access to this area.");
-               showfooter();
-               exit;
-       }
-       if($oldid == 52)
-       {
-               $uid = intval($_REQUEST['uid']);
-               $query = "select * from `tverify` where `id`='$uid' and `modified`=0";
-               $rc = mysql_num_rows(mysql_query($query));
-               if($rc <= 0)
-               {
-                       showheader(_("My CAcert.org Account!"));
-                       echo _("Unable to find a valid tverify request for this ID.");
-                       showfooter();
-                       exit;
-               }
-       }
-
-       if($oldid == 52)
-       {
-               $query = "select * from `tverify-vote` where `tverify`='$uid' and `memid`='".$_SESSION['profile']['id']."'";
-               $rc = mysql_num_rows(mysql_query($query));
-               if($rc > 0)
-               {
-                       showheader(_("My CAcert.org Account!"));
-                       echo _("You have already voted on this request.");
-                       showfooter();
-                       exit;
-               }
-       }
-
-       if($oldid == 52 && ($_REQUEST['agree'] != "" || $_REQUEST['disagree'] != ""))
-       {
-               $vote = -1;
-               if($_REQUEST['agree'] != "")
-                       $vote = 1;
-
-               $query = "insert into `tverify-vote` set
-                               `tverify`='$uid',
-                               `memid`='".$_SESSION['profile']['id']."',
-                               `when`=NOW(), `vote`='$vote',
-                               `comment`='".mysql_real_escape_string($_REQUEST['comment'])."'";
-               mysql_query($query);
-
-               $rc = mysql_num_rows(mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='1'"));
-               if($rc >= 8)
-               {
-                       mysql_query("update `tverify` set `modified`=NOW() where `id`='$uid'");
-                       $tverify = mysql_fetch_assoc(mysql_query("select * from `tverify` where `id`='$uid'"));
-                       $memid = $tverify['memid'];
-                       $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$memid'"));
-                       $tmp = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary` where `to`='$memid'"));
-
-                       $points = 0;
-                       if($tverify['URL'] != "" && $tverify['photoid'] != "")
-                               $points = 150 - intval($tmp['points']);
-                       if($tverify['URL'] != "" && $tverify['photoid'] == "")
-                               $points = 90 - intval($tmp['points']);
-                       if($tverify['URL'] == "" && $tverify['photoid'] == "")
-                               $points = 50 - intval($tmp['points']);
-
-                       if($points < 0)
-                               $points = 0;
-
-                       if($points > 0)
-                       {
-                               mysql_query("insert into `notary` set `from`='0', `to`='$memid', `points`='$points',
-                                               `method`='Thawte Points Transfer', `when`=NOW()");
-                               fix_assurer_flag($memid);
-                       }
-                       $totalpoints = intval($tmp['points']) + $points;
-
-                       $body  = _("Your request to have points transfered was successful. You were issued $points points as a result, and you now have $totalpoints in total")."\n\n"._("The following comments were made by reviewers")."\n\n";
-                       $res = mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='1'");
-                       while($row = mysql_fetch_assoc($res))
-                               $body .= $row['comment']."\n";
-                       $body .= "\n";
-
-                       $body .= _("Best regards")."\n";
-                       $body .= _("CAcert Support Team");
-                       sendmail($user['email'], "[CAcert.org] Thawte Notary Points Transfer", $body, "website-form@cacert.org", "support@cacert.org", "", "CAcert Tverify");
-               }
-
-               $rc = mysql_num_rows(mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='-1'"));
-               if($rc >= 4)
-               {
-                       mysql_query("update `tverify` set `modified`=NOW() where `id`='$uid'");
-                       $tverify = mysql_fetch_assoc(mysql_query("select * from `tverify` where `id`='$uid'"));
-                       $memid = $tverify['memid'];
-                       $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$memid'"));
-
-                       $body  = _("Unfortunately your request for a points increase has been denied, below is the comments from people that reviewed your request as to why they rejected your application.")."\n\n";
-                       $res = mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='-1'");
-                       while($row = mysql_fetch_assoc($res))
-                               $body .= $row['comment']."\n";
-                       $body .= "\n";
-
-                       $body .= _("You are welcome to try submitting another request at any time in the future, please make sure you take the reviewer comments into consideration or you risk having your application rejected again.")."\n\n";
-
-                       $body .= _("Best regards")."\n";
-                       $body .= _("CAcert Support Team");
-                       sendmail($user['email'], "[CAcert.org] Thawte Notary Points Transfer", $body, "website-form@cacert.org", "support@cacert.org", "", "CAcert Tverify");
-               }
-
-               showheader(_("My CAcert.org Account!"));
-               echo _("Your vote has been accepted.");
-               showfooter();
-               exit;
-       }
- */
        if($id == 59){
                if ($oldid == 43 && $_SESSION['profile']['admin'] == 1) {
                        $_SESSION['support']=1;