Merged revisions 2095-2129 which contain bugfixes from stable branch.

Author: tbrehm

docs/INSTALL_CENTOS_5.2.txt

@@ -162,6 +162,18 @@ tar xvfz vlogger-1.3.tar.gz
 mv vlogger-1.3/vlogger /usr/sbin/
 rm -rf vlogger*
 
+Edit the file /etc/sudoers
+
+vi /etc/sudoers
+
+and change the line:
+
+Defaults    requiretty
+
+to:
+
+# Defaults    requiretty
+
 7) Install ISPConfig 3
 
 Disable the firewall:

docs/INSTALL_CENTOS_5.4_dovecot_bind.txt

@@ -191,6 +191,18 @@ make
 make install
 rm -rf jailkit-2.11*
 
+Edit the file /etc/sudoers
+
+vi /etc/sudoers
+
+and change the line:
+
+Defaults    requiretty
+
+to:
+
+# Defaults    requiretty
+
 
 7) Install ISPConfig 3
 

install/dist/lib/centos53.lib.php

@@ -37,6 +37,7 @@ public function configure_amavis() {
 		$configfile = 'fedora_amavisd_conf';
 		if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
 		if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
+		if(!is_dir($conf["amavis"]["config_dir"])) mkdir($conf["amavis"]["config_dir"]);
 		$content = rf("tpl/".$configfile.".master");
 		$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
 		$content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content);

install/dist/lib/fedora.lib.php

@@ -903,6 +903,9 @@ public function install_ispconfig()
 		exec('chown getmail /usr/local/bin/run-getmail.sh');
 		exec('chmod 744 /usr/local/bin/run-getmail.sh');
 
+		// Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
+		replaceLine('/etc/sudoers','Defaults    requiretty','#Defaults    requiretty',0,0);
+		
 
 	}
 

install/lib/installer_base.lib.php

@@ -1010,7 +1010,7 @@ public function configure_apache() {
 		// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
 
 		$content = rf('tpl/apache_ispconfig.conf.master');
-		$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
+		$records = $this->db->queryAllRecords('SELECT * FROM '.$conf['mysql']['master_database'].'.server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");
 		if(is_array($records) && count($records) > 0) {
 			foreach($records as $rec) {
 				$content .= 'NameVirtualHost '.$rec['ip_address'].":80\n";
@@ -1036,6 +1036,10 @@ public function configure_apache() {
 			replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental     yes',0,0);
 			replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName     webalizer.hist',0,0);
 		}
+		
+		// Check the awsatst script
+		if(!is_dir('/usr/share/awstats/tools')) exec('mkdir -p /usr/share/awstats/tools');
+		if(!file_exists('/usr/share/awstats/tools/awstats_buildstaticpages.pl') && file_exists('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl')) symlink('/usr/share/doc/awstats/examples/awstats_buildstaticpages.pl','/usr/share/awstats/tools/awstats_buildstaticpages.pl');
 
 		//* add a sshusers group
 		$command = 'groupadd sshusers';

install/sql/ispconfig3.sql

@@ -1102,7 +1102,6 @@ CREATE TABLE `web_domain` (
   `parent_domain_id` int(11) unsigned NOT NULL default '0',
   `vhost_type` varchar(32) default NULL,
   `document_root` varchar(255) default NULL,
-  `document_root_www` varchar(255) default NULL,
   `system_user` varchar(255) default NULL,
   `system_group` varchar(255) default NULL,
   `hd_quota` bigint(20) NOT NULL default '0',
@@ -1131,9 +1130,9 @@ CREATE TABLE `web_domain` (
   `stats_password` varchar(255) default NULL,
   `stats_type` varchar(255) default 'webalizer',
   `allow_override` varchar(255) NOT NULL default 'All',
-  `apache_directives` text,
-  `php_open_basedir` text,
-  `custom_php_ini` text,
+  `apache_directives` mediumtext,
+  `php_open_basedir` mediumtext,
+  `custom_php_ini` mediumtext,
   `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
   `backup_copies` INT NOT NULL DEFAULT '1',
   `active` enum('n','y') NOT NULL default 'y',
@@ -1354,7 +1353,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.3.1');
 
 -- --------------------------------------------------------
 

install/tpl/apache_ispconfig.conf.master

@@ -41,6 +41,6 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
         Order allow,deny
         Allow from all
 </Directory>
-Alias /awstats-icon "/usr/share/awstats/icon"
 
+Alias /awstats-icon "/usr/share/awstats/icon"
 

install/tpl/config.inc.php.master

@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.3');
+define('ISPC_APP_VERSION', '3.0.3.1');
 
 
 //** Database

install/update.php

@@ -308,7 +308,7 @@
 $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);
 
 // $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
-if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('y','n'),'n')) == 'y') {
+if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
 	$inst->make_ispconfig_ssl_cert();
 }
 

interface/lib/classes/tform.inc.php

@@ -362,7 +362,8 @@ function getHTML($record, $tab, $action = 'NEW') {
                                         // If Datasource is set, get the data from there
                                         if(isset($field['datasource']) && is_array($field['datasource'])) {
 												if(is_array($field["value"])) {
-													$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+													//$field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
+													$field["value"] = $field["value"]+$this->getDatasourceData($field, $record);
 												} else {
                                                 	$field["value"] = $this->getDatasourceData($field, $record);
 												}