Reverted SVN trunk back to revision 3938 to remove changes in default theme an...

Reverted SVN trunk back to revision 3938 to remove changes in default theme an a replacement of the ispconfig logo.

install/dist/lib/fedora.lib.php

@@ -59,8 +59,22 @@ class installer_dist extends installer_base {
 			}
 		}
 		
+		$config_dir = $conf['mailman']['config_dir'].'/';
+		$full_file_name = $config_dir.'virtual_to_transport.sh';
+		
+		//* Backup exiting virtual_to_transport.sh script
+		if(is_file($full_file_name)) {
+			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+		}
+		
+		copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+		chgrp($full_file_name,'mailman');
+		chmod($full_file_name,0750);
+		
 		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
 		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
+		
+		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
 
 		$virtual_domains = '';
 		if($status == 'update')
@@ -87,25 +101,6 @@ class installer_dist extends installer_base {
 		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
 
 		wf($full_file_name, $content);
-		
-		//* Write virtual_to_transport.sh script
-		$config_dir = $conf['mailman']['config_dir'].'/';
-		$full_file_name = $config_dir.'virtual_to_transport.sh';
-		
-		//* Backup exiting virtual_to_transport.sh script
-		if(is_file($full_file_name)) {
-			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
-		}
-		
-		if(is_dir('/etc/mailman')) {
-			copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
-			chgrp($full_file_name,'mailman');
-			chmod($full_file_name,0750);
-		}
-		
-		//* Create aliasaes
-		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
-		
 	}
 	
 	function configure_postfix($options = '')
@@ -209,16 +204,6 @@ class installer_dist extends installer_base {
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
 		
-		//* Create the mailman files
-		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
-		//if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
-		if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
-		if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases','/var/lib/mailman/data/aliases');
-		exec('postalias /var/lib/mailman/data/aliases');
-		if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
-		exec('postmap /var/lib/mailman/data/virtual-mailman');
-		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
-		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
 		
 		//* Make a backup copy of the main.cf file
 		copy($config_dir.'/main.cf', $config_dir.'/main.cf~');

install/dist/lib/opensuse.lib.php

@@ -59,8 +59,22 @@ class installer_dist extends installer_base {
 			}
 		}
 		
+		$config_dir = $conf['mailman']['config_dir'].'/';
+		$full_file_name = $config_dir.'virtual_to_transport.sh';
+		
+		//* Backup exiting virtual_to_transport.sh script
+		if(is_file($full_file_name)) {
+			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
+		}
+		
+		copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
+		chgrp($full_file_name,'mailman');
+		chmod($full_file_name,0750);
+		
 		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
 		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
+		
+		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
 
 		$virtual_domains = '';
 		if($status == 'update')
@@ -87,24 +101,6 @@ class installer_dist extends installer_base {
 		$content = str_replace('{virtual_domains}', $virtual_domains, $content);
 
 		wf($full_file_name, $content);
-		
-		//* Write virtual_to_transport.sh script
-		$config_dir = $conf['mailman']['config_dir'].'/';
-		$full_file_name = $config_dir.'virtual_to_transport.sh';
-		
-		//* Backup exiting virtual_to_transport.sh script
-		if(is_file($full_file_name)) {
-			copy($full_file_name, $config_dir.'virtual_to_transport.sh~');
-		}
-		
-		if(is_dir('/etc/mailman')) {
-			copy('tpl/mailman-virtual_to_transport.sh',$full_file_name);
-			chgrp($full_file_name,'mailman');
-			chmod($full_file_name,0750);
-		}
-		
-		//* Create aliasaes
-		exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
 	}
 	
 	function configure_postfix($options = '')
@@ -222,14 +218,6 @@ class installer_dist extends installer_base {
 		touch($config_dir.'/nested_header_checks');
 		touch($config_dir.'/body_checks');
 		
-		//* Create the mailman files
-		if(!is_dir('/var/lib/mailman/data')) exec('mkdir -p /var/lib/mailman/data');
-		if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
-		exec('postalias /var/lib/mailman/data/aliases');
-		if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
-		exec('postmap /var/lib/mailman/data/virtual-mailman');
-		if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
-		exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
 		
 		//* Make a backup copy of the main.cf file
 		copy($config_dir.'/main.cf', $config_dir.'/main.cf~');

install/sql/incremental/upd_0049.sql

-ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
+ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
\ No newline at end of file

install/sql/incremental/upd_0050.sql

-ALTER TABLE `dns_slave` DROP INDEX `origin`;
-ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file

install/sql/incremental/upd_0051.sql

-ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;

install/sql/incremental/upd_0052.sql

-ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`;
-ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`;
-ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`;

install/sql/ispconfig3.sql

@@ -418,7 +418,7 @@ CREATE TABLE `dns_slave` (
   `active` enum('N','Y') NOT NULL,
   `xfer` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`),
