diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 564b7b628d2731d71aadc8cb6a5e623fafc1767c..ccfaa63bd559a87966f2742fffbe8127295735a2 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -49,7 +49,7 @@ class db 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 @@ class db 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 @@ class db } 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 27d1c8a977e6568fbec2b85caad8be837b254ce1..ce7b220f0bdfe073ec229a492f6e51068075e1d2 100644 --- a/interface/lib/classes/listform.inc.php +++ b/interface/lib/classes/listform.inc.php @@ -268,8 +268,8 @@ class listform { 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 @@ class listform { 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 92ef324cf9f8130d0885e20f9fa6ce644e5c5517..0cb58c7498a800f41e4debe32b701312a4bf1bb8 100644 --- a/interface/lib/classes/tform.inc.php +++ b/interface/lib/classes/tform.inc.php @@ -135,10 +135,16 @@ class tform { $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 7bc99444964cdda3fe6b3197763145bcc9b4fcc0..9311f14eab95c70b6bfe54ad3f87d11bee836d3e 100644 --- a/interface/lib/classes/tform_tpl_generator.inc.php +++ b/interface/lib/classes/tform_tpl_generator.inc.php @@ -112,7 +112,7 @@ class tform_tpl_generator { $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 2c4e56138656dd0b8240fe867568e220d467657d..175db60edba7cec24aaf0c592156b75e0c1f0901 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -21,4 +21,7 @@ $wb["telefon_txt"] = 'Telephone'; $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