Removed the auto increment value for server table.

Fixed a bug in password encryption function.

Author: tbrehm

install/sql/ispconfig3.sql

@@ -487,7 +487,7 @@ CREATE TABLE `server` (
   `updated` tinyint(4) NOT NULL default '0',
   `active` tinyint(4) NOT NULL default '1',
   PRIMARY KEY  (`server_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
 
 -- 
 -- Daten für Tabelle `server`

interface/lib/classes/tform.inc.php

@@ -693,7 +693,7 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
                                                         $sql_insert_key .= "`$key`, ";
                                                         if($field['encryption'] == 'CRYPT') {
                                                                 $salt="$1$";
-																for ($n=0;$n<8;$n++) {
+																for ($n=0;$n<11;$n++) {
 																	$salt.=chr(mt_rand(64,126));
 																}
 																$salt.="$";
@@ -702,7 +702,7 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
                                                         } else {
                                                                 $record[$key] = md5($record[$key]);
                                                         }
-														$sql_insert_val .= "'".$record[$key]."', ";
+														$sql_insert_val .= "'".addslashes($record[$key])."', ";
                                                 } elseif ($field['formtype'] == 'CHECKBOX') {
                                                         $sql_insert_key .= "`$key`, ";
 														if($record[$key] == '') {
@@ -720,7 +720,7 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
                                                 if($field['formtype'] == 'PASSWORD') {
 														if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
                                                                 $salt="$1$";
-																for ($n=0;$n<8;$n++) {
+																for ($n=0;$n<11;$n++) {
 																	$salt.=chr(mt_rand(64,126));
 																}
 																$salt.="$";
@@ -729,7 +729,7 @@ function getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $sql_ext_whe
                                                         } else {
                                                                 $record[$key] = md5($record[$key]);
                                                         }
-                                                        $sql_update .= "`$key` = '".$record[$key]."', ";
+                                                        $sql_update .= "`$key` = '".addslashes($record[$key])."', ";
                                                 } elseif ($field['formtype'] == 'CHECKBOX') {
 														if($record[$key] == '') {
 															// if a checkbox is not set, we set it to the unchecked value