From dea284f5715c8efda8a450ca8fffee6d8e78e83a Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Tue, 18 Nov 2008 16:43:38 -0500
Subject: [PATCH] Improved merge in language editor: - Remove of the file how not exists in master language - Fix the msg show when no file has been created, removed or modified
---
interface/lib/classes/listform_actions.inc.php | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index cfe880c..e90bdc8 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -38,19 +38,16 @@
class listform_actions {
private $id;
- private $idx_key;
- private $DataRowColor;
- private $SQLExtWhere = '';
- private $SQLOrderBy = '';
+ public $idx_key;
+ public $DataRowColor;
+ public $SQLExtWhere = '';
+ public $SQLOrderBy = '';
public function onLoad()
{
global $app, $conf, $list_def_file;
- //TODO: this is_object checking should be in the $appobject - pedro notes
- if(!@is_object($app->tpl)) $app->uses('tpl');
- if(!@is_object($app->listform)) $app->uses('listform');
- if(!@is_object($app->tform)) $app->uses('tform');
+ $app->uses('tpl,listform,tform');
//* Clear session variable that is used when lists are embedded with the listview plugin
$_SESSION['s']['form']['return_to'] = '';
@@ -69,7 +66,6 @@
// Getting Datasets from DB
$records = $app->db->queryAllRecords($this->getQueryString());
-
$this->DataRowColor = "#FFFFFF";
$records_new = '';
if(is_array($records)) {
@@ -86,7 +82,7 @@
}
- private function prepareDataRow($rec)
+ public function prepareDataRow($rec)
{
global $app;
@@ -100,7 +96,12 @@
foreach($app->listform->listDef['item'] as $field) {
$key = $field['field'];
if(isset($field['formtype']) && $field['formtype'] == 'SELECT') {
- $rec[$key] = $field['value'][$rec[$key]];
+ if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') {
+ // Set a additional image variable for bolean fields
+ $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png';
+ }
+ //* substitute value for select field
+ $rec[$key] = @$field['value'][$rec[$key]];
}
}
@@ -142,10 +143,15 @@
{
global $app;
- //* Set Language File
- $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_'.$app->listform->listDef['name'].'_list.lng';
+ //* Set global Language File
+ $lng_file = ISPC_LIB_PATH.'/lang/'.$_SESSION['s']['language'].'.lng';
+ if(!file_exists($lng_file))
+ $lng_file = ISPC_LIB_PATH.'/lang/en.lng';
include($lng_file);
$app->tpl->setVar($wb);
+
+
+ $app->tpl->setVar($app->listform->wordbook);
$app->tpl->setVar('form_action', $app->listform->listDef['file']);
//* Parse the templates and send output to the browser
--
Gitblit v1.9.1