Fixnuty vyhledavani - konflikt v nazvech promennych a chybejici zavorky v query...
[mirrors/SokoMan.git] / index.php
index 925b0e2447bcf052b7733227ba21693bf550eebf..9900ba75c42afc1decab347071fc8cb96bc7c945 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -141,6 +141,7 @@ class Sklad_HTML extends HTML {
                <li><a href="$script/">Home</a></li>
                <li><a href="#">Assistants</A>
                        <menu>
+                               <li><a href="$script/assistant/store">store</a></li>
                                <li><a href="$script/assistant/new-item">new-item</a></li>
                        </menu>
                </li>
@@ -242,7 +243,7 @@ EOF;
                return $this->table($table);
        }
 
-       function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $multi_insert=true) {
+       function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) {
                //echo('<pre>'); print_r($selectbox);
                //echo('<pre>'); print_r($current);
                $update = false;
@@ -253,13 +254,14 @@ EOF;
 
                if(!is_array($hidecols)) $hidecols = array('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
 
-               $html='<form method="POST">';
+               $action = $action ? " action='$action'" : false;
+               $html="<form$action method='POST'>";
                if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
                //$html.=$this->input('table', $class, 'hidden');
                foreach($columns as $column)    {
                        $html.=$class.':<b>'.$column['Field'].'</b>: ';
                        $name="values[$class][".$column['Field'].'][]';
-                       $val = $update ? $current[$column['Field']] : false;
+                       $val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
                        switch(true) {
                                case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
                                        if(!$val) $val = '';
@@ -319,7 +321,7 @@ class Sklad_DB extends PDO {
                return preg_replace('(^.|.$)', '', $this->quote($str)); //TODO HACK
        }
 
-       function build_query_select($class, $id=false, $limit=false, $offset=0, $search=false, $history=false, $order=false, $suffix_id='_id') {
+       function build_query_select($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $order=false, $suffix_id='_id') {
                //Configuration
                $join = array(
                        'item'  => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
@@ -337,26 +339,26 @@ class Sklad_DB extends PDO {
                //JOIN
                if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$suffix_id)\n";
                //WHERE/REGEXP
-               $where = false;
                if($search) {
                        $search = $this->quote($search);
-                       if(!isset($search_fields[$class])) {
-                               $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
-                       }
-                       $where[0] = 'FALSE ';
-                       foreach($search_fields[$class] as $column) $where[0] .= "OR $column REGEXP $search ";
-               }       elseif($id) $where[1] = "$class$suffix_id = $id";
-               if(!$history && $this->contains_history($class)) $where[2] = $class.'_valid_till=0';
-               if($where) $sql .= 'WHERE '.implode(' AND ', $where)."\n";
+                       if(!isset($search_fields[$class])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
+                       $sql_search = '';
+                       foreach($search_fields[$class] as $column) $sql_search .= "OR $column REGEXP $search ";
+                       $where[] = "FALSE $sql_search";
+               }       elseif($id) $where[] = "$class$suffix_id = $id";
+               if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
+
+               if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
+               //ORDER
+               if(!$order) $order = $class.$suffix_id;
+               if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
+               $sql .= "ORDER BY $order\n";
                //LIMIT/OFFSET
                if($limit) {
                        $limit = $this->escape((int)$limit);
                        $offset = $this->escape((int)$offset);
                        $sql .= "LIMIT $offset,$limit\n";
                }
-               //ORDER
-               if(!$order) $order = $class.$suffix_id;
-               $sql .= "ORDER BY $order";
 
                return $sql;
        }
@@ -371,8 +373,8 @@ class Sklad_DB extends PDO {
                return $result;
        }
 
-       function get_listing($class, $id=false, $limit=false, $offset=0, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
-               $sql = $this->build_query_select($class, $id, $limit, $offset, $search, $history);
+       function get_listing($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
+               $sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history);
                $result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
                if(!$result || !is_array($indexed)) return $result;
 
@@ -394,8 +396,8 @@ class Sklad_DB extends PDO {
                        if(!preg_match('/'.$suffix_id.'$/', $column['Field'])) continue;
                        $table=preg_replace('/'.$suffix_id.'$/','',$column['Field']);
 
-                       $history = $this->contains_history($table) ? ' WHERE '.$table.'_valid_till=0' : '';
-                       $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table$history;";
+                       $history = $this->contains_history($table) ? " WHERE ${table}_valid_till=0" : '';
+                       $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table$history;"; //TODO use build_query_select()!!!
                        $result = $this->safe_query($sql, false);
                        if(!$result) continue;
                        $result = $result->fetchAll(PDO::FETCH_ASSOC);
@@ -405,6 +407,14 @@ class Sklad_DB extends PDO {
                return array_filter($selectbox, 'ksort');
        }
 
+       function map_unique($key, $value, $select, $table) { //TODO: Guess $select and $table if not passed
+               $history = $this->contains_history($table) ? " AND ${table}_valid_till=0" : '';
+               $value=$this->quote($value);
+               $sql = "SELECT $select FROM $table WHERE $key=$value$history LIMIT 1;"; //TODO use build_query_select()!!!
+               $result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+               if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error('Položka nenalezena!')); //TODO post_redirect_get...
+       }
+
        function contains_history($table) {
                $history_tables = array('item'); //TODO Autodetect
                return in_array($table, $history_tables);
@@ -429,8 +439,8 @@ class Sklad_DB extends PDO {
                        $history_update=false;  foreach($values as $row) if(is_numeric($row[$table.'_id'])) $history_update=true;
                        if($history_update) {
                                $sql .= "UPDATE $table";
-                               $sql .= ' SET '.$table.'_valid_till=NOW()';
-                               $sql .= ' WHERE '.$table.'_valid_till=0 AND (';
+                               $sql .= " SET ${table}_valid_till=NOW()";
+                               $sql .= " WHERE ${table}_valid_till=0 AND (";
                                $or = '';
                                foreach($values as $row) {
                                        $sql .= $or.' '.$table.'_id='.$row[$table.'_id'];
@@ -482,15 +492,15 @@ class Sklad_DB extends PDO {
                return $sql;
        }
 
-       function insert_or_update($table, $values) {
-               $sql = $this->build_query_insert($table, $values);
+       function insert_or_update($table, $values, $replace=true) {
+               $sql = $this->build_query_insert($table, $values, $replace);
                $this->safe_query($sql);
                return $this->lastInsertId();
        }
 
-       function insert_or_update_multitab($values) {
+       function insert_or_update_multitab($values, $replace=true) {
                $last=false;
-               foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows);
+               foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows, $replace);
                return $last;
        }
 
@@ -529,8 +539,8 @@ class Sklad_UI {
                $this->html = new Sklad_HTML();
        }
 
-       function render_items($class, $id=false, $limit=false, $offset=0, $search=false, $history=false) {
-               return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $search, $history, false));
+       function render_items($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false) {
+               return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $where, $search, $history, false));
        }
 
        function render_form_add($class) {
@@ -542,7 +552,7 @@ class Sklad_UI {
        function render_form_edit($class, $id) {
                $columns = $this->db->get_columns($class);
                $selectbox = $this->db->columns_get_selectbox($columns, $class);
-               $current = $this->db->get_listing($class, $id);
+               $current = $this->db->get_listing($class, $id, 1);
                return $this->html->render_insert_form($class, $columns, $selectbox, $current);
        }
 
@@ -641,10 +651,12 @@ class Sklad_UI {
 
                if($action) switch($action) {
                        case 'new':
+                               $replace = false;
                        case 'edit':
+                               if(!isset($replace)) $replace = true;
                                $table = $class ? $class : 'item';
                                //print_r($values); //debug
-                               $last = $this->db->insert_or_update_multitab($values);
+                               $last = $this->db->insert_or_update_multitab($values, $replace);
                                $last = "$table/$last/";
                                $next = "$table/new/";
                                $this->post_redirect_get($last, 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.');
@@ -718,7 +730,8 @@ class Sklad_UI {
                                                                $history = $PATH_CHUNKS[3] == 'history' ? true : false;
                                                                $limit  = (int) (isset($PATH_CHUNKS[3]) ? $PATH_CHUNKS[3] : '0');
                                                                $offset = (int) (isset($PATH_CHUNKS[4]) ? $PATH_CHUNKS[4] : '0');
-                                                               echo $this->render_items($class, $id, $limit, $offset, $search, $history);
+                                                               $where = false; //TODO get from URL
+                                                               echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
                                                                echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
                                                                //print_r(array("<pre>",$_SERVER));
                                                                break;
This page took 0.205906 seconds and 4 git commands to generate.