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

use correct Settings-class in templates

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-18 15:53:08 +01:00
parent 6329042d40
commit a25150babf
32 changed files with 74 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,72 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* 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
* 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 Florian Lippert <flo@syscp.org> (2003-2009)
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Settings
*
*/
return array(
'groups' => array(
'version' => array(
'fields' => array(
'panel_version' => array(
'settinggroup' => 'panel',
'varname' => 'version',
'type' => 'hidden',
'default' => '',
),
'panel_frontend' => array(
'settinggroup' => 'panel',
'varname' => 'frontend',
'type' => 'hidden',
'default' => '',
),
'system_last_tasks_run' => array(
'settinggroup' => 'system',
'varname' => 'last_tasks_run',
'type' => 'hidden',
'default' => '',
'save_method' => 'storeSettingField',
),
'system_last_traffic_run' => array(
'settinggroup' => 'system',
'varname' => 'last_traffic_run',
'type' => 'hidden',
'default' => '',
),
'system_lastcronrun' => array(
'settinggroup' => 'system',
'varname' => 'lastcronrun',
'type' => 'hidden',
'default' => '',
),
'system_lastguid' => array(
'settinggroup' => 'system',
'varname' => 'lastguid',
'type' => 'hidden',
'default' => 9999,
),
'system_lastaccountnumber' => array(
'settinggroup' => 'system',
'varname' => 'lastaccountnumber',
'type' => 'hidden',
'default' => 0,
),
),
),
),
);
?>

1
admin_settings.php
View File

@@ -33,7 +33,6 @@ Database::needRoot(false);
if ($page == 'overview' && $userinfo['change_serversettings'] == '1') { if ($page == 'overview' && $userinfo['change_serversettings'] == '1') {
$settings_data = loadConfigArrayDir('./actions/admin/settings/'); $settings_data = loadConfigArrayDir('./actions/admin/settings/');
$settings = loadSettings($settings_data);
if (isset($_POST['send']) if (isset($_POST['send'])
&& $_POST['send'] == 'send' && $_POST['send'] == 'send'

81
lib/functions/settings/function.loadSettings.php
View File

@@ -1,81 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* 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
* 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 Florian Lippert <flo@syscp.org> (2003-2009)
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
*/
/**
* @FIXME remove when fully migrated to new Settings class
*
* @param array $settings_data
*
* @return array
*/
function loadSettings(&$settings_data) {
$settings = array();
if (is_array($settings_data)
&& isset($settings_data['groups'])
&& is_array($settings_data['groups'])
) {
// prepare for use in for-loop
$row_stmt = Database::prepare("
SELECT `settinggroup`, `varname`, `value`
FROM `" . TABLE_PANEL_SETTINGS . "`
WHERE `settinggroup` = :group AND `varname` = :varname
");
foreach ($settings_data['groups'] as $settings_part => $settings_part_details) {
if (is_array($settings_part_details)
&& isset($settings_part_details['fields'])
&& is_array($settings_part_details['fields'])
) {
foreach ($settings_part_details['fields'] as $field_name => $field_details) {
if (isset($field_details['settinggroup'])
&& isset($field_details['varname'])
&& isset($field_details['default'])
) {
// execute prepared statement
$row = Database::pexecute_first($row_stmt, array(
'group' => $field_details['settinggroup'],
'varname' => $field_details['varname']
));
if (!empty($row)) {
$varvalue = $row['value'];
} else {
$varvalue = $field_details['default'];
}
$settings[$field_details['settinggroup']][$field_details['varname']] = $varvalue;
} else {
$varvalue = false;
}
$settings_data['groups'][$settings_part]['fields'][$field_name]['value'] = $varvalue;
}
}
}
}
return $settings;
}

33
lib/functions/system/function.isFreeBSD.php
View File

@@ -1,33 +0,0 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2014 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> (2014-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
*/
/**
* check if the system is FreeBSD (if exact)
* or BSD-based (NetBSD, OpenBSD, etc. if exact = false [default])
*
* @param boolean $exact whether to check explicitly for FreeBSD or *BSD
*
* @return boolean
*/
function isFreeBSD($exact = false) {
if (($exact && PHP_OS == 'FreeBSD')
|| (!$exact && stristr(PHP_OS, 'BSD'))
) {
return true;
}
return false;
}

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

@@ -36,7 +36,7 @@ function setCycleOfCronjob($fieldname, $fielddata, $newfieldvalue, $allnewfieldv
break; break;
} }
Database::query("UPDATE `cronjobs_run` SET `interval` = '1 ".$interval."' WHERE `cronfile` = 'cron_used_tickets_reset.php';"); Database::query("UPDATE `cronjobs_run` SET `interval` = '1 ".$interval."' WHERE `cronfile` = 'used_tickets_reset';");
return array(FORMFIELDS_PLAUSIBILITY_CHECK_OK); return array(FORMFIELDS_PLAUSIBILITY_CHECK_OK);
} }

8
templates/Sparkle/admin/admins/admins_admin.tpl vendored
View File

@@ -18,12 +18,12 @@
<span class="overviewcustomerextras"> <span class="overviewcustomerextras">
<span>Webspace:</span> <span>Webspace:</span>
<if $row['diskspace'] != 'UL'> <if $row['diskspace'] != 'UL'>
<if (($row['diskspace']/100)*(int)Settings::Get('system.report_webmax')) < $row['diskspace_used']> <if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
<div class="progress progress-danger tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}"> <div class="progress progress-danger tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>
<else> <else>
<if (($row['diskspace']/100)*((int)Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']> <if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
<div class="progress progress-warn tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}"> <div class="progress progress-warn tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>
@@ -42,12 +42,12 @@
<span class="overviewcustomerextras"> <span class="overviewcustomerextras">
<span>Traffic:</span> <span>Traffic:</span>
<if $row['traffic'] != 'UL'> <if $row['traffic'] != 'UL'>
<if (($row['traffic']/100)*(int)Settings::Get('system.report_trafficmax')) < $row['traffic_used']> <if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}"> <div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>
<else> <else>
<if (($row['traffic']/100)*((int)Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']> <if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}"> <div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>

2
templates/Sparkle/admin/configfiles/wizard.tpl vendored
View File

@@ -59,7 +59,7 @@ $header
<td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td> <td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
</tr> </tr>
<tr> <tr>
<if Settings::Get('panel.is_configured') == '0'> <if \Froxlor\Settings::Get('panel.is_configured') == '0'>
<td colspan="2" align="center">{$lng['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{$lng['panel']['ihave_configured']}</a><br><br></td> <td colspan="2" align="center">{$lng['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{$lng['panel']['ihave_configured']}</a><br><br></td>
<else> <else>
<td colspan="2" align="center">{$lng['panel']['system_is_configured']}</td> <td colspan="2" align="center">{$lng['panel']['system_is_configured']}</td>

8
templates/Sparkle/admin/customers/customers_customer.tpl vendored
View File

@@ -25,12 +25,12 @@
<span class="overviewcustomerextras"> <span class="overviewcustomerextras">
<span>Webspace:</span> <span>Webspace:</span>
<if $row['diskspace'] != 'UL'> <if $row['diskspace'] != 'UL'>
<if (($row['diskspace']/100)*(int)Settings::Get('system.report_webmax')) < $row['diskspace_used']> <if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
<div class="progress progress-danger tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}"> <div class="progress progress-danger tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>
<else> <else>
<if (($row['diskspace']/100)*((int)Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']> <if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
<div class="progress progress-warn tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}"> <div class="progress progress-warn tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>
@@ -49,12 +49,12 @@
<span class="overviewcustomerextras"> <span class="overviewcustomerextras">
<span>Traffic:</span> <span>Traffic:</span>
<if $row['traffic'] != 'UL'> <if $row['traffic'] != 'UL'>
<if (($row['traffic']/100)*(int)Settings::Get('system.report_trafficmax')) < $row['traffic_used']> <if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}"> <div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>
<else> <else>
<if (($row['traffic']/100)*((int)Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']> <if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}"> <div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div> <div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
</div> </div>

4
templates/Sparkle/admin/domains/domains_domain.tpl vendored
View File

@@ -26,7 +26,7 @@
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'logfiles', 'domain_id' => $row['id']))}"> <a href="{$linker->getLink(array('section' => 'domains', 'page' => 'logfiles', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['panel']['viewlogs']}" title="{$lng['panel']['viewlogs']}" /> <img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['panel']['viewlogs']}" title="{$lng['panel']['viewlogs']}" />
</a> </a>
<if $row['isbinddomain'] == '1' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dnsenabled') == '1'> <if $row['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}"> &nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" /> <img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" />
</a> </a>
@@ -34,7 +34,7 @@
<if $row['letsencrypt'] == '1'> <if $row['letsencrypt'] == '1'>
&nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" /> &nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if> </if>
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != Settings::Get('system.hostname_id')> <if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != \Froxlor\Settings::Get('system.hostname_id')>
<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])> <if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}"> &nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" /> <img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />

2
templates/Sparkle/admin/domains/domains_edit.tpl vendored
View File

@@ -4,7 +4,7 @@ $header
<h2> <h2>
<img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp; <img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp;
{$title} {$title}
<if $result['isbinddomain'] == '1' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dnsenabled') == '1'> <if $result['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>) &nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>)
</if> </if>
</h2> </h2>

6
templates/Sparkle/admin/index/index.tpl vendored
View File

@@ -122,7 +122,7 @@ $header
</small> </small>
</div> </div>
<if Settings::Get('system.mail_quota_enabled') == 1> <if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
<div class="canvasbox"> <div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" data-used="{$overview['email_quota_used']}" data-available="{$userinfo['email_quota']}" data-assigned="{$userinfo['email_quota_used']}"> <input type="hidden" id="email_quota" class="circular" data-used="{$overview['email_quota_used']}" data-available="{$userinfo['email_quota']}" data-assigned="{$userinfo['email_quota_used']}">
<canvas id="email_quota-canvas" width="120" height="76"></canvas><br/> <canvas id="email_quota-canvas" width="120" height="76"></canvas><br/>
@@ -150,7 +150,7 @@ $header
</small> </small>
</div> </div>
<if Settings::Get('ticket.enabled') == 1> <if \Froxlor\Settings::Get('ticket.enabled') == 1>
<div class="canvasbox"> <div class="canvasbox">
<input type="hidden" id="tickets" class="circular" data-used="{$overview['tickets_used']}" data-available="{$userinfo['tickets']}" data-assigned="{$userinfo['tickets_used']}"> <input type="hidden" id="tickets" class="circular" data-used="{$overview['tickets_used']}" data-available="{$userinfo['tickets']}" data-assigned="{$userinfo['tickets_used']}">
<canvas id="tickets-canvas" width="120" height="76"></canvas><br/> <canvas id="tickets-canvas" width="120" height="76"></canvas><br/>
@@ -167,7 +167,7 @@ $header
</div> </div>
<div class="grid-u-1-2"> <div class="grid-u-1-2">
<if Settings::Get('admin.show_news_feed') == '1'> <if \Froxlor\Settings::Get('admin.show_news_feed') == '1'>
<table class="dboarditem full" id="newsfeed"> <table class="dboarditem full" id="newsfeed">
<thead> <thead>
<tr> <tr>

2
templates/Sparkle/admin/phpconfig/overview.tpl vendored
View File

@@ -19,7 +19,7 @@ $header
<tr> <tr>
<th>{$lng['admin']['phpsettings']['description']}</th> <th>{$lng['admin']['phpsettings']['description']}</th>
<th>{$lng['admin']['phpsettings']['activedomains']}</th> <th>{$lng['admin']['phpsettings']['activedomains']}</th>
<if Settings::Get('phpfpm.enabled') == '1'> <if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
<th>{$lng['admin']['phpsettings']['fpmdesc']}</th> <th>{$lng['admin']['phpsettings']['fpmdesc']}</th>
<else> <else>
<th>{$lng['admin']['phpsettings']['binary']}</th> <th>{$lng['admin']['phpsettings']['binary']}</th>

2
templates/Sparkle/admin/phpconfig/overview_overview.tpl vendored
View File

@@ -1,7 +1,7 @@
<tr class="top"> <tr class="top">
<td><strong>{$row['description']}</strong></td> <td><strong>{$row['description']}</strong></td>
<td>{$domains}<if 0 < $subdomains_count><if !empty($domains)>+ </if>{$subdomains_count} {$lng['customer']['subdomains']}</if></td> <td>{$domains}<if 0 < $subdomains_count><if !empty($domains)>+ </if>{$subdomains_count} {$lng['customer']['subdomains']}</if></td>
<if Settings::Get('phpfpm.enabled') == '1'> <if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
<td>{$row['fpmdesc']}</td> <td>{$row['fpmdesc']}</td>
<else> <else>
<td>{$row['binary']}</td> <td>{$row['binary']}</td>

4
templates/Sparkle/admin/settings/testmail.tpl vendored
View File

@@ -29,8 +29,8 @@ $header
<td>{$mail_smtp_user}</td> <td>{$mail_smtp_user}</td>
<td>{$mail_smtp_host}</td> <td>{$mail_smtp_host}</td>
<td>{$mail_smtp_port}</td> <td>{$mail_smtp_port}</td>
<td><img src="templates/{$theme}/assets/img/icons/<if Settings::Get('system.mail_use_smtp') == '1'>button_ok<else>cancel</if>.png" alt="" /></td> <td><img src="templates/{$theme}/assets/img/icons/<if \Froxlor\Settings::Get('system.mail_use_smtp') == '1'>button_ok<else>cancel</if>.png" alt="" /></td>
<td><img src="templates/{$theme}/assets/img/icons/<if Settings::Get('system.mail_smtp_usetls') == '1'>button_ok<else>cancel</if>.png" alt="" /></td> <td><img src="templates/{$theme}/assets/img/icons/<if \Froxlor\Settings::Get('system.mail_smtp_usetls') == '1'>button_ok<else>cancel</if>.png" alt="" /></td>
</tr> </tr>
</table> </table>
<br> <br>

4
templates/Sparkle/admin/settings/updatecounters_row_admin.tpl vendored
View File

@@ -14,11 +14,11 @@
{$lng['customer']['emails']}: <span <if $admin['emails_used'] == $admin['emails_used_new']>class="green"<else>class="red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span><br /> {$lng['customer']['emails']}: <span <if $admin['emails_used'] == $admin['emails_used_new']>class="green"<else>class="red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span><br />
{$lng['customer']['accounts']}: <span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span><br /> {$lng['customer']['accounts']}: <span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span><br />
{$lng['customer']['forwarders']}: <span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span><br /> {$lng['customer']['forwarders']}: <span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span><br />
<if Settings::Get('system.mail_quota_enabled') == 1> <if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
{$lng['customer']['email_quota']}: <span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span><br /> {$lng['customer']['email_quota']}: <span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span><br />
</if> </if>
{$lng['customer']['ftps']}: <span <if $admin['ftps_used'] == $admin['ftps_used_new']>class="green"<else>class="red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span><br /> {$lng['customer']['ftps']}: <span <if $admin['ftps_used'] == $admin['ftps_used_new']>class="green"<else>class="red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span><br />
<if Settings::Get('ticket.enabled') == '1'> <if \Froxlor\Settings::Get('ticket.enabled') == '1'>
{$lng['customer']['tickets']}: <span <if $admin['tickets_used'] == $admin['tickets_used_new']>class="green"<else>class="red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span><br /> {$lng['customer']['tickets']}: <span <if $admin['tickets_used'] == $admin['tickets_used_new']>class="green"<else>class="red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span><br />
</if> </if>
</td> </td>

4
templates/Sparkle/admin/settings/updatecounters_row_customer.tpl vendored
View File

@@ -10,11 +10,11 @@
</td> </td>
<td> <td>
{$lng['customer']['forwarders']}: <span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span><br /> {$lng['customer']['forwarders']}: <span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span><br />
<if Settings::Get('system.mail_quota_enabled') == 1> <if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
{$lng['customer']['email_quota']}: <span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span><br /> {$lng['customer']['email_quota']}: <span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span><br />
</if> </if>
{$lng['customer']['ftps']}: <span <if $customer['ftps_used'] == $customer['ftps_used_new']>class="green"<else>class="red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span><br /> {$lng['customer']['ftps']}: <span <if $customer['ftps_used'] == $customer['ftps_used_new']>class="green"<else>class="red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span><br />
<if Settings::Get('ticket.enabled') == '1'> <if \Froxlor\Settings::Get('ticket.enabled') == '1'>
{$lng['customer']['tickets']}: <span <if $customer['tickets_used'] == $customer['tickets_used_new']>class="green"<else>class="red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span><br /> {$lng['customer']['tickets']}: <span <if $customer['tickets_used'] == $customer['tickets_used_new']>class="green"<else>class="red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span><br />
</if> </if>
</td> </td>

2
templates/Sparkle/admin/templates/templates_add_2.tpl vendored
View File

@@ -71,7 +71,7 @@ $header
<td><em>{EMAIL}</em></td> <td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td> <td>{$lng['admin']['templates']['EMAIL']}</td>
</tr> </tr>
<if Settings::Get('panel.sendalternativemail') == 1> <if \Froxlor\Settings::Get('panel.sendalternativemail') == 1>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<strong>{$lng['admin']['templates']['pop_success_alternative']}</strong> <strong>{$lng['admin']['templates']['pop_success_alternative']}</strong>

2
templates/Sparkle/admin/templates/templates_edit.tpl vendored
View File

@@ -73,7 +73,7 @@ $header
<td><em>{EMAIL}</em></td> <td><em>{EMAIL}</em></td>
<td>{$lng['admin']['templates']['EMAIL']}</td> <td>{$lng['admin']['templates']['EMAIL']}</td>
</tr> </tr>
<if Settings::Get('panel.sendalternativemail') == 1> <if \Froxlor\Settings::Get('panel.sendalternativemail') == 1>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<strong>{$lng['admin']['templates']['pop_success_alternative']}</strong> <strong>{$lng['admin']['templates']['pop_success_alternative']}</strong>

2
templates/Sparkle/customer/domains/domains_domain.tpl vendored
View File

@@ -33,7 +33,7 @@
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" /> <img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
</a>&nbsp; </a>&nbsp;
</if> </if>
<if $row['isbinddomain'] == '1' && $userinfo['dnsenabled'] == '1' && $row['caneditdomain'] == '1' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dnsenabled') == '1'> <if $row['isbinddomain'] == '1' && $userinfo['dnsenabled'] == '1' && $row['caneditdomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}"> <a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" /> <img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" />
</a>&nbsp; </a>&nbsp;

2
templates/Sparkle/customer/domains/domains_edit.tpl vendored
View File

@@ -4,7 +4,7 @@ $header
<h2> <h2>
<img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp; <img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp;
{$title} {$title}
<if $result['isbinddomain'] == '1' && $userinfo['dnsenabled'] == '1' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dnsenabled') == '1'> <if $result['isbinddomain'] == '1' && $userinfo['dnsenabled'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>) &nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>)
</if> </if>
</h2> </h2>

4
templates/Sparkle/customer/email/emails.tpl vendored
View File

@@ -30,8 +30,8 @@
<th>{$lng['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th> <th>{$lng['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th>
<th>{$lng['emails']['forwarders']}&nbsp;{$arrowcode['m.destination']}</th> <th>{$lng['emails']['forwarders']}&nbsp;{$arrowcode['m.destination']}</th>
<th>{$lng['emails']['account']}</th> <th>{$lng['emails']['account']}</th>
<if Settings::Get('catchall.catchall_enabled') == '1'><th>{$lng['emails']['catchall']}</th></if> <if \Froxlor\Settings::Get('catchall.catchall_enabled') == '1'><th>{$lng['emails']['catchall']}</th></if>
<if Settings::Get('system.mail_quota_enabled') == '1'> <if \Froxlor\Settings::Get('system.mail_quota_enabled') == '1'>
<th>{$lng['emails']['quota']}</th> <th>{$lng['emails']['quota']}</th>
</if> </if>
<th>{$lng['panel']['options']}</th> <th>{$lng['panel']['options']}</th>

4
templates/Sparkle/customer/email/emails_email.tpl vendored
View File

@@ -2,8 +2,8 @@
<td>{$row['email_full']}</td> <td>{$row['email_full']}</td>
<td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td> <td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td> <td><if $row['popaccountid'] != 0>{$lng['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
<if Settings::Get('catchall.catchall_enabled') == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if> <if \Froxlor\Settings::Get('catchall.catchall_enabled') == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if>
<if Settings::Get('system.mail_quota_enabled') == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MiB</if></if></td> <if \Froxlor\Settings::Get('system.mail_quota_enabled') == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MiB</if></if></td>
<td> <td>
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}"> <a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" /> <img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />

2
templates/Sparkle/customer/ftp/accounts.tpl vendored
View File

@@ -30,7 +30,7 @@
<th>{$lng['login']['username']}&nbsp;{$arrowcode['username']}</th> <th>{$lng['login']['username']}&nbsp;{$arrowcode['username']}</th>
<th>{$lng['panel']['ftpdesc']}&nbsp;{$arrowcode['description']}</th> <th>{$lng['panel']['ftpdesc']}&nbsp;{$arrowcode['description']}</th>
<th>{$lng['panel']['path']}&nbsp;{$arrowcode['homedir']}</th> <th>{$lng['panel']['path']}&nbsp;{$arrowcode['homedir']}</th>
<if Settings::Get('system.allow_customer_shell') == '1' > <if \Froxlor\Settings::Get('system.allow_customer_shell') == '1' >
<th>{$lng['panel']['shell']}</th> <th>{$lng['panel']['shell']}</th>
</if> </if>
<th>{$lng['panel']['options']}</th> <th>{$lng['panel']['options']}</th>

2
templates/Sparkle/customer/ftp/accounts_account.tpl vendored
View File

@@ -2,7 +2,7 @@
<td>{$row['username']}</td> <td>{$row['username']}</td>
<td>{$row['description']}</td> <td>{$row['description']}</td>
<td>{$row['documentroot']}</td> <td>{$row['documentroot']}</td>
<if Settings::Get('system.allow_customer_shell') == '1' > <if \Froxlor\Settings::Get('system.allow_customer_shell') == '1' >
<td>{$row['shell']}</td> <td>{$row['shell']}</td>
</if> </if>
<td> <td>

6
templates/Sparkle/customer/index/index.tpl vendored
View File

@@ -92,7 +92,7 @@ $header
</div> </div>
</if> </if>
<if Settings::Get('system.mail_quota_enabled') == 1 && $userinfo['email_quota'] != '0'> <if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1 && $userinfo['email_quota'] != '0'>
<div class="canvasbox"> <div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" data-used="{$userinfo['email_quota_used']}" data-available="{$userinfo['email_quota']}"> <input type="hidden" id="email_quota" class="circular" data-used="{$userinfo['email_quota_used']}" data-available="{$userinfo['email_quota']}">
<canvas id="email_quota-canvas" width="120" height="76"></canvas><br /> <canvas id="email_quota-canvas" width="120" height="76"></canvas><br />
@@ -135,7 +135,7 @@ $header
</div> </div>
</if> </if>
<if (int)Settings::Get('ticket.enabled') == 1 && $userinfo['tickets'] != '0'> <if (int)\Froxlor\Settings::Get('ticket.enabled') == 1 && $userinfo['tickets'] != '0'>
<div class="canvasbox"> <div class="canvasbox">
<input type="hidden" id="tickets" class="circular" data-used="{$userinfo['tickets_used']}" data-available="{$userinfo['tickets']}"> <input type="hidden" id="tickets" class="circular" data-used="{$userinfo['tickets_used']}" data-available="{$userinfo['tickets']}">
<canvas id="tickets-canvas" width="120" height="76"></canvas><br /> <canvas id="tickets-canvas" width="120" height="76"></canvas><br />
@@ -151,7 +151,7 @@ $header
</div> </div>
<div class="grid-u-1-2"> <div class="grid-u-1-2">
<if Settings::Get('customer.show_news_feed') == '1'> <if \Froxlor\Settings::Get('customer.show_news_feed') == '1'>
<table class="dboarditem full" id="newsfeed" data-role="customer"> <table class="dboarditem full" id="newsfeed" data-role="customer">
<thead> <thead>
<tr> <tr>

4
templates/Sparkle/customer/tickets/tickets.tpl vendored
View File

@@ -32,7 +32,7 @@ $header
{$searchcode} {$searchcode}
</div> </div>
<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && ($ticketsopen < Settings::Get('ticket.concurrently_open') || (Settings::Get('ticket.concurrently_open') == '-1' || Settings::Get('ticket.concurrently_open') == '')) > <if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && ($ticketsopen < \Froxlor\Settings::Get('ticket.concurrently_open') || (\Froxlor\Settings::Get('ticket.concurrently_open') == '-1' || \Froxlor\Settings::Get('ticket.concurrently_open') == '')) >
<div class="overviewadd"> <div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp; <img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a> <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
@@ -66,7 +66,7 @@ $header
</table> </table>
</form> </form>
<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count && ($ticketsopen < Settings::Get('ticket.concurrently_open') || (Settings::Get('ticket.concurrently_open') == '-1' || Settings::Get('ticket.concurrently_open') == '')) > <if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count && ($ticketsopen < \Froxlor\Settings::Get('ticket.concurrently_open') || (\Froxlor\Settings::Get('ticket.concurrently_open') == '-1' || \Froxlor\Settings::Get('ticket.concurrently_open') == '')) >
<div class="overviewadd"> <div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp; <img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a> <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>

6
templates/Sparkle/customer/traffic/traffic.tpl vendored
View File

@@ -37,15 +37,15 @@ $header
</form> </form>
<div id="charts" class="hidden"> <div id="charts" class="hidden">
<if !Settings::IsInList('panel.customer_hide_options','traffic.http')> <if !\Froxlor\Settings::IsInList('panel.customer_hide_options','traffic.http')>
<h3>HTTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['http']})</h3> <h3>HTTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['http']})</h3>
<div id="httpchart" class="trafficchart"></div> <div id="httpchart" class="trafficchart"></div>
</if> </if>
<if !Settings::IsInList('panel.customer_hide_options','traffic.ftp')> <if !\Froxlor\Settings::IsInList('panel.customer_hide_options','traffic.ftp')>
<h3>FTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['ftp']})</h3> <h3>FTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['ftp']})</h3>
<div id="ftpchart" class="trafficchart"></div> <div id="ftpchart" class="trafficchart"></div>
</if> </if>
<if !Settings::IsInList('panel.customer_hide_options','traffic.mail')> <if !\Froxlor\Settings::IsInList('panel.customer_hide_options','traffic.mail')>
<h3>Mail {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['mail']})</h3> <h3>Mail {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['mail']})</h3>
<div id="mailchart" class="trafficchart"></div> <div id="mailchart" class="trafficchart"></div>
</if> </if>

6
templates/Sparkle/customer/traffic/traffic_details.tpl vendored
View File

@@ -31,15 +31,15 @@ $header
</tbody> </tbody>
</table> </table>
<div id="charts" class="hidden"> <div id="charts" class="hidden">
<if !Settings::IsInList('panel.customer_hide_options','traffic.http')> <if !\Froxlor\Settings::IsInList('panel.customer_hide_options','traffic.http')>
<h3>HTTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['http']})</h3> <h3>HTTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['http']})</h3>
<div id="httpchart" class="trafficchart"></div> <div id="httpchart" class="trafficchart"></div>
</if> </if>
<if !Settings::IsInList('panel.customer_hide_options','traffic.ftp')> <if !\Froxlor\Settings::IsInList('panel.customer_hide_options','traffic.ftp')>
<h3>FTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['ftp']})</h3> <h3>FTP {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['ftp']})</h3>
<div id="ftpchart" class="trafficchart"></div> <div id="ftpchart" class="trafficchart"></div>
</if> </if>
<if !Settings::IsInList('panel.customer_hide_options','traffic.mail')> <if !\Froxlor\Settings::IsInList('panel.customer_hide_options','traffic.mail')>
<h3>Mail {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['mail']})</h3> <h3>Mail {$lng['admin']['traffic']} ({$lng['traffic']['months']['total']} {$traffic_complete['mail']})</h3>
<div id="mailchart" class="trafficchart"></div> <div id="mailchart" class="trafficchart"></div>
</if> </if>