-  UNIQUE KEY `slave` (`origin`,`server_id`),
+  UNIQUE KEY `origin` (`origin`),
   KEY `active` (`active`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
@@ -663,9 +663,6 @@ CREATE TABLE `mail_domain` (
   `sys_perm_other` varchar(5) NOT NULL default '',
   `server_id` int(11) unsigned NOT NULL default '0',
   `domain` varchar(255) NOT NULL default '',
-  `dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
-  `dkim_private` mediumtext NOT NULL default '',
-  `dkim_public` mediumtext NOT NULL default '',
   `active` enum('n','y') NOT NULL,
   PRIMARY KEY  (`domain_id`),
   KEY `server_id` (`server_id`,`domain`),
@@ -1631,13 +1628,12 @@ CREATE TABLE `web_backup` (
   `server_id` int(10) unsigned NOT NULL,
   `parent_domain_id` int(10) unsigned NOT NULL,
   `backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
-  `backup_mode` varchar(64) NOT NULL DEFAULT  '',
-  `tstamp` int(10) unsigned NOT NULL,
-  `filename` varchar(255) NOT NULL,
-  `filesize` VARCHAR(10) NOT NULL,
-  PRIMARY KEY (`backup_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
+  `backup_mode` varchar(64) NOT NULL DEFAULT  '',
+  `tstamp` int(10) unsigned NOT NULL,
+  `filename` varchar(255) NOT NULL,
+  PRIMARY KEY (`backup_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
 -- --------------------------------------------------------
 
 --
@@ -2172,7 +2168,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.5.2');
-
-SET FOREIGN_KEY_CHECKS = 1;
+
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.1');
+
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file

install/tpl/amavisd_user_config.master

@@ -75,12 +75,6 @@ $LOGFILE = "/var/log/amavis.log";  # (defaults to empty, no log)
 # Set the log_level to 5 for debugging
 $log_level = 0;                # (defaults to 0)
 
-# DKIM
-
-$enable_dkim_verification = 1;
-$enable_dkim_signing = 1; # load DKIM signing code,
-@dkim_signature_options_bysender_maps = (
-{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
 
 #------------ Do not modify anything below this line -------------
 1;  # insure a defined return

install/tpl/apache_ispconfig.conf.master

@@ -51,4 +51,4 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 Alias /awstats-icon "/usr/share/awstats/icon"
 
 NameVirtualHost *:80
-NameVirtualHost *:443
+NameVirtualHost *:443
\ No newline at end of file

install/tpl/apache_ispconfig.vhost.master

@@ -26,7 +26,6 @@ NameVirtualHost *:{vhost_port}
       Allow from all
     </Directory>
     IPCCommTimeout  7200
-	MaxRequestLen 15728640
   </IfModule>
   
   <IfModule mpm_itk_module>

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.5.2');
+define('ISPC_APP_VERSION', '3.0.5.1');
 define('DEVSYSTEM', 0);
 
 

install/tpl/opensuse_amavisd_conf.master

@@ -778,11 +778,5 @@ $spam_admin = undef;
 $DO_SYSLOG = 1;
 $LOGFILE = "/var/log/amavis.log";  # (defaults to empty, no log)
 
-# DKIM
-
-$enable_dkim_verification = 1;
-$enable_dkim_signing = 1; # load DKIM signing code,
-@dkim_signature_options_bysender_maps = (
-{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
 
 1;  # insure a defined return

install/tpl/server.ini.master

@@ -21,7 +21,6 @@ backup_mode=rootgz
 module=postfix_mysql
 maildir_path=/var/vmail/[domain]/[localpart]
 homedir_path=/var/vmail
-dkim_path=/etc/postfix/dkim
 pop3_imap_daemon=courier
 mail_filter_syntax=maildrop
 mailuser_uid=5000

interface/lib/classes/validate_dkim.inc.php

-<?php
-
-/*
-Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
-Copyright (c) 2013, Florian Schaal, info@schaal-24.de
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of ISPConfig nor the names of its contributors
-      may be used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-class validate_dkim {
-	
-	function get_error($errmsg) {
-		global $app;
-        	if(isset($app->tform->wordbook[$errmsg])) {
-			return $app->tform->wordbook[$errmsg]."<br>\r\n";
-		} else {
-			return $errmsg."<br>\r\n";
-		}
-    	}
-    
-    	/* Validator function for private DKIM-Key */
-    	function check_private_key($field_name, $field_value, $validator) {
-		$dkim_enabled=$_POST['dkim'];
-		if ($dkim_enabled == 'y') {
-			if (empty($field_value)) return $this->get_error($validator['errmsg']);
-			exec('echo "'.$field_value.'"|openssl rsa -check',$output,$result);
-			if($result != 0) return $this->get_error($validator['errmsg']);
-		}
-	}
-
-	/* Validator function for DKIM Path */
-	function check_dkim_path($field_name, $field_value, $validator) {
-		if(empty($field_value)) return $this->get_error($validator['errmsg']);
-		if (substr(sprintf('%o', fileperms($field_value)),-3) <= 600)
-			return $this->get_error($validator['errmsg']);
-	}
-
-}

interface/lib/lang/cz.lng

@@ -132,3 +132,5 @@ $wb['datalog_status_u_web_folder_user'] = 'Aktualizace nastavení uživatele pro
 $wb['datalog_status_d_web_folder_user'] = 'Odstranění uživatele pro adresáře chráněné heslem';
 $wb['login_as_txt'] = 'Přihlaste se jako';
 ?>
+
+

interface/lib/lang/de.lng

@@ -70,7 +70,6 @@ $wb['monthnamesshort_nov'] = 'Nov';
 $wb['monthnamesshort_dec'] = 'Dez';
 $wb['datepicker_nextText'] = 'Vor';
 $wb['datepicker_prevText'] = 'Zurück';
-$wb['activeuser_txt'] = 'Angemeldet als:';
 $wb['logout_txt'] = 'Abmelden';
 $wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?';
 $wb['globalsearch_resultslimit_of_txt'] = 'von';

interface/lib/lang/en.lng

@@ -42,7 +42,6 @@ $wb['top_menu_dashboard'] = 'Home';
 $wb['top_menu_vm'] = 'VServer';
 $wb['toolsarea_head_txt'] = 'Tools';
 $wb['latest_news_txt'] = 'Latest news';
-$wb['activeuser_txt'] = 'Logged in as:';
 $wb['logout_txt'] = "Logout";
 $wb['daynamesmin_su'] = "Su";
 $wb['daynamesmin_mo'] = "Mo";

interface/lib/lang/pl.lng

@@ -132,3 +132,4 @@ $wb['datalog_status_u_web_folder_user'] = 'Edytuj konto zabezpieczonego folderu'
 $wb['datalog_status_d_web_folder_user'] = 'Usuń konto zabezpieczonego folderu';
 $wb['login_as_txt'] = 'Zaloguj jako';
 ?>
+

interface/web/admin/form/server_config.tform.php

@@ -211,19 +211,6 @@ $form["tabs"]['mail'] = array(
 			'width' => '40',
 			'maxlength' => '255'
 		),
-                'dkim_path' => array(
-                        'datatype' => 'VARCHAR',
-                        'formtype' => 'TEXT',
-                        'default' => '/var/db/dkim',
-                        'validators'    => array (  0 => array ('type'  => 'CUSTOM',
-                                                                'class' => 'validate_dkim',
-                                                                'function' => 'check_dkim_path',
-                                                                'errmsg'=> 'dkim_path_error'),
-                                                 ),
-                        'value' => '',
-                        'width' => '40',
-                        'maxlength' => '255'
-                ),
 		'pop3_imap_daemon' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',

interface/web/admin/form/system_config.tform.php

@@ -214,7 +214,7 @@ $form["tabs"]['mail'] = array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 0 => array (	'type'	=> 'REGEX',
-                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}(\?.+)?$/',
+                                                                'regex' => '/^[0-9a-zA-Z\:\/\-\.]{0,255}$/',
                                                                 'errmsg'=> 'webmail_url_error_regex'),
                                                 ),
 			'default'	=> '',