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

Implementing the whole template system using Smarty. This commit includes movements of ROOT/js, ROOT/images, etc. to theme specific directories like templates/<THEME>/. If you are attemping to use your own templates you won't need to modify Froxlor's core files. This commit may require additional work.

Browse Source 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
This commit is contained in:
Arnold Bechtoldt
2012-08-14 23:08:25 +02:00
parent 6d0d1ae015
commit 601bf68d09
618 changed files with 15381 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
install/install.php
View File

@@ -100,23 +100,23 @@ function page_header() {
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="iso-8859-1" />
<meta charset="utf-8" />
<meta http-equiv="Default-Style" content="text/css" />
<link rel="stylesheet" href="../templates/Froxlor/froxlor.css" />
<!--[if IE]><link rel="stylesheet" href="../templates/Froxlor/froxlor_ie.css" /><![endif]-->
<link rel="stylesheet" href="../templates/Froxlor/css/main.css" />
<!--[if IE]><link rel="stylesheet" href="../templates/Froxlor/css/main_ie.css" /><![endif]-->
<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<script type="text/javascript" src="../js/jquery.min.js"></script>
<script type="text/javascript" src="../templates/Froxlor/js/froxlor.js"></script>
<script type="text/javascript" src="../templates/Froxlor/assets/js/jquery.min.js"></script>
<script type="text/javascript" src="../templates/Froxlor/assets/js/main.js"></script>
<title>Froxlor Server Management Panel - Installation</title>
<style>
input {
background: #dae7ee url('../images/Froxlor/icons/text_align_left.png') no-repeat 5px 4px;
background: #dae7ee url('../templates/Froxlor/assets/img/icons/text_align_left.png') no-repeat 5px 4px;
}
input[type="password"] {
background: #dae7ee url('../images/Froxlor/icons/password.png') no-repeat 4px 4px;
background: #dae7ee url('../templates/Froxlor/assets/img/icons/password.png') no-repeat 4px 4px;
}
input[type="submit"] {
background: #ccc url('../images/Froxlor/icons/button_ok.png') no-repeat 4px 8px;
background: #ccc url('../templates/Froxlor/assets/img/icons/button_ok.png') no-repeat 4px 8px;
}
</style>
</head>
@@ -154,13 +154,13 @@ function status_message($case, $text)
function requirement_checks() {
global $lng;
global $lng, $theme;
page_header();
?>
<article class="install bradius">
<header class="dark">
<img src="../images/Froxlor/logo.png" alt="Froxlor Server Management Panel" />
<img src="../templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
</header>
<section class="installsec">
@@ -520,7 +520,7 @@ if(isset($_POST['installstep'])
?>
<article class="install bradius">
<header class="dark">
<img src="../images/Froxlor/logo.png" alt="Froxlor Server Management Panel" />
<img src="../templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
</header>
<section class="installsec">
@@ -841,7 +841,7 @@ else
?>
<article class="install bradius">
<header class="dark">
<img src="../images/Froxlor/logo.png" alt="Froxlor Server Management Panel" />
<img src="../templates/Froxlor/assets/img/logo.png" alt="Froxlor Server Management Panel" />
</header>
<section class="installsec">
<h2><?php echo $lng['install']['language']; ?></h2>

2
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -26,7 +26,7 @@
*/
function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
{
global $settings, $lng, $db;
global $settings, $lng, $db, $theme;
if(versionInUpdate($current_version, '0.9.4-svn2'))
{

34
lib/classes/aps/class.ApsParser.php
View File

@@ -62,7 +62,7 @@ class ApsParser
private function ManageInstances()
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
$Question = false;
//dont do anything if there is no instance
@@ -170,7 +170,7 @@ class ApsParser
//create table with contents based on instance status
if($Question != true)
{
global $settings;
global $settings, $theme;
$Instances = '';
if((int)$this->userinfo['customers_see_all'] == 1)
@@ -317,7 +317,7 @@ class ApsParser
private function ManagePackages()
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
$Question = false;
if(isset($_POST['save']))
@@ -611,7 +611,7 @@ class ApsParser
private function UploadNewPackages()
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
//define how many files can be uploaded at once
@@ -724,7 +724,7 @@ class ApsParser
private function SearchPackages()
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
$Error = 0;
$Ids = array();
$ShowAll = 0;
@@ -852,7 +852,7 @@ class ApsParser
private function CustomerStatus($CustomerId)
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
$Data = '';
$Fieldname = '';
$Fieldvalue = '';
@@ -877,7 +877,7 @@ class ApsParser
//skip if parse of xml has failed
if($Xml == false)continue;
$Icon = './images/Classic/default.png';
$Icon = 'templates/'.$theme.'/assets/img/default.png';
$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
@@ -1033,7 +1033,7 @@ class ApsParser
private function CreatePackageInstance($PackageId, $CustomerId)
{
global $lng;
global $lng, $theme;
if(!self::IsValidPackageId($PackageId, true))return false;
@@ -1141,7 +1141,7 @@ class ApsParser
private function CheckException($Category, $Item, $Value)
{
global $settings;
global $settings, $theme;
//search for element within system settings
@@ -1164,7 +1164,7 @@ class ApsParser
private function CheckSubmappings($ParentMapping, $Url)
{
global $lng;
global $lng, $theme;
$Error = array();
//check for special PHP handler extensions
@@ -1243,7 +1243,7 @@ class ApsParser
private function InstallNewPackage($Filename)
{
global $lng, $userinfo;
global $lng, $userinfo, $theme;
if(file_exists($Filename)
&& $Xml = self::GetXmlFromZip($Filename))
@@ -1726,7 +1726,7 @@ class ApsParser
public function MainHandler($Action)
{
global $lng, $filename, $s, $page, $action, $Id, $userinfo;
global $lng, $filename, $s, $page, $action, $Id, $userinfo, $theme;
//check for basic functions, classes and permissions
@@ -2810,7 +2810,7 @@ class ApsParser
private function ShowPackageInstaller($PackageId, $WrongData, $CustomerId)
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
$Data = '';
$Fieldname = '';
$Fieldvalue = '';
@@ -2838,7 +2838,7 @@ class ApsParser
//icon for package
$Icon = './images/Classic/default.png';
$Icon = 'templates/'.$theme.'/img/default.png';
if($this->aps_version != '1.0')
{
@@ -3231,7 +3231,7 @@ class ApsParser
private function ShowPackageInfo($PackageId, $All = false)
{
global $lng, $filename, $s, $page, $action, $userinfo;
global $lng, $filename, $s, $page, $action, $userinfo, $theme;
$Data = '';
$Fieldname = '';
$Fieldvalue = '';
@@ -3245,7 +3245,7 @@ class ApsParser
//return if parse of xml file has failed
if($Xml == false)return false;
$Icon = './images/Classic/default.png';
$Icon = 'templates/'.$theme.'/img/default.png';
$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
@@ -3460,7 +3460,7 @@ class ApsParser
*/
private function InfoBox($Message, $Type = 0)
{
global $lng, $filename, $s, $page, $action;
global $lng, $filename, $s, $page, $action, $theme;
//shows a box with informations
eval("echo \"" . getTemplate("aps/infobox") . "\";");
}

4
lib/classes/database/class.db.php
View File

@@ -189,7 +189,7 @@ class db
function query($query_str, $unbuffered = false, $suppress_error = false)
{
global $numbqueries;
global $numbqueries, $theme;
if (!mysql_ping($this->link_id))
{
@@ -349,7 +349,7 @@ class db
function showerror($errormsg, $mysqlActive = true)
{
global $filename;
global $filename, $theme;
$text = 'MySQL - Error: ' . str_replace("\n", "\t", $errormsg);
if($mysqlActive)

2
lib/classes/output/class.htmlform.php
View File

@@ -26,7 +26,7 @@ class htmlform
public static function genHTMLForm($data = array())
{
global $lng;
global $lng, $theme;
$nob = false;
self::$_form = '';

2
lib/classes/output/class.paging.php
View File

@@ -421,6 +421,8 @@ class paging
function getHtmlArrowCode($baseurl, $field = '')
{
global $theme;
if($field != ''
&& isset($this->fields[$field]))
{

16
lib/classes/ticket/class.ticket.php
View File

@@ -260,7 +260,7 @@ class ticket
public function sendMail($customerid = - 1, $template_subject = null, $default_subject = null, $template_body = null, $default_body = null)
{
global $mail;
global $mail, $theme;
// Some checks are to be made here in the future
@@ -680,13 +680,13 @@ class ticket
private function convertLatin1ToHtml($str)
{
$html_entities = array (
"<EFBFBD>" => "&Auml;",
"<EFBFBD>" => "&auml;",
"<EFBFBD>" => "&Ouml;",
"<EFBFBD>" => "&ouml;",
"<EFBFBD>" => "&Uuml;",
"<EFBFBD>" => "&uuml;",
"<EFBFBD>" => "&szlig;"
"Ä" => "&Auml;",
"ä" => "&auml;",
"Ö" => "&Ouml;",
"ö" => "&ouml;",
"Ü" => "&Uuml;",
"ü" => "&uuml;",
"ß" => "&szlig;"
/*
* @TODO continue this table for all the special-characters
*/

2
lib/functions.php
View File

@@ -44,7 +44,7 @@ function includeFunctions($dirname)
function __autoload($classname)
{
global $libdirname;
global $libdirname, $theme;
findIncludeClass($libdirname . '/classes/', $classname);
}

2
lib/functions/aps/function.domainHasApsInstances.php
View File

@@ -28,7 +28,7 @@
*/
function domainHasApsInstances($domainid = 0)
{
global $db, $settings;
global $db, $settings, $theme;
if($settings['aps']['aps_active'] == '1')
{

2
lib/functions/database/function.correctMysqlUsers.php
View File

@@ -19,7 +19,7 @@
function correctMysqlUsers($mysql_access_host_array)
{
global $db, $settings, $sql, $sql_root;
global $db, $settings, $sql, $sql_root, $theme;
foreach($sql_root as $mysql_server => $mysql_server_details)
{

2
lib/functions/filedir/function.maildirExists.php
View File

@@ -24,7 +24,7 @@
*/
function maildirExists($result = null)
{
global $settings;
global $settings, $theme;
if(is_array($result))
{

2
lib/functions/filedir/function.makeChownWithNewStats.php
View File

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

2
lib/functions/filedir/function.makePathfield.php
View File

@@ -34,7 +34,7 @@
function makePathfield($path, $uid, $gid, $fieldType, $value = '', $dom = false)
{
global $lng;
global $lng, $theme;
$value = str_replace($path, '', $value);
$field = array();

2
lib/functions/filedir/function.safe_exec.php
View File

@@ -33,7 +33,7 @@
function safe_exec($exec_string, &$return_value = false)
{
global $settings;
global $settings, $theme;
//
// define allowed system commands

2
lib/functions/filedir/function.storeDefaultIndex.php
View File

@@ -27,7 +27,7 @@
*/
function storeDefaultIndex($loginname = null, $destination = null, $logger = null, $force = false)
{
global $db, $settings, $pathtophpfiles;
global $db, $settings, $pathtophpfiles, $theme;
if ($force
|| (int)$settings['system']['store_index_file_subs'] == 1

2
lib/functions/formfields/function.buildFormEx.php
View File

@@ -17,7 +17,7 @@
function buildFormEx($form, $part = '')
{
global $settings;
global $settings, $theme;
$fields = '';
if(validateFormDefinition($form))

2
lib/functions/formfields/function.getFormFieldOutput.php
View File

@@ -19,7 +19,7 @@
function getFormFieldOutput($fieldname, $fielddata)
{
global $settings;
global $settings, $theme;
$returnvalue = '';
if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldOutput' . ucfirst($fielddata['type'])))

4
lib/functions/formfields/function.getFormGroupOutput.php
View File

@@ -19,14 +19,14 @@
function getFormGroupOutput($groupname, $groupdetails)
{
global $lng;
global $lng, $theme;
eval("\$group = \"" . getTemplate("settings/settings_group") . "\";");
return $group;
}
function getFormOverviewGroupOutput($groupname, $groupdetails)
{
global $lng, $settings, $filename, $s;
global $lng, $settings, $filename, $s, $theme;
$group = '';
$title = $groupdetails['title'];

2
lib/functions/froxlor/function.CorrectErrorDocument.php
View File

@@ -26,7 +26,7 @@
*/
function correctErrorDocument($errdoc = null)
{
global $settings, $idna_convert;
global $settings, $idna_convert, $theme;
if($errdoc !== null && $errdoc != '')
{

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

@@ -24,7 +24,7 @@
*/
function getNextCronjobs()
{
global $db;
global $db, $theme;
$query = "SELECT `id`, `cronfile` FROM `".TABLE_PANEL_CRONRUNS."` WHERE `interval` <> '0' AND `isactive` = '1' AND (";
@@ -60,7 +60,7 @@ function getNextCronjobs()
function includeCronjobs($debugHandler, $pathtophpfiles)
{
global $settings;
global $settings, $theme;
$cronjobs = getNextCronjobs();
@@ -84,7 +84,7 @@ function includeCronjobs($debugHandler, $pathtophpfiles)
function getIntervalOptions()
{
global $db, $lng, $cronlog;
global $db, $lng, $cronlog, $theme;
$query = "SELECT DISTINCT `interval` FROM `" . TABLE_PANEL_CRONRUNS . "` ORDER BY `interval` ASC;";
$result = $db->query($query);
@@ -110,7 +110,7 @@ function getIntervalOptions()
function getCronjobsLastRun()
{
global $db, $lng;
global $db, $lng, $theme;
$query = "SELECT `lastrun`, `desc_lng_key` FROM `".TABLE_PANEL_CRONRUNS."` WHERE `isactive` = '1' ORDER BY `cronfile` ASC";
$result = $db->query($query);
@@ -135,7 +135,7 @@ function getCronjobsLastRun()
function toggleCronStatus($module = null, $isactive = 0)
{
global $db;
global $db, $theme;
if($isactive != 1) {
$isactive = 0;
@@ -148,7 +148,7 @@ function toggleCronStatus($module = null, $isactive = 0)
function getOutstandingTasks()
{
global $db, $lng;
global $db, $lng, $theme;
$query = "SELECT * FROM `".TABLE_PANEL_TASKS."` ORDER BY `type` ASC";
$result = $db->query($query);

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

@@ -29,7 +29,7 @@
function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot, $awstats_params = array())
{
global $pathtophpfiles, $settings;
global $pathtophpfiles, $settings, $theme;
// Generation header

2
lib/functions/froxlor/function.customerHasPerlEnabled.php
View File

@@ -27,7 +27,7 @@
*/
function customerHasPerlEnabled($cid = 0)
{
global $db;
global $db, $theme;
if($cid > 0)
{

4
lib/functions/froxlor/function.domainHasMainSubDomains.php
View File

@@ -25,7 +25,7 @@
*/
function domainHasMainSubDomains($id = 0)
{
global $db;
global $db, $theme;
$sql = "SELECT COUNT(`id`) as `mainsubs` FROM `".TABLE_PANEL_DOMAINS."` WHERE `ismainbutsubto` = '".(int)$id."'";
$result = $db->query_first($sql);
@@ -47,7 +47,7 @@ function domainHasMainSubDomains($id = 0)
*/
function domainMainToSubExists($id = 0)
{
global $db;
global $db, $theme;
$sql = "SELECT `id` FROM `".TABLE_PANEL_DOMAINS."` WHERE `id` = '".(int)$id."'";
$result = $db->query_first($sql);

2
lib/functions/froxlor/function.generatePassword.php
View File

@@ -21,7 +21,7 @@
function generatePassword()
{
global $db, $settings;
global $db, $settings, $theme;
return substr(md5(uniqid(microtime(), 1)), 24, 10);
}

2
lib/functions/froxlor/function.getAdmins.php
View File

@@ -19,7 +19,7 @@
function getAdmins($limit_resource = '')
{
global $db;
global $db, $theme;
$additional_conditions = '';
$additional_conditions_array = array();

2
lib/functions/froxlor/function.getCustomerDetail.php
View File

@@ -19,7 +19,7 @@
function getCustomerDetail($customerid, $varname)
{
global $db;
global $db, $theme;
$query = 'SELECT `' . $db->escape($varname) . '` FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `customerid` = \'' . (int)$customerid . '\'';
$customer = $db->query_first($query);

2
lib/functions/froxlor/function.getCustomerIdByDomain.php
View File

@@ -9,7 +9,7 @@
*/
function getCustomerIdByDomain($domain = null)
{
global $db;
global $db, $theme;
$result = $db->query_first("SELECT `customerid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain` = '".$domain."'");
if(is_array($result)

2
lib/functions/froxlor/function.getCustomers.php
View File

@@ -19,7 +19,7 @@
function getCustomers($limit_resource = '')
{
global $db;
global $db, $theme;
$additional_conditions = '';
$additional_conditions_array = array();

2
lib/functions/froxlor/function.getFilesystemQuota.php
View File

@@ -17,7 +17,7 @@
function getFilesystemQuota()
{
global $settings;
global $settings, $theme;
if ($settings['system']['diskquota_enabled'])
{
# Fetch all quota in the desired partition

2
lib/functions/froxlor/function.getIpAddresses.php
View File

@@ -19,7 +19,7 @@
function getIpAddresses()
{
global $db;
global $db, $theme;
$query = 'SELECT `id`, `ip`, `port` FROM `' . TABLE_PANEL_IPSANDPORTS . '` ORDER BY `ip` ASC, `port` ASC';
$result = $db->query($query);

2
lib/functions/froxlor/function.getIpPortCombinations.php
View File

@@ -19,7 +19,7 @@
function getIpPortCombinations($ssl = null)
{
global $db;
global $db, $theme;
$additional_conditions = '';
$additional_conditions_array = array();

2
lib/functions/froxlor/function.getLanguages.php
View File

@@ -19,7 +19,7 @@
function getLanguages()
{
global $db;
global $db, $theme;
$query = 'SELECT * FROM `' . TABLE_PANEL_LANGUAGE . '` ';
$result = $db->query($query);

2
lib/functions/froxlor/function.getLoginNameByUid.php
View File

@@ -9,7 +9,7 @@
*/
function getLoginNameByUid($uid = null)
{
global $db;
global $db, $theme;
$result = $db->query_first("SELECT `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `guid` = '".(int)$uid."'");
if(is_array($result)

2
lib/functions/froxlor/function.getPhpConfigs.php
View File

@@ -22,7 +22,7 @@
*/
function getPhpConfigs()
{
global $db;
global $db, $theme;
$query = 'SELECT * FROM `' . TABLE_PANEL_PHPCONFIGS . '` ';
$result = $db->query($query, false, true);

2
lib/functions/froxlor/function.getServerId.php
View File

@@ -25,7 +25,7 @@
*/
function getServerId() {
global $server_id;
global $server_id, $theme;
if(isset($server_id)
&& is_numeric($server_id)

2
lib/functions/froxlor/function.getSessionUserDetail.php
View File

@@ -19,7 +19,7 @@
function getSessionUserDetail($varname)
{
global $userinfo;
global $userinfo, $theme;
if(isset($userinfo[$varname]))
{

2
lib/functions/froxlor/function.inserttask.php
View File

@@ -29,7 +29,7 @@
function inserttask($type, $param1 = '', $param2 = '', $param3 = '', $param4 = '')
{
global $db, $settings;
global $db, $settings, $theme;
if($type == '1'
|| $type == '3'

2
lib/functions/froxlor/function.isCustomerStdSubdomain.php
View File

@@ -26,7 +26,7 @@
*/
function isCustomerStdSubdomain($did = 0)
{
global $db;
global $db, $theme;
if($did > 0)
{

2
lib/functions/froxlor/function.loadConfigArrayDir.php
View File

@@ -20,7 +20,7 @@
function loadConfigArrayDir()
{
// Workaround until we use gettext
global $lng;
global $lng, $theme;
// we now use dynamic function parameters
// so we can read from more than one directory

4
lib/functions/froxlor/function.openRootDB.php
View File

@@ -28,7 +28,7 @@
*/
function openRootDB($debugHandler = false, $lockfile = false)
{
global $db_root;
global $db_root, $theme;
require dirname(dirname(dirname(__FILE__))).'/userdata.inc.php';
@@ -68,6 +68,6 @@ function openRootDB($debugHandler = false, $lockfile = false)
function closeRootDB()
{
global $db_root;
global $db_root, $theme;
if(isset($db_root)) unset($db_root);
}

2
lib/functions/froxlor/function.updateCounters.php
View File

@@ -28,7 +28,7 @@
function updateCounters($returndebuginfo = false)
{
global $db;
global $db, $theme;
$returnval = array();
if($returndebuginfo === true)

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

@@ -27,7 +27,7 @@
*/
function updateToVersion($new_version = null)
{
global $db, $settings;
global $db, $settings, $theme;
if($new_version !== null && $new_version != '')
{
@@ -48,7 +48,7 @@ function updateToVersion($new_version = null)
*/
function isFroxlor()
{
global $settings;
global $settings, $theme;
if(isset($settings['panel']['frontend'])
&& $settings['panel']['frontend'] == 'froxlor')
@@ -70,7 +70,7 @@ function isFroxlor()
*/
function isFroxlorVersion($to_check = null)
{
global $settings;
global $settings, $theme;
if($settings['panel']['frontend'] == 'froxlor'
&& $settings['panel']['version'] == $to_check)
@@ -92,7 +92,7 @@ function isFroxlorVersion($to_check = null)
*/
function hasUpdates($to_check = null)
{
global $settings;
global $settings, $theme;
if(!isset($settings['panel']['version'])
|| $settings['panel']['version'] != $to_check)
@@ -115,7 +115,7 @@ function hasUpdates($to_check = null)
*/
function showUpdateStep($task = null, $needs_status = true)
{
global $updatelog, $filelog;
global $updatelog, $filelog, $theme;
// output
echo $task;
@@ -141,7 +141,7 @@ function showUpdateStep($task = null, $needs_status = true)
*/
function lastStepStatus($status = -1, $message = '')
{
global $updatelog, $filelog;
global $updatelog, $filelog, $theme;
switch($status)
{

12
lib/functions/output/function.RedirectCode.php
View File

@@ -22,7 +22,7 @@
*/
function getRedirectCodesArray()
{
global $db;
global $db, $theme;
$sql = "SELECT * FROM `".TABLE_PANEL_REDIRECTCODES."` WHERE `enabled` = '1' ORDER BY `id` ASC";
$result = $db->query($sql);
@@ -44,7 +44,7 @@ function getRedirectCodesArray()
*/
function getRedirectCodes()
{
global $db, $lng;
global $db, $lng, $theme;
$sql = "SELECT * FROM `".TABLE_PANEL_REDIRECTCODES."` WHERE `enabled` = '1' ORDER BY `id` ASC";
$result = $db->query($sql);
@@ -68,7 +68,7 @@ function getRedirectCodes()
*/
function getDomainRedirectCode($domainid = 0)
{
global $db;
global $db, $theme;
$code = '';
if($domainid > 0)
@@ -98,7 +98,7 @@ function getDomainRedirectCode($domainid = 0)
*/
function getDomainRedirectId($domainid = 0)
{
global $db;
global $db, $theme;
$code = 1;
if($domainid > 0)
@@ -128,7 +128,7 @@ function getDomainRedirectId($domainid = 0)
*/
function addRedirectToDomain($domainid = 0, $redirect = 1)
{
global $db;
global $db, $theme;
if($domainid > 0)
{
$db->query("INSERT INTO `".TABLE_PANEL_DOMAINREDIRECTS."`
@@ -147,7 +147,7 @@ function addRedirectToDomain($domainid = 0, $redirect = 1)
*/
function updateRedirectOfDomain($domainid = 0, $redirect = false)
{
global $db;
global $db, $theme;
if($redirect == false)
{

4
lib/functions/output/function.ask_yesno.php
View File

@@ -34,7 +34,7 @@
function ask_yesno($text, $yesfile, $params = array(), $targetname = '', $back_nr = 1)
{
global $userinfo, $db, $s, $header, $footer, $lng;
global $userinfo, $db, $s, $header, $footer, $lng, $theme;
$hiddenparams = '';
@@ -58,7 +58,7 @@ function ask_yesno($text, $yesfile, $params = array(), $targetname = '', $back_n
function ask_yesno_withcheckbox($text, $chk_text, $yesfile, $params = array(), $targetname = '', $show_checkbox = true)
{
global $userinfo, $db, $s, $header, $footer, $lng;
global $userinfo, $db, $s, $header, $footer, $lng, $theme;
$hiddenparams = '';

2
lib/functions/output/function.makeyesno.php
View File

@@ -32,7 +32,7 @@
function makeyesno($name, $yesvalue, $novalue = '', $yesselected = '', $disabled = false)
{
global $lng;
global $lng, $theme;
if($disabled) {
$d = ' disabled="disabled"';

2
lib/functions/output/function.redirectTo.php
View File

@@ -38,7 +38,7 @@
function redirectTo($destination, $get_variables = array(), $isRelative = false)
{
global $s;
global $s, $theme;
if(is_array($get_variables))
{

2
lib/functions/output/function.standard_error.php
View File

@@ -28,7 +28,7 @@
function standard_error($errors = '', $replacer = '')
{
global $db, $userinfo, $s, $header, $footer, $lng;
global $db, $userinfo, $s, $header, $footer, $lng, $theme;
$_SESSION['requestData'] = $_POST;
$replacer = htmlentities($replacer);

2
lib/functions/output/function.standard_success.php
View File

@@ -27,7 +27,7 @@
function standard_success($success_message = '', $replacer = '', $params = array())
{
global $s, $header, $footer, $lng;
global $s, $header, $footer, $lng, $theme;
if(isset($lng['success'][$success_message]))
{

2
lib/functions/settings/function.getSetting.php
View File

@@ -19,7 +19,7 @@
function getSetting($settinggroup, $varname)
{
global $settings;
global $settings, $theme;
if(isset($settings[$settinggroup]) && is_array($settings[$settinggroup]) && isset($settings[$settinggroup][$varname]))
{
return $settings[$settinggroup][$varname];

2
lib/functions/settings/function.saveSetting.php
View File

@@ -19,7 +19,7 @@
function saveSetting($settinggroup, $varname, $newvalue)
{
global $db;
global $db, $theme;
$query = 'UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'' . $db->escape($newvalue) . '\' WHERE `settinggroup` = \'' . $db->escape($settinggroup) . '\' AND `varname`=\'' . $db->escape($varname) . '\'';
return $db->query($query);
}

2
lib/functions/settings/function.storeSettingDefaultIp.php
View File

@@ -23,7 +23,7 @@ function storeSettingDefaultIp($fieldname, $fielddata, $newfieldvalue)
if($returnvalue !== false && is_array($fielddata) && isset($fielddata['settinggroup']) && $fielddata['settinggroup'] == 'system' && isset($fielddata['varname']) && $fielddata['varname'] == 'defaultip')
{
global $db;
global $db, $theme;
$customerstddomains_result = $db->query('SELECT `standardsubdomain` FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `standardsubdomain` <> \'0\'');
$ids = array();

2
lib/functions/settings/function.storeSettingHostname.php
View File

@@ -23,7 +23,7 @@ function storeSettingHostname($fieldname, $fielddata, $newfieldvalue)
if($returnvalue !== false && is_array($fielddata) && isset($fielddata['settinggroup']) && $fielddata['settinggroup'] == 'system' && isset($fielddata['varname']) && $fielddata['varname'] == 'hostname')
{
global $db, $idna_convert;
global $db, $idna_convert, $theme;
$newfieldvalue = $idna_convert->encode($newfieldvalue);
$customerstddomains_result = $db->query('SELECT `standardsubdomain` FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `standardsubdomain` <> \'0\'');

2
lib/functions/system/function.checklastguid.php
View File

@@ -31,7 +31,7 @@
*/
function checkLastGuid()
{
global $log, $cronlog, $db, $settings;
global $log, $cronlog, $db, $settings, $theme;
$mylog = null;
if (isset($cronlog) && $cronlog instanceof FroxlorLogger) {

2
lib/functions/validate/function.checkFcgidPhpFpm.php
View File

@@ -17,7 +17,7 @@
function checkFcgidPhpFpm($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
{
global $settings;
global $settings, $theme;
$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_OK);

2
lib/functions/validate/function.checkPathConflicts.php
View File

@@ -17,7 +17,7 @@
function checkPathConflicts($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
{
global $settings;
global $settings, $theme;
if((int)$settings['system']['mod_fcgid'] == 1)
{
/**

2
lib/functions/validate/function.checkUsername.php
View File

@@ -19,7 +19,7 @@
function checkUsername($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
{
global $settings;
global $settings, $theme;
if(!isset($allnewfieldvalues['customer_mysqlprefix']))
{
$allnewfieldvalues['customer_mysqlprefix'] = $settings['customer']['mysqlprefix'];

2
lib/functions/validate/function.setCycleOfCronjob.php
View File

@@ -17,7 +17,7 @@
function setCycleOfCronjob($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
{
global $settings, $db;
global $settings, $db, $theme;
switch($newfieldvalue)
{

2
lib/functions/validate/function.validate.php
View File

@@ -33,7 +33,7 @@
function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = array())
{
global $log;
global $log, $theme;
if(!is_array($emptydefault))
{

2
lib/functions/validate/function.validatePassword.php
View File

@@ -28,7 +28,7 @@
*/
function validatePassword($password = null)
{
global $settings;
global $settings, $theme;
if ($settings['panel']['password_min_length'] > 0) {
$password = validate(

2
lib/functions/validate/function.validateUrl.php
View File

@@ -28,7 +28,7 @@
function validateUrl($url)
{
global $idna_convert;
global $idna_convert, $theme;
if(strtolower(substr($url, 0, 7)) != "http://"
&& strtolower(substr($url, 0, 8)) != "https://")

3
lib/init.php
View File

@@ -363,8 +363,9 @@ if(isset($userinfo['theme']) && $userinfo['theme'] != $theme)
/*
* check for custom header-graphic
*/
$hl_path = 'images/'.$theme;
$hl_path = 'templates/'.$theme.'/assets/img';
$header_logo = $hl_path.'/logo.png';
if(file_exists($hl_path.'/logo_custom.png')) {
$header_logo = $hl_path.'/logo_custom.png';
}

4
scripts/jobs/cron_lighttp.htaccess.php
View File

@@ -47,7 +47,7 @@ else
function read_directory($dir1 = null, $min_depth = 25, $htaccessfh = null)
{
global $htaccessfh;
global $htaccessfh, $theme;
if(!is_string($dir1))
{
@@ -95,7 +95,7 @@ function read_directory($dir1 = null, $min_depth = 25, $htaccessfh = null)
function parseHtaccess($file = null)
{
global $debugHandler, $htaccessfh;
global $debugHandler, $htaccessfh, $theme;
$htacc = @file_get_contents($file);
if($htacc != "")

8
scripts/jobs/cron_traffic.inc.functions.php
View File

@@ -19,7 +19,7 @@
function awstatsDoSingleDomain($domain, $outputdir)
{
global $cronlog, $settings;
global $cronlog, $settings, $theme;
$returnval = 0;
$domainconfig = makeCorrectFile($settings['system']['awstats_conf'].'/awstats.' . $domain . '.conf');
@@ -104,7 +104,7 @@ function awstatsDoSingleDomain($domain, $outputdir)
function callAwstatsGetTraffic($customerid, $outputdir, $usersdomainlist)
{
global $settings, $db, $cronlog;
global $settings, $db, $cronlog, $theme;
$returnval = 0;
foreach($usersdomainlist as $domainid => $singledomain)
@@ -156,7 +156,7 @@ function callAwstatsGetTraffic($customerid, $outputdir, $usersdomainlist)
function callWebalizerGetTraffic($logfile, $outputdir, $caption, $usersdomainlist)
{
global $settings, $cronlog;
global $settings, $cronlog, $theme;
$returnval = 0;
if(file_exists($settings['system']['logfiles_directory'] . $logfile . '-access.log'))
@@ -305,7 +305,7 @@ function callWebalizerGetTraffic($logfile, $outputdir, $caption, $usersdomainlis
function safeSQLLogfile($domains, $loginname)
{
global $db, $settings;
global $db, $settings, $theme;
$sql = "SELECT * FROM access_log ";
$where = "WHERE virtual_host = ";

2
templates/Classic/admin/admins/admins.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="3"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['admins']}</b>&nbsp;({$admincount})</td>
<td class="maintitle_search_left" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['admins']}</b>&nbsp;({$admincount})</td>
<td class="maintitle_search_right" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >7<else>6</if>">{$searchcode}</td>
</tr>
<tr>

2
templates/Classic/admin/admins/admins_add.tpl
View File

@@ -6,7 +6,7 @@ $header
<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/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$admin_add_form}
</table>

2
templates/Classic/admin/admins/admins_edit.tpl
View File

@@ -7,7 +7,7 @@ $header
<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/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$admin_edit_form}
</table>

2
templates/Classic/admin/aps/askyesno.tpl
View File

@@ -1,6 +1,6 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" style="border: solid 1px #B7B7B7;">
<tr>
<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="images/Classic/info.png" alt="" /></td>
<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
<td>
$Message
<form name="continue" action="$filename" method="post">

2
templates/Classic/admin/aps/infobox.tpl
View File

@@ -1,6 +1,6 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable" style="border: solid 1px #B7B7B7;">
<tr>
<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="images/Classic/info.png" alt="" /></td>
<td width="30" valign="top" style="padding: 15px; background-color: #EBECF5;"><img src="templates/{$theme}/assets/img/info.png" alt="" /></td>
<td>$Message</td>
</tr>
</table>

4
templates/Classic/admin/aps/manage_instances.tpl
View File

@@ -1,6 +1,6 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
</tr>
<tr>
<td class="field_name_border_left" valign="top" width="15%"><strong>{$lng['aps']['statistics']}</strong></td>
@@ -15,7 +15,7 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="3"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['aps']['manageinstances']}</b></td>
<td class="maintitle" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['manageinstances']}</b></td>
</tr>
<tr>
<td class="field_display_border_left">{$lng['aps']['packagenameandstatus']}</td>

4
templates/Classic/admin/aps/manage_packages.tpl
View File

@@ -1,6 +1,6 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
</tr>
<tr>
<td class="field_name_border_left" valign="top" width="15%"><strong>{$lng['admin']['phpsettings']['actions']}</strong></td>
@@ -50,7 +50,7 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="6"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['aps']['managepackages']}</b></td>
<td class="maintitle" colspan="6"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['managepackages']}</b></td>
</tr>
<tr>
<td class="field_display_border_left" width="30%">{$lng['aps']['packagenameandversion']}</td>

2
templates/Classic/admin/aps/manage_packages_download.tpl
View File

@@ -1,6 +1,6 @@
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['specialoptions']}</b></td>
</tr>
<tr>
<td class="field_name_border_left" valign="top" width="15%"><strong>{$lng['admin']['phpsettings']['actions']}</strong></td>

2
templates/Classic/admin/aps/upload.tpl
View File

@@ -4,7 +4,7 @@
<input type="hidden" name="action" value="$action" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
<tr>
<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['aps']['upload']}</b></td>
<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['aps']['upload']}</b></td>
</tr>
<tr>
<td class="main_field_name" nowrap="nowrap">{$lng['aps']['upload_description']} <a href="http://www.apsstandard.org/" target="_blank">http://www.apsstandard.org/</a></td>

2
templates/Classic/admin/configfiles/choose.tpl
View File

@@ -1,7 +1,7 @@
$header
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_40">
<tr>
<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href={$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]</td>
<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href={$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]</td>
</tr>
$distributions
</table>

2
templates/Classic/admin/configfiles/configfiles.tpl
View File

@@ -1,7 +1,7 @@
$header
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$configfiles[$distribution]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['daemons'][$daemon]['label']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]</td>
<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$configfiles[$distribution]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['label']}&nbsp;&raquo;&nbsp;{$configfiles[$distribution]['services'][$service]['daemons'][$daemon]['label']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]</td>
</tr>
{$configpage}
<if $restart != ''>

2
templates/Classic/admin/configfiles/wizard.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_40">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]</td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}</b> [<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]</td>
</tr>
<tr>
<td class="main_field_name"><b>{$lng['admin']['configfiles']['distribution']}:</b></td>

2
templates/Classic/admin/cronjobs/cronjob_edit.tpl
View File

@@ -7,7 +7,7 @@ $header
<input type="hidden" name="send" value="send" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$cronjobs_edit_form}
</table>

4
templates/Classic/admin/cronjobs/cronjobs.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['warning']}</b></td>
<td class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['warning']}</b></td>
</tr>
<tr>
<td class="field_name_border_left">
@@ -18,7 +18,7 @@ $header
<br />
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="5"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['cron']['cronsettings']}</b></td>
<td class="maintitle" colspan="5"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['cron']['cronsettings']}</b></td>
</tr>
<tr>
<td class="field_display_border_left">{$lng['cron']['description']}</td>

2
templates/Classic/admin/customers/customers.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="3" ><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['customers']}</b>&nbsp;({$customercount})</td>
<td class="maintitle_search_left" colspan="3" ><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['customers']}</b>&nbsp;({$customercount})</td>
<td class="maintitle_search_right" colspan="<if ($settings['ticket']['enabled'] == 1 || $settings['autoresponder']['autoresponder_active'] == 1) >8<else>7</if>">{$searchcode}</td>
</tr>
<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used']>

2
templates/Classic/admin/customers/customers_add.tpl
View File

@@ -6,7 +6,7 @@ $header
<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/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$customer_add_form}
</table>

2
templates/Classic/admin/customers/customers_edit.tpl
View File

@@ -7,7 +7,7 @@ $header
<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/Classic/title.gif" alt="" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
</tr>
{$customer_edit_form}
</table>

2
templates/Classic/admin/domains/domains.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['domains']}</b>&nbsp;({$domainscount})</td>
<td class="maintitle_search_left"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['domains']}</b>&nbsp;({$domainscount})</td>
<td class="maintitle_search_right" colspan="4">{$searchcode}</td>
</tr>
<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >

2
templates/Classic/admin/domains/domains_add.tpl
View File

@@ -6,7 +6,7 @@ $header
<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/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$domain_add_form}
</table>

2
templates/Classic/admin/domains/domains_edit.tpl
View File

@@ -7,7 +7,7 @@ $header
<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/Classic/title.gif" alt="" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b></td>
</tr>
{$domain_edit_form}
</table>

2
templates/Classic/admin/froxlorclients/froxlorclient_settings.tpl
View File

@@ -1,6 +1,6 @@
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}"</b>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclient_settings']}&nbsp;"{$client->Get('name')}"</b>
[<a href="$filename?page=clients&amp;action=settings&amp;part=&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['compactoverview']}</a>]</td>
</tr>
$fields

2
templates/Classic/admin/froxlorclients/froxlorclient_settingsoverview.tpl
View File

@@ -1,7 +1,7 @@
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle" align="center" colspan="3">
<b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}&nbsp;"{$client->Get('name')}"</b>
<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['configfiles']['serverconfiguration']}&nbsp;"{$client->Get('name')}"</b>
[<a href="$filename?page=clients&amp;action=settings&amp;part=all&amp;s=$s&amp;id={$id}">{$lng['admin']['configfiles']['overview']}</a>]
</td>
</tr>

2
templates/Classic/admin/froxlorclients/froxlorclient_settingsoverviewgroup.tpl
View File

@@ -1,6 +1,6 @@
<tr>
<td class="maintitle_apply_left">
<b><img src="images/Classic/title.gif" alt="" />&nbsp;{$title}</b>
<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$title}</b>
</td>
<td class="main_field_display_small" nowrap="nowrap">{$option}</td>
<td class="main_field_display_small" nowrap="nowrap">

2
templates/Classic/admin/froxlorclients/froxlorclients.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="3"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}</b></td>
<td class="maintitle_search_left" colspan="3"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}</b></td>
<td class="maintitle_search_right" colspan="1">{$searchcode}</td>
</tr>
<tr>

4
templates/Classic/admin/froxlorclients/froxlorclients_add.tpl
View File

@@ -5,7 +5,7 @@ $header
<input type="hidden" name="action" value="$action" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['add']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['add']}</b></td>
</tr>
<tr>
<td class="main_field_name" colspan="2">
@@ -15,7 +15,7 @@ $header
</tr>
<tr>
<td class="maintitle_apply_left">
<b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['client']}</b>
<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['client']}</b>
</td>
<td class="maintitle_apply_right" nowrap="nowrap">
<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />

8
templates/Classic/admin/froxlorclients/froxlorclients_client.tpl
View File

@@ -1,17 +1,17 @@
<tr class="" onmouseover="this.className='RowOverSelected';" onmouseout="this.className='';">
<td class="field_name_border_left">
<img src="images/Classic/multiserver/server.png" alt="Client #{$row['id']}" /></td>
<img src="templates/{$theme}/assets/img/multiserver/server.png" alt="Client #{$row['id']}" /></td>
<td class="field_name">{$row['name']}<br /><span style="font-size:80%">{$row['desc']}</span></td>
<td class="field_name">
<if $row['enabled'] == 1 >
<img src="images/Classic/multiserver/tick.png" alt="{$lng['panel']['yes']}" />
<img src="templates/{$theme}/assets/img/multiserver/tick.png" alt="{$lng['panel']['yes']}" />
<else>
<img src="images/Classic/multiserver/no.png" alt="{$lng['panel']['no']}" />
<img src="templates/{$theme}/assets/img/multiserver/no.png" alt="{$lng['panel']['no']}" />
</if>
</td>
<td class="field_name">
<a href="$filename?s=$s&amp;page=$page&amp;action=view&amp;id={$row['id']}">
<img src="images/Classic/multiserver/view.png" alt="{$lng['admin']['froxlorclients']['view']}" style="border:0;" />
<img src="templates/{$theme}/assets/img/multiserver/view.png" alt="{$lng['admin']['froxlorclients']['view']}" style="border:0;" />
</a>
</td>
</tr>

4
templates/Classic/admin/froxlorclients/froxlorclients_edit.tpl
View File

@@ -7,7 +7,7 @@ $header
<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/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['edit']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['edit']}</b></td>
</tr>
<tr>
<td class="main_field_name" colspan="2">
@@ -17,7 +17,7 @@ $header
</tr>
<tr>
<td class="maintitle_apply_left">
<b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['client']}</b>
<b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlorclients']['client']}</b>
</td>
<td class="maintitle_apply_right" nowrap="nowrap">
<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />

2
templates/Classic/admin/froxlorclients/froxlorclients_view.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="4"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}&nbsp;"{$client->Get('name')}"</b></td>
<td class="maintitle_search_left" colspan="4"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['multiserver']['clients']}&nbsp;"{$client->Get('name')}"</b></td>
</tr>
<tr>
<td colspan="4">@TODO infos about client "{$client->Get('name')}"</td>

4
templates/Classic/admin/index/change_language.tpl
View File

@@ -4,10 +4,10 @@ $header
<input type="hidden" name="page" value="$page" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="none" rowspan="4"><img src="images/Classic/changelanguage.gif" alt="" /></td>
<td class="none" rowspan="4"><img src="templates/{$theme}/assets/img/changelanguage.gif" alt="" /></td>
</tr>
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changelanguage']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changelanguage']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['login']['language']}</td>

4
templates/Classic/admin/index/change_password.tpl
View File

@@ -4,10 +4,10 @@ $header
<input type="hidden" name="page" value="$page" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="none" rowspan="6"><img src="images/Classic/logininternal.gif" alt="" /></td>
<td class="none" rowspan="6"><img src="templates/{$theme}/assets/img/logininternal.gif" alt="" /></td>
</tr>
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changepassword']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changepassword']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['changepassword']['old_password']}</td>

4
templates/Classic/admin/index/change_theme.tpl
View File

@@ -4,10 +4,10 @@ $header
<input type="hidden" name="page" value="$page" />
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable_60">
<tr>
<td class="none" rowspan="4"><img src="images/Classic/changetheme.png" alt="" /></td>
<td class="none" rowspan="4"><img src="templates/{$theme}/assets/img/changetheme.png" alt="" /></td>
</tr>
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changetheme']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['main']['changetheme']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['panel']['theme']}</td>

6
templates/Classic/admin/index/index.tpl
View File

@@ -1,7 +1,7 @@
$header
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td colspan="2" class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['ressourcedetails']}</b></td>
<td colspan="2" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['ressourcedetails']}</b></td>
</tr>
<tr>
<td class="field_name_border_left">{$lng['admin']['customers']}:</td>
@@ -78,7 +78,7 @@ $header
</tr>
</if>
<tr>
<td colspan="2" class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['systemdetails']}</b></td>
<td colspan="2" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['systemdetails']}</b></td>
</tr>
<tr>
<td class="field_name_border_left">{$lng['admin']['serversoftware']}:</td>
@@ -121,7 +121,7 @@ $header
</tr>
</if>
<tr>
<td colspan="2" class="maintitle"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['froxlordetails']}</b></td>
<td colspan="2" class="maintitle"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['froxlordetails']}</b></td>
</tr>
{$outstanding_tasks}
{$cron_last_runs}

2
templates/Classic/admin/ipsandports/ipsandports.tpl
View File

@@ -4,7 +4,7 @@ $header
<input type="hidden" name="page" value="$page"/>
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="5"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['ipsandports']['ipsandports']}</b></td>
<td class="maintitle_search_left" colspan="5"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['ipsandports']['ipsandports']}</b></td>
<td class="maintitle_search_right" colspan="5">{$searchcode}</td>
</tr>
<tr>

2
templates/Classic/admin/ipsandports/ipsandports_add.tpl
View File

@@ -6,7 +6,7 @@ $header
<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/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$ipsandports_add_form}
</table>

2
templates/Classic/admin/ipsandports/ipsandports_edit.tpl
View File

@@ -7,7 +7,7 @@ $header
<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/Classic/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="{$title}" />&nbsp;{$title}</b></td>
</tr>
{$ipsandports_edit_form}
</table>

2
templates/Classic/admin/logger/logger.tpl
View File

@@ -5,7 +5,7 @@ $header
<input type="hidden" name="send" value="send" />
<table cellpadding="5" cellspacing="0" border="0" align="center" class="maintable">
<tr>
<td class="maintitle_search_left" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['menue']['logger']['logger']}</b></td>
<td class="maintitle_search_left" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['menue']['logger']['logger']}</b></td>
<td class="maintitle_search_right" colspan="2">{$searchcode}</td>
</tr>
<if 15 < $log_count >

2
templates/Classic/admin/message/message.tpl
View File

@@ -14,7 +14,7 @@ $header
</if>
<table cellpadding="5" cellspacing="4" border="0" align="center" class="maintable">
<tr>
<td class="maintitle" colspan="2"><b><img src="images/Classic/title.gif" alt="" />&nbsp;{$lng['admin']['message']}</b></td>
<td class="maintitle" colspan="2"><b><img src="templates/{$theme}/assets/img/title.gif" alt="" />&nbsp;{$lng['admin']['message']}</b></td>
</tr>
<tr>
<td class="main_field_name">{$lng['admin']['receipient']}</td>

Some files were not shown because too many files have changed in this diff Show More