Poznamky do budoucna...

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index a81433445999be3e5b8661501203e188c11de4e1..f03be33f7158c8d33a1009488de0c27e99ae9e28 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -470,7 +470,9 @@ EOF;
                $fields_hide = array(
                        'model' => array('barcode_name'),
                        'barcode' => array('model_price_in','model_price_out','model_reserve','producer_name','producer_note','model_eshop_hide','category_name','model_countable','model_descript'),
-                       'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description')
+                       'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description'),
+                       'lock' => array('lock_author'),
+                       'transaction' => array('transaction_author')
                );
                //print_r($table); die();
                if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -738,7 +740,7 @@ class Sklad_DB extends PDO {
                $translate_cols = array(
                        'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
                        'lock_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
-                       'bank_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
+                       'transaction_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
                ); //TODO: Hardcoded
                foreach($result as $key => $row) {
                        foreach($translate_cols as $col => $backend) if(isset($result[$key][$col])){
@@ -1014,7 +1016,8 @@ class Sklad_UI {
 
        function post_redirect_get($location, $message='', $error=false, $translate=true) {
                $messaget = $translate ? T($message) : $message;
-               $url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+               $separator = preg_match('/\?/', $location) ? '&' : '?';
+               $url_args = $messaget != '' ? $separator.'message='.urlencode($messaget) : '';
                $location = $this->html->internal_url($location).$url_args;
                header('Location: '.$location);
                if($error) trigger_error($message);
@@ -1049,9 +1052,10 @@ class Sklad_UI {
        }
 
        function check_locks() {
-               $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+               $user = $this->db->quote($this->db->auth->get_user_id());
+               $result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;");
                if(!empty($result)) {
-                       echo T('There are locks:').' '.$this->html->render_item_table($result);
+                       echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock');
                        $this->post_redirect_get('', 'There are locks!', true);
                }
        }
@@ -1139,7 +1143,7 @@ class Sklad_UI {
                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) : '';
+                       $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result, 'lock') : '';
                        echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
                }
                switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible