bug 999: Added text change in alert messages
authorINOPIAE <inopiae@cacert.org>
Wed, 1 May 2013 09:03:50 +0000 (11:03 +0200)
committerINOPIAE <inopiae@cacert.org>
Wed, 1 May 2013 09:03:50 +0000 (11:03 +0200)
includes/notary.inc.php
pages/account/43.php

index cc0e0eb..b0e3d6b 100644 (file)
@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/ 
+*/
 
        function query_init ($query)
        {
@@ -52,8 +52,8 @@
 
        function get_top_assurer_position ($no_of_assurances)
        {
-               $res = query_init ("SELECT count(*) AS `list` FROM `notary` 
-                       WHERE `method` = 'Face to Face Meeting' 
+               $res = query_init ("SELECT count(*) AS `list` FROM `notary`
+                       WHERE `method` = 'Face to Face Meeting'
                        GROUP BY `from` HAVING count(*) > '".intval($no_of_assurances)."'");
                return intval(query_get_number_of_rows($res)+1);
        }
@@ -83,7 +83,7 @@
                $res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' group by points,awarded,method");
                return $res;
        }
-       
+
        function get_received_assurances_summary ($userid)
        {
                $res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' group by points,awarded,method");
                        $awarded = 100;
                }
                else
-                       $experience = 0;        
+                       $experience = 0;
 
                switch ($row['method'])
                {
 ?>
                <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$when?><?=$emclose?></td>
                <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$email?><?=$emclose?></td>
-<?     } 
+<?     }
 ?>
        <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td>
        <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td>
                        <td class="DataTD" <?=$tdstyle?>>&nbsp;</td>
 <?             } else {
 ?>
-                       <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&amp;userid=<?=intval($userid)?>&amp;assurance=<?=intval($assuranceid)?>&amp;csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a><?=$emclose?></td>
+                       <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&amp;userid=<?=intval($userid)?>&amp;assurance=<?=intval($assuranceid)?>&amp;csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID '%s'?"),$assuranceid)?>');"><?=_("Revoke")?></a><?=$emclose?></td>
 <?
                }
        }
                $res = get_given_assurances(intval($userid));
                while($row = mysql_fetch_assoc($res))
                {
-                       $fromuser = get_user (intval($row['to'])); 
+                       $fromuser = get_user (intval($row['to']));
                        $apoints = calc_experience ($row,$points,$experience,$sum_experience,$revoked);
                        $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to']));
                        $email = show_email_link ($fromuser['email'],intval($row['to']));
index 7bf6d04..ff8375d 100644 (file)
@@ -53,14 +53,14 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
     } else {
       // $email contains non-digits ==> search for mail addresses
       // Be defensive here (outer join) if primary mail is not listed in email table
-      $query = "select `users`.`id` as `id`, `email`.`email` as `email` 
+      $query = "select `users`.`id` as `id`, `email`.`email` as `email`
           from `users` left outer join `email` on (`users`.`id`=`email`.`memid`)
-          where (`email`.`email` like '$emailsearch' 
+          where (`email`.`email` like '$emailsearch'
                  or `users`.`email` like '$emailsearch')
             and `users`.`deleted`=0
           group by `users`.`id` limit 100";
     }
-    // bug-975 ted+uli changes --- end 
+    // bug-975 ted+uli changes --- end
     $res = mysql_query($query);
     if(mysql_num_rows($res) > 1) { ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -338,7 +338,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
     <td colspan="2" class="title"><?=_("Account State")?></td>
   </tr>
 
-<?  
+<?
   // ---  bug-975 begin ---
   //  potential db inconsistency like in a20110804.1
   //    Admin console -> don't list user account
@@ -359,7 +359,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        4.  email.email = primary-email       (???) or'd
       not covered by admin console find user routine, but may block users login
        5.  users.verified = 0|1
-      further "special settings"   
+      further "special settings"
        6.  users.locked  (setting displayed in display form)
        7.  users.assurer_blocked   (setting displayed in display form)
 
@@ -370,7 +370,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        1. users.verified = 1
        2. users.deleted = 0
        3. users.locked = 0
-       4. users.email = primary-email                          
+       4. users.email = primary-email
 
     --- Assurer, assure someone find user query
     select * from `users` where `email`='".mysql_escape_string(stripslashes($_POST['email']))."'
@@ -384,11 +384,11 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        1.  email.hash = ''            Yes        No           No
        2.  email.deleted = 0          Yes        No           No
        3.  users.deleted = 0          Yes        Yes          Yes
-       4.  users.verified = 1         No         Yes          No       
+       4.  users.verified = 1         No         Yes          No
        5.  users.locked = 0           No         Yes          No
        6.  users.email = prim-email   No         Yes          Yes
        7.  email.email = prim-email   Yes        No           No
-                 
+
     full usable account needs all 7 requirements fulfilled
     so if one setting isn't set/cleared there is an inconsistency either way
     if eg email.email is not avail, admin console cannot open user info
@@ -432,7 +432,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
     $dres = mysql_query($query);
     $drow = mysql_fetch_assoc($dres);
   }
-  
+
   if ($drow) {
     $eemail    = $drow['eemail'];
     $edeleted  = $drow['edeleted'];
@@ -451,11 +451,11 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
     }
     if ($edeleted!=0) {
       $inconsistency += 8;
-      $inccause .= (empty($inccause)?"":"<br>")._("Email record set deleted");    
+      $inccause .= (empty($inccause)?"":"<br>")._("Email record set deleted");
     }
     if ($ehash!='') {
       $inconsistency += 16;
-      $inccause .= (empty($inccause)?"":"<br>")._("Email record hash not unset");        
+      $inccause .= (empty($inccause)?"":"<br>")._("Email record hash not unset");
     }
   } else {
     $inconsistency = 32;
@@ -474,14 +474,14 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
       "operations and needs to be fixed manually through arbitration/critical ".
       "team.")?>
      </td>
