X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=c944d1a0866f196b16d4914f8ba414cf3db898c7;hb=ea921a95b65ffaae5b008f864494553d73289612;hp=7d500bac22b08ee934ba60baff196e3a4a967d50;hpb=9fb856bab300b54906a67da103573897cf7f70c7;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index 7d500ba..c944d1a 100755 --- a/index.php +++ b/index.php @@ -18,83 +18,308 @@ */ require_once('sklad.conf.php'); -require_once('Sklad_LMS-fake.class.php'); +set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path()); + +require_once('Sklad_Auth.class/common.php'); require_once('HTTP_Auth.class.php'); +require_once('Locale.class.php'); +require_once('Barcode.class.php'); +require_once('Fortune.php'); /** -* Trida poskytuje podpurne funkce pro generovani HTML kodu specificke pro sklad +* Trida poskytuje vseobecne funkce pro generovani HTML kodu * * Tato trida by nemela sama nic vypisovat (vyjma chybovych a debugovacich hlasek)! * -* @package Sklad_HTML +* @package HTML * @author Tomas Mudrunka */ -class Sklad_HTML { - function header($title='') { - $home = URL_HOME; - $script = $_SERVER['SCRIPT_NAME']; - $search = htmlspecialchars(@trim($_GET['q'])); - $message = htmlspecialchars(@trim($_GET['message'])); - return << - - -

SystémSklad$title

-
- -
  • Logout
  • -
  • Home
  • -
    -
    - - -
    - -
    -
    - $message -
    -EOF; - } - - function row($row) { - $html=''; - foreach($row as $var) { +class HTML { + function row($row,$type=false,$class=false,$parameters='',$colspan=array(),$rowspan=array(),$break_after=array()) { + $html = ''; + $class_br = $class ? " class='$class' " : ''; + $class = $class ? " class='$class tr_nobr' " : ''; + if($type) $html.="<$type>"; + $html.=""; + $td = $type == 'thead' ? 'th' : 'td'; + foreach($row as $id => $var) { + $tdclass = " class='cell_$id'"; if(trim($var) == '') $var = ' '; - $html.="$var"; + $rs = isset($rowspan[$id]) ? " rowspan='$rowspan[$id]'" : ''; + $cs = isset($colspan[$id]) ? " colspan='$colspan[$id]'" : ''; + $html.="<$td$rs$cs$tdclass>$var"; + if(in_array($id,$break_after,true)) $html.=''.""; } $html.=''; + if($type) $html.=""; return $html; } - function table(&$table, $params='border=1') { + function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') { $html=""; $header=true; + $even=false; foreach($table as $row) { + $params = isset($row[$row_classes_field]) ? $row[$row_classes_field] : ''; + unset($row[$row_classes_field]); if($header) { - $html.=$this->row(array_keys($row)); + $keys = array(); foreach($row as $key => $val) $keys[$key]=$key; + $html.=$this->row(T($keys),'thead',false,'',$colspan,$rowspan,$break_after); $header=false; } - $html.=$this->row($row); + $class = $parity_class ? $parity_class[$even] : false; + $html.=$this->row($row,false,$class.$params,'',$colspan,$rowspan,$break_after); + $even = !$even; } $html.='
    '; return $html; } - function internal_url($link) { - return $_SERVER['SCRIPT_NAME'].'/'.$link; + function link($title='n/a', $link='#void', $internal=true, $translate=true) { + if($internal && (!isset($link[0]) || $link[0] != '#')) $link = $this->internal_url($link); + if($translate) $title = T($title); + return "".$title.""; + } + + function img($src='#void', $title='img', $options='height=64') { + if(isset($_GET['noimgs'])) return "".basename($src).''; + $options = $options ? " $options" : ''; + return "$title"; + } + + function img_link($src, $link='#void', $title='img_link', $internal=true, $translate=true, $options='height=64') { + return $this->link($this->img($src,$title,$options),$link,$internal,$translate); + } + + function textarea($name=false, $value='', $placeholder=false, $options=false, $prefix='') { + $html = T($prefix)."textarea($name, $value, $placeholder, $options, $prefix); + $html = T($prefix)."'); print_r($selectbox); + $html = ""; + return $html; + } + + function ul($items,$tag=ul,$head='',$class=false) { + $class = $class ? " class='$class'" : ''; + $html = "$head<$tag$class>"; + foreach($items as $key => $value) { + $html .= '
  • '; + if(is_numeric($key)) { + $html .= $value; + } else { + $html .= $this->link($key,$value); + } + $html .= '
  • '; + } + $html .= ""; + return $html; + } + + function div($html, $options) { + $options = $options ? " $options" : ''; + return "$html"; + } + + function favicon($url='/favicon.ico') { + return ''; + + } + + function head($title=false,$charset='UTF-8',$more='') { + $title = $title ? "\n$title" : ''; + $html= ''; + $html.= ''.$title.$more; + $html.= $this->favicon(dirname($_SERVER['SCRIPT_NAME']).'/favicon.ico'); + $html.= ''; + return $html; + } +} + +/** +* Trida poskytuje podpurne funkce pro generovani HTML kodu specificke pro sklad +* +* Tato trida by nemela sama nic vypisovat (vyjma chybovych a debugovacich hlasek)! +* +* @package Sklad_HTML +* @author Tomas Mudrunka +*/ +class Sklad_HTML extends HTML { //TODO: Split into few more methods + function header($title='', $user=array()) { + $home = URL_HOME; + $script = $_SERVER['SCRIPT_NAME']; + $search = htmlspecialchars(@trim($_GET['q'])); + $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 .= <<
    SōkoMan$instance$title +
    + Logged in as $user_name [UID: $user_id; GID: $user_gid]
    + Page loaded at $time +
    + + + +
    +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"; } - function link($title='n/a', $link='#void', $internal=true) { - if($internal) $link = $this->internal_url($link); - return "$title"; + $tables=array('item','model','category','producer','vendor','room','status','location'); + + foreach($tables as $table) { + $listable[$table] = $table; + $insertable[$table] = "$table/new"; } - function img($src='#void', $title='img') { - return "$title"; + $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) { + return $_SERVER['SCRIPT_NAME'].'/'.$link; } function table_add_images(&$table) { @@ -103,7 +328,77 @@ 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'; + $relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes + 'model' => array( + 'model_id' => array(array('item',$where_url),array('edit','model/%v/edit/')), + '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 + ), + '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) ).','; + } + } } } } @@ -116,20 +411,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])) { + 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(); @@ -138,44 +445,111 @@ 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( + '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 input($name=false, $value=false, $type='text', $placeholder=false, $options=false) { - $html = " array('item_note'), + 'model' => array('model_descript') + ); + $html = ''; + $even=false; + foreach($columns as $column) { + $html.=''; + } + $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(is_bool($val) && !$val) $val = ''; + $html.=$this->input($name, $val, 'hidden'); + $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.='
    '; return $html; } - function select($name, $selectbox, $default=false) { - //echo('
    '); print_r($selectbox);
    -		$html = "";
     		return $html;
     	}
     
    -	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $multi_insert=true) {
    +	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;
    @@ -184,48 +558,36 @@ EOF;
     			$current = array_shift($current);
     		}
     
    -		$html='
    '; - if($multi_insert) $html.='
    '; - //$html.=$this->input('table', $class, 'hidden'); - foreach($columns as $column) { - $html.=$class.':'.$column['Field'].': '; - $name="values[$class][".$column['Field'].'][]'; - $val = $update ? $current[$column['Field']] : false; - switch(true) { - case preg_match('/auto_increment/', $column['Extra']): - if(!$val) $val = ''; - $html.=$this->input($name, $val, 'hidden'); - $html.=$val.'(AUTO)'; - break; - case isset($selectbox[$column['Field']]): - $html.=$this->select($name,$selectbox[$column['Field']],$val); - break; - default: - $html.=$this->input($name, $val); - break; - } - $html.='
    '; - } - - if($multi_insert) { - //TODO, move to separate JS file - $html.=<< -
    - - + -EOF; + 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.='
    '; } - $btn = is_array($current) ? 'UPDATE' : 'INSERT'; - $html.=$this->input(false, $btn, 'submit'); - $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; } } @@ -238,7 +600,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, @@ -250,45 +612,53 @@ 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'), + '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','model_name','model_barcode','model_descript','producer_name','vendor_name') + $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 + //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])) { - trigger_error("Ve tride $class zatim vyhledavat nemozno :-("); - die(); - } - $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"; //TODO: fixnout az budou opraveny vicenasobny carovy kody //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; } @@ -303,37 +673,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) {
    @@ -349,7 +764,8 @@ class Sklad_DB extends PDO {
     		$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 = '';
    @@ -359,11 +775,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";
    @@ -372,8 +788,7 @@ class Sklad_DB extends PDO {
     		}
     
     		//Insert into table (columns)
    -		$sql .= $replace ? 'REPLACE' : 'INSERT';
    -		$sql .= " INTO $table ($columns) VALUES ";
    +		$sql .= "INSERT INTO $table ($columns) VALUES ";
     
     		//Values (a,b,c),(d,e,f)
     		$comma='';
    @@ -389,8 +804,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;
     					}
     				}
    @@ -399,25 +814,34 @@ class Sklad_DB extends PDO {
     			$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) {
    +	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;
     	}
     
     	function delete($table, $id, $suffix_id='_id') {
    -		if($this->contains_history($table)) die(trigger_error("V tabulce $table jentak neco mazat nebudes chlapecku :-P")); //TODO post redirect get
    +		if($this->contains_history($table)) return false;
     		$key = $this->escape($table.$suffix_id);
     		$table = $this->escape($table);
     		$id = $this->quote($id);
    @@ -425,6 +849,16 @@ 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
     *
    @@ -441,8 +875,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) {
    @@ -451,14 +885,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'] : '';
    @@ -466,7 +900,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; @@ -476,53 +911,62 @@ 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.='
    TODO UPDATE FORM!
    '; //TODO: Asi uz je hotovy... - $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->input(false, 'DELETE', 'submit'); - $html.= 'sure?'.$this->html->input('sure', false, 'checkbox'); - $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->input('image', false, 'file', false, 'size="30"'); - $html.= $this->html->input(false, 'IMAGE', 'submit'); - $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='') { - $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); - die("Location: $location"); + if($error) trigger_error($message); + $location=htmlspecialchars($location); + die( + "". + $messaget."
    Location: $location" + ); } function safe_include($dir,$name,$vars=array(),$ext='.inc.php') { - if(preg_match('/[^a-zA-Z0-9-]/',$name)) die(trigger_error('SAFE INCLUDE: Securityfuck.')); + if(preg_match('/[^a-zA-Z0-9-]/',$name)) $this->post_redirect_get('', 'SAFE INCLUDE: Securityfuck.', true); $filename="$dir/$name$ext"; - if(!is_file($filename)) die(trigger_error('SAFE INCLUDE: Fuckfound.')); + if(!is_file($filename)) $this->post_redirect_get('', 'SAFE INCLUDE: Fuckfound.', true); foreach($vars as $var => $val) $$var=$val; ob_start(); include($filename); @@ -531,7 +975,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!!!!
     
    @@ -545,7 +1000,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));
    @@ -553,35 +1015,34 @@ class Sklad_UI {
     
     		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'];
    -				$table='item';
    +				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/";
    -				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(); + $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); + 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); - $this->post_redirect_get("$class/$id", 'Obrazek se naladoval :)'); - } else die(trigger_error('Soubor se nenahral :(')); + $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; } @@ -589,6 +1050,8 @@ class Sklad_UI { } function process_http_request() { + $listing_limit_classes = array('item','model'); + $this->check_auth(); @ini_set('magic_quotes_gpc' , 'off'); @@ -597,19 +1060,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; @@ -632,9 +1106,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] : (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));
     								break;
    @@ -649,4 +1125,4 @@ class Sklad_UI {
     $sklad = new Sklad_UI();
     $sklad->process_http_request();
     
    -echo("
    "); +echo('

    ');