setting version to 0.9.33.2 for bugfix release

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

install/froxlor.sql

@@ -538,7 +538,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'password_numeric', '0'),
 	('panel', 'password_special_char_required', '0'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
-	('panel', 'version', '0.9.33.1');
+	('panel', 'version', '0.9.33.2');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -2900,3 +2900,11 @@ if (isFroxlorVersion('0.9.33')) {
         updateToVersion('0.9.33.1');
 
 }
+
+if (isFroxlorVersion('0.9.33.1')) {
+
+        showUpdateStep("Updating from 0.9.33.1 to 0.9.33.2");
+        lastStepStatus(0);
+        updateToVersion('0.9.33.2');
+
+}

lib/classes/database/class.Database.php

@@ -224,7 +224,7 @@ class Database {
 				&& isset($sql['root_password'])
 				&& (!isset($sql_root) || !is_array($sql_root))
 		) {
-			$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password']));
+			$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'socket' => (isset($sql['socket']) ? $sql['socket'] : null), 'user' => $sql['root_user'], 'password' => $sql['root_password']));
 			unset($sql['root_user']);
 			unset($sql['root_password']);
 		}
@@ -235,11 +235,15 @@ class Database {
 			$user = $sql_root[self::$_dbserver]['user'];
 			$password = $sql_root[self::$_dbserver]['password'];
 			$host = $sql_root[self::$_dbserver]['host'];
+			$socket = isset($sql_root[self::$_dbserver]['socket']) ? $sql_root[self::$_dbserver]['socket'] : null;
+			$port = isset($sql_root[self::$_dbserver]['port']) ? $sql_root[self::$_dbserver]['port'] : '3306';
 		} else {
 			$caption = 'localhost';
 			$user = $sql["user"];
 			$password = $sql["password"];
 			$host = $sql["host"];
+			$socket = isset($sql['socket']) ? $sql['socket'] : null;
+			$port = isset($sql['port']) ? $sql['port'] : '3306';
 		}
 
 		// save sql-access-data if needed
@@ -248,6 +252,8 @@ class Database {
 					'user' => $user,
 					'passwd' => $password,
 					'host' => $host,
+					'port' => $port,
+					'socket' => $socket,
 					'db' => $sql["db"],
 					'caption' => $caption
 			);
@@ -264,10 +270,11 @@ class Database {
 				'charset' => 'utf8'
 		);
 
