X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=inline;f=index.php;h=d4c3cb3c5e151873f8282a4554465f8aa8ae07c6;hb=98f4d4120541dd9e7b9026a993afcdf055d93217;hp=ced77fb406f9bf3bbfdbe837fbc54ea802fc61f9;hpb=7661315fc5e169b250fb080552d18050040d9108;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index ced77fb..d4c3cb3 100755
--- a/index.php
+++ b/index.php
@@ -185,7 +185,7 @@ class HTML {
* @author Tomas Mudrunka
*/
class Sklad_HTML extends HTML { //TODO: Split into few more methods
- function header($title='', $user=array()) {
+ function header($title='', $user=array(), $headerhtml) {
$home = URL_HOME;
$script = $_SERVER['SCRIPT_NAME'];
$search = htmlspecialchars(@trim($_GET['q']));
@@ -308,7 +308,7 @@ EOF;
- $message
+ $headerhtml $message
$fortune
@@ -421,6 +421,7 @@ EOF;
'status_id' => 'status_name',
'item_author' => 'item_author_backend',
'item_customer' => 'item_customer',
+ 'lock_id' => 'lock_name',
);
foreach($table as $id => $row) {
@@ -663,7 +664,6 @@ class Sklad_DB extends PDO {
//SELECT
$sql="SELECT *$group_concat_query 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($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
@@ -685,7 +685,7 @@ class Sklad_DB extends PDO {
//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
+ $sql .= "ORDER BY $order\n";
//LIMIT/OFFSET
if($limit) {
$limit = $this->escape((int)$limit);
@@ -744,7 +744,7 @@ class Sklad_DB extends PDO {
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;";
+ $sql = "SHOW COLUMNS FROM `$class`;";
$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';
@@ -1097,8 +1097,11 @@ class Sklad_UI {
$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
//Sephirot:
if(!isset($PATH_CHUNKS[1])) $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());
+ if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') { //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+ $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+ $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
+ echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
+ }
switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
case 'test': //test
die('Tell me why you cry');