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

Implemented linker - class for admin_index.php -> change_[theme|language|password], more to come

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-06-13 17:21:02 +02:00
parent 68e31962bc
commit 6ebd6db87f
9 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/output/class.linker.php
View File

@@ -114,7 +114,6 @@ class linker
$link .= '/';
}
$link .= $this->filename;
# Overwrite $this->args with parameters of this function (if necessary)
if(func_num_args() == 1 && is_array(func_get_arg(0)))
@@ -122,6 +121,17 @@ class linker
$this->args = array_merge($this->args, func_get_arg(0));
}
# temporary until frontcontroller exists
# We got a section in the URL -> add area and section as filename
if (isset($this->args['section']))
{
$link .= AREA . '_' . $this->args['section'] . '.php';
}
else
{
$link .= $this->filename;
}
# Let's see if we are done (no arguments in query)
if (count($this->args) == 0)
{

14
lib/init.php
View File

@@ -306,6 +306,10 @@ if($language != 'English')
}
}
// Initialize our new link - class
$linker = new linker('index.php', $s);
/**
* global Theme-variable
*/
@@ -320,7 +324,7 @@ if(isset($userinfo['theme']) && $userinfo['theme'] != $theme)
}
/*
* check for custom header-graphic
* check for custom header-graphic
*/
$hl_path = 'images/'.$theme;
$header_logo = $hl_path.'/logo.png';
@@ -371,7 +375,7 @@ if(AREA == 'admin' || AREA == 'customer')
if(hasUpdates($version))
{
/*
* if froxlor-files have been updated
* if froxlor-files have been updated
* but not yet configured by the admin
* we only show logout and the update-page
*/
@@ -389,7 +393,7 @@ if(AREA == 'admin' || AREA == 'customer')
'label' => $lng['login']['logout'],
),
),
),
),
'server' => array (
'label' => $lng['admin']['server'],
'required_resources' => 'change_serversettings',
@@ -429,7 +433,7 @@ elseif(isset($_GET['action']))
else
{
$action = '';
// clear request data
if (isset($_SESSION)) {
unset($_SESSION['requestData']);
@@ -459,7 +463,7 @@ if($page == '')
*/
$mail = new PHPMailer(true);
if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
{
{
// set return-to address and custom sender-name, see #76
$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
if ($settings['panel']['adminmail_return'] != '') {