--- a/admajax.php	Thu Jan 26 01:59:33 2017 +0200
+++ b/admajax.php	Thu Jan 26 13:38:19 2017 +0200
@@ -380,11 +380,11 @@
 }
 
 
-function stGetVoteKeyClass($item)
+function stGetUserKeyClass($item)
 {
-  global $setVoteKeyMode;
+  global $setUserKeyMode;
   
-  switch ($setVoteKeyMode)
+  switch ($setUserKeyMode)
   {
     case VOTE_FREELY:
       $cond = 0;
@@ -400,43 +400,43 @@
   }
 
   return
-    "votekey ".($cond ? "vkeyActive" : "vkeyInactive").
+    "userkey ".($cond ? "vkeyActive" : "vkeyInactive").
     " ".($item["nvotes"] > 0 ? "vkeyUsed" : "vkeyUnused");
 }
 
 
-function stGetVoteKeyInfo()
+function stGetUserKeyInfo()
 {
-  $nkeys = stFetchSQLColumn("SELECT COUNT(*) FROM votekeys WHERE active=1");
-  $totalKeys = stFetchSQLColumn("SELECT COUNT(*) FROM votekeys");
+  $nkeys = stFetchSQLColumn("SELECT COUNT(*) FROM userkeys WHERE active=1");
+  $totalKeys = stFetchSQLColumn("SELECT COUNT(*) FROM userkeys");
   
   $nvoters = stFetchSQLColumn("SELECT COUNT(DISTINCT(key_id)) FROM votes");
 
   return
-    "Info: <b>".$nkeys."</b> of <b>".$totalKeys."</b> votekeys are activated. ".
+    "Info: <b>".$nkeys."</b> of <b>".$totalKeys."</b> userkeys are activated. ".
     "Also, <b>".$nvoters."</b> keys have been used for voting.";
 }
 
 
