X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=2f92066682e8a62a4a1ac4fea6cd9b3929a6f329;hb=a1545cbd97c44f28a54b0ec5780f4ec85b468785;hp=b90738f1ff2884e1d79c671e3229ce5ba29ec1c8;hpb=c6831f3495cabc16fffce7d6fbb42e97cd69ac01;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index b90738f..2f92066 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'])); @@ -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(); @@ -573,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!!!! @@ -1002,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) { @@ -1022,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 @@ -1032,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 :'-("); @@ -1069,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]!='barcodeimg' && $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');