Fixnuty bug s prepisovanim stavajicich zaznamu pri pridavani noveho itemu
[mirrors/SokoMan.git] / index.php
index 01a0ebcd4e0ac69d40ed6f20a6372625589da533..f1a3751405fbdc35ec3b476820f0bb56ac30b123 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -103,7 +103,7 @@ class Sklad_HTML extends HTML {
                $home = URL_HOME;
                $script = $_SERVER['SCRIPT_NAME'];
                $search = htmlspecialchars(@trim($_GET['q']));
-               $message = htmlspecialchars(@trim($_GET['message']));
+               $message = strip_tags(@trim($_GET['message']),'<a><b><u><i>');
                return <<<EOF
 <head>
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -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, $multi_insert=true) {
+       function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $multi_insert=true) {
                //echo('<pre>'); print_r($selectbox);
                //echo('<pre>'); print_r($current);
                $update = false;
@@ -251,6 +252,8 @@ EOF;
                        $current = array_shift($current);
                }
 
+               if(!is_array($hidecols)) $hidecols = array('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
+
                $html='<form method="POST">';
                if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
                //$html.=$this->input('table', $class, 'hidden');
@@ -259,7 +262,7 @@ EOF;
                        $name="values[$class][".$column['Field'].'][]';
                        $val = $update ? $current[$column['Field']] : false;
                        switch(true) {
-                               case preg_match('/auto_increment/', $column['Extra']):
+                               case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
                                        if(!$val) $val = '';
                                        $html.=$this->input($name, $val, 'hidden');
                                        $html.=$val.'(AUTO)';
@@ -317,7 +320,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'),
@@ -335,27 +338,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])) {
-                               trigger_error("Ve tride $class zatim vyhledavat nemozno :-(");
-                               die();
-                       }
-                       $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(!isset($search_fields[$class])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
+                       $search = '';
+                       foreach($search_fields[$class] as $column) $search .= "OR $column REGEXP $search ";
+                       $where[] = "FALSE $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;
        }
@@ -370,8 +372,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;
 
@@ -393,7 +395,8 @@ class Sklad_DB extends PDO {
                        if(!preg_match('/'.$suffix_id.'$/', $column['Field'])) continue;
                        $table=preg_replace('/'.$suffix_id.'$/','',$column['Field']);
 
-                       $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;"; //TODO 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);
@@ -427,8 +430,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'];
@@ -480,20 +483,20 @@ 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;
        }
 
        function delete($table, $id, $suffix_id='_id') {
-               if($this->contains_history($table)) die(trigger_error("V tabulce $table jentak neco mazat nebudes chlapecku :-P")); //TODO post redirect get
+               if($this->contains_history($table)) return false;
                $key = $this->escape($table.$suffix_id);
                $table = $this->escape($table);
                $id = $this->quote($id);
@@ -527,8 +530,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) {
@@ -540,7 +543,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);
        }
 
@@ -579,7 +582,6 @@ class Sklad_UI {
                        $html.=$this->render_listing_navigation($class, '*', $limit, $offset);
                }
                if($edit)       {
-                       $html.='<br />TODO UPDATE FORM!<br />'; //TODO: Asi uz je hotovy...
                        $html.= $this->render_form_edit($class, $id);
                        $action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
            $html.= "<form action='$action' method='POST'>";
@@ -599,16 +601,17 @@ class Sklad_UI {
                new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
        }
 
-       function post_redirect_get($location, $message='') {
+       function post_redirect_get($location, $message='', $error=false) {
                $location = $this->html->internal_url($location).'?message='.urlencode($message);
                header('Location: '.$location);
-               die("Location: $location");
+               if($error) trigger_error($message);
+               die("Location: <a href='$location'>$location</a>");
        }
 
        function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
-               if(preg_match('/[^a-zA-Z0-9-]/',$name)) die(trigger_error('SAFE INCLUDE: Securityfuck.'));
+               if(preg_match('/[^a-zA-Z0-9-]/',$name)) $this->post_redirect_get('', 'SAFE INCLUDE: Securityfuck.', true);
                $filename="$dir/$name$ext";
-               if(!is_file($filename)) die(trigger_error('SAFE INCLUDE: Fuckfound.'));
+               if(!is_file($filename)) $this->post_redirect_get('', 'SAFE INCLUDE: Fuckfound.', true);
                foreach($vars as $var => $val) $$var=$val;
                ob_start();
                include($filename);
@@ -639,32 +642,30 @@ class Sklad_UI {
 
                if($action) switch($action) {
                        case 'new':
+                               $replace = false;
                        case 'edit':
-                               //if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
-                               //$table=$_POST['table'];
-                               $table='item';
+                               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/";
-                               echo 'Hotovo. Poslední vložený záznam naleznete '.$this->html->link('zde', $last).'.<br />'.
-                                       'Další záznam přidáte '.$this->html->link('zde', $next).'.';
-                               die();
+                               $this->post_redirect_get($last, 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.');
                                break;
                        case 'delete':
-                               if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
-                               $this->db->delete($class, $id);
+                               if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
+                               $this->db->delete($class, $id) || $this->post_redirect_get("$class/$id/edit", "V tabulce $class jentak neco mazat nebudes chlapecku :-P");
                                $this->post_redirect_get("$class", "Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-(");
                                break;
                        case 'image':
                                $image_classes = array('model'); //TODO, use this more widely across the code
-                               if(!in_array($class, $image_classes)) die(trigger_error("Nekdo nechce k DB Tride '$class' prirazovat obrazky!"));
+                               if(!in_array($class, $image_classes)) $this->post_redirect_get("$class/$id/edit", "Nekdo nechce k DB Tride '$class' prirazovat obrazky!");
                                $image_destination = DIR_IMAGES."/$class/$id.jpg";
-                               if($_FILES['image']['name'] == '') die(trigger_error('Kazde neco se musi nejak jmenovat!'));
+                               if($_FILES['image']['name'] == '') $this->post_redirect_get("$class/$id/edit", 'Kazde neco se musi nejak jmenovat!', true);
                                if(move_uploaded_file($_FILES['image']['tmp_name'], $image_destination)) {
                                        chmod ($image_destination, 0664);
                                        $this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)');
-                               } else die(trigger_error('Soubor se nenahral :('));
+                               } else $this->post_redirect_get("$class/$id/edit", 'Soubor se nenahral :(', true);
                                break;
                        default:
                                trigger_error('Nothin\' to do here my cutie :-*');
@@ -720,7 +721,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.210624 seconds and 4 git commands to generate.