From 47e3bb63b47a6b6eeae8e5a646274083bdab60db Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 23 May 2008 15:07:01 +0000
Subject: [PATCH] Fixed errors in dbsync form.

---
 interface/web/admin/dbsync_edit.php           | 4 ++--
 interface/web/admin/form/dbsync.tform.php     | 2 +-
 interface/web/admin/templates/dbsync_edit.htm | 6 +++---
 interface/web/dns/form/dns_a.tform.php        | 2 +-
 interface/web/dns/form/dns_alias.tform.php    | 2 +-
 interface/web/dns/form/dns_cname.tform.php    | 2 +-
 interface/web/dns/form/dns_hinfo.tform.php    | 2 +-
 interface/web/dns/form/dns_mx.tform.php       | 2 +-
 interface/web/dns/form/dns_ns.tform.php       | 2 +-
 interface/web/dns/form/dns_ptr.tform.php      | 2 +-
 interface/web/dns/form/dns_rp.tform.php       | 2 +-
 interface/web/dns/form/dns_soa.tform.php      | 2 +-
 interface/web/dns/form/dns_srv.tform.php      | 2 +-
 interface/web/dns/form/dns_txt.tform.php      | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/interface/web/admin/dbsync_edit.php b/interface/web/admin/dbsync_edit.php
index b4ba43bd1..2c0b85953 100644
--- a/interface/web/admin/dbsync_edit.php
+++ b/interface/web/admin/dbsync_edit.php
@@ -53,7 +53,7 @@ $app->tpl->newTemplate("tabbed_form.tpl.htm");
 $app->tform->loadFormDef($tform_def_file);
 
 // ID importieren
