Tagging 0.9.26

Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>

actions/admin/settings/220.quota.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2011- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the

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.26-rc1');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.26');
 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/install.php

@@ -105,7 +105,7 @@ function page_header() {
 	<link rel="stylesheet" href="../templates/Froxlor/froxlor.css"  />
 	<!--[if IE]><link rel="stylesheet" href="../templates/Froxlor/froxlor_ie.css"  /><![endif]-->
 	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-	<script type="text/javascript" src="../templates/Froxlor/js/jquery.min.js"></script>
+	<script type="text/javascript" src="../js/jquery.min.js"></script>
 	<script type="text/javascript" src="../templates/Froxlor/js/froxlor.js"></script>
 	<title>Froxlor Server Management Panel - Installation</title>
 	<style>

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

@@ -1765,3 +1765,10 @@ if(isFroxlorVersion('0.9.26-svn1'))
 	updateToVersion('0.9.26-rc1');
 }
 
+if(isFroxlorVersion('0.9.26-rc1'))
+{
+	showUpdateStep("Updating from 0.9.26-rc1 to 0.9.26");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.26');
+}

lib/classes/output/class.languageSelect.php

@@ -2,7 +2,7 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2011- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the

lib/classes/output/class.linker.php

@@ -2,7 +2,7 @@
 /**
  * This file is part of the Froxlor project.
  * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010-2011 the Froxlor Team (see authors).
+ * Copyright (c) 2010- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the

lib/configfiles/gentoo.inc.php

@@ -234,7 +234,7 @@ return Array(
 							'echo "smtpd_milters = inet:localhost:8891
 milter_macro_daemon_name = SIGNING
 milter_default_action = accept" >> /etc/postfix/main.cf',
-							'rc-update add dovecot default'
+							'rc-update add dkim-filter default'
 						),
 						'restart' => Array(
 							'/etc/init.d/postfix restart'

lib/configfiles/suse11.inc.php

@@ -2,7 +2,7 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2011- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the

lib/functions/filedir/function.makeChownWithNewStats.php

@@ -29,7 +29,7 @@ function makeChownWithNewStats($row)
 	global $settings;
 
 	// get correct user
-	if($settings['system']['mod_fcgid'] == '1' && $row['deactivated'] == '0')
+	if($settings['system']['mod_fcgid'] == '1' && isset($row['deactivated']) && $row['deactivated'] == '0')
 	{
 		$user = $row['loginname'];
 		$group = $row['loginname'];

lib/functions/froxlor/function.generatePassword.php

@@ -2,14 +2,14 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2011- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the
  * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
  *
  * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @author     Froxlor team <team@froxlor.org> (2011-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Functions
  *

lib/functions/froxlor/function.getFilesystemQuota.php

@@ -2,7 +2,7 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2011- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the

lib/tables.inc.php

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

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

@@ -446,11 +446,16 @@ class apache
 			}
 		}
 
+		if(trim($server_alias) != '')
+		{
+			$servernames_text.= '  ServerAlias ' . $server_alias . "\n";
+		}
+
 		$alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . $domain['id'] . '\'');
 
 		while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false)
 		{
-			$server_alias.= ' ' . $alias_domain['domain'];
+			$server_alias = '  ServerAlias ' . $alias_domain['domain'];
 
 			if($alias_domain['iswildcarddomain'] == '1')
 			{
@@ -463,11 +468,8 @@ class apache
 					$server_alias.= ' www.' . $alias_domain['domain'];
 				}
 			}
-		}
 
-		if(trim($server_alias) != '')
-		{
-			$servernames_text.= '  ServerAlias ' . $server_alias . "\n";
+			$servernames_text.= $server_alias . "\n";
 		}
 
 		$servernames_text.= '  ServerAdmin ' . $domain['email'] . "\n";

scripts/jobs/cron_tasks.php

@@ -241,16 +241,10 @@ while($row = $db->fetch_array($result_tasks))
 	}
 
 	/**
-	 * TYPE=4 MEANS THAT SOMETHING IN THE BIND CONFIG HAS CHANGED. REBUILD froxlor_bind.conf
+	 * TYPE=4 MEANS THAT SOMETHING IN THE BIND CONFIG HAS CHANGED. REBUILD froxlor_bind.conf IF BIND IS ENABLED
 	 */
