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

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/de_system_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/client/lib/lang/en_client.lng
	interface/web/client/lib/lang/en_reseller.lng
	interface/web/login/lib/lang/de.lng
	interface/web/mail/form/mail_user.tform.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mail/lib/lang/en_mail_user.lng
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
	interface/web/sites/web_domain_edit.php
	server/cron_daily.php
	server/plugins-available/backup_plugin.inc.php

Author: Marius Cramer

install/lib/install.lib.php

@@ -811,6 +811,8 @@ function get_system_timezone() {
 		exec('date +%Z', $tzinfo);
 		$timezone = $tzinfo[0];
 	}
+	
+	if(substr($timezone, 0, 1) === '/') $timezone = substr($timezone, 1);
 
 	return $timezone;
 }

install/sql/ispconfig3.sql

@@ -236,6 +236,11 @@ CREATE TABLE `client` (
   `tmp_data` mediumblob,
   `id_rsa` varchar(2000) NOT NULL DEFAULT '',
   `ssh_rsa` varchar(600) NOT NULL DEFAULT '',
+  `customer_no_template` varchar(255) DEFAULT 'C[CUSTOMER_NO]',
+  `customer_no_start` int(11) NOT NULL DEFAULT '1',
+  `customer_no_counter` int(11) NOT NULL DEFAULT '0',
+  `added_date` date NOT NULL DEFAULT '0000-00-00',
+  `added_by` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`client_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
@@ -977,7 +982,7 @@ CREATE TABLE IF NOT EXISTS `openvz_ostemplate` (
 -- Dumping data for table `openvz_ostemplate`
 --
 
-INSERT INTO `openvz_ostemplate` (`ostemplate_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `template_file`, `server_id`, `allservers`, `active`, `description`) VALUES(1, 1, 1, 'riud', 'riud', '', 'Debian minimal', 'debian-minimal-x86', 1, 'y', 'y', 'Debain minmal image.');
+INSERT INTO `openvz_ostemplate` (`ostemplate_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `template_name`, `template_file`, `server_id`, `allservers`, `active`, `description`) VALUES(1, 1, 1, 'riud', 'riud', '', 'Debian minimal', 'debian-minimal-x86', 1, 'y', 'y', 'Debian minimal image.');
 
 -- --------------------------------------------------------
 
@@ -1606,6 +1611,7 @@ CREATE TABLE `sys_session` (
   `session_id` varchar(64) NOT NULL DEFAULT '',
   `date_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `last_updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `permanent` enum('n','y') NOT NULL DEFAULT 'n',
   `session_data` longtext,
   PRIMARY KEY (`session_id`),
   KEY `last_updated` (`last_updated`)
@@ -1820,12 +1826,15 @@ CREATE TABLE `web_domain` (
   `custom_php_ini` mediumtext,
   `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none',
   `backup_copies` INT NOT NULL DEFAULT '1',
+  `backup_excludes` mediumtext,
   `active` enum('n','y') NOT NULL default 'y',
   `traffic_quota_lock` enum('n','y') NOT NULL default 'n',
   `fastcgi_php_version` varchar(255) DEFAULT NULL,
   `proxy_directives` mediumtext,
   `last_quota_notification` date NULL default NULL,
   `rewrite_rules` mediumtext,
+  `added_date` date NOT NULL DEFAULT '0000-00-00',
+  `added_by` varchar(255) DEFAULT NULL,
   PRIMARY KEY  (`domain_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
@@ -2240,5 +2249,6 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 --
 
 INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.3');
+INSERT INTO sys_config VALUES ('2','interface','session_timeout','0');
 
 SET FOREIGN_KEY_CHECKS = 1;

install/tpl/apache_apps.vhost.master

@@ -11,6 +11,10 @@
   ServerAdmin webmaster@localhost
   {apps_vhost_servername}
 
+  <FilesMatch "\.ph(p3?|tml)$">
+    SetHandler None
+  </FilesMatch>
+  
   <IfModule mod_php5.c>
     DocumentRoot {apps_vhost_dir}
     AddType application/x-httpd-php .php
@@ -31,12 +35,11 @@
       AllowOverride AuthConfig Indexes Limit Options FileInfo
       AddHandler fcgid-script .php
       FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
+	  # FcgidBusyTimeout 3600
       Order allow,deny
       Allow from all
     </Directory>
   </IfModule>
-  
-  ServerSignature Off
 
 </VirtualHost>
 

install/tpl/server.ini.master

@@ -16,6 +16,8 @@ firewall=bastille
 loglevel=2
 admin_notify_events=1
 backup_dir=/var/backup
+backup_dir_is_mount=n
+backup_dir_mount_cmd=
 backup_mode=rootgz
 monit_url=
 monit_user=

install/tpl/system.ini.master

@@ -47,3 +47,8 @@ reseller_dashlets_left=
 reseller_dashlets_right=
 client_dashlets_left=
 client_dashlets_right=
+customer_no_template=C[CUSTOMER_NO]
+customer_no_start=1
+customer_no_counter=0
+session_timeout=0
+session_allow_endless=0

interface/lib/app.inc.php

@@ -66,6 +66,31 @@ 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) {
+				/* 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
+					} 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
+				}
+			} else {
+				session_set_cookie_params(0); // until browser is closed
+			}
+			
 			session_set_save_handler( array($this->session, 'open'),
 				array($this->session, 'close'),
 				array($this->session, 'read'),
@@ -74,7 +99,7 @@ public function __construct() {
 				array($this->session, 'gc'));
 
 			session_start();
-
+			
 			//* Initialize session variables
 			if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();
 			if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];

interface/lib/classes/aps_guicontroller.inc.php

@@ -155,6 +155,7 @@ public function getNewestPackageID($id)
             CONCAT(version, '-', CAST(`release` AS CHAR)) AS current_version
             FROM aps_packages
             WHERE name = (SELECT name FROM aps_packages WHERE id = ".$app->db->quote($id).")
+            AND package_status = 2
             ORDER BY REPLACE(version, '.', '')+0 DESC, `release` DESC");
 
 		if(!empty($result) && ($id != $result['id'])) return $result['id'];

interface/lib/classes/ispcmail.inc.php

@@ -697,11 +697,11 @@ public function send($recipients) {
 				$recipname = $this->_encodeHeader($recipname, $this->mail_charset);
 
 				//Email From
-				fputs($this->_smtp_conn, 'MAIL FROM: ' . $this->_mail_sender . $this->_crlf);
+				fputs($this->_smtp_conn, 'MAIL FROM: <' . $this->_mail_sender . '>' . $this->_crlf);
 				$response = fgets($this->_smtp_conn, 515);
 
 				//Email To
-				fputs($this->_smtp_conn, 'RCPT TO: ' . $recip . $this->_crlf);
+				fputs($this->_smtp_conn, 'RCPT TO: <' . $recip . '>' . $this->_crlf);
 				$response = fgets($this->_smtp_conn, 515);
 
 				//The Email

interface/lib/classes/session.inc.php

@@ -32,9 +32,22 @@ class session {
 
 	private $session_array = array();
 	private $db;
+	private $timeout = 0;
+	private $permanent = false;
 
-	function __construct() {
+	function __construct($session_timeout = 0) {
 		$this->db = new db;
+		$this->timeout = $session_timeout;
+	}
+	
+	function set_timeout($session_timeout = 0) {
+		$old_timeout = $this->timeout;
+		$this->timeout = $session_timeout;
+		return $old_timeout;
+	}
+	
+	function set_permanent($value = false) {
+		$this->permanent = $value;
 	}
 
 	function open ($save_path, $session_name) {
@@ -51,8 +64,12 @@ function close () {
 	}
 
 	function read ($session_id) {
-
-		$rec = $this->db->queryOneRecord("SELECT * FROM sys_session WHERE session_id = '".$this->db->quote($session_id)."'");
+		
+		if($this->timeout > 0) {
+			$rec = $this->db->queryOneRecord("SELECT * FROM sys_session WHERE session_id = '".$this->db->quote($session_id)."' AND (`permanent` = 'y' OR last_updated >= DATE_SUB(NOW(), INTERVAL " . intval($this->timeout) . " MINUTE))");
+		} else {
+			$rec = $this->db->queryOneRecord("SELECT * FROM sys_session WHERE session_id = '".$this->db->quote($session_id)."'");
+		}
 
 		if (is_array($rec)) {
 			$this->session_array = $rec;
@@ -82,14 +99,14 @@ function write ($session_id, $session_data) {
 			$date_created = date('Y-m-d H:i:s');
 			$last_updated = date('Y-m-d H:i:s');
 			$session_data = $this->db->quote($session_data);
-			$sql = "INSERT INTO sys_session (session_id,date_created,last_updated,session_data) VALUES ('$session_id','$date_created','$last_updated','$session_data')";
+			$sql = "INSERT INTO sys_session (session_id,date_created,last_updated,session_data,permanent) VALUES ('$session_id','$date_created','$last_updated','$session_data','" . ($this->permanent ? 'y' : 'n') . "')";
 			$this->db->query($sql);
 
 		} else {
 			$session_id   = $this->db->quote($session_id);
 			$last_updated = date('Y-m-d H:i:s');
 			$session_data = $this->db->quote($session_data);
-			$sql = "UPDATE sys_session SET last_updated = '$last_updated', session_data = '$session_data' WHERE session_id = '$session_id'";
+			$sql = "UPDATE sys_session SET last_updated = '$last_updated', session_data = '$session_data'" . ($this->permanent ? ", `permanent` = 'y'" : "") . " WHERE session_id = '$session_id'";
 			$this->db->query($sql);
 
 		}
@@ -108,12 +125,23 @@ function destroy ($session_id) {
 
 	function gc ($max_lifetime) {
 
-		$real_now = date('Y-m-d H:i:s');
-		$dt1 = strtotime("$real_now -$max_lifetime seconds");
-		$dt2 = date('Y-m-d H:i:s', $dt1);
+		/*if($this->timeout > 0) {
+			$this->db->query("DELETE FROM sys_session WHERE last_updated < DATE_SUB(NOW(), INTERVAL " . intval($this->timeout) . " MINUTE)");
+		} else {*/
+			$real_now = date('Y-m-d H:i:s');
+			$dt1 = strtotime("$real_now -$max_lifetime seconds");
+			$dt2 = date('Y-m-d H:i:s', $dt1);
 
-		$sql = "DELETE FROM sys_session WHERE last_updated < '$dt2'";
-		$this->db->query($sql);
+			$sql = "DELETE FROM sys_session WHERE last_updated < '$dt2' AND `permanent` != 'y'";
+			$this->db->query($sql);
+			
+			/* delete very old even if they are permanent */
+			$dt1 = strtotime("$real_now -365 days");
+			$dt2 = date('Y-m-d H:i:s', $dt1);
+
+			$sql = "DELETE FROM sys_session WHERE last_updated < '$dt2'";
+			$this->db->query($sql);
+		//}
 
 		return true;
 

interface/lib/config.inc.php

@@ -44,14 +44,14 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.2');
+define('ISPC_APP_VERSION', '3.0.5.3');
 define('DEVSYSTEM', 0);
 
 
 //** Database
 $conf['db_type'] = 'mysql';
 $conf['db_host'] = 'localhost';
-$conf['db_database'] = 'ispconfig3';
+$conf['db_database'] = 'ispconfig3_305';
 $conf['db_user'] = 'root';
 $conf['db_password'] = '';
 $conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")