Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/remoting.inc.php
	server/cron_daily.php

Author: Marius Cramer

install/dist/lib/fedora.lib.php

@@ -226,8 +226,8 @@ function configure_postfix($options = '')
 		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('/etc/mailman/virtual-mailman')) touch('/etc/mailman/virtual-mailman');
+		exec('postmap /etc/mailman/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');
 

install/sql/incremental/upd_0066.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `sys_config` DROP `config_id`,
+	ADD PRIMARY KEY (`group`, `name`);

install/sql/ispconfig3.sql

@@ -1486,10 +1486,10 @@ CREATE TABLE `support_message` (
 --
 
 CREATE TABLE `sys_config` (
-  `config_id` int(11) unsigned NOT NULL,
   `group` varchar(64) NOT NULL,
   `name` varchar(64) NOT NULL,
-  `value` varchar(255) NOT NULL
+  `value` varchar(255) NOT NULL,
+  PRIMARY KEY (`group`, `name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 
@@ -2280,7 +2280,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.3');
-INSERT INTO sys_config VALUES ('2','interface','session_timeout','0');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.3');
+INSERT INTO sys_config VALUES ('interface','session_timeout','0');
 
 SET FOREIGN_KEY_CHECKS = 1;

install/tpl/fedora_postfix.conf.master

@@ -1,5 +1,5 @@
 virtual_alias_domains =
-virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
+virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf, hash:/etc/mailman/virtual-mailman
 virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
 virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
 virtual_mailbox_base = {vmail_mailbox_base}

interface/lib/app.inc.php

@@ -48,14 +48,16 @@ class app {
 	private $_wb;
 	private $_loaded_classes = array();
 	private $_conf;
+	
+	public $loaded_plugins = array();
 
 	public function __construct() {
 		global $conf;
 
 		if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
 			die('Internal Error: var override attempt detected');
 		}
-
+		
 		$this->_conf = $conf;
 		if($this->_conf['start_db'] == true) {
 			$this->load('db_'.$this->_conf['db_type']);
@@ -66,26 +68,26 @@ public function __construct() {
 		if($this->_conf['start_session'] == true) {
 
 			$this->uses('session');
-			$tmp = $this->db->queryOneRecord("SELECT `value` FROM sys_config WHERE `config_id` = 2 AND `group` = 'interface' AND `name` = 'session_timeout'");
-			if($tmp && $tmp['value'] > 0) {
+			$sess_timeout = $this->conf('interface', 'session_timeout');
+			if($sess_timeout) {
 				/* check if user wants to stay logged in */
 				if(isset($_POST['s_mod']) && isset($_POST['s_pg']) && $_POST['s_mod'] == 'login' && $_POST['s_pg'] == 'index' && isset($_POST['stay']) && $_POST['stay'] == '1') {
 					/* check if staying logged in is allowed */
 					$this->uses('ini_parser');
 					$tmp = $this->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
 					$tmp = $this->ini_parser->parse_ini_string(stripslashes($tmp['config']));
 					if(!isset($tmp['misc']['session_allow_endless']) || $tmp['misc']['session_allow_endless'] != 'y') {
-						$this->session->set_timeout($tmp['value']);
-						session_set_cookie_params(($tmp['value'] * 60) + 300); // make the cookie live 5 minutes longer
+						$this->session->set_timeout($sess_timeout);
+						session_set_cookie_params(($sess_timeout * 60) + 300); // make the cookie live 5 minutes longer
 					} else {
 						// we are doing login here, so we need to set the session data
 						$this->session->set_permanent(true);
 						$this->session->set_timeout(365 * 24 * 3600); // one year
 						session_set_cookie_params(365 * 24 * 3600); // make the cookie live 5 minutes longer
 					}
 				} else {
-					$this->session->set_timeout($tmp['value']);
-					session_set_cookie_params(($tmp['value'] * 60) + 300); // make the cookie live 5 minutes longer
+					$this->session->set_timeout($sess_timeout);
+					session_set_cookie_params(($sess_timeout * 60) + 300); // make the cookie live 5 minutes longer
 				}
 			} else {
 				session_set_cookie_params(0); // until browser is closed
@@ -110,6 +112,14 @@ public function __construct() {
 		$this->uses('auth,plugin');
 	}
 
+	public function __get($prop) {
+		if(property_exists($this, $prop)) return $this->{$prop};
+		
+		$this->uses($prop);
+		if(property_exists($this, $prop)) return $this->{$prop};
+		else return null;
+	}
+	
 	public function __destruct() {
 		session_write_close();
 	}
@@ -120,7 +130,7 @@ public function uses($classes) {
 			foreach($cl as $classname) {
 				$classname = trim($classname);
 				//* Class is not loaded so load it
-				if(!array_key_exists($classname, $this->_loaded_classes)) {
+				if(!array_key_exists($classname, $this->_loaded_classes) && is_file(ISPC_CLASS_PATH."/$classname.inc.php")) {
 					include_once ISPC_CLASS_PATH."/$classname.inc.php";
 					$this->$classname = new $classname();
 					$this->_loaded_classes[$classname] = true;
@@ -138,6 +148,22 @@ public function load($files) {
 			}
 		}
 	}
+	
+	public function conf($plugin, $key, $value = null) {
+		if(is_null($value)) {
+			$tmpconf = $this->db->queryOneRecord("SELECT `value` FROM `sys_config` WHERE `group` = '" . $this->db->quote($plugin) . "' AND `name` = '" . $this->db->quote($key) . "'");
+			if($tmpconf) return $tmpconf['value'];
+			else return null;
+		} else {
+			if($value === false) {
+				$this->db->query("DELETE FROM `sys_config` WHERE `group` = '" . $this->db->quote($plugin) . "' AND `name` = '" . $this->db->quote($key) . "'");
+				return null;
+			} else {
+				$this->db->query("REPLACE INTO `sys_config` (`group`, `name`, `value`) VALUES ('" . $this->db->quote($plugin) . "', '" . $this->db->quote($key) . "', '" . $this->db->quote($value) . "')");
+				return $value;
+			}
+		}
+	}
 
 	/** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */
 

interface/web/admin/lib/remote.conf.php

@@ -1,6 +1,6 @@
 <?php
 
-$function_list['server_get,get_function_list,client_templates_get_all,server_get_serverid_by_ip,server_ip_add,server_ip_update,server_ip_delete'] = 'Server functions';
+$function_list['server_get,get_function_list,client_templates_get_all,server_get_serverid_by_ip,server_ip_get,server_ip_add,server_ip_update,server_ip_delete'] = 'Server functions';
 $function_list['admin_record_permissions'] = 'Record permission changes';
 
 ?>

interface/web/admin/system_config_edit.php

@@ -156,8 +156,7 @@ function onUpdateSave($sql) {
 		} elseif($section == 'mail') {
 			if($new_config['smtp_pass'] == '') $new_config['smtp_pass'] = $server_config_array['mail']['smtp_pass'];
 		} elseif($section == 'misc' && $new_config['session_timeout'] != $server_config_array['misc']['session_timeout']) {
-			$app->db->query("DELETE FROM sys_config WHERE `config_id` = 2 AND `group` = 'interface' AND `name` = 'session_timeout'");
-			$app->db->query("INSERT INTO sys_config (`config_id`, `group`, `name`, `value`) VALUES (2, 'interface', 'session_timeout', '" . intval($new_config['session_timeout']) . "')");
+			$app->conf('interface', 'session_timeout', intval($new_config['session_timeout']));
 		}
 		$server_config_array[$section] = $new_config;
 		$server_config_str = $app->ini_parser->get_ini_string($server_config_array);

interface/web/tools/lib/lang/en_resync.lng

@@ -9,6 +9,7 @@ $wb['resync_db_txt'] = 'Resync clientdb config';
 $wb['resync_mailbox_txt'] = 'Resync Mailboxes';
 $wb['resync_dkim_txt'] = 'Resync DKIM-Keys';
 $wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['resync_client_txt'] = 'Resync Client records';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
 ?>

interface/web/tools/resync.php

@@ -106,6 +106,16 @@
 
 //* Resyncing Databases
 if(isset($_POST['resync_db']) && $_POST['resync_db'] == 1) {
+	$db_table = 'web_database_user';
+	$index_field = 'database_user_id';
+	$sql = "SELECT * FROM ".$db_table." WHERE 1";
+	$records = $app->db->queryAllRecords($sql);
+	if(is_array($records)) {
+		foreach($records as $rec) {
+			$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
+			$msg .= "Resynced Database user: ".$rec['database_user'].'<br />';
+		}
+	}
 	$db_table = 'web_database';
 	$index_field = 'database_id';
 	$sql = "SELECT * FROM ".$db_table." WHERE active = 'y'";
@@ -144,6 +154,16 @@
 			$msg .= "Resynced Mailbox: ".$rec['email'].'<br />';
 		}
 	}
+	$db_table = 'mail_forwarding';
+	$index_field = 'forwarding_id';
+	$sql = "SELECT * FROM ".$db_table;
+	$records = $app->db->queryAllRecords($sql);
+	if(is_array($records)) {
+		foreach($records as $rec) {
+			$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
+			$msg .= "Resynced Alias: ".$rec['source'].'<br />';
+		}
+	}
 }
 
 //* Resyncing DKIM-Keys
@@ -183,6 +203,31 @@
 
 }
 
+//* Resyncing Clients
+if(isset($_POST['resync_client']) && $_POST['resync_client'] == 1) {
+	$tform_def_file = "form/client.tform.php";
+	$app->uses('tpl,tform,tform_actions');
+	$app->load('tform_actions');
+	
+	$db_table = 'client';
+	$index_field = 'client_id';
+	$sql = "SELECT * FROM ".$db_table;
+	$records = $app->db->queryAllRecords($sql);
+	if(is_array($records)) {
+		foreach($records as $rec) {
+			$app->db->datalogUpdate($db_table, $rec, $index_field, $rec[$index_field], true);
+			$tmp = new tform_actions;
+			$tmp->id = $rec[$index_field];
+			$tmp->dataRecord = $rec;
+			$tmp->oldDataRecord = $rec;
+			$app->plugin->raiseEvent('client:client:on_after_update', $tmp);
+			$msg .= "Resynced Client: ".$rec['contact_name'].'<br />';
+			unset($tmp);
+		}
+	}
+}
+
+
 $app->tpl->setVar('msg', $msg);
 $app->tpl->setVar('error', $error);
 

interface/web/tools/templates/resync.htm

@@ -52,6 +52,12 @@ <h2><tmpl_var name="head_txt"></h2>
                 <div class="multiField">
                     <input id="resync_dns" type="checkbox" value="1" name="resync_dns" />
                 </div>
+            </div>
+			<div class="ctrlHolder">
+                <p class="label">{tmpl_var name="resync_client_txt"}</p>
+                <div class="multiField">
+                    <input id="resync_client" type="checkbox" value="1" name="resync_client" />
+                </div>
             </div>
         </fieldset>