From f4038a2160d55a7f519a3b42be1aa96e29e9a908 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 27 Feb 2013 09:01:40 -0500
Subject: [PATCH] - Fixed "FUNCTION databasename.CONCAT does not exist" error for older MySQL versions.
---
interface/lib/classes/listform_tpl_generator.inc.php | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php
index 1d14775..e19b52c 100644
--- a/interface/lib/classes/listform_tpl_generator.inc.php
+++ b/interface/lib/classes/listform_tpl_generator.inc.php
@@ -44,7 +44,7 @@
<div class="pnl_toolsarea">
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons">
- <button class="iconstxt icoAdd" type="button" onClick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
+ <button class="iconstxt icoAdd" type="button" onclick="'."loadContent('".$module."/".$listDef["edit_file"]."');".'">
<span>{tmpl_var name="add_new_record_txt"}</span>
</button>
</div>
@@ -59,10 +59,12 @@
';
$lang["list_head_txt"] = $listDef["name"];
+ $colcount = 0;
foreach($listDef["item"] as $field) {
$key = $field["field"];
- $html .= " <th class=\"tbl_col_".$key."\" scope=\"col\"><tmpl_var name=\"".$key."_txt\"></th>\r\n";
+ $html .= " <th class=\"tbl_col_".$key."\" scope=\"col\"><tmpl_var name=\"".$key."_txt\"></th>\n";
$lang[$key."_txt"] = $key;
+ $colcount++;
}
$html .= ' <th class="tbl_col_buttons" scope="col"> </th>
@@ -73,13 +75,13 @@
foreach($listDef["item"] as $field) {
$key = $field["field"];
if($field["formtype"] == 'SELECT') {
- $html .= " <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\r\n";
+ $html .= " <td class=\"tbl_col_".$key."\"><select name=\"".$listDef["search_prefix"].$key."\" onChange=\"submitForm('pageForm','".$module."/".$listDef["file"]."');\">{tmpl_var name='".$listDef["search_prefix"].$key."'}</select></td>\n";
} else {
- $html .= " <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\r\n";
+ $html .= " <td class=\"tbl_col_".$key."\"><input type=\"text\" name=\"".$listDef["search_prefix"].$key."\" value=\"{tmpl_var name='".$listDef["search_prefix"].$key."'}\" /></td>\n";
}
}
- $html .= ' <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ $html .= ' <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="'."submitForm('pageForm','".$module."/".$listDef["file"]."');".'"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
<tbody>
@@ -89,16 +91,21 @@
foreach($listDef["item"] as $field) {
$key = $field["field"];
- $html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" onClick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\r\n";
+ $html .= " <td class=\"tbl_col_".$key."\"><a href=\"#\" onclick=\"loadContent('".$module."/".$listDef["edit_file"]."?id={tmpl_var name='id'}');\">{tmpl_var name=\"".$key."\"}</a></td>\n";
}
$html .= " <td class=\"tbl_col_buttons\">
<div class=\"buttons icons16\">
- <a class=\"icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
+ <a class=\"button icons16 icoDelete\" href=\"javascript: del_record('".$module."/".$listDef["delete_file"]."?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');\"><span>{tmpl_var name='delete_txt'}</span></a>
</div>
</td>
</tr>
</tmpl_loop>
+ <tmpl_unless name=\"records\">
+ <tr class=\"tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>\">
+ <td colspan=\"".$colcount."\">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ </tr>
+ </tmpl_unless>
</tbody>";
$html .= '
<tfoot>
@@ -132,7 +139,48 @@
}
fclose($handle);
+ /*$lang["page_txt"] = 'Page';
+ $lang["page_of_txt"] = 'of';
+ $lang["page_next_txt"] = 'Next';
+ $lang["page_back_txt"] = 'Back';
+ $lang["delete_txt"] = 'Delete';
+ $lang["filter_txt"] = 'Filter';
+ $lang["add_new_record_txt"] = 'Add new record';
+ */
+
+ // save language file
+ $this->lng_add($lang,$listDef,$module);
}
+
+ function lng_add($lang,$listDef,$module = '') {
+ global $go_api, $go_info,$conf;
+
+ if($module == '') {
+ $lng_file = "lib/lang/".$conf["language"]."_".$listDef['name']."_list.lng";
+ } else {
+ $lng_file = '../'.$module."/lib/lang/en_".$listDef['name']."_list.lng";
+ }
+
+ if(is_file($lng_file)) {
+ include_once($lng_file);
+ } else {
+ $wb = array();
+ }
+
+ $wb_out = array_merge($lang,$wb);
+
+ if(is_array($wb_out)) {
+ $fp = fopen ($lng_file, "w");
+ fwrite($fp,"<?php\n");
+ foreach($wb_out as $key => $val) {
+ $new_line = '$wb["'.$key.'"] = '."'$val';\n";
+ fwrite($fp,$new_line);
+
+ }
+ fwrite($fp,"?>");
+ fclose($fp);
+ }
+ }
}
--
Gitblit v1.9.1