-$id = intval($_REQUEST["id"]);
+$id = @intval($_REQUEST["id"]);
 
 if(count($_POST) > 1) {
 
@@ -84,7 +84,7 @@ if(count($_POST) > 1) {
 // Welcher Tab wird angezeigt
 if($app->tform->errorMessage == '') {
     // wenn kein Fehler vorliegt
-	if($_REQUEST["next_tab"] != '') {
+	if(isset($_REQUEST["next_tab"]) && $_REQUEST["next_tab"] != '') {
 		// wenn nächster Tab bekannt
 		$active_tab = $_REQUEST["next_tab"];
     } else {
diff --git a/interface/web/admin/form/dbsync.tform.php b/interface/web/admin/form/dbsync.tform.php
index 5e4ded8a4..d830cd6c7 100644
--- a/interface/web/admin/form/dbsync.tform.php
+++ b/interface/web/admin/form/dbsync.tform.php
@@ -81,7 +81,7 @@ foreach($modules_list as $md) {
 	while ($file = @readdir ($handle)) { 
     	if ($file != '.' && $file != '..' && substr($file, 0, 1) != '.') {
         	include_once(ISPC_WEB_PATH."/$md/form/$file");
-			if($form['db_history'] == 'yes') {
+			if(isset($form['db_history']) && $form['db_history'] == 'yes') {
 				$tmp_id = $form['db_table'];
 				$db_tables[$tmp_id] = $form['db_table'];
 			}
diff --git a/interface/web/admin/templates/dbsync_edit.htm b/interface/web/admin/templates/dbsync_edit.htm
index 240d15f9e..b8966715f 100644
--- a/interface/web/admin/templates/dbsync_edit.htm
+++ b/interface/web/admin/templates/dbsync_edit.htm
@@ -29,7 +29,7 @@
   </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='db_password_txt'}:</td>
-    <td class="frmText11"><input name="db_password" type="text" class="text" value="{tmpl_var name='db_password'}" size="30" maxlength="255"></td>
+    <td class="frmText11"><input name="db_password" type="password" class="text" value="{tmpl_var name='db_password'}" size="30" maxlength="255"></td>
   </tr>
   <tr>
     <td class="frmText11">{tmpl_var name='db_tables_txt'}:</td>
@@ -55,6 +55,6 @@
     <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/dbsync_edit.php');"><div class="buttonEnding"></div>&nbsp;
       <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/dbsync_list.php');"><div class="buttonEnding"></div>
     </td>
-  </tr>
-</table>
+  </tr>
+</table>
 <input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/dns/form/dns_a.tform.php b/interface/web/dns/form/dns_a.tform.php
index 43fa0e0b6..ead974c67 100644
--- a/interface/web/dns/form/dns_a.tform.php
+++ b/interface/web/dns/form/dns_a.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_alias.tform.php b/interface/web/dns/form/dns_alias.tform.php
index dc93f2e48..c63acb029 100644
--- a/interface/web/dns/form/dns_alias.tform.php
+++ b/interface/web/dns/form/dns_alias.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_cname.tform.php b/interface/web/dns/form/dns_cname.tform.php
index 146cad2f5..2d80d6e77 100644
--- a/interface/web/dns/form/dns_cname.tform.php
+++ b/interface/web/dns/form/dns_cname.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_hinfo.tform.php b/interface/web/dns/form/dns_hinfo.tform.php
index d0bfc1651..92d467202 100644
--- a/interface/web/dns/form/dns_hinfo.tform.php
+++ b/interface/web/dns/form/dns_hinfo.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_mx.tform.php b/interface/web/dns/form/dns_mx.tform.php
index 2d70e16a5..63bb7afdd 100644
--- a/interface/web/dns/form/dns_mx.tform.php
+++ b/interface/web/dns/form/dns_mx.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_ns.tform.php b/interface/web/dns/form/dns_ns.tform.php
index fbaa0e969..9e957ac3d 100644
--- a/interface/web/dns/form/dns_ns.tform.php
+++ b/interface/web/dns/form/dns_ns.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_ptr.tform.php b/interface/web/dns/form/dns_ptr.tform.php
index 61a235006..3c0b808f2 100644
--- a/interface/web/dns/form/dns_ptr.tform.php
+++ b/interface/web/dns/form/dns_ptr.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_rp.tform.php b/interface/web/dns/form/dns_rp.tform.php
index 9d80a358c..ac77e97a1 100644
--- a/interface/web/dns/form/dns_rp.tform.php
+++ b/interface/web/dns/form/dns_rp.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_soa.tform.php b/interface/web/dns/form/dns_soa.tform.php
index 7888c04ee..be0a1236f 100644
--- a/interface/web/dns/form/dns_soa.tform.php
+++ b/interface/web/dns/form/dns_soa.tform.php
@@ -202,7 +202,7 @@ $form["tabs"]['dns_records'] = array (
          	'class'   => 'plugin_listview',
      		'options' => array(
 				'listdef' => 'list/dns_a.list.php',
-				'sqlextwhere' => "zone = ".intval(@$_REQUEST['id']),
+				'sqlextwhere' => "zone = ".@intval(@$_REQUEST['id']),
 				'sql_order_by' => "ORDER BY type, name"
 			)
         )
diff --git a/interface/web/dns/form/dns_srv.tform.php b/interface/web/dns/form/dns_srv.tform.php
index 6b99b065e..20ea5314c 100644
--- a/interface/web/dns/form/dns_srv.tform.php
+++ b/interface/web/dns/form/dns_srv.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
diff --git a/interface/web/dns/form/dns_txt.tform.php b/interface/web/dns/form/dns_txt.tform.php
index 5c5e55b04..18054a950 100644
--- a/interface/web/dns/form/dns_txt.tform.php
+++ b/interface/web/dns/form/dns_txt.tform.php
@@ -69,7 +69,7 @@ $form["tabs"]['dns'] = array (
 		'zone' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',
-			'default'	=> intval($_REQUEST["zone"]),
+			'default'	=> @intval($_REQUEST["zone"]),
 			'value'		=> '',
 			'width'		=> '30',
 			'maxlength'	=> '255'
-- 
GitLab