gitlabFork/ISPConfig3.git - Solinfo Gitblit

			@@ -130,9 +130,7 @@
			$this->module = $module;
			$wb = array();

			$lng_file = ISPC_WEB_PATH.'/lang/lib/lang/'.$_SESSION['s']['language'].'_tform.lng';
			if(!file_exists($lng_file)) $lng_file = ISPC_WEB_PATH.'/lang/lib/lang/en'.'_tform.lng';
			include($lng_file);
			include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
			if($module == '') {
			$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng";
			if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng";
			@@ -162,11 +160,11 @@
			foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
			switch ($field['datatype']) {
			case 'VARCHAR':
			$new_record[$key] = stripslashes($record[$key]);
			$new_record[$key] = $record[$key];
			break;

			case 'TEXT':
			$new_record[$key] = stripslashes($record[$key]);
			$new_record[$key] = $record[$key];
			break;

			case 'DATE':
			@@ -188,7 +186,7 @@
			break;

			default:
			$new_record[$key] = stripslashes($record[$key]);
			$new_record[$key] = $record[$key];
			}
			}

			@@ -254,6 +252,45 @@
			return $values;

			}

			//* If the parameter 'valuelimit' is set
			function applyValueLimit($limit,$values) {

			global $app;

			$limit_parts = explode(':',$limit);

			//* values are limited to a comma separated list
			if($limit_parts[0] == 'list') {
			$allowed = explode(',',$limit_parts[1]);
			}

			//* values are limited to a field in the client settings
			if($limit_parts[0] == 'client') {
			if($_SESSION["s"]["user"]["typ"] == 'admin') {
			return $values;
			} else {
			$client_group_id = $_SESSION["s"]["user"]["default_group"];
			$client = $app->db->queryOneRecord("SELECT ".$limit_parts[1]." as lm FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
			$allowed = explode(',',$client['lm']);
			}
			}

			//* values are limited to a field in the system settings
			if($limit_parts[0] == 'system') {
			$app->uses('getconf');
			$tmp_conf = $app->getconf->get_global_config($limit_parts[1]);
			$tmp_key = $limit_parts[2];
			$allowed = $tmp_conf[$tmp_key];
			}

			$values_new = array();
			foreach($values as $key => $val) {
			if(in_array($key,$allowed)) $values_new[$key] = $val;
			}

			return $values_new;
			}


			/**
			@@ -283,6 +320,11 @@
			if(isset($field['datasource']) && is_array($field['datasource'])) {
			$field["value"] = $this->getDatasourceData($field, $record);
			}

			// If a limitation for the values is set
			if(isset($field['valuelimit']) && is_array($field["value"])) {
			$field["value"] = $this->applyValueLimit($field['valuelimit'],$field["value"]);
			}

			switch ($field['formtype']) {
			case 'SELECT':
			@@ -322,7 +364,7 @@

			case 'CHECKBOX':
			$checked = ($val == $field['value'][1])?' CHECKED':'';
			$new_record[$key] = "<input name=\"".$key."\" type=\"checkbox\" value=\"".$field['value'][1]."\" $checked>\r\n";
			$new_record[$key] = "<input name=\"".$key."\" id=\"".$key."\" value=\"".$field['value'][1]."\" type=\"checkbox\" $checked />\r\n";
			break;

			case 'CHECKBOXARRAY':
			@@ -339,10 +381,8 @@
			foreach($vals as $tvl) {
			if(trim($tvl) == trim($k)) $checked = ' CHECKED';
			}
			$out .= "<span class=\"wf_oneChoice\">\r\n
			<input type=\"checkbox\" value=\"$k\" id=\"".$key."[]\" name=\"".$key."[]\" $checked>\r\n
			<label for=\"".$key."[]\" id=\"".$key."[]-L\" class=\"wf_postField\">$v</label>\r\n
			</span><br />\r\n";
			// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
			$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v  \r\n";
			}
			}
			$new_record[$key] = $out;
			@@ -355,10 +395,8 @@
			$out = '';
			foreach($field['value'] as $k => $v) {
			$checked = ($k == $val)?' CHECKED':'';
			$out .= "<span class=\"wf_oneChoice\">\r\n
			<input type=\"radio\" value=\"$k\" id=\"".$key."[]\" name=\"".$key."[]\" $checked>\r\n
			<label for=\"".$key."[]\" id=\"".$key."[]-L\" class=\"wf_postField\">$v</label>\r\n
			</span><br />\r\n";
			//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
			$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";
			}
			}
			$new_record[$key] = $out;
			@@ -375,8 +413,13 @@

			// If Datasource is set, get the data from there
			if(@is_array($field['datasource'])) {
			$field["value"] = $this->getDatasourceData($field, $record);
			$field["value"] = $this->getDatasourceData($field, $record);
			}

			// If a limitation for the values is set
			if(isset($field['valuelimit']) && is_array($field["value"])) {
			$field["value"] = $this->applyValueLimit($field['valuelimit'],$field["value"]);
			}

			switch ($field['formtype']) {
			case 'SELECT':
			@@ -413,7 +456,7 @@
			case 'CHECKBOX':
			// $checked = (empty($field["default"]))?'':' CHECKED';
			$checked = ($field["default"] == $field['value'][1])?' CHECKED':'';
			$new_record[$key] = "<input name=\"".$key."\" type=\"checkbox\" value=\"".$field['value'][1]."\" $checked>\r\n";
			$new_record[$key] = "<input name=\"".$key."\" id=\"".$key."\" value=\"".$field['value'][1]."\" type=\"checkbox\" $checked />\r\n";
			break;

			case 'CHECKBOXARRAY':
			@@ -430,10 +473,8 @@
			foreach($vals as $tvl) {
			if(trim($tvl) == trim($k)) $checked = ' CHECKED';
			}
			$out .= "<span class=\"wf_oneChoice\">\r\n
			<input type=\"checkbox\" value=\"$k\" id=\"".$key."[]\" name=\"".$key."[]\" $checked>\r\n
			<label for=\"".$key."[]\" id=\"".$key."[]-L\" class=\"wf_postField\">$v</label>\r\n
			</span><br />\r\n";
			// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
			$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v  \r\n";
			}
			}
			$new_record[$key] = $out;
			@@ -446,10 +487,8 @@
			$out = '';
			foreach($field['value'] as $k => $v) {
			$checked = ($k == $field["default"])?' CHECKED':'';
			$out .= "<span class=\"wf_oneChoice\">\r\n
			<input type=\"radio\" value=\"$k\" id=\"".$key."[]\" name=\"".$key."[]\" $checked>\r\n
			<label for=\"".$key."[]\" id=\"".$key."[]-L\" class=\"wf_postField\">$v</label>\r\n
			</span><br />\r\n";
			//$out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
			$out .= "<input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"radio\" $checked/> $v\r\n";
			}
			}
			$new_record[$key] = $out;
			@@ -488,7 +527,7 @@
			switch ($field['datatype']) {
			case 'VARCHAR':
			if(!@is_array($record[$key])) {
			$new_record[$key] = (isset($record[$key]))?$app->db->quote($record[$key]):'';
			$new_record[$key] = (isset($record[$key]))?$app->db->quote($record[$key]):'';
			} else {
			$new_record[$key] = implode($field['separator'],$record[$key]);
			}
			@@ -641,8 +680,13 @@
			}
			}else{$vip=0;}
			if($vip==0) {
			$this->errorMessage .= $field_name.": ".$this->wordbook['ipv4_validator_error_txt']."<br />\r\n";
			}
			$errmsg = $validator['errmsg'];
			if(isset($this->wordbook[$errmsg])) {
			$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
			} else {
			$this->errorMessage .= $errmsg."<br />\r\n";
			}
			}
			break;
			case 'CUSTOM':
			// Calls a custom class to validate this record
			@@ -698,10 +742,10 @@
			$sql_insert_val = '';
			$sql_update = '';

			if(!is_array($this->formDef)) $app->error("Keine Formulardefinition vorhanden.");
			if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab ist leer oder existiert nicht (TAB: $tab).");
			if(!is_array($this->formDef)) $app->error("Form definition not found.");
			if(!is_array($this->formDef['tabs'][$tab])) $app->error("The tab is empty or does not exist (TAB: $tab).");

			// gehe durch alle Felder des Tabs
			// go trough all fields of the tab
			if(is_array($record)) {
			foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
			// Wenn es kein leeres Passwortfeld ist
			@@ -825,6 +869,8 @@
			$app->error("Primary ID fehlt!");
			}
			}
			//* return a empty string if there is nothing to update
			if(trim($sql_update) == '') $sql = '';
			}

			return $sql;
			@@ -1069,8 +1115,21 @@
			return $_SESSION["s"]["form"]["tab"];
			}

			function isReadonlyTab($tab) {
			if(isset($this->formDef['tabs'][$tab]['readonly']) && $this->formDef['tabs'][$tab]['readonly'] == true) {
			function isReadonlyTab($tab, $primary_id) {
			global $app, $conf;

			// Add backticks for incomplete table names.
			if(stristr($this->formDef['db_table'],'.')) {
			$escape = '';
			} else {
			$escape = '`';
			}

			$sql = "SELECT sys_userid FROM ".$escape.$this->formDef['db_table'].$escape." WHERE ".$this->formDef['db_table_idx']." = ".$primary_id;
			$record = $app->db->queryOneRecord($sql);

			// return true if the readonly flag of the form is set and the current loggedin user is not the owner of the record.
			if(isset($this->formDef['tabs'][$tab]['readonly']) && $this->formDef['tabs'][$tab]['readonly'] == true && $record['sys_userid'] != $_SESSION["s"]["user"]["userid"]) {
			return true;
			} else {
			return false;