-	elseif ($row['type'] == '4')
+	elseif ($row['type'] == '4' && (int)$settings['system']['bind_enable'] != 0)
 	{
-		//dont do anything when module is disabled
-		if((int)$settings['system']['bind_enable'] == 0)
-		{
-			return;
-		}
-		
 		if(!isset($nameserver))
 		{
 			$nameserver = new bind($db, $cronlog, $debugHandler, $settings);

templates/Classic/customer/extras/backup.tpl

@@ -3,10 +3,11 @@ $header
 		<input type="hidden" name="s" value="$s" />
 		<input type="hidden" name="page" value="$page" />
 		<input type="hidden" name="action" value="$action" />
+		<input type="hidden" name="send" value="send" />
 		
 		<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
 			<tr>
-				<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['backup']}</b></td>
+				<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['backup']}</b></td>
 			</tr>
 			{$backup_form}
 		</table>

templates/Classic/misc/configurehint.tpl

@@ -60,7 +60,7 @@
         </div>
 
         <div class="footer">
-                <ul><li>&copy; 2009-2011 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
+                <ul><li>&copy; 2009-2012 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
         </div>
 
 </body>

templates/Froxlor/index.tpl

@@ -10,7 +10,7 @@
 	<link rel="stylesheet" href="templates/Froxlor/froxlor.css"  />
 	<!--[if IE]><link rel="stylesheet" href="templates/Froxlor/froxlor_ie.css"  /><![endif]-->
 	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-	<script type="text/javascript" src="templates/Froxlor/js/jquery.min.js"></script>
+	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="templates/Froxlor/js/froxlor.js"></script>
 	<title>{$title}Froxlor Server Management Panel</title>
 </head>

templates/Froxlor/misc/alreadyinstalledhint.tpl

@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="../templates/Froxlor/froxlor.css"  />
 	<!--[if IE]><link rel="stylesheet" href="../templates/Froxlor/froxlor_ie.css"  /><![endif]-->
 	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-	<script type="text/javascript" src="../templates/Froxlor/js/jquery.min.js"></script>
+	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="../templates/Froxlor/js/froxlor.js"></script>
 	<title>Froxlor Server Management Panel - Installation</title>
 </head>

templates/Froxlor/misc/configurehint.tpl

@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="./templates/Froxlor/froxlor.css"  />
 	<!--[if IE]><link rel="stylesheet" href="./templates/Froxlor/froxlor_ie.css"  /><![endif]-->
 	<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-	<script type="text/javascript" src="./templates/Froxlor/js/jquery.min.js"></script>
+	<script type="text/javascript" src="js/jquery.min.js"></script>
 	<script type="text/javascript" src="./templates/Froxlor/js/froxlor.js"></script>
 	<title>Froxlor Server Management Panel - Installation</title>
 </head>
@@ -30,7 +30,7 @@
 </div>
 <footer>
 	<span>
-		Froxlor &copy; 2009-2011 by <a href="http://www.froxlor.org/" rel="external">the Froxlor Team</a>
+		Froxlor &copy; 2009-2012 by <a href="http://www.froxlor.org/" rel="external">the Froxlor Team</a>
 	</span>
 </footer>
 </body>

templates/misc/standardcustomer/index.html

@@ -61,7 +61,7 @@
 	</div>
 
 	<div class="footer">
-		<ul><li>&copy; 2009-2011 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
+		<ul><li>&copy; 2009-2012 by <a href="http://www.froxlor.org">the Froxlor Team</a></li></ul>
 	</div>
 
 </body>

webftp.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2011 the Froxlor Team (see authors).
+ * Copyright (c) 2010- the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
  * file that was distributed with this source code. You can also view the