Mercurial > hg > fapweb

changeset 735:884c97eb3585

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work on handling of compo entry data per compo type.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 19 Nov 2014 02:11:53 +0200
parents 26a168d3390f
children e1d5c3e19930
files admajax.php
diffstat 1 files changed, 69 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Wed Nov 19 02:08:40 2014 +0200
+++ b/admajax.php	Wed Nov 19 02:11:53 2014 +0200
@@ -52,7 +52,7 @@
 }
 
 
-function stValidateRequestEntryData(&$compo_id, $full)
+function stValidateRequestEntryData(&$compo_id, $full, $ctype)
 {
   $res = TRUE;
 
@@ -60,28 +60,37 @@
     array(CHK_ISGT, VT_STR, 0, "Entry name too short."),
     array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_NAME, "Entry name too long."));
 
-  stChkRequestItemFail("author", $fake, $res,
-    array(CHK_ISGT, VT_STR, 0, "Author name not set."),
-    array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_AUTHOR, "Entry author too long."));
-
-  stChkRequestItemFail("filename", $fake, $res,
-    array(CHK_TYPE, VT_TEXT, "Invalid data."),
-    array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_FILENAME, "Entry filename too long."));
-
-  stChkRequestItemFail("info", $fake, $res,
-    array(CHK_TYPE, VT_TEXT, "Invalid data."),
-    array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_INFO, "Entry info too long."));
-
   stChkRequestItemFail("compo_id", $compo_id, $res,
     array(CHK_TYPE, VT_INT, "Invalid compo ID."));
 
-  if ($full)
+  stChkRequestItemFail("notes", $fake, $res,
+    array(CHK_TYPE, VT_TEXT, "Invalid data."),
+    array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_NOTES, "Entry notes too long."));
+
+  switch ($ctype)
   {
-    stChkRequestItemFail("notes", $fake, $res,
-      array(CHK_TYPE, VT_TEXT, "Invalid data."),
-      array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_NOTES, "Entry notes too long."));
+    case COMPO_NORMAL:
+      stChkRequestItemFail("author", $fake, $res,
+        array(CHK_ISGT, VT_STR, 0, "Author name not set."),
+        array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_AUTHOR, "Entry author too long."));
+
+      stChkRequestItemFail("filename", $fake, $res,
+        array(CHK_TYPE, VT_TEXT, "Invalid data."),
+        array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_FILENAME, "Entry filename too long."));
+
+      stChkRequestItemFail("info", $fake, $res,
+        array(CHK_TYPE, VT_TEXT, "Invalid data."),
+        array(CHK_LTEQ, VT_STR, SET_LEN_ENTRY_INFO, "Entry info too long."));
+      break;
+    
+    case COMPO_POINTS:
+    case COMPO_ASSIGN:
+      stChkRequestItemFail("evalue", $fake, $res,
+        array(CHK_TYPE, VT_INT, "Invalid evalue."));
+      break;
   }
 
+
   return $res;
 }
 
@@ -1512,17 +1521,28 @@
       stExecSQLCond($sql, "OK, attendee added.");
     }
     else
-    if ($type == "entry" && stValidateRequestEntryData($fake, FALSE))
+    if ($type == "entry")
     {
-      if (stFetchSQLColumn(stPrepareSQL("SELECT id FROM compos WHERE id=%D", "compo_id")) === FALSE)
-      {
+      if (($compo = stFetchSQL(stPrepareSQL("SELECT * FROM compos WHERE id=%D", "compo_id"))) === FALSE)
         stError("No such compo ID.");
-      }
       else
+      if (stValidateRequestEntryData($cfake, TRUE, $compo["ctype"]))
       {
-        $sql = stPrepareSQL(
-          "INSERT INTO entries (name,author,compo_id,filename,info) VALUES (%S,%S,%D,%S,%Q)",
-          "name", "author", "compo_id", "filename", "info");
+        switch ($compo["type"])
+        {
+          case COMPO_NORMAL:
+            $sql = stPrepareSQL(
+            "INSERT INTO entries (name,author,compo_id,filename,info,notes) VALUES (%S,%S,%d,%S,%Q,%Q)",
+            "name", "author", $compo["id"], "filename", "info", "notes");
+            break;
+          
+          case COMPO_POINTS:
+          case COMPO_ASSIGN:
+            $sql = stPrepareSQL(
+            "INSERT INTO entries (name,compo_id,notes) VALUES (%S,%d,%Q)",
+            "name", $compo["id"], "notes");
+            break;
+        }
 
         stExecSQLCond($sql, "OK, entry added.");
       }
@@ -1614,24 +1634,38 @@
         }
       }
       else
-      if ($type == "entry" && stValidateRequestEntryData($compo_id, TRUE))
+      if ($type == "entry")
       {
-        if (stFetchSQLColumn("SELECT id FROM compos WHERE id=".$compo_id) === FALSE)
+        if (($compo = stFetchSQL("SELECT * FROM compos WHERE id=".$compo_id)) === FALSE)
+          stError("No such compo ID.");
+        else
+        if (stValidateRequestEntryData($compo_id, TRUE, $compo["ctype"]))
         {
-          stError("No such compo ID.");
-        }
-        else
-        {
+          switch ($compo["ctype"])
+          {
+            case COMPO_NORMAL:
+              $cdata = array(
+                "author" => "S",
+                "filename" => "S",
+                "info" => "Q",
+              );
+              break;
+            
+            case COMPO_POINTS:
+            case COMPO_ASSIGN:
+              $cdata = array(
+                "evalue" => "D",
+              );
+              break;
+          }
+
           $sql = stPrepareSQLUpdate("entries",
             "WHERE id=".$id,
-            array(
+            array_merge(array(
               "name" => "S",
-              "author" => "S",
-              "filename" => "S",
-              "info" => "Q",
               "notes" => "Q",
               "compo_id" => "D",
-            ));
+            ), $cdata));
 
           stExecSQLCond($sql, "OK, entry updated.");
         }