Tagging froxlor 0.9.13

actions/admin/settings/135.fcgid.php

@@ -28,6 +28,30 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
+					),
+				'system_mod_fcgid_enabled_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_ownvhost',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_fcgid_httpuser' => array(
+					'label' => $lng['admin']['mod_fcgid_user'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_httpuser',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField',
+					),
+				'system_mod_fcgid_httpgroup' => array(
+					'label' => $lng['admin']['mod_fcgid_group'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_httpgroup',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField',
 					),					
 				'system_mod_fcgid_configdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
@@ -93,43 +117,9 @@ return array(
 					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
 					),
-				'system_mod_fcgid_enabled_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_ownvhost',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_httpuser' => array(
-					'label' => $lng['admin']['mod_fcgid_user'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpuser',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_httpgroup' => array(
-					'label' => $lng['admin']['mod_fcgid_group'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpgroup',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_defaultini_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_defaultini_ownvhost',
-					'type' => 'option',
-					'default' => '1',
-					'option_mode' => 'one',
-					'option_options_method' => 'getPhpConfigs',
-					'save_method' => 'storeSettingField',
-					),
-				)
-			)
-		)
+				),
+			),
+		),
 	);
 
 ?>

admin_customers.php

@@ -751,7 +751,7 @@ if($page == 'customers'
 
 				while(list($language_file, $language_name) = each($languages))
 				{
-					$language_options.= makeoption($language_name, $language_file, $settings['panel']['standardlanguage'], true);
+					$language_options.= makeoption($language_name, $language_file, $userinfo['def_language'], true);
 				}
 
 				$diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);

install/froxlor.sql

@@ -460,7 +460,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.13.1');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.13');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');
@@ -589,7 +589,6 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (149, 'perl', 'suexecworkaround', '0');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (150, 'perl', 'suexecpath', '/var/www/cgi-bin/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (151, 'system', 'awstats_awstatspath', '/usr/bin/');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (152, 'system', 'mod_fcgid_defaultini_ownvhost', '1');
 
 # --------------------------------------------------------
 

install/install.php

@@ -705,7 +705,6 @@ if(isset($_POST['installstep'])
 		`password` = '" . md5($admin_pass1) . "',
 		`name` = 'Siteadmin',
 		`email` = 'admin@" . $db->escape($servername) . "',
-		`def_language` = '". $db->escape($languages[$language]) . "',
 		`customers` = -1,
 		`customers_used` = 0,
 		`customers_see_all` = 1,

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

@@ -1072,27 +1072,3 @@ if(isFroxlorVersion('0.9.13-svn1'))
 
 	updateToVersion('0.9.13');
 }
-
-if(isFroxlorVersion('0.9.13'))
-{
-	showUpdateStep("Updating from 0.9.13 to 0.9.13.1 final", false);
-
-	$update_defaultini_ownvhost = isset($_POST['update_defaultini_ownvhost']) ? (int)$_POST['update_defaultini_ownvhost'] : 1;	
-
-	showUpdateStep("Adding settings for Froxlor-vhost's PHP-configuration");
-	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mod_fcgid_defaultini_ownvhost', '".(int)$update_defaultini_ownvhost."');");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.13.1');
-}
-
-/**
- * be compatible with the few who already use 0.9.14-svn1
- */
-if(isFroxlorVersion('0.9.14-svn1'))
-{
-	showUpdateStep("Resetting version 0.9.14-svn1 to 0.9.13.1");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.13.1');
-}

install/updates/preconfig/0.9/preconfig_0.9.inc.php

@@ -291,23 +291,4 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 		}
 	}
-
-	if(versionInUpdate($current_version, '0.9.13.1'))
-	{
-		if((int)$settings['system']['mod_fcgid_ownvhost'] == 1)
-		{
-			$has_preconfig = true;
-			$description = 'You have FCGID for Froxlor itself activated. You can now specify a PHP-configuration for this.';
-			$question = '<strong>Select Froxlor-vhost PHP configuration:</strong>&nbsp;';
-			$question .= '<select name="update_defaultini_ownvhost">';
-			$configs_array = getPhpConfigs();
-			$configs = '';
-			foreach($configs_array as $idx => $desc)
-			{
-				$configs .= makeoption($desc, $idx, '1');
-			}
-			$question .= $configs.'</select>';
-			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
-		}
-	}
 }

lib/classes/ticket/class.ticket.php