-		if (!validateLocalHostname($host) && !validate_ip2($host, true, 'invalidip', true, true)) {
-			$dbconf["dsn"]['unix_socket'] = makeCorrectFile($host);
+		if ($socket != null) {
+			$dbconf["dsn"]['unix_socket'] = makeCorrectFile($socket);
 		} else {
 			$dbconf["dsn"]['host'] = $host;
+			$dbconf["dsn"]['port'] = $port;
 		}
 
 		self::$_dbname = $sql["db"];
@@ -305,6 +312,32 @@ class Database {
 	private static function _showerror($error, $showerror = true) {
 		global $userinfo, $theme, $linker;
 
+		// include userdata.inc.php
+		require FROXLOR_INSTALL_DIR."/lib/userdata.inc.php";
+
+		// le format
+		if (isset($sql['root_user'])
+		    && isset($sql['root_password'])
+		    && (!isset($sql_root) || !is_array($sql_root))
+		) {
+		    $sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'socket' => (isset($sql['socket']) ? $sql['socket'] : null), 'user' => $sql['root_user'], 'password' => $sql['root_password']));
+		}
+
+		// hide username/password in messages
+		$error_message = $error->getMessage();
+		$error_trace = $error->getTraceAsString();
+		// error-message
+		$error_message = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_message);
+		$error_message = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_message);
+		// error-trace
+		$error_trace = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_trace);
+		$error_trace = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_trace);
+
+		if ($error->getCode() == 2003) {
+		    $error_message = "Unable to connect to database. Either the mysql-server is not running or your user/password is wrong.";
+		    $error_trace = "";
+		}
+
 		/**
 		 * log to a file, so we can actually ask people for the error
 		 * (no one seems to find the stuff in the syslog)
@@ -313,11 +346,10 @@ class Database {
 		if (!file_exists($sl_dir)) {
 			@mkdir($sl_dir, 0755);
 		}
-		$sl_file = makeCorrectFile($sl_dir."/sql-error.log");
-		$sqllog = @fopen($sl_file, 'a');
-		@fwrite($sqllog, date('d.m.Y H:i', time())." --- ".str_replace("\n", " ", $error->getMessage())."\n");
-		@fwrite($sqllog, date('d.m.Y H:i', time())." --- DEBUG: \n".$error->getTraceAsString()."\n");
-		@fclose($sqllog);
+		openlog("froxlor", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+		syslog(LOG_WARNING, str_replace("\n", " ", $error_message));
+		syslog(LOG_WARNING, str_replace("\n", " ", "--- DEBUG: ".$error_trace));
+		closelog();
 
 		/**
 		 * log error for reporting
@@ -326,38 +358,17 @@ class Database {
 		$err_file = makeCorrectFile($sl_dir."/".$errid."_sql-error.log");
 		$errlog = @fopen($err_file, 'w');
 		@fwrite($errlog, "|CODE ".$error->getCode()."\n");
-		@fwrite($errlog, "|MSG ".$error->getMessage()."\n");
+		@fwrite($errlog, "|MSG ".$error_message."\n");
 		@fwrite($errlog, "|FILE ".$error->getFile()."\n");
 		@fwrite($errlog, "|LINE ".$error->getLine()."\n");
-		@fwrite($errlog, "|TRACE\n".$error->getTraceAsString()."\n");
+		@fwrite($errlog, "|TRACE\n".$error_trace."\n");
 		@fclose($errlog);
 
 		if ($showerror) {
 
-			// include userdata.inc.php
-			require FROXLOR_INSTALL_DIR."/lib/userdata.inc.php";
-
 			// fallback
 			$theme = 'Sparkle';
 
-			// le format
-			if (isset($sql['root_user'])
-				&& isset($sql['root_password'])
-				&& (!isset($sql_root) || !is_array($sql_root))
-			) {
-				$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password']));
-			}
-
-			// hide username/password in messages
-			$error_message = $error->getMessage();
-			$error_trace = $error->getTraceAsString();
-			// error-message
-			$error_message = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_message);
-			$error_message = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_message);
-			// error-trace
-			$error_trace = str_replace($sql['password'], 'DB_UNPRIV_PWD', $error_trace);
-			$error_trace = str_replace($sql_root[0]['password'], 'DB_ROOT_PWD', $error_trace);
-
 			// clean up sensitive data
 			unset($sql);
 			unset($sql_root);
@@ -388,7 +399,8 @@ class Database {
 					die($err_hint);
 				}
 			}
-			die("We are sorry, but a MySQL - error occurred. The administrator may find more information in in the sql-error.log in the logs/ directory");
+			die("We are sorry, but a MySQL - error occurred. The administrator may find more information in the syslog");
 		}
 	}
 }
+

lib/tables.inc.php

@@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings');
 define('TABLE_DOMAINTOIP', 'panel_domaintoip');
 
 // VERSION INFO
-$version = '0.9.33.1';
+$version = '0.9.33.2';
 $dbversion = '2';
 $branding = '';

scripts/froxlor_master_cronjob.php

@@ -47,6 +47,8 @@ for ($x = 1; $x < count($argv); $x++) {
 			// really force re-generating of config-files by
 			// inserting task 1
 			inserttask('1');
+			// bind (if enabled, inserttask() checks this)
+			inserttask('4');
 			// also regenerate cron.d-file
 			inserttask('99');
 			addToQueue($jobs_to_run, $crontasks);

scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php

@@ -58,7 +58,12 @@ class apache_fcgid extends apache
 					$php_options_text.= '    </FilesMatch>' . "\n";
 					// >=apache-2.4 enabled?
 					if (Settings::Get('system.apache24') == '1') {
-						$php_options_text.= '    Require all granted' . "\n";
+					    $mypath_dir = new frxDirectory($domain['documentroot']);
+					    // only create the require all granted if there is not active directory-protection
+					    // for this path, as this would be the first require and therefore grant all access
+					    if ($mypath_dir->isUserProtected() == false) {
+						    $php_options_text.= '    Require all granted' . "\n";
+					    }
 					} else {
 						$php_options_text.= '    Order allow,deny' . "\n";
 						$php_options_text.= '    allow from all' . "\n";
@@ -90,7 +95,12 @@ class apache_fcgid extends apache
 					$php_options_text.= '    </FilesMatch>' . "\n";
 					// >=apache-2.4 enabled?
 					if (Settings::Get('system.apache24') == '1') {
-						$php_options_text.= '    Require all granted' . "\n";
+					    $mypath_dir = new frxDirectory($domain['documentroot']);
+					    // only create the require all granted if there is not active directory-protection
+					    // for this path, as this would be the first require and therefore grant all access
+					    if ($mypath_dir->isUserProtected() == false) {
+						    $php_options_text.= '    Require all granted' . "\n";
+					    }
 					} else {
 						$php_options_text.= '    Order allow,deny' . "\n";
 						$php_options_text.= '    allow from all' . "\n";

templates/Sparkle/webftp/webftp_navigation_element.tpl

@@ -0,0 +1,13 @@
+<div class="menuelement">
+        <h4>
+                {if $navurl != '#'}
+                        <a href="{$navurl}" {$target} class="menu">{$navlabel}</a>
+                {else}
+                        {$navlabel}
+                {/if}
+        </h4>
+        <ul>
+                {$navigation_links}
+        </ul>
+</div>
+

templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_10-master.conf

@@ -102,6 +102,7 @@ service auth {
   unix_listener auth-client {
     mode = 0660
     user = mail
+    group = Debian-exim
   }
 
   # Auth process is run as this user.

webftp.php

@@ -664,15 +664,24 @@ if (isset($_GET['logoff']) || isset($_POST['logoff'])) {
 				$body .= $smarty->fetch('webftp/webftp_main_multiple.tpl');
 			}
 		}
-		$smarty->assign('completeLink', '<a href="webftp.php?logoff=true">' . _('Logout') . '</a>');
-		$navlinks = $smarty->fetch('navigation_link.tpl');
-		$smarty->assign('completeLink', '<a href="webftp.php?webftp.php?action=mode&amp;mode=FTP_BINARY&amp;currentDir=' . $currentDir . '">' . _('Switch to BINARY mode') . '</a>');
-		$navlinks .= $smarty->fetch('navigation_link.tpl');
-		$smarty->assign('completeLink', '<a href="webftp.php?webftp.php?action=mode&amp;mode=FTP_ASCII&amp;currentDir=' . $currentDir . '">' . _('Switch to ASCII mode') . '</a>');
-		$navlinks .= $smarty->fetch('navigation_link.tpl');
-		$smarty->assign('completeLink', _('Main'));
-		$smarty->assign('navigation_links', $navlinks);
-		$smarty->assign('navigation', $smarty->fetch('navigation_element.tpl'));
+
+                $smarty->assign('target', '');
+                $smarty->assign('active', '');
+
+                $smarty->assign('navurl', 'webftp.php?logoff=true');
+                $smarty->assign('navlabel', _('Logout'));
+                $navlinks = $smarty->fetch('navigation_link.tpl');
+                $smarty->assign('navurl', 'webftp.php?webftp.php?action=mode&amp;mode=FTP_BINARY&amp;currentDir=' . $currentDir);
+                $smarty->assign('navlabel', _('Switch to BINARY mode'));
+                $navlinks .= $smarty->fetch('navigation_link.tpl');
+                $smarty->assign('navurl', 'webftp.php?webftp.php?action=mode&amp;mode=FTP_ASCII&amp;currentDir=' . $currentDir);
+                $smarty->assign('navlabel', _('Switch to ASCII mode'));
+                $navlinks .= $smarty->fetch('navigation_link.tpl');
+                $smarty->assign('navlabel', _('Main'));
+                $smarty->assign('navurl', "#");
+                $smarty->assign('navigation_links', $navlinks);
+                $smarty->assign('navigation', $smarty->fetch('webftp/webftp_navigation_element.tpl'));
+
 	}
 	else {
 		$smarty->assign('errormessage', _('Login failed, please try again') . "\n");