Mercurial > hg > fapweb

changeset 856:4df97b9e6125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename two variables.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 26 Nov 2014 09:31:41 +0200
parents 4a26a5c1df75
children 70a8d52a8d00
files admajax.php
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Wed Nov 26 09:09:26 2014 +0200
+++ b/admajax.php	Wed Nov 26 09:31:41 2014 +0200
@@ -347,9 +347,9 @@
 
 function stGetVoteKeyClass($item)
 {
-  global $voteKeyMode;
+  global $setVoteKeyMode;
   
-  switch ($voteKeyMode)
+  switch ($setVoteKeyMode)
   {
     case VOTE_FREELY:
       $cond = 0;
@@ -370,20 +370,20 @@
 
 function stGetVoteKeyItemData($id, $item, $prefix)
 {
-  global $voteKeyMode, $voteKeyLen;
+  global $setVoteKeyMode, $setVoteKeyLen;
 
-  switch ($voteKeyMode)
+  switch ($setVoteKeyMode)
   {
     case VOTE_FREELY:
     case VOTE_ACTIVATE:
-      $klen = $voteKeyLen - strlen($item["key"]);
+      $klen = $setVoteKeyLen - strlen($item["key"]);
       $str = sprintf(
         "<span class=\"keyid\">%03d</span>&nbsp;:&nbsp;".
         "<span class=\"keycode\">%s</span>",
         $id,
         (($klen > 0) ? str_repeat("&nbsp;", $klen) : "").$item["key"]);
 
-      if ($voteKeyMode == VOTE_ACTIVATE)
+      if ($setVoteKeyMode == VOTE_ACTIVATE)
       {
         $str .= stGetFormCheckBoxInput("active", $id, $prefix, $item["active"], FALSE,
           "class=\"keyactive\" onChange=\"voteKeySetActive(".$id.")\"", "");
@@ -732,8 +732,8 @@
 stSessionExpire(SESS_ADMIN, FALSE);
 
 
-$voteKeyMode = stGetSetting("voteKeyMode");
-$voteKeyLen = stGetSetting("userKeyLength");
+$setVoteKeyMode = stGetSetting("voteKeyMode");
+$setVoteKeyLen = stGetSetting("userKeyLength");
 $type = stGetRequestItem("type", "");
 switch (stGetRequestItem("action", ""))
 {
@@ -1299,7 +1299,7 @@
 
       case "votekey":
       case "votekeyclass":
-        switch ($voteKeyMode)
+        switch ($setVoteKeyMode)
         {
           case VOTE_FREELY:
           case VOTE_ACTIVATE:
@@ -1344,8 +1344,8 @@
         echo
           "<div class=\"info\"><b>Voting mode: ";
         
-        if (isset($voteModeData[$voteKeyMode]))
-          echo $voteModeData[$voteKeyMode][0]."</b>. ".$voteModeData[$voteKeyMode][1];
+        if (isset($voteModeData[$setVoteKeyMode]))
+          echo $voteModeData[$setVoteKeyMode][0]."</b>. ".$voteModeData[$setVoteKeyMode][1];
         else
           echo "VOTE MODE NOT SET! CHECK CONFIGURATION!</b>";
         
@@ -1355,7 +1355,7 @@
           "<a href=\"print.php?type=votekeys\" target=\"_blank\">Show printable key list</a>\n".
           "</div>\n";
 
-        switch ($voteKeyMode)
+        switch ($setVoteKeyMode)
         {
           case VOTE_FREELY:
           case VOTE_ACTIVATE:
@@ -1585,7 +1585,7 @@
           stExecSQLCond($sql, "OK, attendee ".$id." deleted.");
 
           // If assigned votekey mode, delete the key and votes as well
-          if ($voteKeyMode == VOTE_ASSIGN && $attn["key_id"] != 0)
+          if ($setVoteKeyMode == VOTE_ASSIGN && $attn["key_id"] != 0)
           {
             $sql = stPrepareSQL("DELETE FROM votekeys WHERE id=%d", $attn["key_id"]);
             stExecSQLCond($sql, "OK, attendee ".$id." votekey deleted.");