--- a/admajax.php	Sun Dec 15 23:46:41 2013 +0200
+++ b/admajax.php	Sun Dec 15 23:48:14 2013 +0200
@@ -30,7 +30,7 @@
     stChkRequestItem("voting", $fake,
       array(CHK_TYPE, VT_BOOL, "Invalid data.")
     ) &&
-    stChkRequestItem("showAuthors", $fake,
+    stChkRequestItem("show_authors", $fake,
       array(CHK_TYPE, VT_BOOL, "Invalid data.")
     );
 }
@@ -85,7 +85,7 @@
     "  <h2>#".$id." - ".chentities($item["name"])."</h2>\n".
     "  ".stGetFormTextInput(40, SET_LEN_COMPO_NAME, "name", $id, $prefix, $item["name"])."\n".
     "  ".stGetFormCheckBoxInput("visible", $id, $prefix, $item["visible"], "Visible")."\n".
-    "  ".stGetFormCheckBoxInput("showAuthors", $id, $prefix, $item["showAuthors"], "Show authors")."\n".
+    "  ".stGetFormCheckBoxInput("show_authors", $id, $prefix, $item["show_authors"], "Show authors")."\n".
     "  ".stGetFormCheckBoxInput("voting", $id, $prefix, $item["voting"], "Enable voting")."<br />\n".
     "  ".stGetFormTextArea(5, 60, "description", $id, $prefix, $item["description"])."\n<br />\n".
     "  ".stGetFormButtonInput("update", $id, $prefix, "Update", "updateCompo(".$id.")")."\n";
@@ -267,9 +267,9 @@
 function stGetInfoRotationLists($indent, $outer)
 {
   $sql =
-    "SELECT rotationListData.*, ".
-    "(SELECT COUNT(*) FROM rotationListSlides WHERE list_id=rotationListData.id) AS nslides ".
-    "FROM rotationListData ".
+    "SELECT rot_list_data.*, ".
+    "(SELECT COUNT(*) FROM rot_list_slides WHERE list_id=rot_list_data.id) AS nslides ".
+    "FROM rot_list_data ".
     "ORDER BY id DESC";
 
   $str = stGetOptionListStart("ctrlRotationLists", $indent, $outer);
@@ -295,7 +295,7 @@
 {
   $str = stGetOptionListStart("ctrlDisplaySlides", $indent, $outer);
 
-  $sql = "SELECT * FROM displaySlides ORDER BY id DESC";
+  $sql = "SELECT * FROM display_slides ORDER BY id DESC";
   if (($res = stExecSQL($sql)) !== false)
   {
     foreach ($res as $item)
@@ -309,7 +309,7 @@
 
 function stGetInfoRotationListEditFull($indent, $outer, $list_id)
 {
-  $sql = stPrepareSQL("SELECT * FROM rotationListData WHERE id=%d", $list_id);
+  $sql = stPrepareSQL("SELECT * FROM rot_list_data WHERE id=%d", $list_id);
   if (($data = stFetchSQL($sql)) === false)
     return "";
   
@@ -321,7 +321,7 @@
     "<div>Available slides:</div>\n".
     stGetOptionListStart("ctrlEDDisplaySlides", $indent."  ", TRUE);
 
-  $sql = "SELECT * FROM displaySlides";
+  $sql = "SELECT * FROM display_slides";
   if (($res = stExecSQL($sql)) !== false)
   {
     foreach ($res as $item)
@@ -348,10 +348,10 @@
 function stGetInfoRotationListEditData($indent, $outer, $list_id)
 {
   $sql = stPrepareSQL(
-    "SELECT displaySlides.*,rotationListSlides.order_num FROM displaySlides ".
-    "LEFT JOIN rotationListSlides ON displaySlides.id=rotationListSlides.slide_id ".
-    "WHERE rotationListSlides.list_id=%d ".
-    "ORDER BY rotationListSlides.order_num DESC",
+    "SELECT display_slides.*,rot_list_slides.order_num FROM display_slides ".
+    "LEFT JOIN rot_list_slides ON display_slides.id=rot_list_slides.slide_id ".
+    "WHERE rot_list_slides.list_id=%d ".
+    "ORDER BY rot_list_slides.order_num DESC",
     $list_id);
 
   $str = stGetOptionListStart("ctrlEDRotationList", $indent, $outer);
@@ -372,7 +372,7 @@
 
 function stGetInfoActiveRotationList($indent, $outer)
 {
-  $sql = stPrepareSQL("SELECT * FROM rotationListData WHERE id=%d",
+  $sql = stPrepareSQL("SELECT * FROM rot_list_data WHERE id=%d",
     stGetDisplayVar("rotateList"));
   
   $str = $indent.($outer ? "<div id=\"ctrlActiveRotationList\">" : "").
@@ -396,7 +396,7 @@
     $indent."  <form method=\"post\" action=\"\" onsubmit=\"return updateDisplaySlide(".$slide_id.")\">\n".
     $indent."    <div class=\"ctrlTitle\">Edit display slide</div>\n";
 
-  $sql = stPrepareSQL("SELECT * FROM displaySlides WHERE id=%d", $slide_id);
+  $sql = stPrepareSQL("SELECT * FROM display_slides WHERE id=%d", $slide_id);
   if (($slide = stFetchSQL($sql)) !== false)
   {
     $str .=
@@ -660,7 +660,7 @@
         if (stChkRequestItem("id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
             stChkRequestItem("duration", $slide_dur, array(CHK_RANGE, VT_INT, array(1, 60), "Invalid duration range, should be 1-60 min.")))
         {
-          $sql = stPrepareSQL("SELECT * FROM displaySlides WHERE id=%d", $slide_id);
+          $sql = stPrepareSQL("SELECT * FROM display_slides WHERE id=%d", $slide_id);
           if (($slide = stFetchSQL($sql)) !== false)
           {
             stSetDisplayVar("tempDuration", $slide_dur);
@@ -685,10 +685,10 @@
       case "copyDisplaySlide":
         if (stChkRequestItem("id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
-          $sql = stPrepareSQL("SELECT * FROM displaySlides WHERE id=%d", $slide_id);
+          $sql = stPrepareSQL("SELECT * FROM display_slides WHERE id=%d", $slide_id);
           if (($slide = stFetchSQL($sql)) !== false)
           {
-            $sql = stPrepareSQL("INSERT INTO displaySlides (title,text) VALUES (%s,%s)",
+            $sql = stPrepareSQL("INSERT INTO display_slides (title,text) VALUES (%s,%s)",
               $slide["title"]." (copy)", $slide["text"]);
 
             if (stExecSQLCond($sql, "Display slide copied.") !== false)
@@ -703,7 +703,7 @@
         break;
 
       case "newDisplaySlide":
-        $sql = stPrepareSQL("INSERT INTO displaySlides (title) VALUES (%s)", "New slide");
+        $sql = stPrepareSQL("INSERT INTO display_slides (title) VALUES (%s)", "New slide");
         if (stExecSQLCond($sql, "Display slide created.") !== false)
         {
           $slide_id = $db->lastInsertId();
@@ -721,7 +721,7 @@
               array(CHK_LTEQ, VT_STR, SET_LEN_DISP_SLIDE_TEXT, "Slide content too long.")
             ))
         {
-          $sql = stPrepareSQLUpdate("displaySlides",
+          $sql = stPrepareSQLUpdate("display_slides",
             "WHERE id=".$slide_id,
             array(
               "title" => "S",
@@ -736,21 +736,21 @@
       case "deleteDisplaySlide":
         if (stChkRequestItem("id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
-          $sql = stPrepareSQL("DELETE FROM displaySlides WHERE id=%d", $slide_id);
+          $sql = stPrepareSQL("DELETE FROM display_slides WHERE id=%d", $slide_id);
           stExecSQLCond($sql, "Slide deleted.");
 
-          $sql = stPrepareSQL("DELETE FROM rotationListSlides WHERE slide_id=%d", $slide_id);
+          $sql = stPrepareSQL("DELETE FROM rot_list_slides WHERE slide_id=%d", $slide_id);
           stExecSQLCond($sql, "Slide list refs deleted.");
           stDisplayUpdated();
         }
         break;
 
       case "newRotationList":
-        $sql = stPrepareSQL("INSERT INTO rotationListData (name) VALUES (%s)", "New list #");
+        $sql = stPrepareSQL("INSERT INTO rot_list_data (name) VALUES (%s)", "New list #");
         if (stExecSQLCond($sql, "Rotation list created.") !== false)
         {
           $list_id = $db->lastInsertId();
-          $sql = stPrepareSQL("UPDATE rotationListData SET name=%s WHERE id=%d",
+          $sql = stPrepareSQL("UPDATE rot_list_data SET name=%s WHERE id=%d",
             "New list #".$list_id, $list_id);
 
           if (stExecSQLCond($sql, "OK!") !== false)
@@ -764,7 +764,7 @@
               array(CHK_GTEQ, VT_STR, 3, "Rotation list name too short."),
               array(CHK_LTEQ, VT_STR, SET_LEN_ROT_LIST_NAME, "Rotation list name too long.")))
         {
-          $sql = stPrepareSQLUpdate("rotationListData",
+          $sql = stPrepareSQLUpdate("rot_list_data",
             "WHERE id=".$list_id,
             array(
               "name" => "S",
@@ -779,10 +779,10 @@
       case "deleteRotationList":
         if (stChkRequestItem("id", $list_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
-          $sql = stPrepareSQL("DELETE FROM rotationListData WHERE id=%d", $list_id);
+          $sql = stPrepareSQL("DELETE FROM rot_list_data WHERE id=%d", $list_id);
           stExecSQLCond($sql, "List data deleted.");
 
-          $sql = stPrepareSQL("DELETE FROM rotationListSlides WHERE list_id=%d", $list_id);
+          $sql = stPrepareSQL("DELETE FROM rot_list_slides WHERE list_id=%d", $list_id);
           stExecSQLCond($sql, "List slide refs deleted.");
           stDisplayUpdated();
         }
@@ -801,9 +801,9 @@
         if (stChkRequestItem("list_id", $list_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
             stChkRequestItem("slide_id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
-          $nslides = stFetchSQLColumn(stPrepareSQL("SELECT COUNT(*) FROM rotationListSlides WHERE list_id=%d", $list_id));
+          $nslides = stFetchSQLColumn(stPrepareSQL("SELECT COUNT(*) FROM rot_list_slides WHERE list_id=%d", $list_id));
           $sql = stPrepareSQL(
-            "INSERT INTO rotationListSlides (list_id,slide_id,order_num) VALUES (%d,%d,%d)",
+            "INSERT INTO rot_list_slides (list_id,slide_id,order_num) VALUES (%d,%d,%d)",
             $list_id, $slide_id, $nslides+1);
 
           if (stExecSQLCond($sql, "Slide added to list."))
@@ -819,7 +819,7 @@
             stChkRequestItem("slide_id", $slide_id, array(CHK_TYPE, VT_INT, "Invalid data.")) &&
             stChkRequestItem("order_num", $order_num, array(CHK_TYPE, VT_INT, "Invalid data.")))
         {
-          $sql = stPrepareSQL("DELETE FROM rotationListSlides WHERE list_id=%d AND slide_id=%d AND order_num=%d",
+          $sql = stPrepareSQL("DELETE FROM rot_list_slides WHERE list_id=%d AND slide_id=%d AND order_num=%d",
             $list_id, $slide_id, $order_num);
           
           if (stExecSQLCond($sql, "List slide refs deleted."))
@@ -1362,7 +1362,7 @@
     if ($type == "compo" && stValidateRequestCompoData(FALSE))
     {
       $sql = stPrepareSQL(
-        "INSERT INTO compos (name,description,visible,voting,showAuthors) VALUES (%S,%Q,0,0,0)",
+        "INSERT INTO compos (name,description,visible,voting,show_authors) VALUES (%S,%Q,0,0,0)",
         "name", "description");
 
       stExecSQLCond($sql, "OK, compo added.");
@@ -1446,7 +1446,7 @@
             "description" => "Q",
             "visible" => "B",
             "voting" => "B",
-            "showAuthors" => "B",
+            "show_authors" => "B",
           ));
 
         stExecSQLCond($sql, "OK, compo updated.");