Priprava na audit trails, Serazeno pole predavany selectboxu, Pridany TODOs

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index fa04f335198b64a3d021682a921ce6a3cc302fd7..0ac7c4f003f58cfafc733d6c63df3bd360a3e846 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -250,17 +250,24 @@ 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, $id_suffix='_id') {
-               $class = $this->escape($class);
+       function build_query_select($class, $id=false, $limit=false, $offset=0, $search=false, $order=false, $suffix_id='_id') {
+               //Configuration
                $join = array(
                        'item'  => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
                        'model' => array('category', 'producer')
-               );
+               ); //TODO Autodetect using foreign keys?
                $search_fields = array(
                        'item'  => array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name')
-               );
+               ); //TODO Autodetect
+
+               //Escaping
+               $class = $this->escape($class);
+
+               //SELECT
                $sql="SELECT * FROM $class\n";
-               if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$id_suffix)\n";
+               //JOIN
+               if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$suffix_id)\n";
+               //WHERE/REGEXP
                if($search) {
                        $search = $this->quote($search);
                        if(!isset($search_fields[$class])) {
@@ -269,20 +276,25 @@ class Sklad_DB extends PDO {
                        }
                        $sql .= 'WHERE FALSE ';
                        foreach($search_fields[$class] as $column) $sql .= "OR $column REGEXP $search ";
-               }       elseif($id) $sql .= "WHERE $class$id_suffix = $id\n";
+               }       elseif($id) $sql .= "WHERE $class$suffix_id = $id\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;
        }
 
        function safe_query($sql) {
                $result = $this->query($sql);
                if(!$result) {
-                       trigger_error('<font color=red><b>QUERY FAILED:</b><pre>'.$sql.'</pre></font>');
-                       die();
+                       $error = $this->errorInfo();
+                       die(trigger_error("<font color=red><b>QUERY FAILED ($error[0],$error[1]): </b>$error[2]<br /><br /><b>QUERY:</b>\n<pre>$sql</pre></font>"));
                }
                return $result;
        }
@@ -308,15 +320,21 @@ class Sklad_DB extends PDO {
                        if($class && $column['Field'] == $class.$suffix_id) continue;
                        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;";
+                       $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;"; //TODO: tabulka nemusi obsahovat *_name!!! momentalne se to tyka jen tabulky user (a item - u ty to nevadi)!
                        $result=$this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
                        foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
                }
                //echo('<pre>'); print_r($selectbox);
-               return $selectbox;
+               return ksort($selectbox);
+       }
+
+       function contains_history($table) {
+               $history_tables = array('item'); //TODO Autodetect
+               return in_array($table, $history_tables);
        }
 
        function build_query_insert($table, $values, $replace=true, $suffix_id='_id') {
+               //Escaping
                $table = $this->escape($table);
 
                //Get list of POSTed columns
@@ -426,7 +444,7 @@ class Sklad_UI {
                        $html.=$this->render_listing_navigation($class, '*', $limit, $offset);
                }
                if($edit)       {
-                       $html.='<br />TODO UPDATE FORM!<br />';
+                       $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'>";
@@ -446,10 +464,10 @@ class Sklad_UI {
                new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
        }
 
-       function post_redirect_get($last, $next) {
-               //header('Location: '.$_SERVER['REQUEST_URI']); //TODO redirect (need templating system or ob_start() first!!!)
-               header('Location: '.$this->html->internal_url($dest));
-               die("Redirect: $dest");
+       function post_redirect_get($location, $message='') {
+               $location = $this->html->internal_url($location).'?message='.urlencode($message);
+               header('Location: '.$location);
+               die("Location: $location");
        }
 
        function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
@@ -466,7 +484,7 @@ class Sklad_UI {
 
        function process_http_request_post($action=false, $class=false, $id=false) {
                if($_SERVER['REQUEST_METHOD'] != 'POST') return;
-               echo('<pre>'); //DEBUG (maybe todo remove)
+               //echo('<pre>'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
 
                //SephirPOST:
 
@@ -501,7 +519,7 @@ class Sklad_UI {
                        case 'delete':
                                if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
                                $this->db->delete($class, $id);
-                               die("Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-("); //TODO REDIRECT
+                               $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
@@ -509,9 +527,9 @@ class Sklad_UI {
                                $image_destination = DIR_IMAGES."/$class/$id.jpg";
                                if($_FILES['image']['name'] == '') die(trigger_error('Kazde neco se musi nejak jmenovat!'));
                                if(move_uploaded_file($_FILES['image']['tmp_name'], $image_destination)) {
-               chmod ($image_destination, 0664);
-             die('Obrazek se naladoval :)'); //TODO REDIRECT
-        } else die(trigger_error('Soubor se nenahral :('));
+                                       chmod ($image_destination, 0664);
+                                       $this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)');
+                               } else die(trigger_error('Soubor se nenahral :('));
                                break;
                        default:
                                trigger_error('Nothin\' to do here my cutie :-*');
@@ -530,7 +548,7 @@ class Sklad_UI {
                }
 
                $PATH_INFO=@trim($_SERVER[PATH_INFO]);
-               echo $this->html->header($PATH_INFO);
+               if($_SERVER['REQUEST_METHOD'] != 'POST') echo $this->html->header($PATH_INFO); //TODO tahle podminka naznacuje ze je v navrhu nejaka drobna nedomyslenost...
 
 
                //Sephirot: