maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

And another rename - run ;)

Browse Source
This commit is contained in:
Florian Aders (EleRas)
2010-01-22 15:03:14 +00:00
parent 3340415453
commit 9301684847
10 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
actions/admin/settings/000.version.php
View File

@@ -1,16 +1,18 @@
<?php <?php
/** /**
* This file is part of the SysCP project. * This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors). * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
* *
* For the full copyright and license information, please view the COPYING * For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the * file that was distributed with this source code. You can also view the
* COPYING file online at http://files.syscp.org/misc/COPYING.txt * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* *
* @copyright (c) the authors * @copyright (c) the authors
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org> (2003-2009)
* @license GPLv2 http://files.syscp.org/misc/COPYING.txt * @author Froxlor Team <team@froxlor.org> (2010)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Panel * @package Panel
* @version $Id: 000.version.php 2733 2009-11-06 09:32:00Z flo $ * @version $Id: 000.version.php 2733 2009-11-06 09:32:00Z flo $
*/ */
@@ -29,7 +31,7 @@ return array(
'settinggroup' => 'panel', 'settinggroup' => 'panel',
'varname' => 'frontend', 'varname' => 'frontend',
'type' => 'hidden', 'type' => 'hidden',
'default' => 'syscp', 'default' => 'froxlor',
), ),
'system_last_tasks_run' => array( 'system_last_tasks_run' => array(
'settinggroup' => 'system', 'settinggroup' => 'system',

20
index.php
View File

@@ -1,16 +1,18 @@
<?php <?php
/** /**
* This file is part of the SysCP project. * This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors). * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
* *
* For the full copyright and license information, please view the COPYING * For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the * file that was distributed with this source code. You can also view the
* COPYING file online at http://files.syscp.org/misc/COPYING.txt * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* *
* @copyright (c) the authors * @copyright (c) the authors
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org> (2003-2009)
* @license GPLv2 http://files.syscp.org/misc/COPYING.txt * @author Froxlor Team <team@froxlor.org> (2010)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Panel * @package Panel
* @version $Id: index.php 2693 2009-03-27 19:31:48Z flo $ * @version $Id: index.php 2693 2009-03-27 19:31:48Z flo $
*/ */
@@ -211,11 +213,11 @@ if($action == 'forgotpwd')
AND `email`='" . $user['email'] . "'"); AND `email`='" . $user['email'] . "'");
} }
$rstlog = SysCPLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings); $rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!"); $rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
$body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password)); $body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password));
$mail->From = $settings['panel']['adminmail']; $mail->From = $settings['panel']['adminmail'];
$mail->FromName = 'SysCP'; $mail->FromName = 'Froxlor';
$mail->Subject = $lng['pwdreminder']['subject']; $mail->Subject = $lng['pwdreminder']['subject'];
$mail->Body = $body; $mail->Body = $body;
$mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']); $mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']);
@@ -231,7 +233,7 @@ if($action == 'forgotpwd')
$mailerr_msg = $email; $mailerr_msg = $email;
} }
$rstlog = SysCPLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings); $rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg); $rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
redirectTo('index.php', Array('showmessage' => '4'), true); redirectTo('index.php', Array('showmessage' => '4'), true);
exit; exit;
@@ -243,7 +245,7 @@ if($action == 'forgotpwd')
} }
else else
{ {
$rstlog = SysCPLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings); $rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!"); $rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
$message = $lng['login']['usernotfound']; $message = $lng['login']['usernotfound'];
} }
@@ -268,4 +270,4 @@ if($action == 'forgotpwd')
eval("echo \"" . getTemplate("fpwd") . "\";"); eval("echo \"" . getTemplate("fpwd") . "\";");
} }
?> ?>

2
lib/classes/logger/class.SysLogger.php
View File

@@ -108,7 +108,7 @@ class SysLogger extends AbstractLogger
$name = " (" . $this->userinfo['loginname'] . ")"; $name = " (" . $this->userinfo['loginname'] . ")";
} }
openlog("SysCP", LOG_NDELAY, LOG_USER); openlog("Froxlor", LOG_NDELAY, LOG_USER);
if($text != null if($text != null
&& $text != '') && $text != '')

2
lib/cron_init.php
View File

@@ -248,7 +248,7 @@ $idna_convert = new idna_convert_wrapper();
* Initialize logging * Initialize logging
*/ */
$cronlog = SysCPLogger::getInstanceOf(array('loginname' => 'cronjob'), $db, $settings); $cronlog = FroxlorLogger::getInstanceOf(array('loginname' => 'cronjob'), $db, $settings);
fwrite($debugHandler, 'Logger has been included' . "\n"); fwrite($debugHandler, 'Logger has been included' . "\n");
?> ?>

12
lib/functions/froxlor/function.createAWStatsConf.php
View File

@@ -1,16 +1,18 @@
<?php <?php
/** /**
* This file is part of the SysCP project. * This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors). * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
* *
* For the full copyright and license information, please view the COPYING * For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the * file that was distributed with this source code. You can also view the
* COPYING file online at http://files.syscp.org/misc/COPYING.txt * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* *
* @copyright (c) the authors * @copyright (c) the authors
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org> (2003-2009)
* @license GPLv2 http://files.syscp.org/misc/COPYING.txt * @author Froxlor Team <team@froxlor.org> (2010)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions * @package Functions
* @version $Id: function.createAWStatsConf.php 2724 2009-06-07 14:18:02Z flo $ * @version $Id: function.createAWStatsConf.php 2724 2009-06-07 14:18:02Z flo $
*/ */
@@ -34,7 +36,7 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases)
// Generation header // Generation header
$header = "## GENERATED BY SYSCP\n"; $header = "## GENERATED BY SYSCP\n";
$header2 = "## Do not remove the line above! This tells SysCP to update this configuration\n## If you wish to manually change this configuration file, remove the first line to make sure SysCP won't rebuild this file\n## Generated for domain {SITE_DOMAIN} on " . date('l dS \of F Y h:i:s A') . "\n"; $header2 = "## Do not remove the line above! This tells Froxlor to update this configuration\n## If you wish to manually change this configuration file, remove the first line to make sure Froxlor won't rebuild this file\n## Generated for domain {SITE_DOMAIN} on " . date('l dS \of F Y h:i:s A') . "\n";
// These are the variables we will replace // These are the variables we will replace

2
lib/init.php
View File

@@ -318,7 +318,7 @@ if(isset($userinfo['loginname'])
* Initialize logging * Initialize logging
*/ */
$log = SysCPLogger::getInstanceOf($userinfo, $db, $settings); $log = FroxlorLogger::getInstanceOf($userinfo, $db, $settings);
} }
/** /**

13
scripts/cron_tasks.inc.http.15.apache_fcgid.php
View File

@@ -1,12 +1,13 @@
<?php <?php
/** /**
* This file is part of the SysCP project. * This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors). * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
* *
* For the full copyright and license information, please view the COPYING * For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the * file that was distributed with this source code. You can also view the
* COPYING file online at http://files.syscp.org/misc/COPYING.txt * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* *
* @copyright (c) the authors * @copyright (c) the authors
* @author Florian Aders <eleras@syscp.org> * @author Florian Aders <eleras@syscp.org>
@@ -14,7 +15,7 @@
* @author Michael Kaufmann <mk@syscp-help.org> * @author Michael Kaufmann <mk@syscp-help.org>
* @author Sven Skrabal <info@nexpa.de> * @author Sven Skrabal <info@nexpa.de>
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
* @license GPLv2 http://files.syscp.org/misc/COPYING.txt * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package System * @package System
* @version $Id: cron_tasks.inc.http.15.apache_fcgid.php 2714 2009-04-17 10:02:03Z flo $ * @version $Id: cron_tasks.inc.http.15.apache_fcgid.php 2714 2009-04-17 10:02:03Z flo $
*/ */
@@ -97,7 +98,7 @@ class apache_fcgid extends apache
$starter_file = "#!/bin/sh\n\n"; $starter_file = "#!/bin/sh\n\n";
$starter_file.= "#\n"; $starter_file.= "#\n";
$starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n"; $starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
$starter_file.= "# Do not change anything in this file, it will be overwritten by the SysCP Cronjob!\n"; $starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
$starter_file.= "#\n\n"; $starter_file.= "#\n\n";
$starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n"; $starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n";
$starter_file.= "export PHPRC\n"; $starter_file.= "export PHPRC\n";
@@ -210,7 +211,7 @@ class apache_fcgid extends apache
$phpini_file = ";\n"; $phpini_file = ";\n";
$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n"; $phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " 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 SysCP Cronjob!\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.= ";\n\n";
$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables); $phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
$phpini_file = str_replace('"none"', 'none', $phpini_file); $phpini_file = str_replace('"none"', 'none', $phpini_file);
@@ -261,4 +262,4 @@ class apache_fcgid extends apache
} }
} }
?> ?>