@@ -87,7 +87,7 @@ class ticket
 		$this->tid = $tid;
 
 		// initialize purifier
-		require_once dirname(dirname(__FILE__)).'/htmlpurifier/library/HTMLPurifier.auto.php';
+		require_once '../htmlpurifier/library/HTMLPurifier.auto.php';
 		$this->_purifier = new HTMLPurifier();
 
 		// initialize data array

lib/tables.inc.php

@@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.13.1';
+$version = '0.9.13';
 $dbversion = '2';
 $branding = '';
 

lng/english.lng.php

@@ -548,7 +548,7 @@ $lng['panel']['back'] = 'Back';
 $lng['serversettings']['mod_log_sql']['title'] = 'Temporary save logs in the database';
 $lng['serversettings']['mod_log_sql']['description'] = 'Use <a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> to save webrequests temporarily<br /><b>This needs a special <a href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">apache-configuration</a>!</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'Include PHP via mod_fcgid/suexec';
-$lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.<br/><b>This needs a special Webserver configuration, see <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a></b>';
+$lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.<br/><b>This needs a special Webserver configuration. All following options are only valid if the module is enabled.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Use alternative email-address';
 $lng['serversettings']['sendalternativemail']['description'] = 'Send the password-email to a different address during email-account-creation';
 $lng['emails']['alternative_emailaddress'] = 'Alternative e-mail-address';
@@ -1456,7 +1456,7 @@ $lng['serversettings']['perl_path']['description'] = 'Only relevant if you use l
 // ADDED IN FROXLOR 0.9.12-svn1
 $lng['admin']['fcgid_settings'] = 'FCGID';
 $lng['serversettings']['mod_fcgid_ownvhost']['title'] = 'Enable FCGID for the Froxlor vhost';
-$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'If enabled, Froxlor will also be running under a local user';
+$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'If enabled, Froxlor will also be running under a local user<br /><strong>ATTENTION:</strong>This needs manual configuration, see <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a>';
 $lng['admin']['mod_fcgid_user'] = 'Local user to use for FCGID (Froxlor vhost)';
 $lng['admin']['mod_fcgid_group'] = 'Local group to use for FCGID (Froxlor vhost)';
 
@@ -1503,7 +1503,4 @@ $lng['admin']['store_defaultindex'] = 'Store default index-file to customers doc
 // ADDED IN FROXLOR 0.9.13-svn1
 $lng['customer']['autoresponder'] = 'Autoresponder';
 
-// ADDED IN FROXLOR 0.9.14-svn1
-$lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Default PHP configuration for Froxlor-vhost';
-
 ?>

lng/german.lng.php

@@ -578,7 +578,7 @@ $lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma g
 // CHANGED IN 1.2.18
 
 $lng['serversettings']['mod_log_sql']['description'] = '<a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> benutzen um die Webzugriffe tempor&auml;r zu speichern<br /><b>Dies ben&ouml;tigt eine spezielle <a href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - Dokumentation">Apache-Konfiguration</a></b>';
-$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen<br /><b>Dies ben&ouml;tigt eine spezielle Webserver-Konfiguration, siehe <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a>.</b>';
+$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen<br /><b>Dies ben&ouml;tigt eine spezielle Webserver-Konfiguration. Alle nachfolgenden Optionen sind nur g&uuml;ltig wenn das Modul aktiviert wird.</b>';
 
 // ADDED IN 1.2.18-svn1
 
@@ -1439,7 +1439,7 @@ $lng['serversettings']['perl_path']['description'] = 'Nur n&ouml;tig f&uuml;r li
 // ADDED IN FROXLOR 0.9.12-svn1
 $lng['admin']['fcgid_settings'] = 'FCGID';
 $lng['serversettings']['mod_fcgid_ownvhost']['title'] = 'Verwende FCGID im Froxlor Vhost';
-$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Wenn verwendet, wird Froxlor selbst unter einem lokalem Benutzer ausgef&uuml;hrt';
+$lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Wenn verwendet, wird Froxlor selbst unter einem lokalem Benutzer ausgef&uuml;hrt<br /><strong>ACHTUNG:</strong>Hierzu m&uuml;ssen noch zus&auml;tzliche Konfigurationen vorgenommen werden, siehe <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a>';
 $lng['admin']['mod_fcgid_user'] = 'Lokaler Benutzer f&uuml;r FCGID (Froxlor Vhost)';
 $lng['admin']['mod_fcgid_group'] = 'Lokale Gruppe f&uuml;r FCGID (Froxlor Vhost)';
 
