Revize 3b179f69

Re #7580 vyhledávání slovníků

old/html/multidic/app/webroot/classes/db.php

@@ -12 +12 @@
   var $Host     = "Filek.cz";
   var $Database = "aswi-dictionary";
   var $User     = "dbowner";
-  var $Password = "db486ex12";
+  var $Password = "";
 
   /** @var mysqli_result  */
   var $result = null;
@@ -117 +117 @@
   }
 
   function num_rows() {
-    return $this->result->num_rows;
+    if ($this->result) {
+      return $this->result->num_rows;
+    }else{
+      return 0;
+    }
   }
 
   function num_fields() {
-    return $this->result->field_count;
+    if ($this->result) {
+      return $this->result->field_count;
+    }else{
+      return 0;
+    }
   }
 
   function f($Name) {

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

@@ -1 @@
-<?php  
+<?php
 mb_internal_encoding('UTF-8');
 session_start();
 
-  require_once("./classes/db.php");
-  require_once "./functions/new_hebrew_format.php";
+require_once("./classes/db.php");
+require_once "./functions/new_hebrew_format.php";
 
 
-  define('CESTA_SLOV', "voices/word/");
-  define('PRIPONA', ".mp3");
-  define('CESTA_CLANKU', "voices/article/");
-  define('CESTA_KONTEXTU', "voices/context/");
-  define('MAX_ODEZVA', 60 * 60 * 60);
+define('CESTA_SLOV', "voices/word/");
+define('PRIPONA', ".mp3");
+define('CESTA_CLANKU', "voices/article/");
+define('CESTA_KONTEXTU', "voices/context/");
+define('MAX_ODEZVA', 60 * 60 * 60);
 /*
 function register_globals($order = 'egpcs')
 {
@@ -42 +42 @@
 }
   
 */
-  
-  function prihlasit($jmeno, $heslo) {
-  global $_SESSION;
-  if (!Empty($jmeno) && !Empty($heslo)) {
-    $DB = new DB_Sql();
-    $result = $DB->query( "select * " .
-    		"from user " .
-    		"where nick = '".$DB->escape_string($jmeno)."' " .
-    				"and pass = '".$DB->escape_string($heslo)."'");//, array($jmeno, $heslo) );
-    if ($DB->num_rows() != 1)
-      return false;
-    session_regenerate_id();
-    $_SESSION['ses_nick'] = $DB->Record['nick'];
-    $_SESSION['ses_IDuser'] = $DB->Record['IDuser'];
-    $_SESSION['ses_date_last_visit'] = time();
-    $_SESSION['ses_level'] = $DB->Record['privileges'];
-    $_SESSION['ses_name'] = $DB->Record['name'];
-    $_SESSION['ses_surname'] = $DB->Record['surname'];
-
-	pr($_SESSION);
 
-    $number_of_usage = $DB->Record["number_of_usage"];
-	$number_of_usage++;
-
-    $dotaz = "UPDATE \"user\" SET date_last_visit = now(),
+function prihlasit($jmeno, $heslo)
+{
+    global $_SESSION;
+    if (!Empty($jmeno) && !Empty($heslo)) {
+        $DB = new DB_Sql();
+        $result = $DB->query("select * " .
+            "from user " .
+            "where nick = '" . $DB->escape_string($jmeno) . "' " .
+            "and pass = '" . $DB->escape_string($heslo) . "'");//, array($jmeno, $heslo) );
+        if ($DB->num_rows() != 1)
+            return false;
+        session_regenerate_id();
+        $_SESSION['ses_nick'] = $DB->Record['nick'];
+        $_SESSION['ses_IDuser'] = $DB->Record['IDuser'];
+        $_SESSION['ses_date_last_visit'] = time();
+        $_SESSION['ses_level'] = $DB->Record['privileges'];
+        $_SESSION['ses_name'] = $DB->Record['name'];
+        $_SESSION['ses_surname'] = $DB->Record['surname'];
+
+        pr($_SESSION);
+
+        $number_of_usage = $DB->Record["number_of_usage"];
+        $number_of_usage++;
+
+        $dotaz = "UPDATE \"user\" SET date_last_visit = now(),
                             number_of_usage = '$number_of_usage'
-                            WHERE \"IDuser\" = ".$_SESSION["ses_IDuser"];
-    $DB->query($dotaz);
-	clean_old_examinations($_SESSION["ses_IDuser"]);
+                            WHERE \"IDuser\" = " . $_SESSION["ses_IDuser"];
+        $DB->query($dotaz);
+        clean_old_examinations($_SESSION["ses_IDuser"]);
 
-    return true;
-  }
-  return false;
+        return true;
+    }
+    return false;
 }
 
-function kontrola_pristupu($level = 0) {
-  global $_SESSION;
-  //pr($_SESSION);
-  if(Empty($_SESSION['ses_nick'])) return false;
-  if(Empty($_SESSION['ses_date_last_visit'])) return false;
-  if ($_SESSION['ses_date_last_visit']+MAX_ODEZVA < time()) return false;
-  if ($_SESSION['ses_level'] < $level) return false;
-  $_SESSION['ses_date_last_visit'] = time();
-  return true;
+function kontrola_pristupu($level = 0)
+{
+    global $_SESSION;
+    //pr($_SESSION);
+    if (Empty($_SESSION['ses_nick'])) return false;
+    if (Empty($_SESSION['ses_date_last_visit'])) return false;
+    if ($_SESSION['ses_date_last_visit'] + MAX_ODEZVA < time()) return false;
+    if ($_SESSION['ses_level'] < $level) return false;
+    $_SESSION['ses_date_last_visit'] = time();
+    return true;
 }
 
-function odhlasit() {
-  global $_SESSION;
-  session_regenerate_id();
-  //p_g($_SESSION);
+function odhlasit()
+{
+    global $_SESSION;
+    session_regenerate_id();
+    //p_g($_SESSION);
 }
 
-function pr($neco) {
-	p_g($neco);
+function pr($neco)
+{
+    p_g($neco);
 }
 
-function p_g($neco) {
-	echo "<pre>";
-	print_r($neco);
-	echo "</pre>";
+function p_g($neco)
+{
+    echo "<pre>";
+    print_r($neco);
+    echo "</pre>";
 } // END function p_g
 
-function CzStrToLower($str) {
+function CzStrToLower($str)
+{
 
-  /*$str = StrTr($str,
-           "ABCDEFGHIJKLMNOPQRSTUVWXYZÁÉĚÍÓÚŮÝŠČŘŽŇŤĎ",
-           "abcdefghijlkmnopqrstuvwxyzáéěíóúůýščřžňťď");
-  */
-  $str = mb_strtolower($str, "UTF-8");
-  //echo "str = $str<br />";
-  return $str;
+    /*$str = StrTr($str,
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZÁÉĚÍÓÚŮÝŠČŘŽŇŤĎ",
+             "abcdefghijlkmnopqrstuvwxyzáéěíóúůýščřžňťď");
+    */
+    $str = mb_strtolower($str, "UTF-8");
+    //echo "str = $str<br />";
+    return $str;
 }
 
 
-function lang($idf) {
-  if (!isset($_SESSION["LaId"])) {
-    $_SESSION["LaId"] = "cz";
-  }
+function lang($idf)
+{
+    if (!isset($_SESSION["LaId"])) {
+        $_SESSION["LaId"] = "cz";
+    }
     $LaId = $_SESSION["LaId"];
 
-  static $translations;
-  if (!isset($translations)) {
-    $spojeni = new DB_Sql();
-    $dotaz = "SELECT idf, translation FROM translation WHERE language = '$LaId'";
-    $spojeni->query($dotaz);
-    while ($spojeni->next_record()) {
-      $translations[$spojeni->row[0]] = $spojeni->row[1];
+    static $translations;
+    if (!isset($translations)) {
+        $spojeni = new DB_Sql();
+        $dotaz = "SELECT idf, translation FROM translation WHERE language = '$LaId'";
+        $spojeni->query($dotaz);
+        while ($spojeni->next_record()) {
+            $translations[$spojeni->row[0]] = $spojeni->row[1];
+        }
     }
-  }
-  return (isset($translations[$idf]) ? $translations[$idf] : $idf);
+    return (isset($translations[$idf]) ? $translations[$idf] : $idf);
 }
 
 //pouzivat bud lang() nebo lang_cist_cele_najednou()
 //nakonec vybrat podle rychlosti
 
 
-function lang_cist_cele_najednou($idf) {
-  global $LaId; // nastaveno na základě části URL
-  if (!IsSet($LaId))
-    $LaId = "cz";
-  static $translations;
+function lang_cist_cele_najednou($idf)
+{
+    global $LaId; // nastaveno na základě části URL
+    if (!IsSet($LaId))
+        $LaId = "cz";
+    static $translations;
 
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT translation FROM translation WHERE idf = '" . addslashes($idf) . "' AND language = '$LaId'";
-  $row = $spojeni->query($dotaz);
-  // při neexistujícím překladu je vrácen identifikátor
-  if ($spojeni->num_rows() != 0) {
-    $spojeni->next_record();
-    return $spojeni->Record[0];
-  }
-  else {
-    return $idf;
-  }
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT translation FROM translation WHERE idf = '" . addslashes($idf) . "' AND language = '$LaId'";
+    $row = $spojeni->query($dotaz);
+    // při neexistujícím překladu je vrácen identifikátor
+    if ($spojeni->num_rows() != 0) {
+        $spojeni->next_record();
+        return $spojeni->Record[0];
+    } else {
+        return $idf;
+    }
 }
 
 
-function clean_old_examinations($ses_IDuser) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT e.*,
+function clean_old_examinations($ses_IDuser)
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT e.*,
                    (now() - 3 * INTERVAL '1 month') as before_three_month
             FROM examing e
             WHERE e.date < (now() - 3 * INTERVAL '1 month')
-              AND e.\"user\" = ".$_SESSION['ses_IDuser']."
+              AND e.\"user\" = " . $_SESSION['ses_IDuser'] . "
             ORDER BY e.date;";
-  $radky = $spojeni->query($dotaz);
-  while ($spojeni->next_record()) {
-    $id = $spojeni->Record["IDexaming"];
-    $dotaz = "DELETE FROM exam WHERE examing = $id";
-    $spojeni->query($dotaz);
-    $dotaz = "DELETE FROM examing WHERE \"IDexaming\" = $id";
-    $spojeni->query($dotaz);
-  }
+    $radky = $spojeni->query($dotaz);
+    while ($spojeni->next_record()) {
+        $id = $spojeni->Record["IDexaming"];
+        $dotaz = "DELETE FROM exam WHERE examing = $id";
+        $spojeni->query($dotaz);
+        $dotaz = "DELETE FROM examing WHERE \"IDexaming\" = $id";
+        $spojeni->query($dotaz);
+    }
 }
 
-function translation_chooser() {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT code FROM translation_lang WHERE visible <> 0";
-  $radky = $spojeni->query($dotaz);
-  foreach ($radky as $radka) {
-      echo '<a href="?set_lang=' . $radka['code'] . '">' . $radka['code'] . '</a>&nbsp;';
-	}
+function translation_chooser()
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT code FROM translation_lang WHERE visible <> 0";
+    $radky = $spojeni->query($dotaz);
+    foreach ($radky as $radka) {
+        echo '<a href="?set_lang=' . $radka['code'] . '">' . $radka['code'] . '</a>&nbsp;';
+    }
 }
 
-function copyright() {
-  //global $LaId;
-  //echo ('<div class="copyright"><a href="http://www.e-beda.cz" class="active">created by e-beda.cz</a></div>');
-  //echo ("\$LaId = $LaId");
+function copyright()
+{
+    //global $LaId;
+    //echo ('<div class="copyright"><a href="http://www.e-beda.cz" class="active">created by e-beda.cz</a></div>');
+    //echo ("\$LaId = $LaId");
 }
 
-function insert_picture( $class = "obrazek" ) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM pictures ORDER BY RAND() LIMIT 1";
-  $radky = $spojeni->query($dotaz);
-
-  if(!$radky){
-      echo "Chyba pri vyberu obrazku...";
-      return false;
-  }
+function insert_picture($class = "obrazek")
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM pictures ORDER BY RAND() LIMIT 1";
+    $radky = $spojeni->query($dotaz);
 
-  $obrazek = mysqli_fetch_assoc($radky);
-  if (empty($obrazek)) {
-    echo "Chyba pri vyberu obrazku...";
-    return false;
-  }
-  else {
-    $nazev_souboru = $obrazek["name_of_picture"];
-    $cesky = $obrazek["czech"];
-    $anglicky = $obrazek["english"];
-    $arabsky = $obrazek["orig"];
+    if (!$radky) {
+        echo "Chyba pri vyberu obrazku...";
+        return false;
+    }
 
-  $navrat .= "
+    $obrazek = mysqli_fetch_assoc($radky);
+    if (empty($obrazek)) {
+        echo "Chyba pri vyberu obrazku...";
+        return false;
+    } else {
+        $nazev_souboru = $obrazek["name_of_picture"];
+        $cesky = $obrazek["czech"];
+        $anglicky = $obrazek["english"];
+        $arabsky = $obrazek["orig"];
+
+        $navrat .= "
 <div id=\"$class\">
   <table>
     <tr>
@@ -234 +244 @@
 </div>";
 
 
-    echo $navrat;
-  }
+        echo $navrat;
+    }
 }
 
 
-function print_context_chooser($source_id) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM context WHERE source LIKE '$source_id'";
-  $radky = $spojeni->query($dotaz);
-  if ($spojeni->num_rows() == 0) {
-    echo "Bohužel u tohoto zdroje zatím nejsou žádné kontexty,
+function print_context_chooser($source_id)
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM context WHERE source LIKE '$source_id'";
+    $radky = $spojeni->query($dotaz);
+    if ($spojeni->num_rows() == 0) {
+        echo "Bohužel u tohoto zdroje zatím nejsou žádné kontexty,
                můžete je přidat ze slovníku, zvolením položky kontext->přidej";
-    return false;
-  }
-  else {
-    $navrat = "<select name=\"context\" size=\"6\">";
-    while ($spojeni->next_record()) {
-      $navrat .= "  <option value=\"".$spojeni->Record["IDcontext"]."\">  ".
-                  $spojeni->Record[cz_context]." - ".
-                  $spojeni->Record[en_context]." - ".
-                  $spojeni->Record[orig_context].
-                  "  </option>\n";
+        return false;
+    } else {
+        $navrat = "<select name=\"context\" size=\"6\">";
+        while ($spojeni->next_record()) {
+            $navrat .= "  <option value=\"" . $spojeni->Record["IDcontext"] . "\">  " .
+                $spojeni->Record[cz_context] . " - " .
+                $spojeni->Record[en_context] . " - " .
+                $spojeni->Record[orig_context] .
+                "  </option>\n";
+        }
+        $navrat .= '</select>';
     }
-    $navrat .= '</select>';
-  }
-  echo $navrat;
-  return true;
+    echo $navrat;
+    return true;
 }
 
 
-function get_translation_chooser() {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM translation_lang";
-  $spojeni->query($dotaz);
-  $navrat = "<select name=\"translation_lang_id\" size=\"4\">";
-  while ($spojeni->next_record()) {
-    $navrat .= "  <option value=\"".$spojeni->Record["code"]."\">  ".$spojeni->Record["name"]."  </option>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_translation_chooser()
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM translation_lang";
+    $spojeni->query($dotaz);
+    $navrat = "<select name=\"translation_lang_id\" size=\"4\">";
+    while ($spojeni->next_record()) {
+        $navrat .= "  <option value=\"" . $spojeni->Record["code"] . "\">  " . $spojeni->Record["name"] . "  </option>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
 
-function get_field_chooser() {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM field";
-  $radky = $spojeni->query($dotaz);
-  $navrat = "<select name=\"field\" size=\"1\">";
-  while ($spojeni->next_record()) {
-    $navrat .= "  <option value=\"".$spojeni->Record[0]."\">  ".$spojeni->Record[1]."  </option>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_field_chooser()
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM field";
+    $radky = $spojeni->query($dotaz);
+    $navrat = "<select name=\"field\" size=\"1\">";
+    while ($spojeni->next_record()) {
+        $navrat .= "  <option value=\"" . $spojeni->Record[0] . "\">  " . $spojeni->Record[1] . "  </option>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
+
 /*
 function getTree($table, $id, $parent_id, $parent, $level) { 
   require_once("./classes/db.php");
@@ -333 +346 @@
   return $navrat;
 }
 */
-function get_author_chooser() {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM author";
-  $radky = $spojeni->query($dotaz);
-  $navrat = "<select name=\"author_id\" size=\"1\">\n";
-  while ($spojeni->next_record()) {
-    $navrat .= "  <option value=\"".$spojeni->Record[0]."\">  ".
-                         $spojeni->Record[1]." ".$spojeni->Record[2]."  </option>\n";
-  }
-  $navrat .= "</select>\n";
-  return $navrat;
+function get_author_chooser()
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM author";
+    $radky = $spojeni->query($dotaz);
+    $navrat = "<select name=\"author_id\" size=\"1\">\n";
+    while ($spojeni->next_record()) {
+        $navrat .= "  <option value=\"" . $spojeni->Record[0] . "\">  " .
+            $spojeni->Record[1] . " " . $spojeni->Record[2] . "  </option>\n";
+    }
+    $navrat .= "</select>\n";
+    return $navrat;
 }
 
 
-function insert_language_chooser() {
-  echo get_language_chooser();
+function insert_language_chooser()
+{
+    echo get_language_chooser();
 }
 
-function get_language_chooser($size = 1) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $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>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_language_chooser($size = 1)
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $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>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
 
-function get_source_chooser($language, $nazev = "source") {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $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->Record[0]."\">  ".$spojeni->Record[1]." - ".$spojeni->Record[2]."  </option>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_source_chooser($language, $nazev = "source")
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $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->Record[0] . "\">  " . $spojeni->Record[1] . " - " . $spojeni->Record[2] . "  </option>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
 
-function get_lection_chooser($source, $size = 1, $nazev = "lection") {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz  = "SELECT lection FROM dict 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"];
-    $i++;
-  }
-  if (count($cisla) <= 0) {
-  	return "prazdne";
-  }
-  asort($cisla);
-  foreach ($cisla as $klic => $cislo) {
-    $navrat .= "  <option value=\"".$hodnoty[$klic]."\"> ".lang("lekce")." ".$hodnoty[$klic]."  </option>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_lection_chooser($source, $size = 1, $nazev = "lection")
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT lection FROM dict 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"];
+        $i++;
+    }
+    if (count($cisla) <= 0) {
+        return "prazdne";
+    }
+    asort($cisla);
+    foreach ($cisla as $klic => $cislo) {
+        $navrat .= "  <option value=\"" . $hodnoty[$klic] . "\"> " . lang("lekce") . " " . $hodnoty[$klic] . "  </option>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
 
-function get_lection_chooser_article($source, $size = 1, $nazev = "lection") {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz  = "SELECT lection FROM article 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"];
-    $i++;
-  }
-  if (count($cisla) <= 0) {
-  	return "prazdne";
-  }
-  asort($cisla);
-  foreach ($cisla as $klic => $cislo) {
-    $navrat .= "  <option value=\"".$hodnoty[$klic]."\"> ".lang("lekce")." ".$hodnoty[$klic]."  </option>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_lection_chooser_article($source, $size = 1, $nazev = "lection")
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT lection FROM article 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"];
+        $i++;
+    }
+    if (count($cisla) <= 0) {
+        return "prazdne";
+    }
+    asort($cisla);
+    foreach ($cisla as $klic => $cislo) {
+        $navrat .= "  <option value=\"" . $hodnoty[$klic] . "\"> " . lang("lekce") . " " . $hodnoty[$klic] . "  </option>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
 
-function get_lection_chooser_test($source, $size = 1, $nazev = "lection") {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $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"];
-    $i++;
-  }
-  if (count($cisla) <= 0) {
-  	return "prazdne";
-  }
-  asort($cisla);
-  foreach ($cisla as $klic => $cislo) {
-    $navrat .= "  <option value=\"".$hodnoty[$klic]."\"> ".lang("lekce")." ".$hodnoty[$klic]."  </option>";
-  }
-  $navrat .= '</select>';
-  return $navrat;
+function get_lection_chooser_test($source, $size = 1, $nazev = "lection")
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $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"];
+        $i++;
+    }
+    if (count($cisla) <= 0) {
+        return "prazdne";
+    }
+    asort($cisla);
+    foreach ($cisla as $klic => $cislo) {
+        $navrat .= "  <option value=\"" . $hodnoty[$klic] . "\"> " . lang("lekce") . " " . $hodnoty[$klic] . "  </option>";
+    }
+    $navrat .= '</select>';
+    return $navrat;
 }
 
-function get_count_chooser($source, $lection, $size = 1) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $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";
-  $navrat .= lang("Počet slovíček ke zkoušení: \n");
-  $navrat .= "<select name=\"count\" size=\"$size\">";
-  for ($count = 10; $count < $max; $count += 10) {
-    $navrat .= "  <option value=\"".$count."\">  ".$count."  </option>";
-  }
-  $navrat .= "  <option value=\"".$spojeni->num_rows()."\">  ".$max."  </option>";
-  $navrat .= '</select>';
-  return $navrat;
+function get_count_chooser($source, $lection, $size = 1)
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $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";
+    $navrat .= lang("Počet slovíček ke zkoušení: \n");
+    $navrat .= "<select name=\"count\" size=\"$size\">";
+    for ($count = 10; $count < $max; $count += 10) {
+        $navrat .= "  <option value=\"" . $count . "\">  " . $count . "  </option>";
+    }
+    $navrat .= "  <option value=\"" . $spojeni->num_rows() . "\">  " . $max . "  </option>";
+    $navrat .= '</select>';
+    return $navrat;
 }
 
 
-function print_hlasku($text) {
-  echo "<h4 class=\"nadpis3\">".$text."</h4> \n";
+function print_hlasku($text)
+{
+    echo "<h4 class=\"nadpis3\">" . $text . "</h4> \n";
 }
 
-function is_in_dictionary_past($past, $source, $lection) {
-  if (Empty($past) || (Trim($past) == "")) return false;
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT past FROM dict WHERE past LIKE '$past' AND source = $source AND lection LIKE '$lection'";
-  $spojeni->query($dotaz);
-  if ($spojeni->Errno != 0) {
-    print_hlasku($spojeni->Error);
-    return false;
-  }
-  //echo $spojeni->num_rows();
-  if ($spojeni->num_rows() > 0)
-    return true;
+function is_in_dictionary_past($past, $source, $lection)
+{
+    if (Empty($past) || (Trim($past) == "")) return false;
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT past FROM dict WHERE past LIKE '$past' AND source = $source AND lection LIKE '$lection'";
+    $spojeni->query($dotaz);
+    if ($spojeni->Errno != 0) {
+        print_hlasku($spojeni->Error);
+        return false;
+    }
+    //echo $spojeni->num_rows();
+    if ($spojeni->num_rows() > 0)
+        return true;
 
-  return false;
+    return false;
 }
 
 /**
@@ -494 +517 @@
  *
  *  TODO: UPRAVIT OSTATNI DATA VKLADANA DO DB (DATA, USER, ATD...)
  *        DODELAT UPLOAD ZVUKOVEHO SOUBORU
- *  @return true   kdyz se to povede
- *  @return false  naopak
+ * @return true   kdyz se to povede
+ * @return false  naopak
  */
-function insert_word($czech,$english,$word_category,$verbal_class,$present,$past,$valence,$root,
-                     $field,$language,$user,$source,$lection, $future, $infinitive, $gender, $vocalized, $nonvocalized,
+function insert_word($czech, $english, $word_category, $verbal_class, $present, $past, $valence, $root,
+                     $field, $language, $user, $source, $lection, $future, $infinitive, $gender, $vocalized, $nonvocalized,
                      $word_category_foreign, $status_constructus_single, $status_constructus_plural, $single_adj_female,
-                      $plural_adj_female, $conjugation, $imperative, $prefix, $status_constructus_single_female,
-		      $status_constructus_plural_female,
-		      $czech_female, $single_female, $plural_female, 
-                      $status_constructus_single_noun_female, $status_constructus_plural_noun_female,
-		      $nonvocalized_female, $nonvocalized_alternative, $vocalized_alternative) {
+                     $plural_adj_female, $conjugation, $imperative, $prefix, $status_constructus_single_female,
+                     $status_constructus_plural_female,
+                     $czech_female, $single_female, $plural_female,
+                     $status_constructus_single_noun_female, $status_constructus_plural_noun_female,
+                     $nonvocalized_female, $nonvocalized_alternative, $vocalized_alternative)
+{
 
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  /*
-  //pokud uz je ve slovniku nebude se znovu vkladat
-  if (is_in_dictionary_past($past, $source, $lection)) {
-    print_hlasku ("Slovíčko '$past - $czech - $english' nebylo přidáno, již je ve slovníku...");
-    return false;
-  }
-  */
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    /*
+    //pokud uz je ve slovniku nebude se znovu vkladat
+    if (is_in_dictionary_past($past, $source, $lection)) {
+      print_hlasku ("Slovíčko '$past - $czech - $english' nebylo přidáno, již je ve slovníku...");
+      return false;
+    }
+    */
 
-  //$NOW = Date("YmdHis");
-   $dotaz = "INSERT INTO dict (czech,
+    //$NOW = Date("YmdHis");
+    $dotaz = "INSERT INTO dict (czech,
                             english,
                             word_category,
                             verbal_class,
@@ -557 +581 @@
 			    nonvocalized_alternative,
 			    vocalized_alternative
 )
-                    VALUES ('".AddSlashes($czech)."',
-                            '".AddSlashes($english)."',
-                            '".AddSlashes($word_category)."',
-                            '".AddSlashes($verbal_class)."',
-                            '".AddSlashes($present)."',
-                            '".AddSlashes($past)."',
-                            '".AddSlashes($future)."',
-                            '".AddSlashes($infinitive)."',
-                            '".AddSlashes($valence)."',
-                            '".AddSlashes($vocalized)."',
-                            '".AddSlashes($nonvocalized)."',
-                            '".AddSlashes($root)."',
-                            '".AddSlashes($gender)."',
-                            '".AddSlashes($field)."',
-                            '".AddSlashes($source)."',
-                            '".AddSlashes($lection)."',
-                            '".AddSlashes($language)."',
-                            '".AddSlashes($user)."',
+                    VALUES ('" . AddSlashes($czech) . "',
+                            '" . AddSlashes($english) . "',
+                            '" . AddSlashes($word_category) . "',
+                            '" . AddSlashes($verbal_class) . "',
+                            '" . AddSlashes($present) . "',
+                            '" . AddSlashes($past) . "',
+                            '" . AddSlashes($future) . "',
+                            '" . AddSlashes($infinitive) . "',
+                            '" . AddSlashes($valence) . "',
+                            '" . AddSlashes($vocalized) . "',
+                            '" . AddSlashes($nonvocalized) . "',
+                            '" . AddSlashes($root) . "',
+                            '" . AddSlashes($gender) . "',
+                            '" . AddSlashes($field) . "',
+                            '" . AddSlashes($source) . "',
+                            '" . AddSlashes($lection) . "',
+                            '" . AddSlashes($language) . "',
+                            '" . AddSlashes($user) . "',
                             'NOW',
                             '0',
                             '0',
-                            '".AddSlashes($word_category_foreign)."', 
-                            '".AddSlashes($status_constructus_single)."', 
-                            '".AddSlashes($status_constructus_plural)."',
-                            '".AddSlashes($single_adj_female)."',
-                            '".AddSlashes($plural_adj_female)."', 
-                            '".AddSlashes($conjugation)."', 
-                            '".AddSlashes($imperative)."',
-			    '".AddSlashes($prefix)."',
-			    '".AddSlashes($status_constructus_single_female)."',
-			    '".AddSlashes($status_constructus_plural_female)."',
-			    '".AddSlashes($czech_female)."', 
-			    '".AddSlashes($single_female)."', 
-			    '".AddSlashes($plural_female)."', 
-			    '".AddSlashes($status_constructus_single_noun_female)."', 
-			    '".AddSlashes($status_constructus_plural_noun_female)."',
-			    '".AddSlashes($nonvocalized_female)."',
-			    '".AddSlashes($nonvocalized_alternative)."',
-			    '".AddSlashes($vocalized_alternative)."'
+                            '" . AddSlashes($word_category_foreign) . "', 
+                            '" . AddSlashes($status_constructus_single) . "', 
+                            '" . AddSlashes($status_constructus_plural) . "',
+                            '" . AddSlashes($single_adj_female) . "',
+                            '" . AddSlashes($plural_adj_female) . "', 
+                            '" . AddSlashes($conjugation) . "', 
+                            '" . AddSlashes($imperative) . "',
+			    '" . AddSlashes($prefix) . "',
+			    '" . AddSlashes($status_constructus_single_female) . "',
+			    '" . AddSlashes($status_constructus_plural_female) . "',
+			    '" . AddSlashes($czech_female) . "', 
+			    '" . AddSlashes($single_female) . "', 
+			    '" . AddSlashes($plural_female) . "', 
+			    '" . AddSlashes($status_constructus_single_noun_female) . "', 
+			    '" . AddSlashes($status_constructus_plural_noun_female) . "',
+			    '" . AddSlashes($nonvocalized_female) . "',
+			    '" . AddSlashes($nonvocalized_alternative) . "',
+			    '" . AddSlashes($vocalized_alternative) . "'
 )";
-  $spojeni->query($dotaz);
-  if ($spojeni->Errno != 0) {
-    print_hlasku($spojeni->$Error);
-    return false;
-  }
-  return true;
+    $spojeni->query($dotaz);
+    if ($spojeni->Errno != 0) {
+        print_hlasku($spojeni->$Error);
+        return false;
+    }
+    return true;
 }
 
 
-function save_to_not_found($direction, $word) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM not_found_$direction WHERE not_found LIKE '$word'";
-  $radky = $spojeni->query($dotaz);
-  if ($spojeni->num_rows() == 0)  {
-    $dotaz = "INSERT INTO not_found_$direction (not_found,
+function save_to_not_found($direction, $word)
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM not_found_$direction WHERE not_found LIKE '$word'";
+    $radky = $spojeni->query($dotaz);
+    if ($spojeni->num_rows() == 0) {
+        $dotaz = "INSERT INTO not_found_$direction (not_found,
                           date,
                           count)
                   VALUES ('$word', 'NOW', 1)";
-  }
-  else {
-    $spojeni->next_record();
-    $pocet = $spojeni->Record["count"];
-    $pocet++;
-    $identifikator = $spojeni->Record["IDnot_found_$direction"];
-    $dotaz = "UPDATE not_found_$direction
+    } else {
+        $spojeni->next_record();
+        $pocet = $spojeni->Record["count"];
+        $pocet++;
+        $identifikator = $spojeni->Record["IDnot_found_$direction"];
+        $dotaz = "UPDATE not_found_$direction
               SET count = $pocet
               WHERE \"IDnot_found_$direction\" = $identifikator";
-  }
-  $spojeni->query($dotaz);
+    }
+    $spojeni->query($dotaz);
 }
 
 
+function __get_word_in_card_format($Record)
+{
+    //global CESTA_KONTEXTU, PRIPONA, CESTA_SLOV;
+    require_once("./administration/context.php");
 
-function __get_word_in_card_format($Record) {
-  //global CESTA_KONTEXTU, PRIPONA, CESTA_SLOV;
-  require_once("./administration/context.php");
+    $navrat = "<div class=\"card\">\n<br />";
+    $navrat .= " \n     ";
 
-  $navrat = "<div class=\"card\">\n<br />";
-  $navrat .= " \n     ";
+    $navrat .= $Record["czech"];
+    $navrat .= "&nbsp;  - \n";
+    $navrat .= $Record["english"];
+    $navrat .= "&nbsp;   \n";
 
-  $navrat .= $Record["czech"];
-  $navrat .= "&nbsp;  - \n";
-  $navrat .= $Record["english"];
-  $navrat .= "&nbsp;   \n";
- 
-  //if(!empty($Record["gender"])) 
-  //		$navrat .= " (".$Record["gender"].".) "; 
-  $navrat .= "<div lang=\"he\" dir=\"rtl\">";
-  
-  $navrat .= "<span class=\"big arabic\">";
-  $navrat .= (!empty($Record["past"]))? $Record["past"] : $Record["present"] ;
-  $navrat .= "</span>";
-  
-  $Record["gender"] = trim($Record["gender"]);
-  if(!empty( $Record["gender"] )) 
-  		$navrat .= "<span style=\"font-size:200%\"  dir=\"ltr\"> (".$Record["gender"].") </span>";
-  		
-  $navrat .= "&nbsp;</div>\n";
-  $navrat .= " \n  ";
-  
-  if (!Empty($Record["context"])) {
-  	$navrat .= "\n<br />";//.lang("Kontext:");
-    $context = get_context($Record["context"]);
-    $navrat .= $context["cz_context"]." - ".$context["en_context"]." -
-              <div class=\"arabic\">".$context["orig_context"]."</div>";
-  }
-  if (!Empty($Record["context_voice"])) {
-  	$navrat .= '<a href="'.CESTA_KONTEXTU.$Record["IDdict"].PRIPONA.'"> '.lang("přehrát zvuk").' </a>';
-  }
+    //if(!empty($Record["gender"]))
+    //		$navrat .= " (".$Record["gender"].".) ";
+    $navrat .= "<div lang=\"he\" dir=\"rtl\">";
+
+    $navrat .= "<span class=\"big arabic\">";
+    $navrat .= (!empty($Record["past"])) ? $Record["past"] : $Record["present"];
+    $navrat .= "</span>";
+
+    $Record["gender"] = trim($Record["gender"]);
+    if (!empty($Record["gender"]))
+        $navrat .= "<span style=\"font-size:200%\"  dir=\"ltr\"> (" . $Record["gender"] . ") </span>";
+
+    $navrat .= "&nbsp;</div>\n";
+    $navrat .= " \n  ";
+
+    if (!Empty($Record["context"])) {
+        $navrat .= "\n<br />";//.lang("Kontext:");
+        $context = get_context($Record["context"]);
+        $navrat .= $context["cz_context"] . " - " . $context["en_context"] . " -
+              <div class=\"arabic\">" . $context["orig_context"] . "</div>";
+    }
+    if (!Empty($Record["context_voice"])) {
+        $navrat .= '<a href="' . CESTA_KONTEXTU . $Record["IDdict"] . PRIPONA . '"> ' . lang("přehrát zvuk") . ' </a>';
+    }
 //  else {
 //    $navrat .= lang("není");
 //  }
-  
-  if (!Empty($Record["word_voice"])) {
-  	$navrat .= "\n<br />".lang("Zvuk:");
-    $navrat .= '<a href="'.CESTA_SLOV.$Record["IDdict"].PRIPONA.'"> '.lang("přehrát zvuk").' </a>';
-  }
+
+    if (!Empty($Record["word_voice"])) {
+        $navrat .= "\n<br />" . lang("Zvuk:");
+        $navrat .= '<a href="' . CESTA_SLOV . $Record["IDdict"] . PRIPONA . '"> ' . lang("přehrát zvuk") . ' </a>';
+    }
 //  else
 //    $navrat .= lang("není");
-  $navrat .= "\n<br />\n<br />\n</div>";
+    $navrat .= "\n<br />\n<br />\n</div>";
 
-  return $navrat;
+    return $navrat;
 }
 
 /**
@@ -688 +712 @@
  * Tzn. bude se hledat token zacínající na "mal"
  * Tokeny jsou samostatna slova, nebo slova oddelena
  * lomitkem nebo sekvenci znaku carkaMezera.
- * 
+ *
  * @param string $token
  * @return string
  */
-function get_token_regexp($token) {
-	return "^".$token.'[ ]?$|'.
-	       "/".$token.'[ ]?$|'.
-	       ",[ ]?".$token.'[ ]?$|'.
-	       ";[ ]?".$token.'[ ]?$|'.
-	       "^".$token.";|".
-	       "^[ ]?".$token.",|".
-	       ",[ ]?".$token.",|".
-	       "^".$token." [(]";
+function get_token_regexp($token)
+{
+    return "^" . $token . '[ ]?$|' .
+        "/" . $token . '[ ]?$|' .
+        ",[ ]?" . $token . '[ ]?$|' .
+        ";[ ]?" . $token . '[ ]?$|' .
+        "^" . $token . ";|" .
+        "^[ ]?" . $token . ",|" .
+        ",[ ]?" . $token . ",|" .
+        "^" . $token . " [(]";
 }
 
-function hebrew_add_vowel($string) {
-	$ret = '';
-	$mez = mb_strlen($string)-1;
-	for($i = 0; $i < $mez; $i++) {
-		$ret .= mb_substr($string, $i, 1). "[ְֱֲֳִֵֶַָֹֻֻּֽֿׁ]*";//"[][⌈⌉?!><]?";
-	}
-	return $ret.mb_substr($string, $mez, 1);
+function hebrew_add_vowel($string)
+{
+    $ret = '';
+    $mez = mb_strlen($string) - 1;
+    for ($i = 0; $i < $mez; $i++) {
+        $ret .= mb_substr($string, $i, 1) . "[ְֱֲֳִֵֶַָֹֻֻּֽֿׁ]*";//"[][⌈⌉?!><]?";
+    }
+    return $ret . mb_substr($string, $mez, 1);
 }
 
-function arabic_add_vowel($string) {
-	$ret = '';
-	$mez = mb_strlen($string)-1;
-	for($i = 0; $i < $mez; $i++) {
-		$ret .= mb_substr($string, $i, 1). "[ٌَ]*";//"[][⌈⌉?!><]?";
-	}
-	return $ret.mb_substr($string, $mez, 1);
+function arabic_add_vowel($string)
+{
+    $ret = '';
+    $mez = mb_strlen($string) - 1;
+    for ($i = 0; $i < $mez; $i++) {
+        $ret .= mb_substr($string, $i, 1) . "[ٌَ]*";//"[][⌈⌉?!><]?";
+    }
+    return $ret . mb_substr($string, $mez, 1);
 }
 
 /**
  *  Funkce vytiskne preklad slova z parametru
  *
- *  @param $word slovo urcene k prekladu
- *  @param $language jazyk
+ * @param $word slovo urcene k prekladu
+ * @param $language jazyk
  *
  */
-function print_translation($word, $direction, $language = 1) {
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $text = "\n       ";
+function print_translation($word, $direction, $language = 1)
+{
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $text = "\n       ";
 
-  //$po = mb_strtolower($word, "UTF-8");
-  //echo $word."\n<br />".$po;
+    //$po = mb_strtolower($word, "UTF-8");
+    //echo $word."\n<br />".$po;
 
-  if (empty($word)) {
-    $text .= lang("Musíte zadat nějaké slovo.");
-  }
-  else {
-    $navrat = "";
-    //pr($direction);
-    switch ($direction) {
-      case("en"):
-        $word = mb_strtolower($word, "UTF-8");
-        $word = get_token_regexp($word);
-        
-        $dotaz = "SELECT * FROM dict 
+    if (empty($word)) {
+        $text .= lang("Musíte zadat nějaké slovo.");
+    } else {
+        $navrat = "";
+        //pr($direction);
+        switch ($direction) {
+            case("en"):
+                $word = mb_strtolower($word, "UTF-8");
+
+                $dotaz = "SELECT * FROM dict 
         		WHERE language = $language 
-        		  AND lower(english) ~ '$word' 
+        		  AND lower(english) = '$word' 
         		  ORDER BY english LIMIT 30";
-      break;
-      case("he"):
-        $word_strict = $word;
-        //$word = hebrew_add_vowel($word);
-	
-	$word_token = get_token_regexp($word);
+                break;
+            case("he"):
+                $word_strict = $word;
+                //$word = hebrew_add_vowel($word);
 
-	$word_token = pg_escape_string($word_token);
+                $word_token = $spojeni->escape_string($word);
 
-	$dotaz = "SELECT * FROM dict
+                $dotaz = "SELECT * FROM dict
             WHERE language = $language AND
                   (
-                   (past    ~ ('$word_token')) 
+                   (past    = ('$word_token')) 
                    OR
-                   (nonvocalized ~ ('$word_token'))
+                   (nonvocalized = ('$word_token'))
 		   OR
-                   (nonvocalized_female ~ ('$word_token'))
+                   (nonvocalized_female = ('$word_token'))
 		   OR
-                   (single_female ~ ('$word_token'))
+                   (single_female = ('$word_token'))
 		   OR
-                   (nonvocalized_alternative ~ ('$word_token'))
+                   (nonvocalized_alternative = ('$word_token'))
 		   OR
-                   (vocalized_alternative ~ ('$word_token'))
+                   (vocalized_alternative = ('$word_token'))
                   ) 
 		  AND 
                   (
                    czech NOT LIKE '' OR czech IS NOT NULL
                   )
-               ORDER BY length(nonvocalized) LIMIT 30";
+               ORDER BY nonvocalized LIMIT 30";
 
 //	    echo $dotaz;
 
-/*
-	$dotaz = "SELECT * FROM dict
-            WHERE language = $language AND
-                  (
-                   (past    ~ ('$word')) 
-                   OR
-                   (nonvocalized ~ ('$word_strict'))
-                  ) 
-               ORDER BY english LIMIT 30";
-*/
-	/*
-      	$dotaz = "SELECT * FROM dict
-            WHERE language = $language AND
-                  (
-                   (present ~ ('$word')) 
-                   OR
-                   (past    ~ ('$word')) 
-                   OR
-                   (valence ~ ('$word')) 
-                   OR
-                   (nonvocalized ~ ('$word_strict'))
-                  ) 
-               ORDER BY english LIMIT 30";
-	       */
-      break;
-      case("ar"):
-        $word = arabic_add_vowel($word);
-        //pr($word);
-        $dotaz = "SELECT * FROM dict
+                /*
+                    $dotaz = "SELECT * FROM dict
+                            WHERE language = $language AND
+                                  (
+                                   (past    ~ ('$word'))
+                                   OR
+                                   (nonvocalized ~ ('$word_strict'))
+                                  )
+                               ORDER BY english LIMIT 30";
+                */
+                /*
+                      $dotaz = "SELECT * FROM dict
+                        WHERE language = $language AND
+                              (
+                               (present ~ ('$word'))
+                               OR
+                               (past    ~ ('$word'))
+                               OR
+                               (valence ~ ('$word'))
+                               OR
+                               (nonvocalized ~ ('$word_strict'))
+                              )
+                           ORDER BY english LIMIT 30";
+                       */
+                break;
+            case("ar"):
+                $word = arabic_add_vowel($word); //kdyžtak zakomentuj?
+                //pr($word);
+                $dotaz = "SELECT * FROM dict
             WHERE language = $language AND
                   ((present = '$word') OR
                    (past    = '$word') OR
                    (valence = '$word') OR
                    (root    = '$word')) 
               ORDER BY english LIMIT 30";
-        //pr($dotaz);
-      break;
-      case("cz"):
-      	$word = mb_strtolower($word, "UTF-8");
-        $word = get_token_regexp($word); 
-        $dotaz = "SELECT * FROM dict 
+                //pr($dotaz);
+                break;
+            case("cz"):
+                $word = mb_strtolower($word, "UTF-8");
+                $dotaz = "SELECT * FROM dict 
                  WHERE language = $language 
-                   AND lower(czech) ~ '$word' 
+                   AND lower(czech) = '$word' 
                    ORDER BY english LIMIT 30";
-    }
-    //$dotaz .= " ORDER BY context DESC, word_voice";
-    //echo "sql = $dotaz\n<br />";
+        }
+        //$dotaz .= " ORDER BY context DESC, word_voice";
+        //echo "sql = $dotaz\n<br />";
 
-    $radky = $spojeni->query($dotaz);
-    if ($spojeni->num_rows() == 0)  {
-      $text .= "<br />Slovo nebylo nalezeno";
+        $radky = $spojeni->query($dotaz);
+        if ($spojeni->num_rows() == 0) {
+            $text .= "<br />Slovo nebylo nalezeno";
 ////////save_to_not_found($direction, $word);//vratit zpatky a opravit
+        } else {
+            foreach ($radky as $radka) {
+                if ($language == 2 && $radka['autorized']) //hebrew
+                {
+                    $text .= __get_word_in_new_hebrew_format($radka);
+                } else {
+                    //dle zadani vybereme jen prvni slovo - tj. s contextem a zvukem
+                    $text .= __get_word_in_card_format($radka);
+                }
+            }
+        }
     }
-    else {
-      while($spojeni->next_record()) {
-	  if($language == 2 && $spojeni->Record['autorized']) //hebrew
-	  {
-	    $text .= __get_word_in_new_hebrew_format($spojeni->Record);
-	  }
-	  else {
-	      //dle zadani vybereme jen prvni slovo - tj. s contextem a zvukem
-	    $text .= __get_word_in_card_format($spojeni->Record);
-	  }
-      }
-    }
-  }
-  $text .= "\n   \n";
-  echo $text;
+    $text .= "\n   \n";
+    echo $text;
 }
 
 /**
  *  Funkce pro preklad z cestiny, vyhleda ve slovniku
  *  vsechna slova odpovidajici parametru
  *
- *  @param $word slovo urcene k prekladu
- *  @return do tabulky zformatovany preklad
+ * @param $word slovo urcene k prekladu
+ * @return do tabulky zformatovany preklad
  */
-function translate_from_cz($word) {
-  $navrat = "";
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM dict WHERE lower(czech) LIKE lower('$word') ;";
-  $radky = $spojeni->query($dotaz);
-  $spojeni->next_record();
-  return $spojeni->Record;
+function translate_from_cz($word)
+{
+    $navrat = "";
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM dict WHERE lower(czech) LIKE lower('$word') ;";
+    $radky = $spojeni->query($dotaz);
+    $spojeni->next_record();
+    return $spojeni->Record;
 }
 
 /**
  *  Funkce pro preklad z anglictiny, vyhleda ve slovniku
  *  vsechna slova odpovidajici parametru
  *
- *  @param $word slovo urcene k prekladu
- *  @return do tabulky zformatovany preklad
+ * @param $word slovo urcene k prekladu
+ * @return do tabulky zformatovany preklad
  */
-function translate_from_en($word) {
-  $navrat = "";
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM dict WHERE lower(english) LIKE lower('$word') ;";
-  $radky = $spojeni->query($dotaz);
-  $spojeni->next_record();
-  return $spojeni->Record;
+function translate_from_en($word)
+{
+    $navrat = "";
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM dict WHERE lower(english) LIKE lower('$word') ;";
+    $radky = $spojeni->query($dotaz);
+    $spojeni->next_record();
+    return $spojeni->Record;
 }
 
 /**
  *  Funkce pro preklad z "tretiho" jazyka, vyhleda ve slovniku
  *  vsechna slova odpovidajici parametru
  *
- *  @param $word slovo urcene k prekladu
- *  @return do tabulky zformatovany preklad
+ * @param $word slovo urcene k prekladu
+ * @return do tabulky zformatovany preklad
  */
-function translate_from_ar($word) {
-  $navrat = "";
-  require_once("./classes/db.php");
-  $spojeni = new DB_Sql();
-  $dotaz = "SELECT * FROM dict
+function translate_from_ar($word)
+{
+    $navrat = "";
+    require_once("./classes/db.php");
+    $spojeni = new DB_Sql();
+    $dotaz = "SELECT * FROM dict
             WHERE language = 1 AND
                   ((present LIKE '$word') OR
                    (past LIKE '$word') OR
                    (valence LIKE '$word') OR
                    (root LIKE '$word'))";
-  $radky = $spojeni->query($dotaz);
-  $spojeni->next_record();
-  return $spojeni->Record;
+    $radky = $spojeni->query($dotaz);
+    $spojeni->next_record();
+    return $spojeni->Record;
 }
 
 /**
@@ -917 +941 @@
  *  TODO: UPRAVIT OSTATNI DATA VKLADANA DO DB (DATA, USER, ATD...)
  *
  *
- *  @param $file - cesta k csv souboru
- *  @return true   kdyz se to povede
- *  @return false  naopak
+ * @param $file - cesta k csv souboru
+ * @return true   kdyz se to povede
+ * @return false  naopak
  */
-function dump_csv_file($file) {
+function dump_csv_file($file)
+{
 
-  if (!file_exists($file)) {
-    echo ("Chyba!!! Zadany soubor: $file neexistuje!!!");
-    return false;
-  }
-  require_once("./classes/db.php");
+    if (!file_exists($file)) {
+        echo("Chyba!!! Zadany soubor: $file neexistuje!!!");
+        return false;
+    }
+    require_once("./classes/db.php");
 
-  $spojeni = new DB_Sql();
+    $spojeni = new DB_Sql();
 
-  $radky = file($file);
-  echo "<table border=\"1\">\n";
-
-  $pocitadlo = 0;
-
-  $NOW = Date("YmdHis");
-  for($i=0;$i<Count($radky);$i++) {
-    if (!strpos($radky[$i], ";"))  continue;
-    $radek = explode(';', $radky[$i]);
-    insert_word(AddSlashes($radek[0]),//czech