Silly Microsoft line endings removed to not error on Linux Subversion serve...

latham

2013-03-02 30fc1b7c564e4062266bd4b53fd95fa229f62f31

 interface/lib/classes/tform.inc.php

@@ -40,7 +40,7 @@
*        - DOUBLE
*        - CURRENCY (Formats digits in currency notation)
*        - VARCHAR (No format check)
*        - DATE (Date format, converts from and to linux timestamps automatically)
*        - DATE (Date format, converts from and to UNIX timestamps automatically)
*
*        Formtype:
*        - TEXT (Normal text field)
@@ -54,14 +54,14 @@
*        SEPARATOR
*        - separator char used for fileds with multiple values
*
*        Hint: The auto increment (ID) filed of the table has not be be definied eoarately.
*        Hint: The auto increment (ID) filed of the table has not be be definied separately.
*
*/

class tform {

        /**
        * Table definition (array)
        * Definition of the database table (array)
        * @var tableDef
        */
        var $tableDef;
@@ -79,25 +79,25 @@
        var $table_name;

        /**
        * Enable debigging
        * Debug Variable
        * @var debug
        */
        var $debug = 0;

        /**
        * name of the primary field of the datbase table (string)
        * name of the primary field of the database table (string)
        * @var table_index
        */
        var $table_index;

        /**
        * contains the error message
        * contains the error messages
        * @var errorMessage
        */
        var $errorMessage = '';

        var $dateformat = "d.m.Y";
       var $formDef;
       var $formDef = array();
        var $wordbook;
        var $module;
        var $primary_id;
@@ -124,13 +124,16 @@
    function loadFormDef($file,$module = '') {
                global $app,$conf;

                include_once($file);
                include($file);
                $this->formDef = $form;

                $this->module = $module;
            $wb = array();
            
            include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
				
            if(is_array($wb)) $wb_global = $wb;
				
                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";
@@ -140,7 +143,15 @@
               if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng";
               include($lng_file);
                }

            if(is_array($wb_global)) {
               $wb = $app->functions->array_merge($wb_global,$wb);
            }
            if(isset($wb_global)) unset($wb_global);
				
                $this->wordbook = $wb;
				
            $this->dateformat = $app->lng('conf_format_dateshort');

                return true;
        }
@@ -154,11 +165,21 @@
        * @return record
        */
        function decode($record,$tab) {
                if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab does not exist or the tab is empty (TAB: $tab).");
                global $conf, $app;
            if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab does not exist or the tab is empty (TAB: $tab).");
                $new_record = '';
            $table_idx = $this->formDef['db_table_idx'];
            if(isset($record[$table_idx])) $new_record[$table_idx] = $app->functions->intval($record[$table_idx ]);
				
            if(is_array($record)) {
                        foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
                                switch ($field['datatype']) {
                  foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
                                
                        //* Apply filter to record value.
                        if(isset($field['filters']) && is_array($field['filters'])) {
                           $record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SHOW');
                        }
								
                        switch ($field['datatype']) {
                                case 'VARCHAR':
                                        $new_record[$key] = $record[$key];
                                break;
@@ -167,14 +188,21 @@
                                        $new_record[$key] = $record[$key];
                                break;

                                case 'DATE':
                                case 'DATETSTAMP':
                                        if($record[$key] > 0) {
                                                $new_record[$key] = date($this->dateformat,$record[$key]);
                                        }
                                break;
								
                        case 'DATE':
                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
                                    $tmp = explode('-',$record[$key]);
                                                $new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1]  , $tmp[2], $tmp[0]));
                                        }
                                break;

                                case 'INTEGER':
                                        $new_record[$key] = intval($record[$key]);
                                        $new_record[$key] = $app->functions->intval($record[$key]);
                                break;

                                case 'DOUBLE':
@@ -182,7 +210,7 @@
                                break;

                                case 'CURRENCY':
                                        $new_record[$key] = number_format($record[$key], 2, ',', '');
                                        $new_record[$key] = $app->functions->currency_format($record[$key]);
                                break;

                                default:
