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

merged more of the re-design files to current state

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2011-02-08 13:17:24 +01:00
parent 43770d37e1
commit bee19fabfa
12 changed files with 121 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql
View File

@@ -465,7 +465,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.18-svn1');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.18-svn2');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');

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

@@ -911,7 +911,7 @@ class ApsParser
if($Error == 1)
{
self::InfoBox($lng['aps']['nospecialchars']);
self::InfoBox($lng['aps']['nospecialchars'], 1);
}
elseif($Error == 2)
{
@@ -948,11 +948,11 @@ class ApsParser
{
if($this->db->num_rows($result) == 1)
{
self::InfoBox(sprintf($lng['aps']['searchoneresult'], $this->db->num_rows($result)));
self::InfoBox(sprintf($lng['aps']['searchoneresult'], $this->db->num_rows($result)), 2);
}
else
{
self::InfoBox(sprintf($lng['aps']['searchmultiresult'], $this->db->num_rows($result)));
self::InfoBox(sprintf($lng['aps']['searchmultiresult'], $this->db->num_rows($result)), 2);
}
while($Row = $this->db->fetch_array($result))
@@ -996,7 +996,7 @@ class ApsParser
//skip if parse of xml has failed
if($Xml == false)continue;
$Icon = './images/default.png';
$Icon = './images/Classic/default.png';
$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
@@ -1162,7 +1162,7 @@ class ApsParser
if($this->db->num_rows($result) == 0)
{
self::InfoBox($lng['aps']['erroronnewinstance']);
self::InfoBox($lng['aps']['erroronnewinstance'], 1);
return false;
}
@@ -1194,7 +1194,7 @@ class ApsParser
//update used counter for packages
$this->db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `aps_packages_used` = `aps_packages_used` + 1 WHERE `customerid` = ' . (int)$CustomerId);
self::InfoBox(sprintf($lng['aps']['successonnewinstance'], $Xml->name));
self::InfoBox(sprintf($lng['aps']['successonnewinstance'], $Xml->name), 2);
unset($Xml);
}
@@ -1735,7 +1735,7 @@ class ApsParser
$Output.= '<li>' . $Entry . '</li>';
}
self::InfoBox(sprintf($lng['aps']['erroronscan'], $Xml->name, $Output));
self::InfoBox(sprintf($lng['aps']['erroronscan'], $Xml->name, $Output), 1);
return false;
}
else
@@ -1819,11 +1819,11 @@ class ApsParser
if($Newer == 1)
{
self::InfoBox(sprintf($lng['aps']['successpackageupdate'], $Xml->name));
self::InfoBox(sprintf($lng['aps']['successpackageupdate'], $Xml->name), 2);
}
else
{
self::InfoBox(sprintf($lng['aps']['successpackageinstall'], $Xml->name));
self::InfoBox(sprintf($lng['aps']['successpackageinstall'], $Xml->name), 2);
}
unset($Xml);
@@ -1870,11 +1870,11 @@ class ApsParser
if(!isset($this->userinfo['customerid']))
{
self::InfoBox(sprintf($lng['aps']['initerror'], $Error));
self::InfoBox(sprintf($lng['aps']['initerror'], $Error), 1);
}
else
{
self::InfoBox($lng['aps']['initerror_customer']);
self::InfoBox($lng['aps']['initerror_customer'], 1);
}
return;
@@ -2139,11 +2139,11 @@ class ApsParser
{
if($i == $_GET['page'])
{
echo ('<span class="pageitem">' . $i . '</span>');
echo ('<span class="pageitem">' . $i . '</span>&nbsp;');
}
else
{
echo ('<span class="pageitem"><a href="' . $filename . '?s=' . $s . '&amp;action=overview&amp;page=' . $i . '">' . $i . '</a></span>');
echo ('<span class="pageitem"><a href="' . $filename . '?s=' . $s . '&amp;action=overview&amp;page=' . $i . '">' . $i . '</a></span>&nbsp;');
}
}
@@ -2177,7 +2177,7 @@ class ApsParser
echo ('<div style="width: 90%; text-align: center;"><br/>');
for ($i = 1;$i < $Pages + 1;$i++)
{
echo ('<span class="pageitem"><a href="' . $filename . '?s=' . $s . '&amp;action=overview&amp;page=' . $i . '">' . $i . '</a></span>');
echo ('<span class="pageitem"><a href="' . $filename . '?s=' . $s . '&amp;action=overview&amp;page=' . $i . '">' . $i . '</a></span>&nbsp;');
}
echo ('</div>');
@@ -2935,7 +2935,7 @@ class ApsParser
//icon for package
$Icon = './images/default.png';
$Icon = './images/Classic/default.png';
if($this->aps_version != '1.0')
{
@@ -3342,7 +3342,7 @@ class ApsParser
//return if parse of xml file has failed
if($Xml == false)return false;
$Icon = './images/default.png';
$Icon = './images/Classic/default.png';
$this->aps_version = isset($Xml->attributes()->version) ? (string)$Xml->attributes()->version : '1.0';
@@ -3551,15 +3551,14 @@ class ApsParser
/**
* show a nice looking infobox
*
* @param message message to display in beautifull layout
* @param string $Message message to display in beautifull layout
* @param int $Type 0 = warning, 1 = errror, 2 = success
*
*/
private function InfoBox($Message)
private function InfoBox($Message, $Type = 0)
{
global $lng, $filename, $s, $page, $action;
//shows a box with informations
eval("echo \"" . getTemplate("aps/infobox") . "\";");
}
@@ -3574,5 +3573,3 @@ class ApsParser
return '<div class="fielderror">' . $Error . '</div>';
}
}
?>

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

