X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=d6469e5149f088b7f26fc6a2a3970a8d85ca65a7;hb=ee2e74152b83654cd26c2e913555f147e6fa19e2;hp=a7059586ba1c7bbe37b6f3b8fa3b87324a264006;hpb=273c1aac8c2c482b6b76779083c15d69d920e8ad;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index a705958..d6469e5 100755 --- a/index.php +++ b/index.php @@ -471,7 +471,7 @@ EOF; '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'), - 'bank' => array('bank_author') + 'transaction' => array('transaction_author') ); //print_r($table); die(); if(isset($fields_hide[$class])) foreach($table as $id => $row) { @@ -739,7 +739,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])){ @@ -1015,7 +1015,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);