Tagging 0.9.27

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>

install/froxlor.sql

@@ -469,7 +469,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.27-rc1');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.27');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');

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

@@ -1812,3 +1812,12 @@ if(isFroxlorVersion('0.9.27-svn2'))
 
 	updateToVersion('0.9.27-rc1');
 }
+
+if(isFroxlorVersion('0.9.27-rc1'))
+{
+	showUpdateStep("Updating from 0.9.27-rc1 to 0.9.27");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.27');
+}
+

lib/formfields/admin/customer/formfield.customer_add.php

@@ -252,7 +252,9 @@ return array(
 					'backup_allowed' => array(
 						'label' => $lng['backup_allowed'].'?',
 						'type' => 'yesno',
-						'yesno_var' => $backup_allowed
+						'value' => 0,
+						'yesno_var' => $backup_allowed,
+						'visible' => ($settings['system']['backup_enabled'] == '1' ? true : false)
 					),
 					'number_of_aps_packages' => array(
 						'label' => $lng['aps']['numberofapspackages'],

lib/formfields/admin/customer/formfield.customer_edit.php

@@ -261,7 +261,9 @@ return array(
 					'backup_allowed' => array(
 						'label' => $lng['backup_allowed'].'?',
 						'type' => 'yesno',
-						'yesno_var' => $backup_allowed
+						'value' => 0,
+						'yesno_var' => $backup_allowed,
+						'visible' => ($settings['system']['backup_enabled'] == '1' ? true : false)
 					),
 					'number_of_aps_packages' => array(
 						'label' => $lng['aps']['numberofapspackages'],

lib/tables.inc.php

@@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.27-rc1';
+$version = '0.9.27';
 $dbversion = '2';
 $branding = '';

scripts/jobs/cron_tasks.inc.http.10.apache.php

@@ -232,7 +232,9 @@ class apache
 				}
 
 				// create fcgid <Directory>-Part (starter is created in apache_fcgid)
-				if($this->settings['system']['mod_fcgid_ownvhost'] == '1')
+				if($this->settings['system']['mod_fcgid_ownvhost'] == '1'
+					&& $this->settings['system']['mod_fcgid'] == '1'
+				)
 				{
 					
 					$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/froxlor.panel/' . $this->settings['system']['hostname']);
@@ -274,7 +276,7 @@ class apache
 
 					$php = new phpinterface($this->getDB(), $this->settings, $domain);
 					$this->virtualhosts_data[$vhosts_filename].= '  SuexecUserGroup "' . $this->settings['system']['mod_fcgid_httpuser'] . '" "' . $this->settings['system']['mod_fcgid_httpgroup'] . '"' . "\n";
-					$this->virtualhosts_data[$vhosts_filename].= '  FastCgiExternalServer ' . $mypath . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $this->settings['system']['mod_fcgid_httpuser'] . ' -group ' . $this->settings['system']['mod_fcgid_httpuser'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '  FastCgiExternalServer ' . $mypath . $domain['domain'] . "." . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $this->settings['system']['mod_fcgid_httpuser'] . ' -group ' . $this->settings['system']['mod_fcgid_httpuser'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
 					$this->virtualhosts_data[$vhosts_filename].= '  <Directory "' . $mypath . '">' . "\n";
 					$this->virtualhosts_data[$vhosts_filename].= '    AddHandler php5-fastcgi .php'. "\n";
 					$this->virtualhosts_data[$vhosts_filename].= '    Action php5-fastcgi /fastcgiphp' . "\n";
@@ -282,7 +284,7 @@ class apache
 					$this->virtualhosts_data[$vhosts_filename].= '    Order allow,deny' . "\n";
 					$this->virtualhosts_data[$vhosts_filename].= '    allow from all' . "\n";
 					$this->virtualhosts_data[$vhosts_filename].= '  </Directory>' . "\n";
-					$this->virtualhosts_data[$vhosts_filename].= '  Alias /fastcgiphp ' . $mypath . 'fpm.external' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '  Alias /fastcgiphp ' . $mypath . $domain['domain'] . "." . 'fpm.external' . "\n";
 				}
 
 				/**
@@ -1298,6 +1300,11 @@ class apache
 		}
 		if($this->settings['phpfpm']['enabled'] == '1')
 		{
+			foreach($this->virtualhosts_data as $vhosts_filename => $vhosts_file)
+			{
+				$this->known_vhostfilenames[] = basename($vhosts_filename);
+			}
+
 			foreach($this->known_vhostfilenames as $vhostfilename){
 				$known_phpfpm_files[]=preg_replace('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_/', '', $vhostfilename);
 			}
@@ -1349,6 +1356,11 @@ class apache
 		}
 		if($this->settings['phpfpm']['enabled'] == '1')
 		{
+			foreach($this->virtualhosts_data as $vhosts_filename => $vhosts_file)
+			{
+				$this->known_vhostfilenames[] = basename($vhosts_filename);
+			}
+
 			foreach($this->known_vhostfilenames as $vhostfilename){
 				$known_phpfpm_files[]=preg_replace('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_/', '', $vhostfilename);
 			}
@@ -1358,7 +1370,8 @@ class apache
 		
 			while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle)))
 			{
-				if($phpfpm_filename != '.'
+				if(is_array($known_phpfpm_files)
+					&& $phpfpm_filename != '.'
 					&& $phpfpm_filename != '..'
 					&& !in_array($phpfpm_filename, $known_phpfpm_files)
 					&& file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)))
@@ -1367,6 +1380,10 @@ class apache
 						$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename);
 						unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename));
 					}
+				if(!is_array($known_phpfpm_files))
+					{
+						$this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!");
+					}
 			}
 		}
 	}

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

@@ -38,7 +38,7 @@ class apache_fcgid extends apache
 			if((int)$this->settings['phpfpm']['enabled'] == 1)
 			{
 				$php_options_text.= '  SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
-				$php_options_text.= '  FastCgiExternalServer ' . makeCorrectDir($domain['documentroot']) . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $domain['loginname'] . ' -group ' . $domain['loginname'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
+				$php_options_text.= '  FastCgiExternalServer ' . makeCorrectDir($domain['documentroot']) . $domain['domain'] . "." . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $domain['loginname'] . ' -group ' . $domain['loginname'] . " -idle-timeout " . $this->settings['phpfpm']['idle_timeout'] . "\n";
 				$php_options_text.= '  <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n";
 				$php_options_text.= '    <FilesMatch "\.php$">' . "\n";
 				$php_options_text.= '      SetHandler php5-fastcgi'. "\n";
@@ -48,7 +48,7 @@ class apache_fcgid extends apache
 				$php_options_text.= '    Order allow,deny' . "\n";
 				$php_options_text.= '    allow from all' . "\n";
 				$php_options_text.= '  </Directory>' . "\n";
-				$php_options_text.= '  Alias /fastcgiphp ' . makeCorrectDir($domain['documentroot']) . 'fpm.external' . "\n";
+				$php_options_text.= '  Alias /fastcgiphp ' . makeCorrectDir($domain['documentroot']) . $domain['domain'] . "." . 'fpm.external' . "\n";
 			}
 			else
 			{