2
templates/Sparkle/footer.tpl vendored
View File

@@ -5,7 +5,7 @@
</if> </if>
<footer> <footer>
<span><img src="templates/{$theme}/assets/img/logo_grey.png" alt="Froxlor" /> <span><img src="templates/{$theme}/assets/img/logo_grey.png" alt="Froxlor" />
<if (Settings::Get('admin.show_version_login') == '1' && $filename == 'index.php') || ($filename != 'index.php' && Settings::Get('admin.show_version_footer') == '1')> <if (\Froxlor\Settings::Get('admin.show_version_login') == '1' && $filename == 'index.php') || ($filename != 'index.php' && \Froxlor\Settings::Get('admin.show_version_footer') == '1')>
{$version}{$branding} {$version}{$branding}
</if> </if>
&copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">the Froxlor Team</a><br /> &copy; 2009-{$current_year} by <a href="http://www.froxlor.org/" rel="external">the Froxlor Team</a><br />

14
templates/Sparkle/header.tpl vendored
View File

@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="Default-Style" content="text/css" /> <meta http-equiv="Default-Style" content="text/css" />
<if Settings::Get('panel.no_robots') == '0'> <if \Froxlor\Settings::Get('panel.no_robots') == '0'>
<meta name="robots" content="noindex, nofollow, noarchive" /> <meta name="robots" content="noindex, nofollow, noarchive" />
<meta name="GOOGLEBOT" content="nosnippet" /> <meta name="GOOGLEBOT" content="nosnippet" />
</if> </if>
@@ -43,12 +43,12 @@
</a> </a>
<div class="topheader_navigation"> <div class="topheader_navigation">
<ul class="topheadernav"> <ul class="topheadernav">
<if Settings::Get('panel.is_configured') == 0 && $userinfo['adminsession'] == 1 && $userinfo['change_serversettings'] == 1> <if \Froxlor\Settings::Get('panel.is_configured') == 0 && $userinfo['adminsession'] == 1 && $userinfo['change_serversettings'] == 1>
<li class="liwarn"> <li class="liwarn">
<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['panel']['not_configured']}</a> <a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['panel']['not_configured']}</a>
</li> </li>
</if> </if>
<if Settings::Get('ticket.enabled') == 1> <if \Froxlor\Settings::Get('ticket.enabled') == 1>
<li> <li>
<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets'))}"> <a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets'))}">
<if 0 < $awaitingtickets> <if 0 < $awaitingtickets>
@@ -66,16 +66,16 @@
<ul> <ul>
<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_password'))}">{$lng['login']['password']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_password'))}">{$lng['login']['password']}</a></li>
<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_language'))}">{$lng['login']['language']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_language'))}">{$lng['login']['language']}</a></li>
<if Settings::Get('2fa.enabled') == 1> <if \Froxlor\Settings::Get('2fa.enabled') == 1>
<li><a href="{$linker->getLink(array('section' => 'index', 'page' => '2fa'))}">{$lng['2fa']['2fa']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'page' => '2fa'))}">{$lng['2fa']['2fa']}</a></li>
</if> </if>
<if Settings::Get('panel.allow_theme_change_admin') == '1' && $userinfo['adminsession'] == 1> <if \Froxlor\Settings::Get('panel.allow_theme_change_admin') == '1' && $userinfo['adminsession'] == 1>
<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li>
</if> </if>
<if Settings::Get('panel.allow_theme_change_customer') == '1' && $userinfo['adminsession'] == 0> <if \Froxlor\Settings::Get('panel.allow_theme_change_customer') == '1' && $userinfo['adminsession'] == 0>
<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_theme'))}">{$lng['panel']['theme']}</a></li>
</if> </if>
<if Settings::Get('api.enabled') == 1> <if \Froxlor\Settings::Get('api.enabled') == 1>
<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'apikeys'))}">{$lng['menue']['main']['apikeys']}</a></li> <li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'apikeys'))}">{$lng['menue']['main']['apikeys']}</a></li>
<li><a href="https://api.froxlor.org/doc/" rel="external">{$lng['menue']['main']['apihelp']}</a></li> <li><a href="https://api.froxlor.org/doc/" rel="external">{$lng['menue']['main']['apihelp']}</a></li>
</if> </if>

2
templates/Sparkle/login/login.tpl vendored
View File

@@ -50,7 +50,7 @@ $header
</form> </form>
<aside> <aside>
<if Settings::Get('panel.allow_preset') == '1'> <if \Froxlor\Settings::Get('panel.allow_preset') == '1'>
<a href="$filename?action=forgotpwd">{$lng['login']['forgotpwd']}</a> <a href="$filename?action=forgotpwd">{$lng['login']['forgotpwd']}</a>
<else> <else>
&nbsp; &nbsp;