@@ -196,7 +224,7 @@
        }

        /**
        * Get the key => value array of a form filed from a datasource definitiom
        * Get the key => value array of a form filled from a datasource definitiom
        *
        * @param field = array with field definition
        * @param record = Dataset as array
@@ -223,7 +251,7 @@
                  unset($tmp_recordid);
                  
                        $querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring);

						
                        // Getting the records
                        $tmp_records = $app->db->queryAllRecords($querystring);
                        if($app->db->errorMessage != '') die($app->db->errorMessage);
@@ -247,6 +275,17 @@
                        } else {
                                $this->errorMessage .= "Custom datasource class or function is empty<br />\r\n";
                        }
                }
                
                if(isset($field['filters']) && is_array($field['filters'])) {
                    $new_values = array();
                    foreach($values as $index => $value) {
                        $new_index = $this->filterField($index, $index, $field['filters'], 'SHOW');
                        $new_values[$new_index] = $this->filterField($index, (isset($values[$index]))?$values[$index]:'', $field['filters'], 'SHOW');
                    }
                    $values = $new_values;
                    unset($new_values);
                    unset($new_index);
                }

                return $values;
@@ -341,11 +380,21 @@
                        $record = $this->decode($record,$tab);
                        if(is_array($record)) {
                                foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {
                                        $val = $record[$key];
								
                                        if(isset($record[$key])) {
                                 $val = $record[$key];
                              } else {
                                 $val = '';
                              }

                                        // If Datasource is set, get the data from there
                                        if(isset($field['datasource']) && is_array($field['datasource'])) {
                                                $field["value"] = $this->getDatasourceData($field, $record);
                                    if(is_array($field["value"])) {
                                       //$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
                                       $field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record));
                                    } else {
                                                   $field["value"] = $this->getDatasourceData($field, $record);
                                    }
                                        }
                              
                              // If a limitation for the values is set
@@ -359,7 +408,9 @@
                                                if(is_array($field['value'])) {
                                                        foreach($field['value'] as $k => $v) {
                                                                $selected = ($k == $val)?' SELECTED':'';
                                                                $out .= "<option value='$k'$selected>$v</option>\r\n";
                                                if(!empty($this->wordbook[$v]))
                                                   $v = $this->wordbook[$v];
                                                                $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
                                                        }
                                                }
                                                $new_record[$key] = $out;
@@ -402,6 +453,7 @@

                                                        // HTML schreiben
                                                        $out = '';
                                                        $elementNo = 0;
                                                        foreach($field['value'] as $k => $v) {

                                                                $checked = '';
@@ -409,7 +461,8 @@
                                                                        if(trim($tvl) == trim($k)) $checked = ' CHECKED';
                                                                }
                                                                // $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 &nbsp;\r\n";
                                                $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label><br/>\r\n";
                                                                $elementNo++;
                                                        }
                                                }
                                                $new_record[$key] = $out;
@@ -420,17 +473,37 @@

                                                        // HTML schreiben
                                                        $out = '';
                                                        $elementNo = 0;
                                                        foreach($field['value'] as $k => $v) {
                                                                $checked = ($k == $val)?' CHECKED':'';
                                                                //$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";
                                                $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v </label>\r\n";
                                                                $elementNo++;
                                                        }
                                                }
                                                $new_record[$key] = $out;
                                        break;
                                        
                                        case 'DATETIME':
                                              if (strtotime($val) !== false) {
                                                 $dt_value = $val;
                                              } elseif ( isset($field['default']) && (strtotime($field['default']) !== false) ) {
                                                 $dt_value = $field['default'];
                                              } else {
                                                 $dt_value = 0;
                                              }
                                        		
                                              $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false;
		                              
                                              $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
                                        break;

                                        default:
                                 if(isset($record[$key])) {
                                                $new_record[$key] = htmlspecialchars($record[$key]);
                                 } else {
                                    $new_record[$key] = '';
                                 }
                                        }
                                }
                        }
@@ -440,7 +513,11 @@

                                // If Datasource is set, get the data from there
                                if(@is_array($field['datasource'])) {
                                   $field["value"] = $this->getDatasourceData($field, $record);
                                   if(is_array($field["value"])) {
                              $field["value"] = $app->functions->array_merge($field["value"],$this->getDatasourceData($field, $record));
                           } else {
                                       $field["value"] = $this->getDatasourceData($field, $record);
                           }
                                }
                        
                        // If a limitation for the values is set
@@ -453,9 +530,8 @@
                                        if(is_array($field['value'])) {
                                                $out = '';
                                                foreach($field['value'] as $k => $v) {
                                                    //$selected = ($k == $val)?' SELECTED':'';
                                       $selected = '';
                                                    $out .= "<option value='$k'$selected>$v</option>\r\n";
                                                    $selected = ($k == $field["default"])?' SELECTED':'';
                                                    $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
                                                }
                                        }
                                        if(isset($out)) $new_record[$key] = $out;
@@ -494,6 +570,7 @@

                                                // HTML schreiben
                                                $out = '';
                                                $elementNo = 0;
                                                foreach($field['value'] as $k => $v) {

                                                        $checked = '';
@@ -501,7 +578,8 @@
                                                                if(trim($tvl) == trim($k)) $checked = ' CHECKED';
                                                        }
                                                        // $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 &nbsp;\r\n";
                                          $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label> &nbsp;\r\n";
                                                        $elementNo++;
                                                }
                                        }
                                        $new_record[$key] = $out;
@@ -512,13 +590,22 @@

                                                // HTML schreiben
                                                $out = '';
                                                $elementNo = 0;
                                                foreach($field['value'] as $k => $v) {
                                                        $checked = ($k == $field["default"])?' CHECKED':'';
                                                        //$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";
                                          $out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"radio\" $checked/> $v</label>\r\n";
                                                        $elementNo++;
                                                }
                                        }
                                        $new_record[$key] = $out;
                                break;
                                
                                case 'DATETIME':
                                        $dt_value = (isset($field['default'])) ? $field['default'] : 0;
                                        $display_seconds = (isset($field['display_seconds']) && $field['display_seconds'] == true) ? true : false;
                              
                                        $new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
                                break;

                                default:
@@ -540,7 +627,7 @@
        * @param record = Datensatz als Array
        * @return record
        */
        function encode($record,$tab) {
        function encode($record,$tab,$dbencode = true) {
         global $app;
         
                if(!is_array($this->formDef['tabs'][$tab])) $app->error("Tab is empty or does not exist (TAB: $tab).");
@@ -548,25 +635,32 @@

                if(is_array($record)) {
                        foreach($this->formDef['tabs'][$tab]['fields'] as $key => $field) {

                                if(isset($field['validators']) && is_array($field['validators'])) $this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']);
								
                        //* Apply filter to record value
                                if(isset($field['filters']) && is_array($field['filters'])) {
                           $record[$key] = $this->filterField($key, (isset($record[$key]))?$record[$key]:'', $field['filters'], 'SAVE');
                        }
                        //* Validate record value
                        if(isset($field['validators']) && is_array($field['validators'])) {
                           $this->validateField($key, (isset($record[$key]))?$record[$key]:'', $field['validators']);
                        }

                                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]))?$record[$key]:'';
                                        } else {
                                                $new_record[$key] = implode($field['separator'],$record[$key]);
                                        }
                                break;
                                case 'TEXT':
                                        if(!is_array($record[$key])) {
                                                $new_record[$key] = $app->db->quote($record[$key]);
                                                $new_record[$key] = $record[$key];
                                        } else {
                                                $new_record[$key] = implode($field['separator'],$record[$key]);
                                        }
                                break;
                                case 'DATE':
                                case 'DATETSTAMP':
                                        if($record[$key] > 0) {
                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                                $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
@@ -574,16 +668,46 @@
                                 $new_record[$key] = 0;
                              }
                                break;
                        case 'DATE':
                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
                                    if(function_exists('date_parse_from_format')) {
                                       $date_parts = date_parse_from_format($this->dateformat,$record[$key]);
                                       //list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                       $new_record[$key] = $date_parts['year'].'-'.$date_parts['month'].'-'.$date_parts['day'];
                                       //$tmp = strptime($record[$key],$this->dateformat);
                                       //$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
                                    } else {
                                       //$tmp = strptime($record[$key],$this->dateformat);
                                       //$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
                                       $tmp = strtotime($record[$key]);
                                       $new_record[$key] = date('Y-m-d',$tmp);
                                    }
                                        } else {
                                 $new_record[$key] = '0000-00-00';
                              }
                                break;
                                case 'INTEGER':
                                        $new_record[$key] = (isset($record[$key]))?$record[$key]:0;
                              $new_record[$key] = (isset($record[$key]))?$app->functions->intval($record[$key]):0;
                                        //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default'];
                                        //if($key == 'refresh') die($record[$key]);
                                break;
                                case 'DOUBLE':
                                        $new_record[$key] = $app->db->quote($record[$key]);
                                        $new_record[$key] = $record[$key];
                                break;
                                case 'CURRENCY':
                                        $new_record[$key] = str_replace(",",".",$record[$key]);
                                break;
                                
                                case 'DATETIME':
                                      if (is_array($record[$key]))
                                      {
                                         $filtered_values = array_map(create_function('$item','return (int)$item;'), $record[$key]);
                                         extract($filtered_values, EXTR_PREFIX_ALL, '_dt');
                                			
                                         if ($_dt_day != 0 && $_dt_month != 0 && $_dt_year != 0) {
                                            $new_record[$key] = date( 'Y-m-d H:i:s', mktime($_dt_hour, $_dt_minute, $_dt_second, $_dt_month, $_dt_day, $_dt_year) );
                                         }
                                      }
                                break;
                                }

