mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-07 15:16:30 +02:00
Code Issues Releases Wiki Activity

Expanded admin-perms issue corrected.

Browse Source
This commit is contained in:
Cameron
2013-02-22 15:45:31 -08:00
parent ad1452d65e
commit 200c92aa96
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
e107_handlers/user_handler.php
View File

@@ -318,7 +318,7 @@ class UserHandler
do do
{ {
$newname = $this->generateRandomString($pattern, $seed); $newname = $this->generateRandomString($pattern, $seed);
} while ($ul_sql->db_Select('user','user_id',"`user_loginname`='{$newname}'")); } while ($ul_sql->select('user','user_id',"`user_loginname`='{$newname}'"));
return $newname; return $newname;
} }
@@ -692,7 +692,7 @@ Following fields auto-filled in code as required:
} }
if ($force) if ($force)
{ // Remove 'orphaned' extended user field records { // Remove 'orphaned' extended user field records
$sql->db_Select_gen("DELETE `#user_extended` FROM `#user_extended` LEFT JOIN `#user` ON `#user_extended`.`user_extended_id` = `#user`.`user_id` $sql->gen("DELETE `#user_extended` FROM `#user_extended` LEFT JOIN `#user` ON `#user_extended`.`user_extended_id` = `#user`.`user_id`
WHERE `#user`.`user_id` IS NULL"); WHERE `#user`.`user_id` IS NULL");
} }
return $temp1; return $temp1;
@@ -798,7 +798,7 @@ Following fields auto-filled in code as required:
} }
if ($uid) { $qry = '`user_id`='.$uid; } if ($uid) { $qry = '`user_id`='.$uid; }
if ($emailAddress) { if ($qry) $qry .= ' OR '; $qry .= "`user_email` = '{$emailAddress}'"; } if ($emailAddress) { if ($qry) $qry .= ' OR '; $qry .= "`user_email` = '{$emailAddress}'"; }
if (FALSE === $db->db_Select('user', 'user_id, user_email, user_ban, user_loginname', $qry.' LIMIT 1')) if (FALSE === $db->select('user', 'user_id, user_email, user_ban, user_loginname', $qry.' LIMIT 1'))
{ {
$error = 'User not found: '.$uid.'/'.$emailAddress; $error = 'User not found: '.$uid.'/'.$emailAddress;
} }
@@ -1222,10 +1222,9 @@ class e_userperms
$tp = e107::getParser(); $tp = e107::getParser();
$plg = e107::getPlugin(); $plg = e107::getPlugin();
$installed = $plg->getall(1); $allPlugins = $plg->getall();
// print_a($installed); foreach($allPlugins as $k=>$row2)
foreach($installed as $k=>$row2)
{ {
if($plg->parse_plugin($row2['plugin_path'])) if($plg->parse_plugin($row2['plugin_path']))
{ {
@@ -1346,12 +1345,17 @@ class e_userperms
function renderPerms($perms,$uniqueID='') function renderPerms($perms,$uniqueID='')
{ {
$tmp = explode(".",$perms); $tmp = explode(".",$perms);
$tmp = array_filter($tmp);
$permdiz = $this->getPermList(); $permdiz = $this->getPermList();
$ptext = array(); $ptext = array();
foreach($tmp as $p) foreach($tmp as $p)
{ {
$ptext[] = is_array($permdiz[$p]) ? $permdiz[$p][0] : $permdiz[$p]; // if(trim($p) == ""){ continue; }
$val = vartrue($permdiz[$p],'missing '.$p);
$ptext[] = is_array($permdiz[$p]) ? $permdiz[$p][0] : $val;
} }
$id = "id_".$uniqueID; $id = "id_".$uniqueID;