');
- echo $this->input('table', $class, 'hidden');
- foreach($columns as $column) {
- echo($column['Field'].': ');
- $name='value:'.$column['Field'].'[]';
- switch(true) {
- case preg_match('/auto_increment/', $column['Extra']):
- $val = $update ? $current[$column['Field']] : ''; //opakuje se (skoro) zbytecne
- echo $this->input($name, $val, 'hidden');
- echo($val.'(AUTO)');
- break;
- case isset($selectbox[$column['Field']]):
- $val = $update ? $current[$column['Field']] : false;
- echo $this->select($name,$selectbox[$column['Field']],$val); //opakuje se
- break;
- default:
- $val = $update ? $current[$column['Field']] : false; //opakuje se
- echo $this->input($name, $val);
- break;
- }
- echo('
');
+ if(!is_array($hidecols)) $hidecols = array();
+ $hidecols = array_merge($hidecols, array('item_author', 'item_valid_from', 'item_valid_till')); //TODO Autodetect
+
+ if(!is_array($parts) || in_array('head', $parts)) {
+ $action = $action ? " action='$action'" : false;
+ $html.="
');
+ $btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+ $html.=$this->input(false, $btn, 'submit');
+ $html.='';
+ }
+ return $html;
}
}
+/**
+* Trida poskytuje rozhrani k databazi skladu
+*
+* @package Sklad_DB
+* @author Tomas Mudrunka
+*/
class Sklad_DB extends PDO {
function __construct() {
- $this->lms = new Sklad_LMS();
+ $this->auth = new Sklad_Auth();
parent::__construct(
DB_DSN, DB_USER, DB_PASS,
@@ -226,102 +440,218 @@ class Sklad_DB extends PDO {
return preg_replace('(^.|.$)', '', $this->quote($str)); //TODO HACK
}
- function build_query_select($class, $id=false, $limit=false, $offset=0, $search=false, $id_suffix='_id') {
- $class = $this->escape($class);
+ function quote_identifier($str) {
+ return '`'.$this->escape($str).'`'; //TODO HACK
+ }
+
+ function build_query_select($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $order=false, $suffix_id='_id') {
+ //Configuration
$join = array(
'item' => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
'model' => array('category', 'producer')
- );
+ ); //TODO Autodetect using foreign keys?
$search_fields = array(
- 'item' => array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name')
- );
- $sql="SELECT * FROM $class\n";
- if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$id_suffix)\n";
+ 'item' => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
+ ); //TODO Autodetect
+
+ //Init
+ if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
+
+ //Escaping
+ $class = $this->escape($class);
+
+ //SELECT
+ $sql="SELECT * FROM `$class`\n";
+ //JOIN
+ if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
+ //WHERE/REGEXP
if($search) {
$search = $this->quote($search);
- if(!isset($search_fields[$class])) {
- trigger_error("Ve tride $class zatim vyhledavat nemozno :-(");
- die();
- }
- $sql .= 'WHERE FALSE ';
- foreach($search_fields[$class] as $column) $sql .= "OR $column REGEXP $search ";
- } elseif($id) $sql .= "WHERE $class$id_suffix = $id\n";
+ if(!isset($search_fields[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get
+ $sql_search = '';
+ foreach($search_fields[$class] as $column) $sql_search .= "OR $column REGEXP $search ";
+ $where[] = "FALSE $sql_search";
+ } elseif($id) $where[] = "$class$suffix_id = $id";
+ if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
+
+ if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
+ //ORDER
+ if(!$order) $order = $class.$suffix_id;
+ if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
+ $sql .= "ORDER BY $order\n";
+ //LIMIT/OFFSET
if($limit) {
$limit = $this->escape((int)$limit);
$offset = $this->escape((int)$offset);
$sql .= "LIMIT $offset,$limit\n";
}
+
return $sql;
}
- function safe_query($sql) {
+ function safe_query($sql, $fatal=true) {
$result = $this->query($sql);
if(!$result) {
- trigger_error('
QUERY FAILED:'.$sql.'
');
- die();
+ $error = $this->errorInfo();
+ trigger_error("
QUERY FAILED ($error[0],$error[1]): $error[2]
QUERY:\n$sql
");
+ if($fatal) die();
+ }
+ return $result;
+ }
+
+ function translate_query_results($result) {
+ $translate_cols = array('status_name', 'item_valid_till'); //TODO: Hardcoded
+ foreach($result as $key => $row) {
+ foreach($translate_cols as $col) if(isset($result[$key][$col])){
+ $result[$key][$col] = T($result[$key][$col]);
+ }
}
return $result;
}
- function get_listing($class, $id=false, $limit=false, $offset=0, $search=false, $indexed=array(), $suffix_id='_id') {
- $sql = $this->build_query_select($class, $id, $limit, $offset, $search);
- $result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+ function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
+ $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+ if($translate) $result = $this->translate_query_results($result);
+ return $result;
+ }
+
+
+ function get_listing($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
+ $sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history);
+ $result = $this->safe_query_fetch($sql);
if(!$result || !is_array($indexed)) return $result;
foreach($result as $key => $row) $indexed[$row[$class.$suffix_id]]=$row;
return $indexed;
}
- function get_columns($class) {
+ function get_columns($class,$disable_cols=array()) { //TODO: Not sure if compatible with non-MySQL DBs
$class = $this->escape($class);
$sql = "SHOW COLUMNS FROM $class;";
- return $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+ $columns = $this->safe_query_fetch($sql);
+ /*foreach($columns as $colk => $col) foreach($col as $key => $val) {
+ if(in_array($col['Field'],$disable_cols)) $columns[$colk]['Extra']='auto_increment';
+ }*/
+ return $columns;
}
function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
$selectbox=array();
foreach($columns as $column) {
+ if($column['Field'] == 'user_id') continue; //TODO HACK Blacklist: tabulka nemusi obsahovat *_name!!! momentalne se to tyka jen tabulky user (a item - u ty to nevadi)!
if($class && $column['Field'] == $class.$suffix_id) continue;
if(!preg_match('/'.$suffix_id.'$/', $column['Field'])) continue;
$table=preg_replace('/'.$suffix_id.'$/','',$column['Field']);
- $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table;";
- $result=$this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+
+ $history = $this->contains_history($table) ? " WHERE ${table}_valid_till=0" : '';
+ $sql = "SELECT $table$suffix_id, $table$suffix_name FROM $table$history;"; //TODO use build_query_select()!!!
+ $result = $this->safe_query_fetch($sql, false);
+ if(!$result) continue;
foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
}
//echo('
'); print_r($selectbox);
- return $selectbox;
+ return array_filter($selectbox, 'ksort');
+ }
+
+ function map_unique($key, $value, $select, $table, $fatal=true) { //TODO: Guess $select and $table if not passed
+ $history = $this->contains_history($table) ? " AND ${table}_valid_till=0" : '';
+ $value=$this->quote($value);
+ $sql = "SELECT $select FROM $table WHERE $key=$value$history LIMIT 1;"; //TODO use build_query_select()!!!
+ $result = $this->safe_query_fetch($sql);
+ if(isset($result[0][$select])) return $result[0][$select]; else if($fatal) die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
+ }
+
+ function contains_history($table) {
+ $history_tables = array('item'); //TODO Autodetect
+ return in_array($table, $history_tables);
}
function build_query_insert($table, $values, $replace=true, $suffix_id='_id') {
+ //Init
+ $history = $this->contains_history($table);
+
+ //Escaping
$table = $this->escape($table);
//Get list of POSTed columns
- $columns = implode(',',array_map(array($this,'escape'), array_keys($values[0])));
+ $columns_array = array_map(array($this,'escape'), array_keys($values[0]));
+ $columns = implode(',',$columns_array);
+
+ //Build query
+ $sql = '';
+ //echo(''); die(print_r($values));
+
+ if($history) {
+ $history_update=false; foreach($values as $row) if(is_numeric($row[$table.'_id'])) $history_update=true;
+ if($history_update) {
+ $sql .= "UPDATE $table";
+ $sql .= " SET ${table}_valid_till=NOW()";
+ $sql .= " WHERE ${table}_valid_till=0 AND (";
+ $or = '';
+ foreach($values as $row) {
+ $sql .= $or.' '.$table.'_id='.$this->quote($row[$table.'_id']);
+ $or = ' OR';
+ }
+ $sql .= " );\n\n";
+ $replace = false;
+ }
+ }
//Insert into table (columns)
- $sql = 'INSERT';
- if($replace) $sql = 'REPLACE';
- $sql .= " INTO $table ($columns) VALUES ";
+ $sql .= "INSERT INTO $table ($columns) VALUES ";
//Values (a,b,c),(d,e,f)
$comma='';
foreach($values as $row) {
- $sql .= $comma.'('.implode(',',array_map(array($this,'quote'), $row)).')';
+ $row_quoted = array_map(array($this,'quote'), $row); //Check
+ if($history) {
+ foreach($row as $column => $value) {
+ switch($column) {
+ case $table.'_valid_from':
+ $row_quoted[$column] = 'NOW()';
+ break;
+ case $table.'_valid_till':
+ $row_quoted[$column] = '0';
+ break;
+ case $table.'_author':
+ $row_quoted[$column] = $this->auth->get_user_id();
+ //die($this->auth->get_user_id().'=USER');
+ break;
+ }
+ }
+ }
+ $sql .= $comma.'('.implode(',',$row_quoted).')';
$comma = ',';
}
+ //On duplicate key
+ if($replace) {
+ foreach($columns_array as $col) {
+ if($col == $table.'_id' || $col == $table.'_valid_till') continue;
+ $on_duplicate[] = "$col=VALUES($col)";
+ }
+ $sql .= "\nON DUPLICATE KEY UPDATE ".implode(',', $on_duplicate);
+ }
+
//Terminate
$sql .= ';';
return $sql;
}
- function insert_or_update($table, $values) {
- $sql = $this->build_query_insert($table, $values);
+ function insert_or_update($table, $values, $replace=true) {
+ $sql = $this->build_query_insert($table, $values, $replace);
$this->safe_query($sql);
return $this->lastInsertId();
}
+ function insert_or_update_multitab($values, $replace=true) {
+ $last=false;
+ foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows, $replace);
+ return $last;
+ }
+
function delete($table, $id, $suffix_id='_id') {
+ if($this->contains_history($table)) return false;
$key = $this->escape($table.$suffix_id);
$table = $this->escape($table);
$id = $this->quote($id);
@@ -329,127 +659,178 @@ class Sklad_DB extends PDO {
}
}
+/**
+* Trida poskytuje high-level rozhrani k databazi skladu
+*
+* @package Sklad_DB_Abstract
+* @author Tomas Mudrunka
+*/
+class Sklad_DB_Abstract extends Sklad_DB {
+ //TODO Code
+}
+
+/**
+* Trida implementuje uzivatelske rozhrani skladu
+*
+* Example usage:
+* $sklad = new Sklad_UI();
+* $sklad->process_http_request();
+*
+* @package Sklad_UI
+* @author Tomas Mudrunka
+*/
class Sklad_UI {
function __construct() {
$this->db = new Sklad_DB();
$this->html = new Sklad_HTML();
}
- function show_items($class, $id=false, $limit=false, $offset=0, $search=false) {
- $this->html->print_item_table($this->db->get_listing($class, $id, $limit, $offset, $search));
+ function render_items($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false) {
+ return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $where, $search, $history, false));
}
- function show_form_add($class) {
+ function render_form_add($class) {
$columns = $this->db->get_columns($class);
$selectbox = $this->db->columns_get_selectbox($columns, $class);
- $this->html->print_insert_form($class, $columns, $selectbox);
+ return $this->html->render_insert_form($class, $columns, $selectbox);
}
- function show_form_edit($class, $id) {
+ function render_form_edit($class, $id) {
$columns = $this->db->get_columns($class);
$selectbox = $this->db->columns_get_selectbox($columns, $class);
- $current = $this->db->get_listing($class, $id);
- $this->html->print_insert_form($class, $columns, $selectbox, $current);
+ $current = $this->db->get_listing($class, $id, 1);
+ return $this->html->render_insert_form($class, $columns, $selectbox, $current);
}
- function show_single_record_details($class, $id) {
+ function render_single_record_details($class, $id) {
$id_next = $id + 1;
$id_prev = $id - 1 > 0 ? $id - 1 : 0;
$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
- echo $this->html->link('<<', "$class/$id_prev/");
- echo '-';
- echo $this->html->link('>>', "$class/$id_next/");
- echo ('
');
- echo $this->html->link('edit', "$class/$id/edit/");
+ $html='';
+ $html.= $this->html->link('<<', "$class/$id_prev/");
+ $html.= '-';
+ $html.= $this->html->link('>>', "$class/$id_next/");
+ $html.= '
';
+ $html.=''.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'';
+ $html.= $this->html->link('edit', "$class/$id/edit/");
+ if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
+ return $html;
}
- function show_listing_navigation($class, $id, $limit, $offset) {
+ function render_listing_navigation($class, $id, $limit, $offset) {
$offset_next = $offset + $limit;
$offset_prev = $offset - $limit > 0 ? $offset - $limit : 0;
$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
- echo $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
- echo '-';
- echo $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
- echo ('
');
- echo $this->html->link('new', "$class/new/$get");
+ $html='';
+ $html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
+ $html.= '-';
+ $html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
+ $html.= '
';
+ $html.= $this->html->link('new', "$class/new/$get");
+ return $html;
}
- function show_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+ function render_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+ $html='';
if(is_numeric($id)) {
- $this->show_single_record_details($class, $id);
+ $html.=$this->render_single_record_details($class, $id);
} else {
- $this->show_listing_navigation($class, '*', $limit, $offset);
+ $html.=$this->render_listing_navigation($class, '*', $limit, $offset);
}
if($edit) {
- echo('
TODO UPDATE FORM!
');
- $this->show_form_edit($class, $id);
+ $html.= $this->render_form_edit($class, $id);
$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
- echo("
');
+ $html.=$this->html->form($action,'POST',array(
+ array(false,'DELETE','submit'),
+ array('sure', false, 'checkbox', false, false, 'sure?')
+ ));
$action = $_SERVER['SCRIPT_NAME']."/$class/$id/image";
- echo("
');
+ $html.=$this->html->form($action,'POST',array(
+ array('image', false, 'file', false, 'size="30"'),
+ array(false, 'IMAGE', 'submit')
+ ), "enctype='multipart/form-data'");
}
+ return $html;
}
function check_auth() {
- new HTTP_Auth('SkladovejSystem', true, array($this->db->lms,'check_auth'));
+ new HTTP_Auth('SkladovejSystem', true, array($this->db->auth,'check_auth'));
+ }
+
+ function post_redirect_get($location, $message='', $error=false) {
+ $url_args = $message != '' ? '?message='.urlencode(T($message)) : '';
+ $location = $this->html->internal_url($location).$url_args;
+ header('Location: '.$location);
+ if($error) trigger_error($message);
+ $location=htmlspecialchars($location);
+ die(
+ "
".
+ T($message)."
Location:
$location"
+ );
}
- function post_redirect_get($last, $next) { //TODO prepracovat, tohle je uplna picovina...
- //header('Location: '.$_SERVER['REQUEST_URI']); //TODO redirect (need templating system or ob_start() first!!!)
- echo 'Hotovo. Poslednà vložený záznam naleznete '.$this->html->link('zde', $last).'.
'.
- 'DalÅ¡Ã záznam pÅidáte '.$this->html->link('zde', $next).'.';
- die();
+ function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
+ if(preg_match('/[^a-zA-Z0-9-]/',$name)) $this->post_redirect_get('', 'SAFE INCLUDE: Securityfuck.', true);
+ $filename="$dir/$name$ext";
+ if(!is_file($filename)) $this->post_redirect_get('', 'SAFE INCLUDE: Fuckfound.', true);
+ foreach($vars as $var => $val) $$var=$val;
+ ob_start();
+ include($filename);
+ $out=ob_get_contents();
+ ob_end_clean();
+ return $out;
}
- function process_http_request_post($action=false, $class=false, $id=false) {
+ function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
if($_SERVER['REQUEST_METHOD'] != 'POST') return;
- echo('
'); //DEBUG (maybe todo remove)
+ //echo(''); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
//SephirPOST:
- $values=array();
- foreach($_POST as $key => $value) {
- $name = preg_split('/:/',$key);
- if(isset($name[0])) switch($name[0]) {
- case 'value':
- foreach($value as $id => $val) $values[$id][$name[1]]=$value[$id];
- break;
- default:
- break;
+
+ /* Tenhle foreach() prekopiruje promenne
+ * z: $_POST['values'][$table][$column][$id];
+ * do: $values[$table][$id][$column]
+ */
+ if(isset($_POST['values'])) {
+ $values=array();
+ foreach($_POST['values'] as $table => $columns) {
+ foreach($columns as $column => $ids) {
+ foreach($ids as $id => $val) $values[$table][$id][$column] = $val;
+ }
}
+ //die(print_r($values));
}
if($action) switch($action) {
case 'new':
+ $replace = false;
case 'edit':
- if(!isset($_POST['table'])) die(trigger_error("Jest nutno specifikovat tabulku voe!"));
- $table=$_POST['table'];
+ if(!isset($replace)) $replace = true;
+ $table = $class ? $class : 'item';
//print_r($values); //debug
- $last = $this->db->insert_or_update($table, $values);
- $this->post_redirect_get("$table/$last/", "$table/new/");
+ $last = $this->db->insert_or_update_multitab($values, $replace);
+ $last = $force_redirect ? $force_redirect."?last=$last" : "$table/$last/";
+ $next = "$table/new/";
+ $message = $force_redirect ? '' : 'Hotovo. DalÅ¡Ã záznam pÅidáte '.$this->html->link('zde', $next).'.';
+ $this->post_redirect_get($last, $message);
break;
case 'delete':
- if(!isset($_POST['sure']) || !$_POST['sure']) die(trigger_error('Sure user expected :-)'));
- //$this->db->delete($class, $id);
- die('Neco asi bylo smazano. Fnuk :\'-('); //TODO REDIRECT
+ 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 :'-(");
break;
case 'image':
$image_classes = array('model'); //TODO, use this more widely across the code
- if(!in_array($class, $image_classes)) die(trigger_error("Nekdo nechce k DB Tride '$class' prirazovat obrazky!"));
+ if(!in_array($class, $image_classes)) $this->post_redirect_get("$class/$id/edit", "Nekdo nechce k DB Tride '$class' prirazovat obrazky!");
$image_destination = DIR_IMAGES."/$class/$id.jpg";
- if($_FILES['image']['name'] == '') die(trigger_error('Kazde neco se musi nejak jmenovat!'));
+ if($_FILES['image']['name'] == '') $this->post_redirect_get("$class/$id/edit", 'Everything has to be called somehow!', true);
if(move_uploaded_file($_FILES['image']['tmp_name'], $image_destination)) {
- chmod ($image_destination, 0664);
- die('Obrazek se naladoval :)'); //TODO REDIRECT
- } else die(trigger_error('Soubor se nenahral :('));
+ chmod ($image_destination, 0664);
+ $this->post_redirect_get("$class/$id", 'Image has been upbloated successfully :)');
+ } else $this->post_redirect_get("$class/$id/edit", 'File upload failed :(', true);
break;
default:
- trigger_error('Nothin\' to do here my cutie :-*');
+ $this->post_redirect_get('', 'Nothin\' to do here my cutie :-*');
break;
}
@@ -465,16 +846,26 @@ class Sklad_UI {
}
$PATH_INFO=@trim($_SERVER[PATH_INFO]);
- $this->html->header_print($PATH_INFO);
-
-
- //Sephirot:
$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
+ //Sephirot:
if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
- switch($PATH_CHUNKS[1]) {
+ if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+ echo $this->html->header($PATH_INFO,$this->db->auth->get_user());
+ switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
case 'test': //test
die('Tell me why you cry');
break;
+ case 'assistant': //assistant
+ $PATH_CHUNKS[3] = isset($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+ $assistant_vars['SUBPATH'] = array_slice($PATH_CHUNKS, 3);
+ $assistant_vars['URL_INTERNAL'] = 'assistant/'.$PATH_CHUNKS[2];
+ $assistant_vars['URL'] = $_SERVER['SCRIPT_NAME'].'/'.$assistant_vars['URL_INTERNAL'];
+ $assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
+ echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
+ break;
+ case 'barcode': //barcode
+ Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
+ break;
default: //?
$search = (isset($_GET['q']) && trim($_GET['q']) != '') ? trim($_GET['q']) : false;
$class = (isset($PATH_CHUNKS[1]) && $PATH_CHUNKS[1] != '') ? $PATH_CHUNKS[1] : 'item';
@@ -482,7 +873,7 @@ class Sklad_UI {
switch($PATH_CHUNKS[2]) {
case 'new': //?/new
$this->process_http_request_post($PATH_CHUNKS[2], $class);
- $this->show_form_add($class);
+ echo $this->render_form_add($class);
break;
default: //?/?
$id = (isset($PATH_CHUNKS[2]) && is_numeric($PATH_CHUNKS[2]) ? (int) $PATH_CHUNKS[2] : false);
@@ -490,15 +881,17 @@ class Sklad_UI {
$edit=false;
switch($PATH_CHUNKS[3]) {
case 'edit': //?/?/edit
- case 'image': //?/image
- case 'delete': //?/delete
+ case 'image': //?/?/image
+ case 'delete': //?/?/delete
$this->process_http_request_post($PATH_CHUNKS[3], $class, $id);
$edit=true;
default: //?/?/?
+ $history = $PATH_CHUNKS[3] == 'history' ? true : false;
$limit = (int) (isset($PATH_CHUNKS[3]) ? $PATH_CHUNKS[3] : '0');
$offset = (int) (isset($PATH_CHUNKS[4]) ? $PATH_CHUNKS[4] : '0');
- $this->show_items($class, $id, $limit, $offset, $search);
- $this->show_listing_extensions($class, $id, $limit, $offset, $edit);
+ $where = @is_array($_GET['where']) ? $_GET['where'] : false;
+ echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
+ echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
//print_r(array("",$_SERVER));
break;
}
@@ -512,4 +905,4 @@ class Sklad_UI {
$sklad = new Sklad_UI();
$sklad->process_http_request();
-echo("
");
+echo('
');