-  </tr>  
+  </tr>
 <? }
 
   // ---  bug-975 end ---
 ?>
 </table>
 <br>
-<?    
+<?
  //  End - Debug infos
 ?>
 
@@ -510,12 +510,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        $dres = mysql_query($query);
        $drow = mysql_fetch_assoc($dres);
        $total = $drow['total'];
-       
+
        $maxexpire = "0000-00-00 00:00:00";
        if ($drow['maxexpire']) {
                $maxexpire = $drow['maxexpire'];
        }
-       
+
        if($total > 0) {
                $query = "select COUNT(*) as `valid`
                          from `domains` inner join `domaincerts`
@@ -526,7 +526,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $valid = $drow['valid'];
-               
+
                $query = "select COUNT(*) as `expired`
                          from `domains` inner join `domaincerts`
                               on `domains`.`id` = `domaincerts`.`domid`
@@ -535,7 +535,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $expired = $drow['expired'];
-               
+
                $query = "select COUNT(*) as `revoked`
                          from `domains` inner join `domaincerts`
                               on `domains`.`id` = `domaincerts`.`domid`
@@ -568,12 +568,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        $dres = mysql_query($query);
        $drow = mysql_fetch_assoc($dres);
        $total = $drow['total'];
-       
+
        $maxexpire = "0000-00-00 00:00:00";
        if ($drow['maxexpire']) {
                $maxexpire = $drow['maxexpire'];
        }
-       
+
        if($total > 0) {
                $query = "select COUNT(*) as `valid`
                          from `emailcerts`
@@ -583,7 +583,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $valid = $drow['valid'];
-               
+
                $query = "select COUNT(*) as `expired`
                          from `emailcerts`
                          where `memid` = '".intval($row['id'])."'
@@ -591,7 +591,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $expired = $drow['expired'];
-               
+
                $query = "select COUNT(*) as `revoked`
                          from `emailcerts`
                          where `memid` = '".intval($row['id'])."'
@@ -623,12 +623,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        $dres = mysql_query($query);
        $drow = mysql_fetch_assoc($dres);
        $total = $drow['total'];
-       
+
        $maxexpire = "0000-00-00 00:00:00";
        if ($drow['maxexpire']) {
                $maxexpire = $drow['maxexpire'];
        }
-       
+
        if($total > 0) {
                $query = "select COUNT(*) as `valid`
                          from `gpg`
@@ -637,7 +637,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $valid = $drow['valid'];
-               
+
                $query = "select COUNT(*) as `expired`
                          from `emailcerts`
                          where `memid` = '".intval($row['id'])."'
@@ -645,7 +645,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $expired = $drow['expired'];
-               
+
                ?>
                <td class="DataTD"><?=intval($total)?></td>
                <td class="DataTD"><?=intval($valid)?></td>
@@ -672,12 +672,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        $dres = mysql_query($query);
        $drow = mysql_fetch_assoc($dres);
        $total = $drow['total'];
-       
+
        $maxexpire = "0000-00-00 00:00:00";
        if ($drow['maxexpire']) {
                $maxexpire = $drow['maxexpire'];
        }
-       
+
        if($total > 0) {
                $query = "select COUNT(*) as `valid`
                          from `orgdomaincerts` as `orgcerts` inner join `org`
@@ -688,7 +688,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $valid = $drow['valid'];
-               
+
                $query = "select COUNT(*) as `expired`
                          from `orgdomaincerts` as `orgcerts` inner join `org`
                                   on `orgcerts`.`orgid` = `org`.`orgid`
@@ -697,7 +697,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $expired = $drow['expired'];
-               
+
                $query = "select COUNT(*) as `revoked`
                          from `orgdomaincerts` as `orgcerts` inner join `org`
                                   on `orgcerts`.`orgid` = `org`.`orgid`
@@ -732,12 +732,12 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
        $dres = mysql_query($query);
        $drow = mysql_fetch_assoc($dres);
        $total = $drow['total'];
-       
+
        $maxexpire = "0000-00-00 00:00:00";
        if ($drow['maxexpire']) {
                $maxexpire = $drow['maxexpire'];
        }
-       
+
        if($total > 0) {
                $query = "select COUNT(*) as `valid`
                          from `orgemailcerts` as `orgcerts` inner join `org`
@@ -748,7 +748,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $valid = $drow['valid'];
-               
+
                $query = "select COUNT(*) as `expired`
                          from `orgemailcerts` as `orgcerts` inner join `org`
                                   on `orgcerts`.`orgid` = `org`.`orgid`
@@ -757,7 +757,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
                $dres = mysql_query($query);
                $drow = mysql_fetch_assoc($dres);
                $expired = $drow['expired'];
-               
+
                $query = "select COUNT(*) as `revoked`
                          from `orgemailcerts` as `orgcerts` inner join `org`
                                   on `orgcerts`.`orgid` = `org`.`orgid`
@@ -827,7 +827,7 @@ function showassuredto()
     <td class="DataTD"><?=intval($drow['points'])?></td>
     <td class="DataTD"><?=sanitizeHTML($drow['location'])?></td>
     <td class="DataTD"><?=sanitizeHTML($drow['method'])?></td>
-    <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['to'])?>&amp;assurance=<?=intval($drow['id'])?>&amp;csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a></td>
+    <td class="DataTD"><a href="account.php?id=43&amp;userid=<?=intval($drow['to'])?>&amp;assurance=<?=intval($drow['id'])?>&amp;csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID '%s'?"),$drow['id'])?>');"><?=_("Revoke")?></a></td>
   </tr>
 <? } ?>
   <tr>
@@ -873,7 +873,7 @@ function showassuredby()
     <td class="DataTD"><?=$drow['points']?></td>
     <td class="DataTD"><?=$drow['location']?></td>
     <td class="DataTD"><?=$drow['method']?></td>
-    <td class="DataTD"><a href="account.php?id=43&userid=<?=$drow['from']?>&assurance=<?=$drow['id']?>&amp;csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a></td>
+    <td class="DataTD"><a href="account.php?id=43&userid=<?=$drow['from']?>&assurance=<?=$drow['id']?>&amp;csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=sprintf(_("Are you sure you want to revoke the assurance with ID '%s'?"),$drow['id'])?>');"><?=_("Revoke")?></a></td>
   </tr>
 <? } ?>
   <tr>
@@ -884,7 +884,7 @@ function showassuredby()
 </table>
 <? } ?>
 <br><br>
-<? } } 
+<? } }
 
 switch ($_GET['shownotary'])
         {