X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=f1744a4a17fe63cb429b2efaa180ee23df26bc74;hb=7c1f53f75b0c7fc77877f924ded2b37ac4c3ffad;hp=6296552329f21e584583511ee65a902658dcf5a6;hpb=1f52346fa3205e61b1d0d406d60313095cbe5754;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index 6296552..f1744a4 100755 --- a/index.php +++ b/index.php @@ -185,7 +185,7 @@ class HTML { * @author Tomas Mudrunka */ class Sklad_HTML extends HTML { //TODO: Split into few more methods - function header($title='', $user=array()) { + function header($title='', $user=array(), $headerhtml) { $home = URL_HOME; $script = $_SERVER['SCRIPT_NAME']; $search = htmlspecialchars(@trim($_GET['q'])); @@ -267,7 +267,7 @@ EOF; if($count) $assistants[$item] = "assistant/$item"; } - $tables=array('item','model','category','producer','vendor','room','status','location'); + $tables=array('item','barcode','model','category','producer','vendor','room','status','location'); foreach($tables as $table) { $listable[$table] = $table; @@ -308,7 +308,7 @@ EOF;
'); print_r($selectbox); //echo(''); print_r($current); $update = false; + $current_new=array(); if(is_array($current)) { $update = true; - $current = array_shift($current); + $current_new = array_merge($current_new,array_shift($current)); + } + if(isset($_GET['insert']) && is_array($_GET['insert'])) { + $update = true; + $current_new = array_merge($current_new,$_GET['insert']); } if(!is_array($hidecols)) $hidecols = array(); @@ -567,7 +582,7 @@ EOF; } if(!is_array($parts) || in_array('inputs', $parts)) - $html.=$this->render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update); + $html.=$this->render_insert_inputs($class,$columns,$selectbox,$current_new,$hidecols,$update); if(!is_array($parts) || in_array('foot', $parts)) { $html .= '
'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!! @@ -994,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) { @@ -1014,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 @@ -1024,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 :'-("); @@ -1061,8 +1110,11 @@ class Sklad_UI { $PATH_CHUNKS = preg_split('/\//', $PATH_INFO); //Sephirot: if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]=''; - if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode' && $PATH_CHUNKS[1]!='api') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost... - echo $this->html->header($PATH_INFO,$this->db->auth->get_user()); + 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) : ''; + echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml); + } switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible case 'test': //test die('Tell me why you cry'); @@ -1079,7 +1131,7 @@ class Sklad_UI { $assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2]; echo $this->safe_include($incdirs[$PATH_CHUNKS[1]],$PATH_CHUNKS[2],$assistant_vars); break; - case 'barcode': //barcode + case 'barcodeimg': //barcode Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2))); break; default: //?