deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

* Updated auth.inc.php

Browse Source
This commit is contained in:
Scott Luther 2009-02-22 05:11:12 -08:00
parent 7bda76a3e4
commit 9b1628149c
2 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
modules/core/auth.inc.php
View File

@ -55,50 +55,45 @@ class CORE_auth
$this->account = FORCE_SESS_ACCOUNT; $this->account = FORCE_SESS_ACCOUNT;
$this->logged = TRUE; $this->logged = TRUE;
} }
$this->auth_update();
if ( isset($VAR['_logout']) || if ( isset($VAR['_logout']) ||
isset($VAR['_login']) || isset($VAR['_login']) ||
isset($VAR['lid']) || isset($VAR['lid']) ||
$force == true || $force == true ||
CACHE_SESSIONS != "1") { CACHE_SESSIONS != "1") {
$this->auth_update(); return;
return; } else {
} else { if($this->session_auth_cache_retrieve())
if($this->session_auth_cache_retrieve()) {
{ $this->module_count = count($this->module);
$this->module_count = count($this->module); return;
return; }
}
} }
$this->auth_update();
} }
function auth_update() { function auth_update() {
$this->group = array('0');
$this->module = array('0');
if(!$this->account) { if($this->account) {
$this->group = Array("0");
$this->module = Array("0");
} else {
$this->group_list($this->account); $this->group_list($this->account);
if (!$this->group) { if (!$this->group) {
$this->group = array ('0');
$this->module = array ('0');
return; return;
} }
$db = &DB(); $db = &DB();
$p = AGILE_DB_PREFIX; $p = AGILE_DB_PREFIX;
$sql="SELECT DISTINCT MM.module_id, GM.method_id, GM.group_id, $sql="SELECT DISTINCT MM.module_id, GM.method_id, GM.group_id,
M.name AS module_name, M.parent_id AS module_parent_id, M.menu_display AS module_display, M.name AS module_name, M.parent_id AS module_parent_id, M.menu_display AS module_display,
MM.name AS method_name, MM.page AS method_page, MM.menu_display AS method_display MM.name AS method_name, MM.page AS method_page, MM.menu_display AS method_display
FROM {$p}group_method as GM FROM {$p}group_method as GM
LEFT JOIN {$p}module as M on (GM.module_id=M.id and M.site_id=".DEFAULT_SITE.") LEFT JOIN {$p}module as M on (GM.module_id=M.id and M.site_id=".DEFAULT_SITE.")
LEFT JOIN {$p}module_method as MM on (GM.method_id=MM.id and MM.site_id=".DEFAULT_SITE.") "; LEFT JOIN {$p}module_method as MM on (GM.method_id=MM.id and MM.site_id=".DEFAULT_SITE.") ";
for($i=0; $i<count($this->group); $i++) for($i=0; $i<count($this->group); $i++)
if($i==0) $sql .= "WHERE (GM.group_id={$this->group[$i]} "; if($i==0) $sql .= "WHERE (GM.group_id={$this->group[$i]} ";
else $sql .= "OR GM.group_id={$this->group[$i]} "; else $sql .= "OR GM.group_id={$this->group[$i]} ";
$sql .= ") AND GM.site_id=".DEFAULT_SITE." ORDER BY M.name,MM.name"; $sql .= ") AND GM.site_id=".DEFAULT_SITE." ORDER BY M.name,MM.name";
$result=$db->Execute($sql); $result=$db->Execute($sql);
if($result === false) if($result === false)
{ {
global $C_debug; global $C_debug;
@ -106,18 +101,17 @@ class CORE_auth
return; return;
} }
while (!$result->EOF) { while (!$result->EOF) {
$module_name = $result->fields["module_name"]; $module_name = $result->fields["module_name"];
$method_name = $result->fields["method_name"]; $method_name = $result->fields["method_name"];
if(empty($this->module[$module_name])) { if(empty($this->module[$module_name])) {
$this->module[$module_name] = Array($result->fields["module_id"], $this->module[$module_name] = array($result->fields["module_id"],
$result->fields["module_parent_id"], $result->fields["module_parent_id"],
$result->fields["module_display"]); $result->fields["module_display"]);
} }
if(empty($this->module[$module_name][$method_name])) { if(empty($this->module[$module_name][$method_name])) {
$this->module[$module_name][$method_name] = Array($result->fields["method_id"], $this->module[$module_name][$method_name] = array($result->fields["method_id"],
$result->fields["method_display"], $result->fields["method_display"],
$result->fields["method_page"]); $result->fields["method_page"]);
} }