@@ -596,11 +720,52 @@
                                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                                        }
                                }


								
                        //* Add slashes to all records, when we encode data which shall be inserted into mysql.
                        if($dbencode == true) $new_record[$key] = $app->db->quote($new_record[$key]);
                        }
                }
                return $new_record;
        }
		
      /**
        * process the filters for a given field.
        *
        * @param field_name = Name of the field
        * @param field_value = value of the field
        * @param filters = Array of filters
      * @param filter_event = 'SAVE'or 'SHOW'
        * @return record
        */

        function filterField($field_name, $field_value, $filters, $filter_event) {

         global $app;
         $returnval = $field_value;
				
         //* Loop trough all filters
         foreach($filters as $filter) {
            if($filter['event'] == $filter_event) {
               switch ($filter['type']) {
                  case 'TOLOWER':
                     $returnval = strtolower($returnval);
                  break;
                  case 'TOUPPER':
                     $returnval = strtoupper($returnval);
                  break;
                  case 'IDNTOASCII':
                     $returnval = $app->functions->idn_encode($returnval);
                  break;
                  case 'IDNTOUTF8':
                     $returnval = $app->functions->idn_decode($returnval);
                  break;
                  default:
                     $this->errorMessage .= "Unknown Filter: ".$filter['type'];
                  break;
               }
            }
         }
            return $returnval;
        }

        /**
@@ -634,7 +799,9 @@
                                        }
                                break;
                                case 'UNIQUE':
                                        if($this->action == 'NEW') {
                              if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
                              if($validator['allowempty'] == 'n' || ($validator['allowempty'] == 'y' && $field_value != '')){
                                 if($this->action == 'NEW') {
                                                $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."'");
                                                if($num_rec["number"] > 0) {
                                                        $errmsg = $validator['errmsg'];
@@ -644,7 +811,7 @@
                                             $this->errorMessage .= $errmsg."<br />\r\n";
                                          }
                                                }
                                        } else {
                                 } else {
                                                $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM ".$escape.$this->formDef['db_table'].$escape. " WHERE $field_name = '".$app->db->quote($field_value)."' AND ".$this->formDef['db_table_idx']." != ".$this->primary_id);
                                                if($num_rec["number"] > 0) {
                                                        $errmsg = $validator['errmsg'];
@@ -654,7 +821,8 @@
                                             $this->errorMessage .= $errmsg."<br />\r\n";
                                          }
                                                }
                                        }
                                 }
                              }
                                break;
                                case 'NOTEMPTY':
                                        if(empty($field_value)) {
@@ -667,7 +835,17 @@
                                        }
                                break;
                                case 'ISEMAIL':
                                        if(!preg_match("/^\w+[\w.-]*\w+@\w+[\w.-]*\w+\.[a-z]{2,10}$/i", $field_value)) {
                                    if(function_exists('filter_var')) {
                              if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
                                 $errmsg = $validator['errmsg'];
                                            if(isset($this->wordbook[$errmsg])) {
                                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                                 } else {
                                    $this->errorMessage .= $errmsg."<br />\r\n";
                                 }
                                        }
                           } else {
                              if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-zA-Z0-9\-]{2,30}$/i", $field_value)) {
                                                $errmsg = $validator['errmsg'];
                                                if(isset($this->wordbook[$errmsg])) {
                                                    $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
@@ -675,9 +853,20 @@
                                       $this->errorMessage .= $errmsg."<br />\r\n";
                                    }
                                        }
                           }
                                break;
                                case 'ISINT':
                                        $tmpval = intval($field_value);
                           if(function_exists('filter_var') && $field_value < 2147483647) {
                              if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) {
                                 $errmsg = $validator['errmsg'];
                                 if(isset($this->wordbook[$errmsg])) {
                                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                                 } else {
                                    $this->errorMessage .= $errmsg."<br />\r\n";
                                 }
                                        }
                           } else {
                                        $tmpval = $app->functions->intval($field_value);
                                        if($tmpval === 0 and !empty($field_value)) {
                                                $errmsg = $validator['errmsg'];
                                                if(isset($this->wordbook[$errmsg])) {
@@ -686,6 +875,7 @@
                                       $this->errorMessage .= $errmsg."<br />\r\n";
                                    }
                                        }
                           }
                                break;
                                case 'ISPOSITIVE':
                                        if(!is_numeric($field_value) || $field_value <= 0){
@@ -697,6 +887,37 @@
                                }
                                        }
                                break;
            case 'ISV6PREFIX':
               $v6_prefix_ok = 0;
               $explode_field_value = explode(':',$field_value);
               if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){
                       if ( count($explode_field_value) <= 9 ) {
                               if(filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) {
                                       $v6_prefix_ok = 1;
                               }
                       }
               } else { 
                  $v6_prefix_ok = 2; 
               }
               // check subnet against defined server-ipv6
               $sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1");
               $sql_v6_explode=explode(':',$sql_v6['ip_address']);
               if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) )  { 
                  $v6_prefix_ok = 3; 
               }
               if($v6_prefix_ok == 0) { 
                  $errmsg = $validator['errmsg']; 
               }
               if($v6_prefix_ok == 2) { 
                  $errmsg = 'IPv6 Prefix must end with ::'; 
               }
               if($v6_prefix_ok == 3) { 
                  $errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)'; 
               }
               if($v6_prefix_ok <> 1){
                  $this->errorMessage .= $errmsg."<br />\r\n"; 
               }
            break;
                        case 'ISIPV4':
                        $vip=1;
                        if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
@@ -714,6 +935,70 @@
                                  $this->errorMessage .= $errmsg."<br />\r\n";
                                }
                              }
                                break;
                        case 'ISIP':
                        if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
                        if($validator['allowempty'] == 'y' && $field_value == '') {
                           //* Do nothing
                        } else {
                        //* Check if its a IPv4 or IPv6 address
                           if(isset($validator['separator']) && $validator['separator'] != '') {
                              //* When the field may contain several IP addresses, split them by the char defined as separator
                              $field_value_array = explode($validator['separator'],$field_value);
                           } else {
                              $field_value_array[] = $field_value;
                           }
                           foreach($field_value_array as $field_value) {
                              if(function_exists('filter_var')) {
                                 if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
                                    $errmsg = $validator['errmsg'];
                                    if(isset($this->wordbook[$errmsg])) {
                                       $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                                    } else {
                                       $this->errorMessage .= $errmsg."<br />\r\n";
                                    }
                                 }
                              } else {
                                 //* Check content with regex, if we use php < 5.2
                                 $ip_ok = 0;
                                 if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
                                    $ip_ok = 1;
                                 }
                                 if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
                                    $ip_ok = 1;
                                 }
                                 if($ip_ok == 0) {
                                    $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 'RANGE':
                                        //* Checks if the value is within the given range or above / below a value
                              //* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:".
                              $range_parts = explode(':',trim($validator['range']));
                              $ok = true;
                                        if($range_parts[0] != '' && $field_value < $range_parts[0]) {
                                 $ok = false;
                              }
                              if($range_parts[1] != '' && $field_value > $range_parts[1]) {
                                 $ok = false;
                              }
                              if($ok != true) {
                                 $errmsg = $validator['errmsg'];
                                 if(isset($this->wordbook[$errmsg])) {
                                    $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                                 } else {
                                    $this->errorMessage .= $errmsg."<br />\r\n";
                                 }
                                        }
                              unset($range_parts);
                                break;
                                case 'CUSTOM':
                                        // Calls a custom class to validate this record
@@ -738,7 +1023,7 @@
        }

        /**
        * Create the SQL staement.
        * Create SQL statement
        *
        * @param record = Datensatz als Array
        * @param action = INSERT oder UPDATE
@@ -764,7 +1049,7 @@
                $this->action = $action;
                $this->primary_id = $primary_id;

                $record = $this->encode($record,$tab);
                $record = $this->encode($record,$tab,true);
                $sql_insert_key = '';
                $sql_insert_val = '';
                $sql_update = '';
@@ -782,20 +1067,16 @@
                                                if($field['formtype'] == 'PASSWORD') {
                                                        $sql_insert_key .= "`$key`, ";
                                                        if($field['encryption'] == 'CRYPT') {
                                                                $salt="$1$";
                                                for ($n=0;$n<8;$n++) {
                                                   $salt.=chr(mt_rand(64,126));
                                                }
                                                $salt.="$";
                                                // $salt = substr(md5(time()),0,2);
                                                $record[$key] = crypt($record[$key],$salt);
                                                $record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
                                                $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
                                          } elseif ($field['encryption'] == 'MYSQL') {
                                                $sql_insert_val .= "PASSWORD('".$app->db->quote($record[$key])."'), ";
                                                $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
                                                $record[$key] = $tmp['crypted'];
                                                $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
                                          } elseif ($field['encryption'] == 'CLEARTEXT') {
                                                $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
                                                        } else {
                                                                $record[$key] = md5($record[$key]);
                                                                $record[$key] = md5(stripslashes($record[$key]));
                                                $sql_insert_val .= "'".$app->db->quote($record[$key])."', ";
                                                        }
                                          
@@ -815,20 +1096,16 @@
                                        } else {
                                                if($field['formtype'] == 'PASSWORD') {
                                          if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
                                                                $salt="$1$";
                                                for ($n=0;$n<8;$n++) {
                                                   $salt.=chr(mt_rand(64,126));
                                                }
                                                $salt.="$";
                                                // $salt = substr(md5(time()),0,2);
                                                $record[$key] = crypt($record[$key],$salt);
                                                                $record[$key] = $app->auth->crypt_password(stripslashes($record[$key]));
                                                $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
                                          } elseif (isset($field['encryption']) && $field['encryption'] == 'MYSQL') {
                                                $sql_update .= "`$key` = PASSWORD('".$app->db->quote($record[$key])."'), ";
                                                $tmp = $app->db->queryOneRecord("SELECT PASSWORD('".$app->db->quote(stripslashes($record[$key]))."') as `crypted`");
                                                $record[$key] = $tmp['crypted'];
                                                $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
                                          } elseif (isset($field['encryption']) && $field['encryption'] == 'CLEARTEXT') {
                                                $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
                                                        } else {
                                                                $record[$key] = md5($record[$key]);
                                                                $record[$key] = md5(stripslashes($record[$key]));
                                                $sql_update .= "`$key` = '".$app->db->quote($record[$key])."', ";
                                                        }
                                                        
@@ -899,7 +1176,7 @@
               //* return a empty string if there is nothing to update
               if(trim($sql_update) == '') $sql = '';
                }
                

                return $sql;
        }

@@ -928,6 +1205,9 @@
        foreach( $this->formDef["tabs"] as $key => $tab) {

            $tab['name'] = $key;
         // Translate the title of the tab
         $tab['title'] = $this->lng($tab['title']);
			
            if($tab['name'] == $active_tab) {

                // If module is set, then set the template path relative to the module..
@@ -935,14 +1215,13 @@

                // Generate the template if it does not exist yet.
            
            // Translate the title of the tab
            $tab['title'] = $this->lng($tab['title']);
				
                        
                if(!is_file($tab["template"])) {
                     $app->uses('tform_tpl_generator');
                     $app->tform_tpl_generator->buildHTML($this->formDef,$tab['name']);
                }

                $app->tpl->setVar('readonly_tab', (isset($tab['readonly']) && $tab['readonly'] == true));
                $app->tpl->setInclude('content_tpl',$tab["template"]);
                $tab["active"] = 1;
                $_SESSION["s"]["form"]["tab"] = $tab['name'];
@@ -984,7 +1263,11 @@

        function datalogSave($action,$primary_id, $record_old, $record_new) {
                global $app,$conf;

				
            $app->db->datalogSave($this->formDef['db_table'], $action, $this->formDef['db_table_idx'], $primary_id, $record_old, $record_new);
            return true;
				
            /*
                // Add backticks for incomplete table names.
                if(stristr($this->formDef['db_table'],'.')) {
                        $escape = '';
@@ -993,26 +1276,6 @@
                }

                $this->diffrec = array();
            /*
                if(is_array($record_new) && count($record_new) > 0) {
                        foreach($record_new as $key => $val) {
                                if(@$record_old[$key] != $val) {
                              // Record has changed
                                        $diffrec[$key] = array('old' => @$record_old[$key],
                                                               'new' => $val);
                                }
                        }
                } elseif(is_array($record_old)) {
                        foreach($record_old as $key => $val) {
                                if($record_new[$key] != $val) {
                              // Record has changed
                                        $diffrec[$key] = array('new' => $record_new[$key],
                                                               'old' => $val);
                                }
                        }
                }
            $this->diffrec = $diffrec;
            */
            
            // Full diff records for ISPConfig, they have a different format then the simple diffrec
            $diffrec_full = array();