@@ -1486,7 +1486,4 @@ $lng['admin']['store_defaultindex'] = 'Erstelle standard Index-Datei in Kunden-O
 // ADDED IN FROXLOR 0.9.13-svn1
 $lng['customer']['autoresponder'] = 'Abwesenheitsnachrichten';
 
-// ADDED IN FROXLOR 0.9.14-svn1
-$lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Voreingestellte PHP Konfiguration f&uuml;r den Froxlor-Vhost';
-
 ?>

scripts/jobs/cron_autoresponder.php

@@ -138,7 +138,7 @@ if($db->num_rows($result) > 0)
 						$to = $match[2];
 					}
 					elseif(!strlen($to)
-					       && preg_match("/^To:\s+(.*@.*)$/", $line, $match) 
+					       && preg_match("/To:\s+(.*@.*)$/", $line, $match)
 					) {
 						$to = $match[1];
 					}

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

@@ -286,7 +286,6 @@ class apache_fcgid extends apache
 			$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); // /var/www/froxlor, needed for chown
 			$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/froxlor.panel/');
 			$starter_filename = makeCorrectFile($configdir . '/php-fcgi-starter');
-			$phpini_filename = makeCorrectFile($configdir . '/php.ini');
 			$tmpdir = makeCorrectDir($this->settings['system']['mod_fcgid_tmpdir'] . '/froxlor.panel/');
 			
 			$user = $this->settings['system']['mod_fcgid_httpuser'];
@@ -311,8 +310,10 @@ class apache_fcgid extends apache
 				safe_exec('chmod 0750 ' . escapeshellarg($tmpdir));
 			}
 			
-			// get php.ini for our own vhost
-			$phpconfig = $this->getPhpConfig((int)$this->settings['system']['mod_fcgid_defaultini_ownvhost']); 
+			// we only need this for some basic, no special parameters that
+			// would require to maybe allow selecting a specific php.ini
+			// because we only need the binary and spawning parameters
+			$phpconfig = $this->getPhpConfig(0); 
 
 			// create starter
 			$starter_file = "#!/bin/sh\n\n";
@@ -357,37 +358,6 @@ class apache_fcgid extends apache
 			safe_exec('chmod 750 ' . escapeshellarg($starter_filename));
 			safe_exec('chown ' . $user . ':' . $group . ' ' . escapeshellarg($starter_filename));
 			setImmutable($starter_filename);
-
-			// define the php.ini
-
-			$php_ini_variables = array(
-				'SAFE_MODE' => 'Off',
-				'PEAR_DIR' => $this->settings['system']['mod_fcgid_peardir'],
-				'OPEN_BASEDIR' => 'none',
-				'OPEN_BASEDIR_C' => ';',
-				'OPEN_BASEDIR_GLOBAL' => '',
-				'TMP_DIR' => $tmpdir,
-				'CUSTOMER_EMAIL' => $this->settings['panel']['adminmail'],
-				'ADMIN_EMAIL' => $this->settings['panel']['adminmail'],
-				'DOMAIN' => $this->settings['system']['hostname'],
-				'CUSTOMER' => $user,
-				'ADMIN' => $user
-			);
-
-			//insert a small header for the file
-
-			$phpini_file = ";\n";
-			$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for Froxlor-vhost from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
-			$phpini_file.= "; Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$phpini_file.= ";\n\n";
-			$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
-			$phpini_file = str_replace('"none"', 'none', $phpini_file);
-			$phpini_file = preg_replace('/\"+/', '"', $phpini_file);
-			$phpini_file_handler = fopen($phpini_filename, 'w');
-			fwrite($phpini_file_handler, $phpini_file);
-			fclose($phpini_file_handler);
-			safe_exec('chown root:0 ' . escapeshellarg($phpini_filename));
-			safe_exec('chmod 0644 ' . escapeshellarg($phpini_filename));
 		}
 	}
 

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf

@@ -65,7 +65,6 @@ proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps
     $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains
     $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps
     $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks
-    $smtpd_sender_login_maps
 virtual_mailbox_limit_override = yes
 virtual_maildir_limit_message = Sorry, this user has overdrawn their diskspace quota. Please try again later.
 virtual_overquota_bounce = yes