From 0108768810a47a03e42f205ee6fa1cd5bd8ef439 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 21 Aug 2007 11:10:07 -0400
Subject: [PATCH] Several fixes to avoid strict warnings. Made a variable public in db_mysql.inc.php. Added missing language tokens to en_users.lng
---
interface/lib/classes/tform_tpl_generator.inc.php | 2 +-
interface/web/admin/lib/lang/en_users.lng | 3 +++
interface/lib/classes/tform.inc.php | 6 ++++++
interface/lib/classes/db_mysql.inc.php | 14 +++++++-------
interface/lib/classes/listform.inc.php | 7 ++++---
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 564b7b6..ccfaa63 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -49,7 +49,7 @@
private $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
- private $show_error_messages = false;
+ public $show_error_messages = false;
public function __construct()
{
@@ -252,7 +252,7 @@
foreach($columns as $col){
$sql .= $col['name'].' '.$this->mapType($col['type'], $col['typeValue']).' ';
//* Set default value
- if($col['defaultValue'] != '') {
+ if(isset($col['defaultValue']) && $col['defaultValue'] != '') {
if($col['defaultValue'] == 'NULL' or $col['defaultValue'] == 'NOT NULL') {
$sql .= 'DEFAULT '.$col['defaultValue'].' ';
} else {
@@ -261,19 +261,19 @@
} elseif($col['defaultValue'] != false) {
$sql .= "DEFAULT '' ";
}
- if($col['defaultValue'] != 'NULL' && $col['defaultValue'] != 'NOT NULL') {
+ if(isset($col['defaultValue']) && $col['defaultValue'] != 'NULL' && $col['defaultValue'] != 'NOT NULL') {
if($col['notNull'] == true) {
$sql .= 'NOT NULL ';
} else {
$sql .= 'NULL ';
}
}
- if($col['autoInc'] == true){ $sql .= 'auto_increment '; }
+ if(isset($col['autoInc']) && $col['autoInc'] == true){ $sql .= 'auto_increment '; }
$sql.= ',';
//* Index Definitions
- if($col['option'] == 'primary'){ $index .= 'PRIMARY KEY ('.$col['name'].'),'; }
- if($col['option'] == 'index'){ $index .= 'INDEX ('.$col['name'].'),'; }
- if($col['option'] == 'unique'){ $index .= 'UNIQUE ('.$col['name'].'),'; }
+ if(isset($col['option']) && $col['option'] == 'primary'){ $index .= 'PRIMARY KEY ('.$col['name'].'),'; }
+ if(isset($col['option']) && $col['option'] == 'index'){ $index .= 'INDEX ('.$col['name'].'),'; }
+ if(isset($col['option']) && $col['option'] == 'unique'){ $index .= 'UNIQUE ('.$col['name'].'),'; }
}
$sql .= $index;
$sql = substr($sql,0,-1);
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 27d1c8a..ce7b220 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -268,8 +268,8 @@
if(is_array($record)) {
foreach($this->listDef['item'] as $field){
$key = $field['field'];
- switch ($field['datatype']){
-
+ if(isset($record[$key])) {
+ switch ($field['datatype']){
case 'VARCHAR':
case 'TEXT':
$record[$key] = stripslashes($record[$key]);
@@ -293,7 +293,8 @@
default:
$record[$key] = stripslashes($record[$key]);
- }
+ }
+ }
}
}
return $record;
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index 92ef324..0cb58c7 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -135,10 +135,16 @@
$this->formDef = $form;
$this->module = $module;
+ $wb = array();
+
if($module == '') {
+ if(is_file("lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng")) {
include_once("lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng");
+ }
} else {
+ if(is_file("../$module/lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng")) {
include_once("../$module/lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng");
+ }
}
$this->wordbook = $wb;
diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index 7bc9944..9311f14 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -112,7 +112,7 @@
$lang[$key."_txt"] = $key;
// language File Eintrag, f�r error-Text anlegen
- if($field["errmsg"] != '') {
+ if(isset($field["errmsg"]) && $field["errmsg"] != '') {
$errmsg = $field["errmsg"];
$lang[$errmsg] = $errmsg;
}
diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng
index 2c4e561..175db60 100644
--- a/interface/web/admin/lib/lang/en_users.lng
+++ b/interface/web/admin/lib/lang/en_users.lng
@@ -21,4 +21,7 @@
$wb["fax_txt"] = 'Fax';
$wb["groups_txt"] = 'Groups';
$wb["default_group_txt"] = 'Default Group';
+$wb["active_txt"] = 'Active';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
?>
\ No newline at end of file
--
Gitblit v1.9.1