Enano CMS (1.1.x): comparison includes/sessions.php

equal deleted inserted replaced

-:ac4c6a7f01d8
+:63e131c38876
 USER_LEVEL_ADMIN  => RANK_ID_ADMIN,
 USER_LEVEL_MOD    => RANK_ID_MOD,
 USER_LEVEL_MEMBER => RANK_ID_MEMBER,
 USER_LEVEL_CHPREF => RANK_ID_MEMBER,
 USER_LEVEL_GUEST  => RANK_ID_GUEST
+);
+/**
+* A constant array that maps precedence constants to language strings
+* @var array
+*/
+var $acl_inherit_lang_table = array(
+ACL_INHERIT_ENANO_DEFAULT   => 'acl_inherit_enano_default',
+ACL_INHERIT_GLOBAL_EVERYONE => 'acl_inherit_global_everyone',
+ACL_INHERIT_GLOBAL_GROUP    => 'acl_inherit_global_group',
+ACL_INHERIT_GLOBAL_USER     => 'acl_inherit_global_user',
+ACL_INHERIT_PG_EVERYONE     => 'acl_inherit_pg_everyone',
+ACL_INHERIT_PG_GROUP        => 'acl_inherit_pg_group',
+ACL_INHERIT_PG_USER         => 'acl_inherit_pg_user',
+ACL_INHERIT_LOCAL_EVERYONE  => 'acl_inherit_local_everyone',
+ACL_INHERIT_LOCAL_GROUP     => 'acl_inherit_local_group',
+ACL_INHERIT_LOCAL_USER      => 'acl_inherit_local_user'
 );
 # Basic functions
 /**
 {
 $base_cache[$user_id_or_name] = $this->acl_types;
 $current_perms =& $base_cache[$user_id_or_name];
 $current_perms['__resolve_table'] = array();
-$bs = 'SELECT rules, target_type, target_id, rule_id, page_id, namespace FROM '.table_prefix.'acl' . "\n"
+$bs = 'SELECT rules, target_type, target_id, rule_id, page_id, namespace, g.group_name FROM '.table_prefix."acl AS a\n"
-. '  WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
+. "  LEFT JOIN " . table_prefix . "groups AS g\n"
-. '  ( ';
+. "    ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n"
+. '  WHERE page_id IS NULL AND namespace IS NULL AND' . "\n"
+. '  ( ';
 $q = Array();
 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id= ' . $user_id . ' )';
 if(count($groups) > 0)
 {
 $q = $this->sql($bs);
 foreach ( $this->acl_types as $perm_type => $_ )
 {
 // init the resolver table with blanks
 $current_perms['__resolve_table'][$perm_type] = array(
-'src' => ACL_INHERIT_GLOBAL_EVERYONE,
+'src' => ACL_INHERIT_ENANO_DEFAULT,
 'rule_id' => -1
 );
 }
 if ( $row = $db->fetchrow() )
 {
 {
 $current_perms['__resolve_table'][$perm_type] = array(
 'src' => $src,
 'rule_id' => $row['rule_id']
 );
+if ( $row['group_name'] )
+{
+$current_perms['__resolve_table'][$perm_type]['group_name'] = $row['group_name'];
+}
 }
 // merge it in
 $current_perms = $this->acl_merge($current_perms, $rules, $is_everyone, $_defaults_used);
 } while ( $row = $db->fetchrow() );
 }
 {
 $pg_info .= ' ( page_id=\'' . $g_id . '\' AND namespace=\'__PageGroup\' ) OR';
 }
 // Build a query to grab ACL info
-$bs = 'SELECT rules,target_type,target_id,page_id,namespace,rule_id FROM '.table_prefix.'acl WHERE ' . "\n"
+$bs = 'SELECT rules,target_type,target_id,page_id,namespace,rule_id,pg.pg_name,g.group_name FROM '.table_prefix."acl AS a\n"
+. "  LEFT JOIN " . table_prefix . "page_groups AS pg\n"
+. "    ON ( ( a.page_id = pg.pg_id AND a.namespace = '__PageGroup' ) OR ( a.namespace != '__PageGroup' ) )\n"
+. "  LEFT JOIN " . table_prefix . "groups AS g\n"
+. "    ON ( ( a.target_type = " . ACL_TYPE_GROUP . " AND a.target_id = g.group_id ) OR ( a.target_type != " . ACL_TYPE_GROUP . " ) )\n";
+$bs .= '  WHERE ' . "\n"
 . '  ( ';
 $q = Array();
 $q[] = '( target_type='.ACL_TYPE_USER.' AND target_id='.$this->user_id.' )';
 if(count($this->groups) > 0)
 {
 }
 // The reason we're using an ORDER BY statement here is because ACL_TYPE_GROUP is less than ACL_TYPE_USER, causing the user's individual
 // permissions to override group permissions.
 $bs .= implode(" OR\n    ", $q) . ' ) AND (' . $pg_info . ' ( page_id=\''.$db->escape($page_id).'\' AND namespace=\''.$db->escape($namespace).'\' ) )
 ORDER BY target_type ASC, page_id ASC, namespace ASC;';
 $q = $session->sql($bs);
 if ( $row = $db->fetchrow() )
 {
 do {
 $rules = $session->string_to_perm($row['rules']);
 $is_everyone = ( $row['target_type'] == ACL_TYPE_GROUP && $row['target_id'] == 1 );
 // log where this comes from
 if ( $row['namespace'] == '__PageGroup' )
 {
 $src = ( $is_everyone ) ? ACL_INHERIT_PG_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_PG_GROUP : ACL_INHERIT_PG_USER );
+$pg_name = $row['pg_name'];
 }
 else
 {
 $src = ( $is_everyone ) ? ACL_INHERIT_LOCAL_EVERYONE : ( $row['target_type'] == ACL_TYPE_GROUP ? ACL_INHERIT_LOCAL_GROUP : ACL_INHERIT_LOCAL_USER );
+}
+if ( $row['group_name'] )
+{
+$group_name = $row['group_name'];
 }
 foreach ( $rules as $perm_type => $perm_value )
 {
 if ( $this->perms[$perm_type] == AUTH_DENY )
 continue;
 $this->perm_resolve_table[$perm_type] = array(
 'src' => $src,
 'rule_id' => $row['rule_id']
 );
+if ( isset($pg_name) )
+{
+$this->perm_resolve_table[$perm_type]['pg_name'] = $pg_name;
+}
+if ( isset($group_name) )
+{
+$this->perm_resolve_table[$perm_type]['group_name'] = $group_name;
+}
 }
 $this->acl_merge_with_current($rules, $is_everyone);
 } while ( $row = $db->fetchrow() );
 }

changeset 556	63e131c38876
parent 555	ac4c6a7f01d8
child 557	26479224936a