';
//$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 && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
@@ -294,7 +342,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;
@@ -341,7 +389,7 @@ class Sklad_DB extends PDO {
//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";
@@ -373,9 +421,26 @@ 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;
@@ -385,7 +450,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') {
@@ -398,9 +463,8 @@ 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);
@@ -411,8 +475,8 @@ class Sklad_DB extends PDO {
$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 die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
}
function contains_history($table) {
@@ -593,15 +657,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;
}
@@ -611,10 +675,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') {
@@ -629,7 +698,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!!!!
@@ -657,9 +726,10 @@ class Sklad_UI {
$table = $class ? $class : 'item';
//print_r($values); //debug
$last = $this->db->insert_or_update_multitab($values, $replace);
- $last = "$table/$last/";
+ $last = $force_redirect ? $force_redirect."?last=$last" : "$table/$last/";
$next = "$table/new/";
- $this->post_redirect_get($last, 'Hotovo. DalÅ¡Ã záznam pÅidáte '.$this->html->link('zde', $next).'.');
+ $message = $force_redirect ? '' : 'Hotovo. DalÅ¡Ã záznam pÅidáte '.$this->html->link('zde', $next).'.';
+ $this->post_redirect_get($last, $message);
break;
case 'delete':
if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
@@ -670,14 +740,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;
}
@@ -704,7 +774,10 @@ class Sklad_UI {
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;
default: //?