require_once('sklad.conf.php');
set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path());
-require_once('Sklad_LMS-fake.class.php');
+require_once('Sklad_Auth.class/common.php');
require_once('HTTP_Auth.class.php');
require_once('Locale.class.php');
+require_once('Barcode.class.php');
/**
* Trida poskytuje vseobecne funkce pro generovani HTML kodu
* @author Tomas Mudrunka
*/
class HTML {
- function row($row) {
- $html='<tr>';
+ function row($row,$type=false) {
+ $html = '';
+ if($type) $html.="<$type>";
+ $html.='<tr>';
+ $td = $type == 'thead' ? 'th' : 'td';
foreach($row as $var) {
if(trim($var) == '') $var = ' ';
- $html.="<td>$var</td>";
+ $html.="<$td>$var</$td>";
}
$html.='</tr>';
+ if($type) $html.="</$type>";
return $html;
}
$header=true;
foreach($table as $row) {
if($header) {
- $html.=$this->row(array_keys($row));
+ $html.=$this->row(array_keys($row),'thead');
$header=false;
}
$html.=$this->row($row);
return $html;
}
- function link($title='n/a', $link='#void', $internal=true) {
- if($internal) $link = $this->internal_url($link);
- return "<a href='$link'>".T($title)."</a>";
+ 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 "<a href='$link'>".$title."</a>";
}
- function img($src='#void', $title='img') {
- return "<img src='$src' alt='$title' title='$title' width=64 />";
+ function img($src='#void', $title='img', $options='width=64') {
+ $options = $options ? " $options" : '';
+ return "<img src='$src' alt='$title' title='$title'$options; />";
}
- function input($name=false, $value=false, $type='text', $placeholder=false, $options=false) {
- $html = "<input type='$type' ";
+ function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') {
+ $html = T($prefix)."<input type='$type' ";
if($name) $html.= "name='$name' ";
if(!is_bool($value)) {
if($type == 'submit') $value = T($value);
return $html;
}
+ function form($action=false, $method=false, $inputs, $options=false) {
+ $action = $action ? " action='$action'" : '';
+ $method = $method ? " method='$method'" : '';
+ $options = $options ? " $options" : '';
+ $html = "<form$action$method$options>";
+ foreach($inputs as $input) $html .= call_user_func_array(array($this,'input'), $input);
+ $html .= "</form>";
+ return $html;
+ }
+
function select($name, $selectbox, $default=false) {
//echo('<pre>'); print_r($selectbox);
$html = "<select name='$name'>";
$html .= "</select>";
return $html;
}
+
+ function ul($items,$tag=ul,$head='',$class=false) {
+ $class = $class ? " class='$class'" : '';
+ $html = "$head<$tag$class>";
+ foreach($items as $key => $value) {
+ $html .= '<li>';
+ if(is_numeric($key)) {
+ $html .= $value;
+ } else {
+ $html .= $this->link($key,$value);
+ }
+ $html .= '</li>';
+ }
+ $html .= "</$tag>";
+ return $html;
+ }
+
+ function div($html, $options) {
+ $options = $options ? " $options" : '';
+ return "<div$options>$html</div>";
+ }
+
+ function head($title=false,$charset='UTF-8',$more='') {
+ $title = $title ? "\n<title>$title</title>" : '';
+ $html= '<head>';
+ $html.= '<meta http-equiv="Content-Type" content="text/html; charset='.$charset.'" />'.$title.$more;
+ $html.= '</head>';
+ return $html;
+ }
}
/**
* @package Sklad_HTML
* @author Tomas Mudrunka
*/
-class Sklad_HTML extends HTML {
- function header($title='') {
+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']),'<a><b><u><i>');
$instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : '';
- return <<<EOF
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>SōkoMan$title</title>
-</head>
-<h1><a href="$script/">SōkoMan</a><small>$instance$title</small></h1>
+ $user_id = htmlspecialchars($user['id']);
+ $user_gid = htmlspecialchars($user['gid']);
+ $user_name = htmlspecialchars($user['name']);
+ //$title = T($title); //TODO
+
+ $html = $this->head("SōkoMan$title");
+ $html .= <<<EOF
+<h1 style="display: inline;"><a href="$script/">SōkoMan</a><small>$instance$title</small></h1>
+<div style="float:right">Loged in as <b>$user_name</b> [UID: <b>$user_id</b>; GID: <b>$user_gid</b>]</div>
<style type="text/css">
* { font-family: arial; }
+td,body { background-color: white; }
+table { background-color: orange; border: orange; }
+a, a img { text-decoration:none; color: darkblue; border:none; }
+li a, a:hover { text-decoration:underline; }
.menu li {
float: left;
</style>
<div>
- <menu class="menu">
- <li><a href="?logout">Logout</a></li>
- <li><a href="$script/">Home</a></li>
- <li><a href="#">Assistants</a>
- <menu>
- <li><a href="$script/assistant/stats">stats</a></li>
- <li><a href="$script/assistant/store">store</a></li>
- <li><a href="$script/assistant/store-single">store-single</a></li>
- <li><a href="$script/assistant/dispose">dispose</a></li>
- <li><a href="$script/assistant/sell">sell</a></li>
- <li>↓↓ BETA ↓↓</li>
- </menu>
- </li>
- <li><a href="#">List</a>
- <menu>
- <li><a href="$script/item">item</a></li>
- <li><a href="$script/model">model</a></li>
- <li><a href="$script/category">category</a></li>
- <li><a href="$script/producer">producer</a></li>
- <li><a href="$script/vendor">vendor</a></li>
- <li><a href="$script/room">room</a></li>
- <li><a href="$script/status">status</a></li>
- </menu>
- </li>
- <li><a href="#">New</a>
- <menu>
- <li><a href="$script/item/new">item</a></li>
- <li><a href="$script/model/new">model</a></li>
- <li><a href="$script/category/new">category</a></li>
- <li><a href="$script/producer/new">producer</a></li>
- <li><a href="$script/vendor/new">vendor</a></li>
- <li><a href="$script/room/new">room</a></li>
- <li><a href="$script/status/new">status</a></li>
- </menu>
- </li>
- </menu>
-
- <div style="float: right;">
- <form action="$script/assistant/go" method="GET" style="float: left;"><!-- TODO: Display only when go plugin available -->
- <input type="text" name="q" placeholder="smart id..." />
- <input type="submit" value="go" />
- </form>
- <form action="?" method="GET" style="float: left;">
- <input type="text" name="q" placeholder="regexp..." value="$search" />
- <input type="submit" value="filter" />
- </form>
- <!-- form action="$script/" method="GET">
- <input type="text" name="q" placeholder="regexp..." value="$search" />
- <input type="submit" value="search items" />
- </form -->
- </div>
+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 .= '<div style="float: right;">';
+
+ $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 .= '</div>';
+
+ $html .= <<<EOF
</div>
<hr style="clear: both;" />
<div style="background-color:#FFDDDD;">
<font color="red">$message</font>
</div>
EOF;
+
+ return $html;
}
function internal_url($link) {
}
}
+ function render_barcode($barcode,$opts=false) {
+ return $this->link($this->img($this->internal_url("barcode/$barcode"),$barcode,$opts),"barcode/$barcode",true,false);
+ }
+
+ 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_collapse(&$table) {
$collapse = array(
'item_id' => 'item_id',
function render_item_table($table) {
$this->table_add_images($table);
+ $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('<pre>'); print_r($selectbox);
- //echo('<pre>'); 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="<form$action method='POST'>";
- if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
- //$html.=$this->input('table', $class, 'hidden');
+ function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
+ $html = '';
foreach($columns as $column) {
$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
$name="values[$class][".$column['Field'].'][]';
}
$html.='<br />';
}
+ return $html;
+ }
- if($multi_insert) {
- //TODO, move to separate JS file
- $html.=<<<EOF
- </div>
- <span name="input_set_next"></span><br style="clear:both" />
- <script>
- function duplicate_element(what, where) {
- document.getElementsByName(where)[0].outerHTML =
- document.getElementsByName(what)[0].outerHTML
- + document.getElementsByName(where)[0].outerHTML;
- }
- </script>
- <a href='#' onClick="duplicate_element('input_set', 'input_set_next')">+</a>
-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 = '<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('<pre>'); print_r($selectbox);
+ //echo('<pre>'); 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.='</form>';
+ 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.="<form$action method='POST'>"; //TODO: use $this->form()
+ $html.='<span><div name="input_set" style="float:left; border:1px solid grey; padding: 1px; margin: 1px;">';
+ }
+
+ 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 .= '</div></span><br style="clear:both" />';
+ if($multi_insert) { //TODO, move to separate JS file
+ $html.=<<<EOF
+ <script>
+ function duplicate_element(what, where) {
+ var node = document.getElementsByName(what)[0];
+ node.parentNode.appendChild(node.cloneNode(true));
+ }
+ </script>
+ <a href='#' onClick="duplicate_element('input_set')">+</a>
+EOF;
+ }
+
+ $btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+ $html.=$this->input(false, $btn, 'submit');
+ $html.='</form>';
+ }
return $html;
}
}
*/
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,
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('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);
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_fetch($sql);
+ $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') {
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_fetch($sql);
- if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
+ 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) {
$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";
$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;
}
}
$html.= '-';
$html.= $this->html->link('>>', "$class/$id_next/");
$html.= '<br />';
+ $html.='<span style="float:right;">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
$html.= $this->html->link('edit', "$class/$id/edit/");
if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
return $html;
if($edit) {
$html.= $this->render_form_edit($class, $id);
$action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete";
- $html.= "<form action='$action' method='POST'>";
- $html.= $this->html->input(false, 'DELETE', 'submit');
- $html.= T('sure?').$this->html->input('sure', false, 'checkbox');
- $html.= '</form>';
+ $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.= "<form action='$action' method='POST' enctype='multipart/form-data'>";
- $html.= $this->html->input('image', false, 'file', false, 'size="30"');
- $html.= $this->html->input(false, 'IMAGE', 'submit');
- $html.='</form>';
+ $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) {
}
$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;
$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';
$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("<pre>",$_SERVER));
$sklad = new Sklad_UI();
$sklad->process_http_request();
-echo("<hr/>");
+echo('<br style="clear:both;" /><hr />');
GIT.Harvie.CZ / mirrors / SokoMan.git / blobdiff