SystémSklad$title
+ $message = strip_tags(@trim($_GET['message']),''); + $fortune = fortune(); + $instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : ''; + $user_id = htmlspecialchars($user['id']); + $user_gid = htmlspecialchars($user['gid']); + $user_name = htmlspecialchars($user['name']); + $time = date('r'); + //$title = T($title); //TODO + + $html = $this->head("SÅkoMan$title"); + $html .= <<
+ Logged in as $user_name [UID: $user_id; GID: $user_gid]
+ Page loaded at $time +
+ Page loaded at $time +
-
-
-
'; + $this->table_add_row_classes($table); $this->table_add_images($table); + if($class) $this->table_add_relations($table,$class); + $this->table_add_barcodes($table); $this->table_collapse($table); + if($class) $this->table_hide_columns($table,$class); $this->table_sort($table); - return $this->table($table); + return $this->table($table,$colspan,$rowspan,$break_after); } - function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) { - //echo('
-
-
-
-
+EOF;
+
+ $assistants=array();
+ foreach(scandir(DIR_ASSISTANTS) as $item) {
+ if($item == '.' || $item == '..') continue;
+ $item = preg_replace('/\.inc\.php$/','',$item,-1,$count);
+ if($count) $assistants[$item] = "assistant/$item";
+ }
+
+ $tables=array('item','barcode','model','category','producer','vendor','room','status','location');
+
+ foreach($tables as $table) {
+ $listable[$table] = $table;
+ $insertable[$table] = "$table/new";
+ }
+
+ $html .= $this->ul(array(
+ 'Home' => '',
+ 'Logout' => '?logout',
+ 0 => $this->ul($assistants,'menu',$this->link('Assistants','#')),
+ 1 => $this->ul($insertable,'menu',$this->link('New','#')),
+ 2 => $this->ul($listable,'menu',$this->link('List','#'))
+ ),'menu', '', 'menu');
+
+ $html .= '';
+
+ /*
+ //TODO: Do we really need this?
+ $html .= $this->form("$script/api/go", 'GET', array(
+ array('q','','text','smart id...', 'autofocus'),
+ array(false,'go','submit')
+ ), 'style="float: left;"');
+ */
+
+ $html .= $this->form('?', 'GET', array(
+ array('q',$search,'text','regexp...'),
+ array(false,'filter','submit')
+ ), 'style="float: left;"');
+
+ $html .= $this->form("$script/item", 'GET', array(
+ array('q',$search,'text','regexp...','autofocus'),
+ array(false,'search','submit')
+ ), 'style="float: left;"');
+
+ $html .= '
';
+
+ $html .= <<
$message
+
+$fortune
+
EOF;
+
+ return $html;
}
function internal_url($link) {
@@ -212,7 +328,83 @@ EOF;
foreach($image as $column) if(isset($table[$id][$column])) {
$type = @array_shift(preg_split('/_/', $column));
$src=URL_IMAGES."/$type/".$table[$id][$column].'.jpg';
- $table[$id][$type.'_image']=$this->img($src, $table[$id][$column]);
+ $table[$id][$type.'_image']=$this->img_link($src, $src, $table[$id][$column], false, false);
+ }
+ }
+ }
+
+ function render_barcode($barcode,$opts=false) {
+ return $this->img_link($this->internal_url("barcodeimg/$barcode"),$this->internal_url("barcodeimg/$barcode"),$barcode,false,false,$opts);
+ }
+
+ function table_add_barcodes(&$table) {
+ $image = array('barcode_name', 'model_barcode', 'item_serial');
+ foreach($table as $id => $row) {
+ foreach($image as $column) if(isset($table[$id][$column])) {
+ $table[$id][$column]=$this->render_barcode($table[$id][$column]);
+ }
+ }
+ }
+
+ function table_add_row_classes(&$table, $class_col='_row_classes') {
+ $image = array('status_name' => ' item_status_');
+ foreach($table as $id => $row) {
+ foreach($image as $column => $param) if(isset($table[$id][$column])) {
+ @$table[$id][$class_col] .= $param.$table[$id][$column];
+ }
+ }
+ }
+
+ function table_add_relations(&$table, $class, $suffix_relations='_relations') {
+ $where_url = '%d/?where[%c]==%v';
+ $insert_url = '%d/new?insert[%c]=%v';
+ $relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes
+ 'model' => array(
+ 'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url)),
+ 'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
+ 'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
+ 'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
+ ),
+ 'barcode' => array(
+ 'model_id' => array(array('model',$where_url)),
+ 'barcode_id' => array(array('item',$where_url),array('edit','barcode/%v/edit/')),
+ 'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
+ ),
+ 'item' => array(
+ 'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
+ 'item_id' => array(array('edit','item/%v/edit/'))
+ ),
+ 'category' => array('category_id' => array(array('item',$where_url), array('model',$where_url))),
+ 'producer' => array('producer_id' => array(array('item',$where_url), array('model',$where_url))),
+ 'vendor' => array('vendor_id' => array(array('item',$where_url))),
+ 'room' => array('room_id' => array(array('item',$where_url))),
+ 'status' => array('status_id' => array(array('item',$where_url))),
+ 'location' => array(
+ 'location_id' => array(array('item',$where_url),array('edit','location/%v/edit/')),
+ 'location_name' => array(array('smokeping','http://tartarus.brevnov.czf/cgi-bin/smokeping.cgi?filter=%v'))
+ )
+ );
+ $relations_conditions=array(
+ 'in_stock' => 'return(@$table[$id]["status_name"] == "stored");',
+ 'not_sold' => 'return(@$table[$id]["status_name"] != "sold");',
+ 'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "sold" && @$table[$id]["status_name"] != "disposed");'
+ );
+ foreach($table as $id => $row) {
+ foreach($row as $column => $value) {
+ if(isset($relations[$class][$column])) {
+ foreach($relations[$class][$column] as $destination) {
+ $destination_url = str_replace(
+ array('%d','%c','%v'),
+ array(urlencode($destination[0]),urlencode($column),urlencode($value)),
+ $destination[1]
+ );
+ if(isset($destination[2]) && isset($relations_conditions[$destination[2]])) {
+ //$condition = $relations_conditions[$destination[2]]($table,$id);
+ if(!eval($relations_conditions[$destination[2]])) continue;
+ }
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
+ }
+ }
}
}
}
@@ -225,20 +417,32 @@ EOF;
'producer_id' => 'producer_name',
'vendor_id' => 'vendor_name',
'room_id' => 'room_name',
+ 'location_id' => 'location_name',
'status_id' => 'status_name',
+ 'item_author' => 'item_author_backend',
+ 'item_customer' => 'item_customer',
);
+
foreach($table as $id => $row) {
foreach($collapse as $link => $title)
if(isset($table[$id][$link]) && isset($row[$title])) {
$type = @array_shift(preg_split('/_/', $link));
if($link != $title) unset($table[$id][$link]);
- $table[$id][$title]=$this->link($row[$title], $type.'/'.$row[$link].'/');
+ switch($link) { //TODO: Move to array for easy configuration
+ case 'item_author':
+ case 'item_customer':
+ $table[$id][$title]=$this->link($row[$title], "?where[$link]==".$row[$link], false);
+ break;
+ default:
+ $table[$id][$title]=$this->link($row[$title], $type.'/'.$row[$link].'/');
+ break;
+ }
}
}
}
function table_sort(&$table) {
- $precedence = array('item_id', 'model_image', 'model_name','model_descript','category_name','status_name','room_name');
+ $precedence = array('item_id', 'model_image', 'model_name','model_descript','category_name','status_name','room_name','item_quantity','item_price_in','item_price_out','model_price_in','model_price_out','item_relations','model_relations');
$table_sorted = array();
foreach($table as $id => $row) {
$table_sorted[$id] = array();
@@ -247,71 +451,156 @@ EOF;
unset($table[$id][$column]);
}
$table_sorted[$id]=array_merge($table_sorted[$id],$table[$id]);
+ //foreach($table[$id] as $key => $val) $table_sorted[$id][T($key)] = $val; //array_merge with T() translating
}
$table = $table_sorted;
}
- function render_item_table($table) {
+ function table_hide_columns(&$table, $class) { //TODO: Move to build_query_select() !!! :-)))
+ $fields_hide = array(
+ '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')
+ );
+ //print_r($table); die();
+ if(isset($fields_hide[$class])) foreach($table as $id => $row) {
+ foreach($fields_hide[$class] as $field) unset($table[$id][$field]);
+ }
+ }
+
+ function render_item_table($table,$class=false) {
+
+ $cellspan = array(
+ 'break_after' => array(
+ 'item' => array('category_name'),
+ 'model'=> array('model_descript')
+ ),
+ 'rowspan' => array(
+ 'item' => array('model_image'=>2,'item_id'=>2),
+ 'model'=> array('model_image'=>2)
+ ),
+ 'colspan' => array(
+ 'item' => array('model_name'=>6,'category_name'=>'100%'),
+ 'model'=> array('model_name'=>4,'model_descript'=>'100%')
+ )
+ );
+
+ foreach(array_keys($cellspan) as $vari)
+ $$vari = isset($cellspan[$vari][$class]) ? $cellspan[$vari][$class] : array();
+
+ if(empty($table)) return ''.T('holy primordial emptiness is all you can find here...').'
'; + $this->table_add_row_classes($table); $this->table_add_images($table); + if($class) $this->table_add_relations($table,$class); + $this->table_add_barcodes($table); $this->table_collapse($table); + if($class) $this->table_hide_columns($table,$class); $this->table_sort($table); - return $this->table($table); + return $this->table($table,$colspan,$rowspan,$break_after); } - function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) { - //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('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
-
- $action = $action ? " action='$action'" : false;
- $html="";
- if($multi_insert) $html.='';
- //$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 = '';
+ $even=false;
foreach($columns as $column) {
- $html.=$class.':'.$column['Field'].': ';
+ $html.=''.T($class).':'.T($column['Field']).': ';
+ $even = !$even;
$name="values[$class][".$column['Field'].'][]';
$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
- if(!$val) $val = '';
+ 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.='
';
+ 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;
+ }
- $btn = is_array($current) ? 'UPDATE' : 'INSERT';
- $html.=$this->input(false, $btn, 'submit');
- $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;
+ $current_new=array();
+ if(is_array($current)) {
+ $update = true;
+ $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();
+ $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.=""; //TODO: use $this->form()
+ $html.='';
+ }
+
+ if(!is_array($parts) || in_array('inputs', $parts))
+ $html.=$this->render_insert_inputs($class,$columns,$selectbox,$current_new,$hidecols,$update);
+
+ if(!is_array($parts) || in_array('foot', $parts)) {
+ $html .= '
';
+ if($multi_insert) { //TODO, move to separate JS file
+ $html.=<<
+ function duplicate_element(what, where) {
+ var node = document.getElementsByName(what)[0];
+ node.parentNode.appendChild(node.cloneNode(true));
+ }
+
+ +
+EOF;
+ }
+
+ $btn = count($current_new)>0 ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+ $html.=$this->input(false, $btn, 'submit');
+ $html.='';
+ }
return $html;
}
}
@@ -324,7 +613,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,
@@ -336,38 +625,67 @@ class Sklad_DB extends PDO {
return preg_replace('(^.|.$)', '', $this->quote($str)); //TODO HACK
}
+ 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'),
+ 'barcode' => array('model', 'category', 'producer'),
+ 'item' => array('barcode', 'model', 'category', 'producer', 'vendor', 'room', 'location', 'status'),
'model' => array('category', 'producer')
); //TODO Autodetect using foreign keys?
- $search_fields = array(
- 'item' => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
+ $join2 = array(
+ 'model' => array('barcode'=>'model_id')
+ );
+ $fields_search = array(
+ 'item' => array('item_id','item_serial','model_name','barcode_name','model_barcode','model_descript','producer_name','vendor_name'),
+ 'model' => array('model_id','model_name','barcode_name','model_barcode','model_descript','producer_name')
); //TODO Autodetect
+ $group_concat = array(
+ 'model' => array('barcode_name'=>'model_id')
+ );
+
+ //Init
+ if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
//Escaping
$class = $this->escape($class);
+ //GROUP_CONCAT
+ $group_concat_query = '';
+ $group_by = '';
+ if(isset($group_concat[$class])) foreach($group_concat[$class] as $gc => $gb) {
+ $group_concat_query .= ",group_concat($gc separator ', ')";
+ $group_by .= "GROUP BY $gb\n";
+ }
+
//SELECT
- $sql="SELECT * FROM $class\n";
+ $sql="SELECT *$group_concat_query 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";
+ if(isset($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
//WHERE/REGEXP
if($search) {
$search = $this->quote($search);
- if(!isset($search_fields[$class])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
+ if(!isset($fields_search[$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 ";
+ 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";
+
+ //GROUP BY
+ $sql.=$group_by;
+
//ORDER
- if(!$order) $order = $class.$suffix_id;
+ if(!$order) $order = $class.$suffix_id.' DESC';
if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
- $sql .= "ORDER BY $order\n";
+ //$sql .= "ORDER BY $order\n"; //TODO: fixnout az budou opraveny vicenasobny carovy kody
//LIMIT/OFFSET
if($limit) {
$limit = $this->escape((int)$limit);
@@ -388,23 +706,58 @@ class Sklad_DB extends PDO {
return $result;
}
+ 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($sql)->fetchAll(PDO::FETCH_ASSOC);
+ $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;
@@ -413,21 +766,22 @@ class Sklad_DB extends PDO {
$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($sql, false);
+ $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) { //TODO: Guess $select and $table if not passed
+ 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($sql)->fetchAll(PDO::FETCH_ASSOC);
- if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error('Položka nenalezena!')); //TODO post_redirect_get...
+ $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) {
@@ -458,7 +812,7 @@ class Sklad_DB extends PDO {
$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";
@@ -483,8 +837,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;
}
}
@@ -555,7 +909,7 @@ class Sklad_UI {
}
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));
+ return $this->html->render_item_table($this->db->get_listing($class, $id, $limit, $offset, $where, $search, $history, false),$class);
}
function render_form_add($class) {
@@ -564,14 +918,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, 1);
- return $this->html->render_insert_form($class, $columns, $selectbox, $current);
+ 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'] : '';
@@ -579,7 +933,8 @@ class Sklad_UI {
$html.= $this->html->link('<<', "$class/$id_prev/");
$html.= '-';
$html.= $this->html->link('>>', "$class/$id_next/");
- $html.= '
';
+ $html.= ' ';
+ $barcode && $html.='';
$html.= $this->html->link('edit', "$class/$id/edit/");
if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
return $html;
@@ -589,51 +944,55 @@ 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) {
- $url_args = $message != '' ? '?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);
$location=htmlspecialchars($location);
die(
"".
- "Location: $location"
+ $messaget."
Location: $location"
);
}
@@ -649,7 +1008,18 @@ 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' => '/./',
+ 'barcode_name' => '/./',
+ '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!!!!
@@ -663,7 +1033,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));
@@ -677,9 +1054,10 @@ class Sklad_UI {
$table = $class ? $class : 'item';
//print_r($values); //debug
$last = $this->db->insert_or_update_multitab($values, $replace);
- $last = "$table/$last/";
+ $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 :-)');
@@ -690,14 +1068,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;
}
@@ -705,6 +1083,8 @@ class Sklad_UI {
}
function process_http_request() {
+ $listing_limit_classes = array('item','model');
+
$this->check_auth();
@ini_set('magic_quotes_gpc' , 'off');
@@ -713,19 +1093,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]!='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());
+ 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 'barcodeimg': //barcode
+ Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
break;
default: //?
$search = (isset($_GET['q']) && trim($_GET['q']) != '') ? trim($_GET['q']) : false;
@@ -748,9 +1139,10 @@ 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');
- $where = false; //TODO get from URL
+ $limit = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : (in_array($class, $listing_limit_classes) ? FRONTEND_LISTING_LIMIT : 0);
+ $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));
@@ -766,4 +1158,4 @@ class Sklad_UI {
$sklad = new Sklad_UI();
$sklad->process_http_request();
-echo("
");
+echo('
');