@@ -392,19 +392,22 @@ class paging
function getHtmlSortCode($lng, $break = false)
{
$sortcode = '<select class="dropdown_noborder" name="sortfield">';
$sortcode = '';
$fieldoptions = '';
$orderoptions = '';
foreach($this->fields as $fieldname => $fieldcaption)
{
$sortcode.= makeoption($fieldcaption, $fieldname, $this->sortfield, true, true);
$fieldoptions.= makeoption($fieldcaption, $fieldname, $this->sortfield, true, true);
}
$sortcode.= '</select>' . ($break ? '<br />' : '&nbsp;') . '<select class="dropdown_noborder" name="sortorder">';
$breakorws = ($break ? '<br />' : '&nbsp;');
foreach(array('asc' => $lng['panel']['ascending'], 'desc' => $lng['panel']['decending']) as $sortordertype => $sortorderdescription)
{
$sortcode.= makeoption($sortorderdescription, $sortordertype, $this->sortorder, true, true);
$orderoptions.= makeoption($sortorderdescription, $sortordertype, $this->sortorder, true, true);
}
$sortcode.= '</select>&nbsp;<input type="submit" name="Go" value="Go" />';
eval("\$sortcode =\"" . getTemplate("misc/htmlsortcode", '1') . "\";");
return $sortcode;
}
@@ -421,14 +424,18 @@ class paging
if($field != ''
&& isset($this->fields[$field]))
{
$arrowcode = '<a href="' . htmlspecialchars($baseurl) . '&amp;sortfield=' . htmlspecialchars($field) . '&amp;sortorder=desc"><img src="images/order_desc.gif" border="0" alt="" /></a><a href="' . htmlspecialchars($baseurl) . '&amp;sortfield=' . htmlspecialchars($field) . '&amp;sortorder=asc"><img src="images/order_asc.gif" border="0" alt="" /></a>';
$baseurl = htmlspecialchars($baseurl);
$fieldname = htmlspecialchars($field);
eval("\$arrowcode =\"" . getTemplate("misc/htmlarrowcode", '1') . "\";");
}
else
{
$baseurl = htmlspecialchars($baseurl);
$arrowcode = array();
foreach($this->fields as $fieldname => $fieldcaption)
{
$arrowcode[$fieldname] = '<a href="' . htmlspecialchars($baseurl) . '&amp;sortfield=' . htmlspecialchars($fieldname) . '&amp;sortorder=desc"><img src="images/order_desc.gif" border="0" alt="" /></a><a href="' . htmlspecialchars($baseurl) . '&amp;sortfield=' . htmlspecialchars($fieldname) . '&amp;sortorder=asc"><img src="images/order_asc.gif" border="0" alt="" /></a>';
$fieldname = htmlspecialchars($fieldname);
eval("\$arrowcode[\$fieldname] =\"" . getTemplate("misc/htmlarrowcode", '1') . "\";");
}
}
@@ -444,14 +451,15 @@ class paging
function getHtmlSearchCode($lng)
{
$sortcode = $lng['panel']['search'] . ': <select class="dropdown_noborder" name="searchfield">';
$searchcode = '';
$fieldoptions = '';
$searchtext = htmlspecialchars($this->searchtext);
foreach($this->fields as $fieldname => $fieldcaption)
{
$sortcode.= makeoption($fieldcaption, $fieldname, $this->searchfield, true, true);
$fieldoptions.= makeoption($fieldcaption, $fieldname, $this->searchfield, true, true);
}
$sortcode.= '</select>&nbsp;<input type="text" name="searchtext" value="' . htmlspecialchars($this->searchtext) . '" />&nbsp;<input type="submit" name="Go" value="Go" />';
return $sortcode;
eval("\$searchcode =\"" . getTemplate("misc/htmlsearchcode", '1') . "\";");
return $searchcode;
}
/**
@@ -493,16 +501,16 @@ class paging
$stop = $pages;
}
$pagingcode = '<a href="' . htmlspecialchars($baseurl) . '&amp;pageno=1">&laquo;</a> <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) - 1) == 0 ? '1' : intval($this->pageno) - 1) . '">&lt;</a> ';
$pagingcode = '<a href="' . htmlspecialchars($baseurl) . '&amp;pageno=1">&laquo;</a> <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) - 1) == 0 ? '1' : intval($this->pageno) - 1) . '">&lt;</a>&nbsp;';
for ($i = $start;$i <= $stop;$i++)
{
if($i != $this->pageno)
{
$pagingcode.= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . $i . '">' . $i . '</a> ';
$pagingcode.= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . $i . '">' . $i . '</a>&nbsp;';
}
else
{
$pagingcode.= ' <b>' . $i . '</b> ';
$pagingcode.= ' <strong>' . $i . '</strong>/nbsp;';
}
}

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

@@ -124,10 +124,10 @@ function getCronjobsLastRun()
$lastrun = date('d.m.Y H:i:s', $row['lastrun']);
}
$cronjobs_last_run .= '<tr>
<td class="field_name_border_left">'.$lng['crondesc'][$row['desc_lng_key']].':</td>
<td class="field_display">'.$lastrun.'</td>
</tr>';
$text = $lng['crondesc'][$row['desc_lng_key']];
$value = $lastrun;
eval("\$cronjobs_last_run .= \"" . getTemplate("index/overview_item") . "\";");
}
return $cronjobs_last_run;
@@ -153,10 +153,7 @@ function getOutstandingTasks()
$query = "SELECT * FROM `".TABLE_PANEL_TASKS."` ORDER BY `type` ASC";
$result = $db->query($query);
$outstanding_tasks = '<tr>
<td class="field_name_border_left">'.$lng['tasks']['outstanding_tasks'].':</td>
<td class="field_display" colspan="2"><ul>';
$value = '<ul class="cronjobtask">';
$tasks = '';
while($row = $db->fetch_array($result))
{
@@ -272,12 +269,14 @@ function getOutstandingTasks()
}
if(trim($tasks) == '') {
$outstanding_tasks .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
$value .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
} else {
$outstanding_tasks .= $tasks;
$value .= $tasks;
}
$outstanding_tasks .= '</ul></td></tr>';
$value .= '</ul>';
$text = $lng['tasks']['outstanding_tasks'];
eval("\$outstanding_tasks = \"" . getTemplate("index/overview_item") . "\";");
return $outstanding_tasks;
}

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

@@ -332,14 +332,15 @@ function updateCounters($returndebuginfo = false)
$admin_resources[$admin['adminid']]['aps_packages_used'] = 0;
}
$admin['aps_packages_used_new'] = $admin_resources[$admin['adminid']]['aps_packages_used'];
$admin['subdomains_used_new'] = $admin_resources[$admin['adminid']]['subdomains_used'];
if(!isset($admin_resources[$admin['adminid']]['aps_packages_used']))
{
$admin_resources[$admin['adminid']]['aps_packages_used'] = 0;
}
$admin['subdomains_used_new'] = $admin_resources[$admin['adminid']]['subdomains_used'];
$admin['aps_packages_used_new'] = $admin_resources[$admin['adminid']]['aps_packages_used'];
$db->query('UPDATE
`' . TABLE_PANEL_ADMINS . '`
SET

16
lib/functions/output/function.getTemplate.php
View File

@@ -28,16 +28,21 @@
function getTemplate($template, $noarea = 0)
{
global $templatecache;
global $templatecache, $theme;
if(!isset($theme) || $theme == '')
{
$theme = 'Froxlor';
}
if($noarea != 1)
{
$template = AREA . '/' . $template;
}
if(!isset($templatecache[$template]))
if(!isset($templatecache[$theme][$template]))
{
$filename = './templates/' . $template . '.tpl';
$filename = './templates/' . $theme . '/' . $template . '.tpl';
if(file_exists($filename)
&& is_readable($filename))
@@ -56,8 +61,9 @@ function getTemplate($template, $noarea = 0)
$templatefile = 'TEMPLATE NOT FOUND: ' . $filename;
}
$templatecache[$template] = $templatefile;
$output = $templatefile; // Minify_HTML::minify($templatefile, array('cssMinifier', 'jsMinifier'));
$templatecache[$theme][$template] = $output;
}
return $templatecache[$template];
return $templatecache[$theme][$template];
}

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

@@ -39,5 +39,5 @@ function makeyesno($name, $yesvalue, $novalue = '', $yesselected = '', $disabled
} else {
$d = '';
}
return '<select class="dropdown_noborder" name="' . $name . '"'.$d.'><option value="' . $yesvalue . '"' . ($yesselected ? ' selected="selected"' : '') . '>' . $lng['panel']['yes'] . '</option><option value="' . $novalue . '"' . ($yesselected ? '' : ' selected="selected"') . '>' . $lng['panel']['no'] . '</option></select>';
return '<select class="dropdown_noborder" id="' . $name . '" name="' . $name . '"'.$d.'><option value="' . $yesvalue . '"' . ($yesselected ? ' selected="selected"' : '') . '>' . $lng['panel']['yes'] . '</option><option value="' . $novalue . '"' . ($yesselected ? '' : ' selected="selected"') . '>' . $lng['panel']['no'] . '</option></select>';
}

49
lib/init.php
View File

@@ -49,7 +49,7 @@ $filename = basename($_SERVER['PHP_SELF']);
if(!file_exists('./lib/userdata.inc.php'))
{
$config_hint = file_get_contents('./templates/misc/configurehint.tpl');
$config_hint = file_get_contents('./templates/Froxlor/misc/configurehint.tpl');
die($config_hint);
}
@@ -67,7 +67,7 @@ require ('./lib/userdata.inc.php');
if(!isset($sql)
|| !is_array($sql))
{
$config_hint = file_get_contents('./templates/misc/configurehint.tpl');
$config_hint = file_get_contents('./templates/Froxlor/misc/configurehint.tpl');
die($config_hint);
}
@@ -161,23 +161,6 @@ if(get_magic_quotes_gpc())
$settings_data = loadConfigArrayDir('./actions/admin/settings/');
$settings = loadSettings($settings_data, $db);
/*
* when upgrading from syscp, the header-graphic gets lost
*/
if(!isset($settings['admin']['froxlor_graphic'])
|| $settings['admin']['froxlor_graphic'] == ''
) {
if(isset($settings['admin']['syscp_graphic'])
&& $settings['admin']['syscp_graphic'] != ''
){
$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
}
else
{
$settings['admin']['froxlor_graphic'] = 'images/header.gif';
}
}
/**
* SESSION MANAGEMENT
*/
@@ -261,19 +244,16 @@ $langs = array();
$languages = array();
// query the whole table
$query = 'SELECT * FROM `' . TABLE_PANEL_LANGUAGE . '` ';
$result = $db->query($query);
// presort languages
while($row = $db->fetch_array($result))
{
$langs[$row['language']][] = $row;
}
// buildup $languages for the login screen
foreach($langs as $key => $value)
{
$languages[$key] = $key;
@@ -306,7 +286,6 @@ else
}
// include every english language file we can get
foreach($langs['English'] as $key => $value)
{
include_once makeSecurePath($value['file']);
@@ -322,6 +301,28 @@ if($language != 'English')
}
}
/**
* global Theme-variable
*/
$theme = isset($settings['panel']['default_theme']) ? $settings['panel']['default_theme'] : 'Froxlor';
/**
* overwrite with customer/admin theme if defined
*/
if(isset($userinfo['theme']) && $userinfo['theme'] != $theme)
{
$theme = $userinfo['theme'];
}
/*
* check for custom header-graphic
*/
$hl_path = 'images/'.$theme;
$header_logo = $hl_path.'/logo.png';
if(file_exists($hl_path.'/logo_custom.png')) {
$header_logo = $hl_path.'/logo_custom.png';
}
/**
* Redirects to index.php (login page) if no session exists
*/
@@ -455,5 +456,3 @@ if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
$mail->AddReplyTo($settings['panel']['adminmail_return'], $settings['panel']['adminmail_defname']);
}
}
?>

11
lib/navigation/00.froxlor.main.php
View File

@@ -21,7 +21,7 @@ return array (
'customer' => array (
'index' => array (
'url' => 'customer_index.php',
'label' => $lng['menue']['main']['main'],
'label' => $lng['admin']['overview'],
'elements' => array (
array (
'label' => $lng['menue']['main']['username'],
@@ -34,6 +34,10 @@ return array (
'url' => 'customer_index.php?page=change_language',
'label' => $lng['menue']['main']['changelanguage'],
),
array (
'url' => 'customer_index.php?page=change_theme',
'label' => $lng['menue']['main']['changetheme'],
),
array (
'url' => 'customer_index.php?action=logout',
'label' => $lng['login']['logout'],
@@ -154,6 +158,10 @@ return array (
'url' => 'admin_index.php?page=change_language',
'label' => $lng['menue']['main']['changelanguage'],
),
array (
'url' => 'admin_index.php?page=change_theme',
'label' => $lng['menue']['main']['changetheme'],
),
array (
'url' => 'admin_index.php?action=logout',
'label' => $lng['login']['logout'],
@@ -250,4 +258,3 @@ return array (
),
),
);
?>

4
lib/tables.inc.php
View File

@@ -73,8 +73,6 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO
$version = '0.9.18-svn1';
$version = '0.9.18-svn2';
$dbversion = '2';
$branding = '';
?>

9
lng/english.lng.php
View File

@@ -70,7 +70,7 @@ $lng['customer']['forwarders'] = 'E-mail-Forwarders';
$lng['customer']['ftps'] = 'FTP-Accounts';
$lng['customer']['subdomains'] = 'Sub-Domain';
$lng['customer']['domains'] = 'Domain';
$lng['customer']['unlimited'] = 'unlimited';
$lng['customer']['unlimited'] = '&infin;';
/**
* Customermenue
@@ -1332,6 +1332,7 @@ $lng['cronmgmt']['weeks'] = 'weeks';
$lng['cronmgmt']['months'] = 'months';
$lng['admin']['cronjob_edit'] = 'Edit cronjob';
$lng['cronjob']['cronjobsettings'] = 'Cronjob settings';
$lng['cronjob']['cronjobintervalv'] = 'Runtime interval value';
$lng['cronjob']['cronjobinterval'] = 'Runtime interval';
$lng['panel']['options'] = 'options';
$lng['admin']['warning'] = 'WARNING - Please note!';
@@ -1566,3 +1567,9 @@ $lng['mysql']['database_edit'] = 'Edit database';
// ADDED IN FROXLOR 0.9.18
$lng['error']['domains_cantdeletedomainwithaliases'] = 'You cannot delete a domain which is used for alias-domains. You have to delete the aliases first.';
$lng['serversettings']['default_theme'] = 'Default theme';
$lng['menue']['main']['changetheme'] = 'Change theme';
$lng['panel']['theme'] = 'Theme';
$lng['success']['rebuildingconfigs'] = 'Successfully inserted tasks for rebuild configfiles';
$lng['panel']['variable'] = 'Variable';
$lng['panel']['description'] = 'Description';

7
lng/german.lng.php
View File

@@ -1311,6 +1311,7 @@ $lng['cronmgmt']['weeks'] = 'Wochen';
$lng['cronmgmt']['months'] = 'Monate';
$lng['admin']['cronjob_edit'] = 'Cronjob bearbeiten';
$lng['cronjob']['cronjobsettings'] = 'Cronjob Einstellungen';
$lng['cronjob']['cronjobintervalv'] = 'Laufzeit-Intervall Wert';
$lng['cronjob']['cronjobinterval'] = 'Laufzeit-Intervall';
$lng['panel']['options'] = 'Optionen';
$lng['admin']['warning'] = 'ACHTUNG - Wichtiger Hinweis!';
@@ -1548,3 +1549,9 @@ $lng['mysql']['database_edit'] = 'Datenbank bearbeiten';
// ADDED IN FROXLOR 0.9.18
$lng['error']['domains_cantdeletedomainwithaliases'] = 'Sie k&ouml;nnen keine Domain l&ouml;schen, die noch von Alias-Domains verwendet wird. L&ouml;schen Sie zuerst alle Alias-Domains dieser Domain.';
$lng['serversettings']['default_theme'] = 'Standard Theme';
$lng['menue']['main']['changetheme'] = 'Theme wechseln';
$lng['panel']['theme'] = 'Theme';
$lng['success']['rebuildingconfigs'] = 'Task f&uuml;r das Neuerstellen der Konfigurationen wurde erfolgreich eingetragen';
$lng['panel']['variable'] = 'Variable';
$lng['panel']['description'] = 'Beschreibung';