4
scripts/cron_tasks.inc.http.25.lighttpd_fcgid.php
View File

@@ -119,7 +119,7 @@ class lighttpd_fcgid extends lighttpd
$starter_file = "#!/bin/sh\n\n"; $starter_file = "#!/bin/sh\n\n";
$starter_file.= "#\n"; $starter_file.= "#\n";
$starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n"; $starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
$starter_file.= "# Do not change anything in this file, it will be overwritten by the SysCP Cronjob!\n"; $starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
$starter_file.= "#\n\n"; $starter_file.= "#\n\n";
$starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n"; $starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n";
$starter_file.= "export PHPRC\n"; $starter_file.= "export PHPRC\n";
@@ -232,7 +232,7 @@ class lighttpd_fcgid extends lighttpd
$phpini_file = ";\n"; $phpini_file = ";\n";
$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n"; $phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " 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 SysCP Cronjob!\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.= ";\n\n";
$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables); $phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
$phpini_file = str_replace('"none"', 'none', $phpini_file); $phpini_file = str_replace('"none"', 'none', $phpini_file);

9
scripts/cron_traffic.php
View File

@@ -1,17 +1,18 @@
<?php <?php
/** /**
* This file is part of the SysCP project. * This file is part of the Froxlor project.
* Copyright (c) 2003-2009 the SysCP Team (see authors). * Copyright (c) 2003-2009 the SysCP Team (see authors).
* Copyright (c) 2010 the Froxlor Team (see authors).
* *
* For the full copyright and license information, please view the COPYING * For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the * file that was distributed with this source code. You can also view the
* COPYING file online at http://files.syscp.org/misc/COPYING.txt * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
* *
* @copyright (c) the authors * @copyright (c) the authors
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
* @author Martin Burchert <eremit@syscp.org> * @author Martin Burchert <eremit@syscp.org>
* @license GPLv2 http://files.syscp.org/misc/COPYING.txt * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package System * @package System
* @version $Id: cron_traffic.php 2739 2009-11-06 14:46:30Z flo $ * @version $Id: cron_traffic.php 2739 2009-11-06 14:46:30Z flo $
*/ */
@@ -210,7 +211,7 @@ while($row = $db->fetch_array($result))
fclose($debugHandler); fclose($debugHandler);
unlink($lockfile); unlink($lockfile);
$cronlog->logAction(CRON_ACTION, LOG_ERR, 'Database-connection crashed during traffic-cronjob, could not reconnect!'); $cronlog->logAction(CRON_ACTION, LOG_ERR, 'Database-connection crashed during traffic-cronjob, could not reconnect!');
die('SysCP can\'t connect to mysqlserver. Exiting...'); die('Froxlor can\'t connect to mysqlserver. Exiting...');
} }
fwrite($debugHandler, 'Database-connection re-established' . "\n"); fwrite($debugHandler, 'Database-connection re-established' . "\n");

4
templates/misc/configfiles/ubuntu_hardy/lighttpd/etc_lighttpd.conf
View File

@@ -1,5 +1,5 @@
############################################################################### ###############################################################################
# Default lighttpd.conf for SysCP. # Default lighttpd.conf for Froxlor.
############################################################################### ###############################################################################
var.basedir = "/var/www" var.basedir = "/var/www"
var.logdir = "/var/log/lighttpd" var.logdir = "/var/log/lighttpd"
@@ -57,4 +57,4 @@ include_shell "/usr/share/lighttpd/create-mime.assign.pl"
## load enabled configuration files, ## load enabled configuration files,
## read /etc/lighttpd/conf-available/README first ## read /etc/lighttpd/conf-available/README first
include_shell "/usr/share/lighttpd/include-conf-enabled.pl" include_shell "/usr/share/lighttpd/include-conf-enabled.pl"