Nyni nejde udelat anonymni lock skladu

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index 3200b84314f4205b17f21935d39a175c55009b2c..2f92066682e8a62a4a1ac4fea6cd9b3929a6f329 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -421,6 +421,7 @@ EOF;
                        'status_id' => 'status_name',
                        'item_author' => 'item_author_backend',
                        'item_customer' => 'item_customer',
+                       'lock_id' => 'lock_name',
                );
 
                foreach($table as $id => $row) {
@@ -726,7 +727,9 @@ class Sklad_DB extends PDO {
        }
 
        function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
-               $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+               $result = $this->safe_query($sql, $fatal);
+               if(!$fatal && !$result) return $result;
+               $result = $result->fetchAll($fetch_flags);
                $this->load_backend_data_to_query_results($result);
                if($translate) $this->translate_query_results($result);
                return $result;
@@ -1018,6 +1021,14 @@ class Sklad_UI {
                return true;
        }
 
+       function check_locks() {
+               $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+               if(!empty($result)) {
+                       echo T('There are locks:').' '.$this->html->render_item_table($result);
+                       $this->post_redirect_get('', 'There are locks!', true);
+               }
+       }
+
        function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
                if($_SERVER['REQUEST_METHOD'] != 'POST') return;
                //echo('<pre>'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
@@ -1029,6 +1040,7 @@ class Sklad_UI {
                 * do:  $values[$table][$id][$column]
                 */
                if(isset($_POST['values'])) {
+                       $this->check_locks();
                        $values=array();
                        foreach($_POST['values'] as $table => $columns) {
                                foreach($columns as $column => $ids) {
@@ -1049,6 +1061,7 @@ class Sklad_UI {
                        case 'new':
                                $replace = false;
                        case 'edit':
+                               $this->check_locks();
                                if(!isset($replace)) $replace = true;
                                $table = $class ? $class : 'item';
                                //print_r($values); //debug
@@ -1059,6 +1072,7 @@ class Sklad_UI {
                                $this->post_redirect_get($last, $message);
                                break;
                        case 'delete':
+                               $this->check_locks();
                                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 :'-(");
@@ -1097,8 +1111,8 @@ class Sklad_UI {
                //Sephirot:
                if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
                if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') { //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
-           $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
-       $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
+                       $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+                       $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
                        echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
                }
                switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible