Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method)

mcramer

2012-11-27 7990f8881b085279269d35cf9dd2787b88ae1c08

 interface/lib/classes/tform.inc.php

@@ -799,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'];
@@ -809,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'];
@@ -819,7 +821,8 @@
                                             $this->errorMessage .= $errmsg."<br />\r\n";
                                          }
                                                }
                                        }
                                 }
                              }
                                break;
                                case 'NOTEMPTY':
                                        if(empty($field_value)) {
@@ -881,12 +884,43 @@
                                             $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                                } else {
                                  $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)){
                                }

                                        }

                                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)){

                        $groups=explode(".",$field_value);
                        foreach($groups as $group){
                           if($group<0 OR $group>255)