+EOF;
+
+ $assistants=array();
+ foreach(scandir(DIR_ASSISTANTS) as $item) {
+ if($item == '.' || $item == '..') continue;
+ $item = preg_replace('/\.inc\.php$/','',$item);
+ $assistants[$item] = "assistant/$item";
+ }
+
+ $tables=array('item','model','category','producer','vendor','room','status');
+
+ 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 .= '
';
+
+ $html .= $this->form("$script/assistant/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 .= '
$message
EOF;
+
+ return $html;
}
function internal_url($link) {
@@ -212,7 +273,53 @@ 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("barcode/$barcode"),$this->internal_url("barcode/$barcode"),$barcode,false,false,$opts);
+ }
+
+ function table_add_barcodes(&$table) {
+ $image = array('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_relations(&$table, $class, $suffix_relations='_relations') {
+ $where_url = '%d/?where[%c]==%v';
+ $relations = array( //TODO: Autodetect???
+ 'model' => array(
+ 'model_id' => array(array('item',$where_url)),
+ 'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
+ 'model_name' => array(array('google','http://google.com/search?q=%v',true))
+ ),
+ 'item' => array(
+ 'item_serial' => array(array('dispose','assistant/%d?serial=%v'),array('sell','assistant/%d?serial=%v'))
+ ),
+ 'category' => array('category_id' => array(array('item',$where_url))),
+ 'producer' => array('producer_id' => array(array('item',$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)))
+ );
+ 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]
+ );
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !isset($destination[2])).',';
+ }
+ }
}
}
}
@@ -243,38 +350,28 @@ EOF;
foreach($table as $id => $row) {
$table_sorted[$id] = array();
foreach($precedence as $column) if(isset($table[$id][$column])) {
- $table_sorted[$id][$column]=$table[$id][$column];
+ $table_sorted[$id][T($column)]=$table[$id][$column];
unset($table[$id][$column]);
}
- $table_sorted[$id]=array_merge($table_sorted[$id],$table[$id]);
+ //$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 render_item_table($table,$class=false) {
$this->table_add_images($table);
+ if($class) $this->table_add_relations($table,$class);
+ $this->table_add_barcodes($table);
$this->table_collapse($table);
$this->table_sort($table);
return $this->table($table);
}
- 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) {
+ $html = '';
foreach($columns as $column) {
- $html.=$class.':
'.$column['Field'].': ';
+ $html.=T($class).':
'.T($column['Field']).': ';
$name="values[$class][".$column['Field'].'][]';
$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
@@ -292,26 +389,71 @@ EOF;
}
$html.='
';
}
+ return $html;
+ }
- if($multi_insert) {
- //TODO, move to separate JS file
- $html.=<<
-
-
- +
-EOF;
+ 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);
}
- $btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
- $html.=$this->input(false, $btn, 'submit');
- $html.='';
+ 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,$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 = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+ $html.=$this->input(false, $btn, 'submit');
+ $html.='';
+ }
return $html;
}
}
@@ -324,7 +466,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,6 +478,10 @@ 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(
@@ -346,17 +492,20 @@ class Sklad_DB extends PDO {
'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";
+ $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
if($search) {
$search = $this->quote($search);
- if(!isset($search_fields[$class])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
+ 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";
@@ -388,19 +537,40 @@ class Sklad_DB extends PDO {
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 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($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') {
@@ -413,21 +583,20 @@ 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');
}
- 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 +627,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 +652,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 +724,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) {
@@ -580,6 +749,7 @@ class Sklad_UI {
$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;
@@ -608,32 +778,33 @@ class Sklad_UI {
if($edit) {
$html.= $this->render_form_edit($class, $id);
$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('SkladovejSystem', 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,6 +820,15 @@ class Sklad_UI {
return $out;
}
+ function check_input_validity($field, $value='', $ruleset=0) {
+ $rules = array(0 => array(
+ 'model_barcode' => '/./',
+ 'item_serial' => '/./'
+ ));
+ 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 +843,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));
@@ -691,14 +878,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;
}
@@ -714,13 +901,12 @@ 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:
$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;
@@ -729,8 +915,12 @@ class Sklad_UI {
$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';
@@ -754,7 +944,7 @@ class Sklad_UI {
$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
+ $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));
@@ -770,4 +960,4 @@ class Sklad_UI {
$sklad = new Sklad_UI();
$sklad->process_http_request();
-echo("
");
+echo('
');