Revize 556ea52a

Re #7580 správa testů ve slovníku

old/html/multidic/app/webroot/administration.php

@@ -27 +27 @@
 
    <div class="nadpis_sekce">
      <i>Přihlášen:</i><br />
-     <?php echo "".$ses_name." ".$ses_surname."\n"?>
+     <?php echo "".@$_REQUEST['ses_name']." ".@$_REQUEST['ses_surname']."\n"?>
      <br />
      <?php if(kontrola_pristupu(3)) echo "Administrátor";
            else echo "Uživatel (smí i zapisovat)";?>
@@ -156 +156 @@
    
   // pr($_);
    
-  switch($_REQUEST['nav_id']) {
+  switch(@$_REQUEST['nav_id']) {
     case("add_user") :
       require_once($cesta."add_user.php");
     break;

old/html/multidic/app/webroot/administration/add_test.php

@@ -13 +13 @@
       echo $string;
   }
 
+$language = @$_REQUEST['language'];
+$source = @$_REQUEST['source'];
 
 if (Empty($language) || $language == "") {
   $krok = 0;
@@ -77 +79 @@
 
   case (2):
   
-  $zobrazit_znovu = true;  
+  $zobrazit_znovu = true;
+
+    $action = @$_REQUEST['action'];
+      $lection = @$_REQUEST['lection'];
+      $title = @$_REQUEST['title'];
+      $body = @$_REQUEST['body'];
+      $note = @$_REQUEST['note'];
+      $test_category = @$_REQUEST['test_category'];
 
     if (!Empty($action) && $action == "insert_new_test") {
 

old/html/multidic/app/webroot/administration/edit_test.php

@@ -1 +1 @@
 <?php 
 require_once("./administration/test.php");
 $vypis_edit = true;
+
+$action = @$_REQUEST['action'];
+$test_id = @$_REQUEST['test_id'];
+
+$language = @$_REQUEST['language'];
+$source = @$_REQUEST['source'];
+
+
 if (!Empty($action) && $action == "edit_test") {
-  
-	if (Empty($lection)) {
+    $lection = @$_REQUEST['lection'];
+
+    if (Empty($lection)) {
       print_hlasku("Lekci musíte vyplnit");
     }
 	else {
+        $title = @$_REQUEST['title'];
+        $body = @$_REQUEST['body'];
+        $note = @$_REQUEST['note'];
+        $test_category = @$_REQUEST['test_category'];
+
 	    update_test($test_id, $title, $body, $note, $lection, $test_category);
 	    //echo_zpet_do_slovniku();
 	    $vypis_edit = false;

old/html/multidic/app/webroot/administration/list_test.php

@@ -5 +5 @@
 else
   require_once("./administration/test.php");
 
+$nav_id = @$_REQUEST['nav_id'];
+$pomocna = @$_REQUEST['pomocna'];
+$language = @$_REQUEST['language'];
+$contrains_source = @$_REQUEST['contrains_source'];
+$contrains_lection = @$_REQUEST['contrains_lection'];
+$action = @$_REQUEST['action'];
+$test_id = @$_REQUEST['test_id'];
+
 if (Empty($language)) :
 
 
@@ -81 +89 @@
 
 if ($nav_id == "list_test") $pomocna = false;
 else if ($nav_id == "list_nonauthorized_test") $pomocna = true;
-else  $pomocna = ($nonauthorized == true);
+else  $pomocna = (@$_REQUEST['nonauthorized'] == true);
 //pr($nav_id);
 //vypis
-if (!Empty($serad)) {
-    print_table_of_test($language, $contrains_source, $contrains_lection,$pomocna, $order, $od, $limit);
+if (!Empty(@$_REQUEST['serad'])) {
+    print_table_of_test($language, $contrains_source, $contrains_lection,$pomocna, @$_REQUEST['order'], @$_REQUEST['od'], @$_REQUEST['limit']);
 }
 else {
   print_table_of_test($language, $contrains_source, $contrains_lection, $pomocna);

old/html/multidic/app/webroot/administration/test.php

@@ -6 +6 @@
   require_once("./classes/db.php");
   $spojeni = new DB_Sql();
   $dotaz = "UPDATE test SET autorized = true
-                        WHERE \"IDtest\" = '$ID'";
-  $spojeni->query($dotaz);
-  if ($spojeni->connection->errno != 0) {
+                        WHERE IDtest = $ID";
+  $result = $spojeni->query($dotaz);
+  if (!$result) {
     return false;
   }
   return true;
@@ -26 +26 @@
 }
 
 function get_row_of_table($Record) {
-  global $language;
-  global $order;
-  global $od;
-  global $limit;
-  global $contrains_source;
-  global $contrains_lection;
+  $language = @$_REQUEST['language'];
+  $order = @$_REQUEST['order'];
+  $od = @$_REQUEST['od'];
+  $limit = @$_REQUEST['limit'];
+  $contrains_source = @$_REQUEST['contrains_source'];
+  $contrains_lection = @$_REQUEST['contrains_lection'];
 
   $nav_str = "language=$language&contrains_source=$contrains_source&contrains_lection=$contrains_lection";
 
-  $navrat .= "  <tr>\n";
+  $navrat = "  <tr>\n";
   $navrat .= '    <td>
                 <a href="?nav_id=list_test&action=delete_test&test_id='.$Record[0].'&'.$nav_str.'">smaž</a>
                   <!--input type="checkbox" name="smaz['.$Record[0].']" /-->';
@@ -229 +229 @@
   else $pomocna = " autorized = true";
 
   if ($language != "all")
-    $dotaz .= " WHERE language = '$language' AND $pomocna ";
+    $dotaz .= " WHERE language = $language AND $pomocna ";
   else
     $dotaz .= " WHERE $pomocna ";
 
@@ -239 +239 @@
     $dotaz .= "AND lection = '$contrains_lection'";
 
 
-  $dotaz .= " ORDER BY \"$order\" OFFSET $od LIMIT $limit";
-  
+  $dotaz .= " ORDER BY $order LIMIT $od,$limit";
+
   //pr($dotaz);
 
   $radky = $spojeni->query($dotaz);
 
-  while ($spojeni->next_record()) {
-    $navrat .= get_row_of_table($spojeni->Record);
+  while ($record = $spojeni->next_record()) {
+    $navrat .= get_row_of_table($record);
   }
   $navrat .= get_foot_of_table();
   $navrat .= "</table>";
@@ -256 +256 @@
 function get_test($id) {
   require_once("./classes/db.php");
   $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM test WHERE \"IDtest\" = '$id'";
+  $dotaz = "SELECT * FROM test WHERE IDtest = $id";
   $radky = $spojeni->query($dotaz);
-  $spojeni->next_record();
+  $record = $spojeni->next_record();
 
-  if ($spojeni->connection->errno != 0) {
+  if (!$radky) {
     print_hlasku("Test se nepodařilo načíst.");
   }
 
-  return $spojeni->Record;
+  return $record;
 }
 
 function delete_test($ID) {
   require_once("./classes/db.php");
   $spojeni = new DB_Sql();
-  $dotaz = "DELETE FROM test WHERE \"IDtest\" = '$ID'";
-  $spojeni->query($dotaz);
-  if ($spojeni->connection->errno != 0) {
+  $dotaz = "DELETE FROM test WHERE `IDtest` = $ID";
+  $result = $spojeni->query($dotaz);
+  if (!$result) {
     return false;
   }
   return true;
@@ -287 +287 @@
                             note = '".AddSlashes($note)."',
                             lection = '".AddSlashes($lection)."',
                             test_category_id = '".AddSlashes($test_category)."'
-                            WHERE \"IDtest\" = '".AddSlashes($id)."'";
-  $spojeni->query($dotaz);
-  if ($spojeni->connection->errno != 0) {
+                            WHERE IDtest = ".AddSlashes($id);
+  $result = $spojeni->query($dotaz);
+  if (!$result) {
     print_hlasku("Test se nepodařilo upravit.");
   }
   print_hlasku("Test změněn.");
@@ -303 +303 @@
   $spojeni = new DB_Sql();
   //$NOW = Date("YmdHis");
 
-  $dotaz = "INSERT INTO test (\"language\",
-                              \"source\",
-                              \"lection\",
-                              \"inserted_by\",
-                              \"title\",
-                              \"body\",
-                              \"note\",
-                              \"test_category_id\")
+  $dotaz = "INSERT INTO test (`language`,
+                              `source`,
+                              `lection`,
+                              `inserted_by`,
+                              `title`,
+                              `body`,
+                              `note`,
+                              `test_category_id`)
                     VALUES ('". AddSlashes($language)."',
                             '". AddSlashes($source)."',
                             '". AddSlashes($lection)."',
@@ -319 +319 @@
                             '". AddSlashes($body)."',
                             '". AddSlashes($note)."',
                             '". AddSlashes($test_category)."')";
-  $spojeni->query($dotaz);
-  if ($spojeni->connection->errno != 0) {
+  $result = $spojeni->query($dotaz);
+  if (!$result) {
     return false;
   }
   return true;

old/html/multidic/app/webroot/examination/test.php

@@ -16 +16 @@
         //$found = ereg ( "^(([^\{]*)\{([^\}]*)\})*([^\{]*)" , $this->text, $tokens);
         $text = $this->text;
         
-        while(ereg('\{', $text)) {
-            $found = ereg ( "^([^\{]*)\{([^\}]*)\}(.*)" , $text, $tokens);
+        while(preg_match('#\{#', $text)) {
+            $found = preg_match( "#^([^\{]*)\{([^\}]*)\}(.*)#" , $text, $tokens);
             $parsed .= $tokens[1];
             $parsed .= $this->buildSelect($tokens[2]);
             $text = $tokens[3];
@@ -29 +29 @@
     
     function buildSelect($selectString) {
         $select = '';
-        $pole = split('/', $selectString);
+        $pole = preg_split('#/#', $selectString);
         
         shuffle($pole);//zamichame!!!
         
@@ -104 +104 @@
 function get_test($test_id) {
     require_once("./classes/db.php");
   $spojeni = new DB_Sql();
-  $dotaz  = "SELECT * FROM test WHERE \"IDtest\" = '".pg_escape_string($test_id)."' LIMIT 1 ";
+  $dotaz  = "SELECT * FROM test WHERE IDtest = '".intval($test_id)."' LIMIT 1 ";
   $radky = $spojeni->query($dotaz);
   
-  $spojeni->next_record();
+  $record = $spojeni->next_record();
   
-  return $spojeni->Record;
+  return $record;
 }
 
 function get_tests_by_category($category_id) {

old/html/multidic/app/webroot/functions/dictionary.php

@@ -372 +372 @@
 {
     require_once("./classes/db.php");
     $spojeni = new DB_Sql();
-    $dotaz = "SELECT * FROM \"language\"";
+    $dotaz = "SELECT * FROM `language`";
     $radky = $spojeni->query($dotaz);
     $navrat = "<select name=\"language\" size=\"$size\">";
-    while ($spojeni->next_record()) {
-        $navrat .= "  <option value=\"" . $spojeni->Record[0] . "\">  " . $spojeni->Record[1] . "  </option>";
+    while ($record = $spojeni->next_record()) {
+        $navrat .= "  <option value=\"" . $record[0] . "\">  " . $record[1] . "  </option>";
     }
     $navrat .= '</select>';
     return $navrat;
@@ -386 +386 @@
 {
     require_once("./classes/db.php");
     $spojeni = new DB_Sql();
-    $dotaz = "SELECT * FROM source";
+    $dotaz = "SELECT * FROM `source`";
     if (!Empty($language))
         $dotaz .= " WHERE language = '$language'";
     $radky = $spojeni->query($dotaz);
 
     $navrat = "<select name=\"$nazev\" size=\"1\">";
-    while ($spojeni->next_record()) {
-        $navrat .= "  <option value=\"" . $spojeni->row['IDsource'] . "\">  " . $spojeni->row['title'] . " - " . $spojeni->row['subtitle'] . "  </option>";
+    while ($record = $spojeni->next_record()) {
+        $navrat .= "  <option value=\"" . $record['IDsource'] . "\">  " . $record['title'] . " - " . $record['subtitle'] . "  </option>";
     }
     $navrat .= '</select>';
     return $navrat;
@@ -453 +453 @@
 {
     require_once("./classes/db.php");
     $spojeni = new DB_Sql();
-    $dotaz = "SELECT lection FROM test WHERE source = '$source' GROUP BY lection ORDER BY lection ";
+    $dotaz = "SELECT lection FROM test WHERE `source` = '$source' GROUP BY lection ORDER BY lection ";
     $radky = $spojeni->query($dotaz);
     $navrat = "<select name=\"$nazev\" size=\"$size\">";
     $i = 0;
-    while ($spojeni->next_record()) {
-        $cisla[$i] = 0 + ($spojeni->Record["lection"]);
-        $hodnoty[$i] = $spojeni->Record["lection"];
+    while ($record = $spojeni->next_record()) {
+        $cisla[$i] = 0 + ($record["lection"]);
+        $hodnoty[$i] = $record["lection"];
         $i++;
     }
     if (count($cisla) <= 0) {
@@ -477 +477 @@
 {
     require_once("./classes/db.php");
     $spojeni = new DB_Sql();
-    $dotaz = "SELECT czech FROM dict WHERE source = '$source' AND lection = '$lection' ";
+    $dotaz = "SELECT czech FROM dict WHERE `source` = '$source' AND lection = '$lection' ";
     $radky = $spojeni->query($dotaz);
     $max = $spojeni->num_rows();
     $navrat = lang("V této lekci je ") . $max . lang(" slovíček ") . " <br /> <br />\n";
@@ -1129 +1129 @@
 
     $ret = array();
 
-    while ($spojeni->next_record()) {
+    while ($record = $spojeni->next_record()) {
         $ret[] = array(
-            'id' => $spojeni->Record['id'],
-            'name' => $spojeni->Record['name'],
-            'parent_id' => $spojeni->Record['parent_id'],
-            'children' => getStrom($spojeni->Record['id']),
+            'id' => $record['id'],
+            'name' => $record['name'],
+            'parent_id' => $record['parent_id'],
+            'children' => getStrom($record['id']),
         );
     }