@@ -1065,18 +1328,22 @@
                }

                return true;
            */

        }

        function getAuthSQL($perm) {
        function getAuthSQL($perm, $table = '') {
            if($_SESSION["s"]["user"]["typ"] == 'admin') {
               return '1';
            } else {
               if ($table != ''){
                  $table = ' ' . $table . '.';
               }
                   $groups = ( $_SESSION["s"]["user"]["groups"] ) ? $_SESSION["s"]["user"]["groups"] : 0;
               $sql = '(';
                   $sql .= "(sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND sys_perm_user like '%$perm%') OR  ";
                   $sql .= "(sys_groupid IN (".$groups.") AND sys_perm_group like '%$perm%') OR ";
                   $sql .= "sys_perm_other like '%$perm%'";
                   $sql .= "(" . $table . "sys_userid = ".$_SESSION["s"]["user"]["userid"]." AND " . $table . "sys_perm_user like '%$perm%') OR  ";
                   $sql .= "(" . $table . "sys_groupid IN (".$groups.") AND " . $table ."sys_perm_group like '%$perm%') OR ";
                   $sql .= $table . "sys_perm_other like '%$perm%'";
                   $sql .= ')';

                   return $sql;
@@ -1166,7 +1433,7 @@
      
      // translation function for forms, tries the form wordbook first and if this fails, it tries the global wordbook
      function lng($msg) {
         global $app;
         global $app,$conf;
         
         if(isset($this->wordbook[$msg])) {
            return $this->wordbook[$msg];
@@ -1256,7 +1523,109 @@
         return $diffrec;
      
      }
		
      /**
       * Generate HTML for DATETIME fields.
       * 
       * @access private
       * @param string $form_element Name of the form element.
       * @param string $default_value Selected value for fields.
       * @param bool $display_secons Include seconds selection.
       * @return string HTML	
       */
      function _getDateTimeHTML($form_element, $default_value, $display_seconds=false)
      {
         $_datetime = strtotime($default_value);
         $_showdate = ($_datetime === false) ? false : true;

         $dselect = array('day','month','year','hour','minute');
            if ($display_seconds === true) {
             $dselect[] = 'second';
         }
			 
         $out = '';
			 
         foreach ($dselect as $dt_element)
         {
             $dt_options = array();
             $dt_space = 1;
			 	
             switch ($dt_element) {
                case 'day':
                   for ($i = 1; $i <= 31; $i++) {
                        $dt_options[] = array('name' =>  sprintf('%02d', $i),
                                         'value' => sprintf('%d', $i));
                    }
                    $selected_value = date('d', $_datetime);
                   break;
			 			
                case 'month':
                   for ($i = 1; $i <= 12; $i++) {
                        $dt_options[] = array('name' => strftime('%b', mktime(0, 0, 0, $i, 1, 2000)),
                                         'value' => strftime('%m', mktime(0, 0, 0, $i, 1, 2000)));
                    }
                    $selected_value = date('n', $_datetime);
                   break;
			 			
                case 'year':
                   $start_year = strftime("%Y");
                  $years = range((int)$start_year, (int)($start_year+3));
				        
                    foreach ($years as $year) {
                       $dt_options[] = array('name' => $year,
                                        'value' => $year);
                    }
                    $selected_value = date('Y', $_datetime);
                    $dt_space = 2;
                   break;
			 			
                case 'hour':
                   foreach(range(0, 23) as $hour) {
                      $dt_options[] = array('name' =>  sprintf('%02d', $hour),
                                          'value' => sprintf('%d', $hour));
                   }
                   $selected_value = date('G', $_datetime);
                   break;
			 			
                case 'minute':
                   foreach(range(0, 59) as $minute) {
                      if (($minute % 5) == 0) {
                         $dt_options[] = array('name' =>  sprintf('%02d', $minute),
                                         'value' => sprintf('%d', $minute));
                      }
                   }
                   $selected_value = (int)floor(date('i', $_datetime));
                   break;
			 			
                case 'second':	
                   foreach(range(0, 59) as $second) {
                      $dt_options[] = array('name' =>  sprintf('%02d', $second),
                                         'value' => sprintf('%d', $second));
                   }
                   $selected_value = (int)floor(date('s', $_datetime));
                   break;
             }
					 	
            $out .= "<select name=\"".$form_element."[$dt_element]\" id=\"".$form_element."_$dt_element\" class=\"selectInput\" style=\"width: auto; float: none;\">";
            if (!$_showdate) {
               $out .= "<option value=\"-\" selected=\"selected\">--</option>" . PHP_EOL;
            } else {
               $out .= "<option value=\"-\">--</option>" . PHP_EOL;
            }
				 
            foreach ($dt_options as $dt_opt) {
               if ( $_showdate && ($selected_value == $dt_opt['value']) ) {
                  $out .= "<option value=\"{$dt_opt['value']}\" selected=\"selected\">{$dt_opt['name']}</option>" . PHP_EOL;
               } else {
                  $out .= "<option value=\"{$dt_opt['value']}\">{$dt_opt['name']}</option>" . PHP_EOL;
               }
            }
												        
            $out .= '</select>' . str_repeat('&nbsp;', $dt_space);
         }
			
         return $out;
      }
}

?>
?>