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

more require-statement/function stuff

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-11-18 13:02:59 +01:00
parent 0db0b3bd88
commit 87ccff6a7b
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
index.php
View File

@@ -18,11 +18,7 @@
*/ */
define('AREA', 'login'); define('AREA', 'login');
require './lib/init.php';
/**
* Include our init.php, which manages Sessions, Language etc.
*/
require ('./lib/init.php');
if ($action == '') { if ($action == '') {
$action = 'login'; $action = 'login';
@@ -32,13 +28,13 @@ if ($action == 'login') {
if (isset($_POST['send']) && $_POST['send'] == 'send') { if (isset($_POST['send']) && $_POST['send'] == 'send') {
$loginname = validate($_POST['loginname'], 'loginname'); $loginname = validate($_POST['loginname'], 'loginname');
$password = validate($_POST['password'], 'password'); $password = validate($_POST['password'], 'password');
$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` $stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
WHERE `loginname`= :loginname" WHERE `loginname`= :loginname"
); );
Database::pexecute($stmt, array("loginname" => $loginname)); Database::pexecute($stmt, array("loginname" => $loginname));
$row = $stmt->fetch(PDO::FETCH_ASSOC); $row = $stmt->fetch(PDO::FETCH_ASSOC);
if ($row['customer'] == $loginname) { if ($row['customer'] == $loginname) {
$table = "`" . TABLE_PANEL_CUSTOMERS . "`"; $table = "`" . TABLE_PANEL_CUSTOMERS . "`";
$uid = 'customerid'; $uid = 'customerid';
@@ -53,7 +49,7 @@ if ($action == 'login') {
); );
Database::pexecute($stmt, array("domain" => $domainname)); Database::pexecute($stmt, array("domain" => $domainname));
$row2 = $stmt->fetch(PDO::FETCH_ASSOC); $row2 = $stmt->fetch(PDO::FETCH_ASSOC);
if (isset($row2['customerid']) && $row2['customerid'] > 0) { if (isset($row2['customerid']) && $row2['customerid'] > 0) {
$loginname = getCustomerDetail($row2['customerid'], 'loginname'); $loginname = getCustomerDetail($row2['customerid'], 'loginname');
if ($loginname !== false) { if ($loginname !== false) {
@@ -177,7 +173,7 @@ if ($action == 'login') {
$has_theme = true; $has_theme = true;
} }
} }
$params = array( $params = array(
"hash" => $s, "hash" => $s,
"userid" => $userinfo['userid'], "userid" => $userinfo['userid'],
@@ -187,7 +183,7 @@ if ($action == 'login') {
"language" => $language, "language" => $language,
"adminsession" => $userinfo['adminsession'] "adminsession" => $userinfo['adminsession']
); );
if ($has_theme) { if ($has_theme) {
$params["theme"] = $theme; $params["theme"] = $theme;
$stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` $stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_SESSIONS . "`
@@ -274,7 +270,7 @@ if ($action == 'forgotpwd') {
AND `email`= :email" AND `email`= :email"
); );
Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email)); Database::pexecute($result_stmt, array("loginname" => $loginname, "email" => $email));
if (Database::num_rows() > 0) { if (Database::num_rows() > 0) {
$adminchecked = true; $adminchecked = true;
} else { } else {
@@ -284,7 +280,7 @@ if ($action == 'forgotpwd') {
if ($result_stmt !== null) { if ($result_stmt !== null) {
$user = $result_stmt->fetch(PDO::FETCH_ASSOC); $user = $result_stmt->fetch(PDO::FETCH_ASSOC);
/* Check whether user is banned */ /* Check whether user is banned */
if ($user['deactivated']) { if ($user['deactivated']) {
$message = $lng['pwdreminder']['notallowed']; $message = $lng['pwdreminder']['notallowed'];
@@ -327,13 +323,13 @@ if ($action == 'forgotpwd') {
$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` $result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
WHERE `adminid`= :adminid WHERE `adminid`= :adminid
AND `language`= :lang AND `language`= :lang
AND `templategroup`=\'mails\' AND `templategroup`=\'mails\'
AND `varname`=\'password_reset_subject\'' AND `varname`=\'password_reset_subject\''
); );
Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language)); Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
$result = $result_stmt->fetch(PDO::FETCH_ASSOC); $result = $result_stmt->fetch(PDO::FETCH_ASSOC);
$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['pwdreminder']['subject']), $replace_arr)); $mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['pwdreminder']['subject']), $replace_arr));
$result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` $result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '`
WHERE `adminid`= :adminid WHERE `adminid`= :adminid
AND `language`= :lang AND `language`= :lang
@@ -343,7 +339,7 @@ if ($action == 'forgotpwd') {
Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language)); Database::pexecute($result_stmt, array("adminid" => $user['adminid'], "lang" => $def_language));
$result = $result_stmt->fetch(PDO::FETCH_ASSOC); $result = $result_stmt->fetch(PDO::FETCH_ASSOC);
$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr)); $mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $body), $replace_arr));
$_mailerror = false; $_mailerror = false;
try { try {
$mail->Subject = $mail_subject; $mail->Subject = $mail_subject;

2
webftp.php
View File

@@ -90,7 +90,7 @@ if (!is_readable(FROXLOR_INSTALL_DIR.'/lib/userdata.inc.php')) {
die($owner_hint); die($owner_hint);
} }
require (FROXLOR_INSTALL_DIR.'/lib/userdata.inc.php'); require FROXLOR_INSTALL_DIR.'/lib/userdata.inc.php';
if (!isset($sql) if (!isset($sql)
|| !is_array($sql) || !is_array($sql)