-function stGetVoteKeyItemData($id, $item, $prefix)
+function stGetUserKeyItemData($id, $item, $prefix)
 {
-  global $setVoteKeyMode, $setVoteKeyLen;
+  global $setUserKeyMode, $setUserKeyLen;
 
-  switch ($setVoteKeyMode)
+  switch ($setUserKeyMode)
   {
     case VOTE_FREELY:
     case VOTE_ACTIVATE:
-      $klen = $setVoteKeyLen - strlen($item["key"]);
+      $klen = $setUserKeyLen - 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 ($setVoteKeyMode == VOTE_ACTIVATE)
+      if ($setUserKeyMode == VOTE_ACTIVATE)
       {
         $str .= stGetFormCheckBoxInput("active", $id, $prefix, $item["active"], FALSE,
-          "class=\"keyactive\" onChange=\"voteKeySetActive(".$id.")\"", "");
+          "class=\"keyactive\" onChange=\"userKeySetActive(".$id.")\"", "");
       }
       
       return $str;
@@ -447,10 +447,10 @@
         "  <td class=\"groups\">".chentities($item["groups"])."</td>\n".
         "  <td class=\"vkeynum\">".
           stGetFormTextInput(5, 5, "key_id", $id, $prefix, $item["key_id"]).
-          stGetFormButtonInput("assign", $id, $prefix, "Set", "voteKeyAssign(".$id.",1)");
+          stGetFormButtonInput("assign", $id, $prefix, "Set", "userKeyAssign(".$id.",1)");
 
         if ($item["key_id"] != 0)
-          $str .= stGetFormButtonInput("clear", $id, $prefix, "Clear", "voteKeyAssign(".$id.",0)");
+          $str .= stGetFormButtonInput("clear", $id, $prefix, "Clear", "userKeyAssign(".$id.",0)");
         
       $str .=
         "</td>\n".
@@ -806,8 +806,8 @@
 stSessionExpire(SESS_ADMIN, FALSE);
 
 
-$setVoteKeyMode = stGetSetting("voteKeyMode");
-$setVoteKeyLen = stGetSetting("userKeyLength");
+$setUserKeyMode = stGetSetting("userKeyMode");
+$setUserKeyLen = stGetSetting("userKeyLength");
 $type = stGetRequestItem("type", "");
 switch (stGetRequestItem("action", ""))
 {
@@ -1406,37 +1406,37 @@
           stError("No such attendee ID!");
         break;
 
-      case "votekeyinfo":
-        echo stGetVoteKeyInfo();
+      case "userkeyinfo":
+        echo stGetUserKeyInfo();
         break;
 
-      case "votekey":
-      case "votekeyclass":
-        switch ($setVoteKeyMode)
+      case "userkey":
+      case "userkeyclass":
+        switch ($setUserKeyMode)
         {
           case VOTE_FREELY:
           case VOTE_ACTIVATE:
-            $sql = stPrepareSQL("SELECT (SELECT COUNT(id) FROM votes WHERE key_id=%D) AS nvotes,votekeys.* FROM votekeys WHERE id=%D", "id", "id");
+            $sql = stPrepareSQL("SELECT (SELECT COUNT(id) FROM votes WHERE key_id=%D) AS nvotes,userkeys.* FROM userkeys WHERE id=%D", "id", "id");
             break;
 
           case VOTE_ASSIGN:
-            $sql = stPrepareSQL("SELECT (SELECT COUNT(id) FROM votes WHERE key_id=%D) AS nvotes,votekeys.key,attendees.* FROM attendees ".
-              "LEFT JOIN votekeys ON votekeys.id=attendees.key_id ".
+            $sql = stPrepareSQL("SELECT (SELECT COUNT(id) FROM votes WHERE key_id=%D) AS nvotes,userkeys.key,attendees.* FROM attendees ".
+              "LEFT JOIN userkeys ON userkeys.id=attendees.key_id ".
               "WHERE attendees.id=%D", "id", "id");
             break;
         }
         if (($res = stFetchSQL($sql)) !== FALSE)
         {
-          if ($type == "votekeyclass")
-            echo stGetVoteKeyClass($res);
+          if ($type == "userkeyclass")
+            echo stGetUserKeyClass($res);
           else
-            echo stGetVoteKeyItemData($res["id"], $res, "vk");
+            echo stGetUserKeyItemData($res["id"], $res, "vk");
         }
         break;
 
       case "voters":
-        // Generate vote keys, if needed
-        $numVKeys = stFetchSQLColumn("SELECT COUNT(*) FROM votekeys");
+        // Generate user keys, if needed
+        $numVKeys = stFetchSQLColumn("SELECT COUNT(*) FROM userkeys");
         $numUsers = stFetchSQLColumn("SELECT COUNT(*) FROM attendees");
         if (($tmp = stGetSetting("maxAttendeesHard")) > $numUsers)
           $numUsers = $tmp;
@@ -1448,7 +1448,7 @@
         {
           if (($key = stGenerateUserKey()) !== false)
           {
-            if (stExecSQL(stPrepareSQL("INSERT INTO votekeys (key) VALUES (%s)", $key)) !== false)
+            if (stExecSQL(stPrepareSQL("INSERT INTO userkeys (key) VALUES (%s)", $key)) !== false)
               $numVKeys++;
           }
         }
@@ -1456,48 +1456,50 @@
         // Some information
         echo
           "<div class=\"tabHeadersSub\">\n".
-          " <a href=\"print.php?type=votekeys\" target=\"_blank\">Show printable key list</a>\n".
+          " <a href=\"print.php?type=userkeys\" target=\"_blank\">Show printable key list</a>\n".
           " <a href=\"print.php?type=results&flags=".(RFLAG_NORMAL)."\" target=\"_blank\">Printable results</a>\n".
           " <a href=\"print.php?type=results&flags=".(RFLAG_DISQUALIFIED)."\" target=\"_blank\">Printable full results</a> (shows also disqualified entries)\n".
           " <a href=\"print.php?type=results&flags=".(RFLAG_DISQUALIFIED | RFLAG_HIDDEN_COMPOS)."\" target=\"_blank\">Printable FULL results</a> (shows also hidden and empty compos)\n".
-          " <div id=\"vkeyInfo\">".stGetVoteKeyInfo()."</div>\n".
+          " <div id=\"vkeyInfo\">".stGetUserKeyInfo()."</div>\n".
           "</div>\n";
 
         echo
-          "<div class=\"info\"><b>Voting mode: ";
+          "<div class=\"info\">".
+          "User key length ".stGetSetting("userKeyLength")." ".
+          "<b>Voting mode: ";
         
-        if (isset($voteModeData[$setVoteKeyMode]))
-          echo $voteModeData[$setVoteKeyMode][0]."</b>. ".$voteModeData[$setVoteKeyMode][1];
+        if (isset($voteModeData[$setUserKeyMode]))
+          echo $voteModeData[$setUserKeyMode][0]."</b>. ".$voteModeData[$setUserKeyMode][1];
         else
           echo "VOTE MODE NOT SET! CHECK CONFIGURATION!</b>";
 
         echo "</div>\n";
 
-        // List of votekeys
-        switch ($setVoteKeyMode)
+        // List of userkeys
+        switch ($setUserKeyMode)
         {
           case VOTE_FREELY:
           case VOTE_ACTIVATE:
-            $sql = "SELECT votekeys.*,COUNT(votes.id) AS nvotes FROM votekeys ".
-              "LEFT JOIN votes ON votes.key_id=votekeys.id ".
-              "GROUP BY votekeys.id ".
-              "ORDER BY votekeys.id ASC";
+            $sql = "SELECT userkeys.*,COUNT(votes.id) AS nvotes FROM userkeys ".
+              "LEFT JOIN votes ON votes.key_id=userkeys.id ".
+              "GROUP BY userkeys.id ".
+              "ORDER BY userkeys.id ASC";
 
             foreach (stExecSQL($sql) as $item)
             {
               echo
-                "<div class=\"".stGetVoteKeyClass($item).
+                "<div class=\"".stGetUserKeyClass($item).
                 "\" id=\"vkey".$item["id"]."\">".
-                stGetVoteKeyItemData($item["id"], $item, "vk").
+                stGetUserKeyItemData($item["id"], $item, "vk").
                 "</div>\n";
             }
             break;
 
           case VOTE_ASSIGN:
-            $sql = "SELECT votekeys.*,attendees.*,COUNT(votes.id) AS nvotes FROM attendees ".
-              "LEFT JOIN votekeys ON votekeys.id=attendees.key_id ".
+            $sql = "SELECT userkeys.*,attendees.*,COUNT(votes.id) AS nvotes FROM attendees ".
+              "LEFT JOIN userkeys ON userkeys.id=attendees.key_id ".
               "LEFT JOIN votes ON votes.key_id=attendees.key_id ".
-              "GROUP BY votekeys.id ".
+              "GROUP BY userkeys.id ".
               "ORDER BY attendees.regtime DESC";
 
             echo
@@ -1506,16 +1508,16 @@
               "  <th class=\"name\">Name</th>\n".
               "  <th class=\"groups\">Groups</th>\n".
               "  <th class=\"vkeynum\">Key #</th>\n".
-              "  <th class=\"vkey\">Votekey</th>\n".
+              "  <th class=\"vkey\">Userkey</th>\n".
               " </tr>\n";
 
             $index = 0;
             foreach (stExecSQL($sql) as $item)
             {
               echo
-                " <tr class=\"".stGetVoteKeyClass($item).
+                " <tr class=\"".stGetUserKeyClass($item).
                 "\" id=\"vkey".$item["id"]."\">\n".
-                stGetVoteKeyItemData($item["id"], $item, "vk").
+                stGetUserKeyItemData($item["id"], $item, "vk").
                 " </tr>\n";
             }
 
@@ -1716,11 +1718,11 @@
           $sql = stPrepareSQL("DELETE FROM attendees WHERE id=%d", $id);
           stExecSQLCond($sql, "OK, attendee ".$id." deleted.");
 
-          // If assigned votekey mode, delete the key and votes as well
-          if ($setVoteKeyMode == VOTE_ASSIGN && $attn["key_id"] != 0)
+          // If assigned userkey mode, delete the key and votes as well
+          if ($setUserKeyMode == VOTE_ASSIGN && $attn["key_id"] != 0)
           {
-            $sql = stPrepareSQL("DELETE FROM votekeys WHERE id=%d", $attn["key_id"]);
-            stExecSQLCond($sql, "OK, attendee ".$id." votekey deleted.");
+            $sql = stPrepareSQL("DELETE FROM userkeys WHERE id=%d", $attn["key_id"]);
+            stExecSQLCond($sql, "OK, attendee ".$id." userkey deleted.");
 
             $sql = stPrepareSQL("DELETE FROM votes WHERE key_id=%d", $attn["key_id"]);
             stExecSQLCond($sql, "OK, attendee ".$id." votes deleted.");
@@ -1748,10 +1750,10 @@
       }
     }
     else
-    if ($type == "votekeys")
+    if ($type == "userkeys")
     {
-      $sql = stPrepareSQL("DELETE FROM votekeys");
-      stExecSQLCond($sql, "OK, all votekeys purged");
+      $sql = stPrepareSQL("DELETE FROM userkeys");
+      stExecSQLCond($sql, "OK, all userkeys purged");
     }
 
     stDBCommitTransaction();
@@ -1940,9 +1942,9 @@
     stDBCommitTransaction();
     break;
 
-  case "votekey":
+  case "userkey":
     //
-    // Votekey activation/deactivation handling
+    // Userkey activation/deactivation handling
     //
     stDBBeginTransaction();
     if (stChkRequestItem("id", $id, array(CHK_TYPE, VT_INT, "Invalid data.")))
@@ -1952,7 +1954,7 @@
         case "assign":
           // Check if already assigned to someone ..
           $key_id = intval(stGetRequestItem("key_id", 0));
-          $sql = stPrepareSQL("SELECT * FROM votekeys WHERE id=%d", $key_id);
+          $sql = stPrepareSQL("SELECT * FROM userkeys WHERE id=%d", $key_id);
           if (stFetchSQL($sql) === false)
             stError("Invalid key ID #.");
           else
@@ -1976,8 +1978,8 @@
         
         case "active":
           // Autobots activate!
-          $sql = stPrepareSQL("UPDATE votekeys SET active=%B WHERE id=%d", "active", $id);
-          stExecSQLCond($sql, "Votekey status changed.");
+          $sql = stPrepareSQL("UPDATE userkeys SET active=%B WHERE id=%d", "active", $id);
+          stExecSQLCond($sql, "Userkey status changed.");
           break;
       }
     }