';
//$html.=$this->input('table', $class, 'hidden');
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']):
+ case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
if(!$val) $val = '';
$html.=$this->input($name, $val, 'hidden');
$html.=$val.'(AUTO)';
@@ -290,7 +365,7 @@ EOF;
EOF;
}
- $btn = is_array($current) ? 'UPDATE' : 'INSERT';
+ $btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
$html.=$this->input(false, $btn, 'submit');
$html.='';
return $html;
@@ -317,14 +392,14 @@ 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 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')
+ 'item' => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
); //TODO Autodetect
//Escaping
@@ -335,26 +410,26 @@ class Sklad_DB extends PDO {
//JOIN
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($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";
}
- //ORDER
- if(!$order) $order = $class.$suffix_id;
- $sql .= "ORDER BY $order";
return $sql;
}
@@ -369,9 +444,26 @@ 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('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_fetch($sql);
if(!$result || !is_array($indexed)) return $result;
foreach($result as $key => $row) $indexed[$row[$class.$suffix_id]]=$row;
@@ -381,7 +473,7 @@ class Sklad_DB extends PDO {
function get_columns($class) {
$class = $this->escape($class);
$sql = "SHOW COLUMNS FROM $class;";
- return $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+ return $this->safe_query_fetch($sql);
}
function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
@@ -392,16 +484,24 @@ class Sklad_DB extends PDO {
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');
}
+ function map_unique($key, $value, $select, $table) { //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 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);
@@ -426,8 +526,8 @@ 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'];
@@ -479,15 +579,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 +626,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));
}
function render_form_add($class) {
@@ -539,7 +639,7 @@ class Sklad_UI {
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);
+ $current = $this->db->get_listing($class, $id, 1);
return $this->html->render_insert_form($class, $columns, $selectbox, $current);
}
@@ -554,6 +654,7 @@ class Sklad_UI {
$html.= '
';
$html.= $this->html->link('edit', "$class/$id/edit/");
if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
+ $html.='
'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id"));
return $html;
}
@@ -580,15 +681,15 @@ 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;
}
@@ -598,10 +699,15 @@ class Sklad_UI {
}
function post_redirect_get($location, $message='', $error=false) {
- $location = $this->html->internal_url($location).'?message='.urlencode($message);
+ $url_args = $message != '' ? '?message='.urlencode(T($message)) : '';
+ $location = $this->html->internal_url($location).$url_args;
header('Location: '.$location);
if($error) trigger_error($message);
- die("Location:
$location");
+ $location=htmlspecialchars($location);
+ die(
+ "
".
+ T($message)."
Location:
$location"
+ );
}
function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
@@ -616,7 +722,7 @@ class Sklad_UI {
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), HEADERS ALREADY SENT!!!!
@@ -638,13 +744,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 +764,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,20 +787,24 @@ 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') echo $this->html->header($PATH_INFO); //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+ 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;
+ $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'];
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';
@@ -715,7 +828,8 @@ 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');
- echo $this->render_items($class, $id, $limit, $offset, $search, $history);
+ $where = false; //TODO get from URL
+ 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;