Merge pull request #158 from BNoiZe/master

Updated webftp to PDO database class, refs #1287
This commit is contained in:
Michael Kaufmann
2013-11-19 04:41:38 -08:00
3 changed files with 384 additions and 676 deletions

View File

@@ -224,12 +224,12 @@ if ($page == 'overview') {
$stmt = Database::prepare("SELECT `id`, `email`, `email_full`, `iscatchall`, `destination`, `customerid` FROM `" . TABLE_MAIL_VIRTUAL . "` $stmt = Database::prepare("SELECT `id`, `email`, `email_full`, `iscatchall`, `destination`, `customerid` FROM `" . TABLE_MAIL_VIRTUAL . "`
WHERE (`email` = :email WHERE (`email` = :email
OR `email_full` = :emailfull ) OR `email_full` = :emailfull )
AND `customerid`= :customerid" AND `customerid`= :cid"
); );
$params = array( $params = array(
"email" => $email, "email" => $email,
"email_full" => $email_full, "emailfull" => $email_full,
"customerid" => $userinfo['customerid'] "cid" => $userinfo['customerid']
); );
$email_check = Database::pexecute_first($stmt, $params); $email_check = Database::pexecute_first($stmt, $params);

View File

@@ -30,7 +30,9 @@
<hgroup> <hgroup>
<h1>Froxlor Server Management Panel</h1> <h1>Froxlor Server Management Panel</h1>
</hgroup> </hgroup>
<img src="{$header_logo}" alt="Froxlor Server Management Panel" /> <a href="{$linker->getLink(array('section' => 'index'))}">
<img src="{$header_logo}" alt="Froxlor Server Management Panel" class="small" />
</a>
</header> </header>
<div class="content"> <div class="content">
<nav><div class="menuelement bradiusodd"> <nav><div class="menuelement bradiusodd">
@@ -39,7 +41,7 @@
{/if} {/if}
{if $loggedin} {if $loggedin}
<div class="main bradius"> <div class="main">
{else} {else}
<div class="loginpage"> <div class="loginpage">
{/if} {/if}

File diff suppressed because it is too large Load Diff