';
- //$html.=$this->input('table', $class, 'hidden');
+ function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
+ $textarea = array(
+ 'item' => array('item_note'),
+ 'model' => array('model_descript')
+ );
+ $html = '
';
foreach($columns as $column) {
- $html.=$class.':'.$column['Field'].': ';
+ $html.=''.T($class).':'.T($column['Field']).': | ';
$name="values[$class][".$column['Field'].'][]';
- $val = $update ? $current[$column['Field']] : false;
+ $val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
- case preg_match('/auto_increment/', $column['Extra']):
- if(!$val) $val = '';
+ case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
+ if(is_bool($val) && !$val) $val = '';
$html.=$this->input($name, $val, 'hidden');
- $html.=$val.'(AUTO)';
+ $html.='[AUTO] '.$val.'';
break;
case isset($selectbox[$column['Field']]):
$html.=$this->select($name,$selectbox[$column['Field']],$val);
break;
+ case isset($textarea[$class]) && in_array($column['Field'],$textarea[$class]):
+ $html.=$this->input($name, $val, 'textarea');
+ break;
default:
$html.=$this->input($name, $val);
break;
}
- $html.=' ';
- }
-
- if($multi_insert) {
- //TODO, move to separate JS file
- $html.=<<
-
-
- +
-EOF;
+ $html.=' |
';
+ }
+ $html.='
';
+ return $html;
+ }
+
+ function render_insert_form_multi($array) {
+ $html = '';
+ $head=false;
+
+ foreach($array as $key => $args) {
+ $parts=array('inputs');
+ if(!$head) { $head = true;
+ $parts[]='head';
+ }
+ if(!isset($array[$key+1])) {
+ $parts[]='foot';
+ $hr = '';
+ } else $hr = '
';
+ //$args[] = false;
+ $args[] = $parts;
+
+ $html .= call_user_func_array(array($this, 'render_insert_form'), $args);
+ $html .= $hr;
+ }
+ return $html;
+ }
+
+ function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true, $parts=false) {
+ $html = '';
+ //print_r($parts);
+ //echo('
'); print_r($selectbox);
+ //echo(''); print_r($current);
+ $update = false;
+ if(is_array($current)) {
+ $update = true;
+ $current = array_shift($current);
+ }
+
+ 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.="
';
+ }
return $html;
}
}
@@ -305,7 +592,7 @@ EOF;
*/
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,
@@ -317,44 +604,52 @@ 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, $history=false, $order=false, $suffix_id='_id') {
+ 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')
+ $fields_search = array(
+ 'item' => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name'),
+ 'model' => array('model_id','model_name','model_barcode','model_descript','producer_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";
+ $sql="SELECT * FROM `$class`\n";
//JOIN
- if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN $j USING($j$suffix_id)\n";
+ if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
//WHERE/REGEXP
- $where = false;
if($search) {
$search = $this->quote($search);
- if(!isset($search_fields[$class])) {
- $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
- }
- $where[0] = 'FALSE ';
- foreach($search_fields[$class] as $column) $where[0] .= "OR $column REGEXP $search ";
- } elseif($id) $where[1] = "$class$suffix_id = $id";
- if(!$history && $this->contains_history($class)) $where[2] = $class.'_valid_till=0';
- if($where) $sql .= 'WHERE '.implode(' AND ', $where)."\n";
+ if(!isset($fields_search[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get
+ $sql_search = '';
+ foreach($fields_search[$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.' DESC';
+ 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";
}
- //ORDER
- if(!$order) $order = $class.$suffix_id;
- $sql .= "ORDER BY $order";
return $sql;
}
@@ -369,37 +664,82 @@ class Sklad_DB extends PDO {
return $result;
}
- function get_listing($class, $id=false, $limit=false, $offset=0, $search=false, $history=false, $indexed=array(), $suffix_id='_id') {
- $sql = $this->build_query_select($class, $id, $limit, $offset, $search, $history);
- $result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+ function translate_query_results(&$result) {
+ $translate_cols = array('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]);
+ }
+ }
+ }
+
+ function load_backend_data_to_query_results(&$result,$suffix_backend='_backend') {
+ $translate_cols = array(
+ 'item_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])){
+ $result[$key][$col.$suffix_backend] = eval($backend);
+ }
+ }
+ }
+
+ function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
+ $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+ $this->load_backend_data_to_query_results($result);
+ if($translate) $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();
+ $selectbox=array( //TODO: Hardcoded...
+ 'model_countable' => array(0 => 'no', 1 => 'yes'),
+ 'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
+ 'vendor_id' => array('COMPULSORY' => 'select...')
+ );
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;"; //TODO History
- $result = $this->safe_query($sql, false);
+ $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;
- $result = $result->fetchAll(PDO::FETCH_ASSOC);
foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
}
//echo('
'); print_r($selectbox);
- return array_filter($selectbox, 'ksort');
+ //return array_filter($selectbox, 'ksort');
+ return array_filter($selectbox, 'natcasesort');
+ //array_multisort($selectbox); return $selectbox;
+ }
+
+ 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) {
@@ -426,11 +766,11 @@ class Sklad_DB extends PDO {
$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 (';
+ $sql .= " SET ${table}_valid_till=NOW()";
+ $sql .= " WHERE ${table}_valid_till=0 AND (";
$or = '';
foreach($values as $row) {
- $sql .= $or.' '.$table.'_id='.$row[$table.'_id'];
+ $sql .= $or.' '.$table.'_id='.$this->quote($row[$table.'_id']);
$or = ' OR';
}
$sql .= " );\n\n";
@@ -455,8 +795,8 @@ class Sklad_DB extends PDO {
$row_quoted[$column] = '0';
break;
case $table.'_author':
- $row_quoted[$column] = $this->lms->get_authorized_user_id();
- //die($this->lms->get_authorized_user_id().'=USER');
+ $row_quoted[$column] = $this->auth->get_user_id();
+ //die($this->auth->get_user_id().'=USER');
break;
}
}
@@ -479,15 +819,15 @@ class Sklad_DB extends PDO {
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) {
+ function insert_or_update_multitab($values, $replace=true) {
$last=false;
- foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows);
+ foreach($values as $table => $rows) $last = $this->insert_or_update($table, $rows, $replace);
return $last;
}
@@ -526,8 +866,8 @@ class Sklad_UI {
$this->html = new Sklad_HTML();
}
- function render_items($class, $id=false, $limit=false, $offset=0, $search=false, $history=false) {
- return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $search, $history, false));
+ 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),$class);
}
function render_form_add($class) {
@@ -536,14 +876,14 @@ class Sklad_UI {
return $this->html->render_insert_form($class, $columns, $selectbox);
}
- function render_form_edit($class, $id) {
+ function render_form_edit($class, $id, $multi_insert) {
$columns = $this->db->get_columns($class);
$selectbox = $this->db->columns_get_selectbox($columns, $class);
- $current = $this->db->get_listing($class, $id);
- return $this->html->render_insert_form($class, $columns, $selectbox, $current);
+ $current = $this->db->get_listing($class, $id, 1);
+ return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
}
- function render_single_record_details($class, $id) {
+ function render_single_record_details($class, $id, $barcode=true) {
$id_next = $id + 1;
$id_prev = $id - 1 > 0 ? $id - 1 : 0;
$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
@@ -551,7 +891,8 @@ class Sklad_UI {
$html.= $this->html->link('<<', "$class/$id_prev/");
$html.= '-';
$html.= $this->html->link('>>', "$class/$id_next/");
- $html.= '
';
+ $html.= ' ';
+ $barcode && $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;
@@ -561,47 +902,56 @@ class Sklad_UI {
$offset_next = $offset + $limit;
$offset_prev = $offset - $limit > 0 ? $offset - $limit : 0;
$get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
+ $moreget = isset($get[0]) ? '&' : '?';
$html='';
$html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
$html.= '-';
+ $html.= $this->html->link('[*]', "$class/$id/0/0/$get$moreget".'noimgs');
+ $html.= '-';
$html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
- $html.= '
';
+ $html.= ' ';
$html.= $this->html->link('new', "$class/new/$get");
return $html;
}
- function render_listing_extensions($class, $id, $limit, $offset, $edit=false) {
+ function render_listing_extensions($class, $id, $limit, $offset, $edit=false, $barcode=true) {
$html='';
if(is_numeric($id)) {
- $html.=$this->render_single_record_details($class, $id);
+ $html.=$this->render_single_record_details($class, $id, $barcode);
} else {
$html.=$this->render_listing_navigation($class, '*', $limit, $offset);
}
- if($edit) {
- $html.= $this->render_form_edit($class, $id);
+ if($edit && $barcode) {
+ $html.= $this->render_form_edit($class, $id, false);
$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
- $html.= "
';
+ $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";
- $html.= "
';
+ $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('WareHouse ['.BACKEND_AUTH.']', true, array($this->db->auth,'check_auth'));
}
- function post_redirect_get($location, $message='', $error=false) {
- $location = $this->html->internal_url($location).'?message='.urlencode($message);
+ function post_redirect_get($location, $message='', $error=false, $translate=true) {
+ $messaget = $translate ? T($message) : $message;
+ $url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+ $location = $this->html->internal_url($location).$url_args;
header('Location: '.$location);
if($error) trigger_error($message);
- die("Location:
$location");
+ $location=htmlspecialchars($location);
+ die(
+ "
".
+ $messaget."
Location:
$location"
+ );
}
function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
@@ -616,7 +966,17 @@ class Sklad_UI {
return $out;
}
- function process_http_request_post($action=false, $class=false, $id=false) {
+ function check_input_validity($field, $value='', $ruleset=0) {
+ $rules = array(0 => array(
+ 'model_barcode' => '/./',
+ 'item_serial' => '/./',
+ 'vendor_id' => '/^[0-9]*$/'
+ ));
+ if(isset($rules[$ruleset][$field]) && !preg_match($rules[$ruleset][$field], trim($value))) return false;
+ return true;
+ }
+
+ 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), HEADERS ALREADY SENT!!!!
@@ -630,7 +990,14 @@ class Sklad_UI {
$values=array();
foreach($_POST['values'] as $table => $columns) {
foreach($columns as $column => $ids) {
- foreach($ids as $id => $val) $values[$table][$id][$column] = $val;
+ foreach($ids as $id => $val) {
+ $values[$table][$id][$column] = trim($val);
+ if(!$this->check_input_validity($column,$val)) {
+ $message = "Spatny vstup: $column [$id] = \"$val\"; ". //XSS
+ $this->html->link('GO BACK', 'javascript:history.back()', false, false);
+ $this->post_redirect_get('', $message, false, false);
+ }
+ }
}
}
//die(print_r($values));
@@ -638,13 +1005,16 @@ class Sklad_UI {
if($action) switch($action) {
case 'new':
+ $replace = false;
case 'edit':
+ if(!isset($replace)) $replace = true;
$table = $class ? $class : 'item';
//print_r($values); //debug
- $last = $this->db->insert_or_update_multitab($values);
- $last = "$table/$last/";
+ $last = $this->db->insert_or_update_multitab($values, $replace);
+ $last = $force_redirect ? $force_redirect."?last=$last" : "$table/$last/";
$next = "$table/new/";
- $this->post_redirect_get($last, 'Hotovo. DalÅ¡Ã záznam pÅidáte '.$this->html->link('zde', $next).'.');
+ $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']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
@@ -655,14 +1025,14 @@ class Sklad_UI {
$image_classes = array('model'); //TODO, use this more widely across the code
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'] == '') $this->post_redirect_get("$class/$id/edit", 'Kazde neco se musi nejak jmenovat!', true);
+ 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);
- $this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)');
- } else $this->post_redirect_get("$class/$id/edit", 'Soubor se nenahral :(', true);
+ $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;
}
@@ -678,19 +1048,30 @@ class Sklad_UI {
}
$PATH_INFO=@trim($_SERVER[PATH_INFO]);
- if($_SERVER['REQUEST_METHOD'] != 'POST') echo $this->html->header($PATH_INFO); //TODO tahle podminka naznacuje ze je v navrhu nejaka drobna nedomyslenost...
-
-
- //Sephirot:
+ if($PATH_INFO == '' || $PATH_INFO == '/') $PATH_INFO = FRONTEND_PAGE_WELCOME;
$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' && $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());
+ 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
- $assistant_vars['step'] = isset($PATH_CHUNKS[3]) && is_numeric($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
- echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
+ case 'assistant': case 'api': //assistant|api
+ $incdirs = array(
+ 'assistant' => DIR_ASSISTANTS,
+ 'api' => DIR_APIS
+ );
+ $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($incdirs[$PATH_CHUNKS[1]],$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;
@@ -713,9 +1094,11 @@ class Sklad_UI {
$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');
- echo $this->render_items($class, $id, $limit, $offset, $search, $history);
+ $limit = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT;
+ $offset = isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0;
+ $where = @is_array($_GET['where']) ? $_GET['where'] : false;
+ echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit, 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;
@@ -730,4 +1113,4 @@ class Sklad_UI {
$sklad = new Sklad_UI();
$sklad->process_http_request();
-echo("
");
+echo('
');