mirror of
https://github.com/e107inc/e107.git
synced 2025-08-13 18:14:26 +02:00
Notice/Warning Removal. + admin -> users cleanup. (work in progress)
This commit is contained in:
@@ -9,8 +9,8 @@
|
||||
* Form Handler
|
||||
*
|
||||
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
|
||||
* $Revision: 1.29 $
|
||||
* $Date: 2009-07-07 06:26:50 $
|
||||
* $Revision: 1.30 $
|
||||
* $Date: 2009-07-08 06:58:00 $
|
||||
* $Author: e107coders $
|
||||
*
|
||||
*/
|
||||
@@ -649,6 +649,8 @@ class e_form
|
||||
|
||||
function filterValue($type,$fields)
|
||||
{
|
||||
|
||||
|
||||
if($type)
|
||||
{
|
||||
|
||||
|
@@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
|
||||
| $Revision: 1.26 $
|
||||
| $Date: 2009-07-07 22:56:12 $
|
||||
| $Revision: 1.27 $
|
||||
| $Date: 2009-07-08 06:58:00 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@@ -733,11 +733,14 @@ class themeHandler{
|
||||
|
||||
$l = $this->themeArray[$theme];
|
||||
|
||||
foreach($l['layouts'] as $key=>$val)
|
||||
if($l['layouts'])
|
||||
{
|
||||
if(isset($val['@attributes']['default']) && ($val['@attributes']['default'] == "true"))
|
||||
foreach($l['layouts'] as $key=>$val)
|
||||
{
|
||||
return $key;
|
||||
if(isset($val['@attributes']['default']) && ($val['@attributes']['default'] == "true"))
|
||||
{
|
||||
return $key;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -831,11 +834,13 @@ class themeHandler{
|
||||
}
|
||||
// echo " <hr>".$path."<hr>";
|
||||
|
||||
|
||||
|
||||
foreach($themeContentsArray as $line)
|
||||
{
|
||||
if(strstr($line,"CUSTOMPAGES"))
|
||||
{
|
||||
eval(str_replace("$","\\$",$line));
|
||||
eval(str_replace("$","\$",$line));
|
||||
}
|
||||
}
|
||||
if(is_array($CUSTOMPAGES))
|
||||
|
@@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/userclass_class.php,v $
|
||||
| $Revision: 1.34 $
|
||||
| $Date: 2009-07-07 07:25:27 $
|
||||
| $Revision: 1.35 $
|
||||
| $Date: 2009-07-08 06:58:00 $
|
||||
| $Author: e107coders $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@@ -494,14 +494,17 @@ class user_class
|
||||
{
|
||||
$ret = '';
|
||||
$nest_level++;
|
||||
foreach ($this->class_tree[$listnum]['class_children'] as $p)
|
||||
if(isset($this->class_tree[$listnum]['class_children']))
|
||||
{
|
||||
// Looks like we don't need to differentiate between function and class calls
|
||||
if (isset($perms[$p]))
|
||||
foreach ($this->class_tree[$listnum]['class_children'] as $p)
|
||||
{
|
||||
$ret .= call_user_func($callback,$treename, $p,$current_value,$nest_level, $opt_options);
|
||||
// Looks like we don't need to differentiate between function and class calls
|
||||
if (isset($perms[$p]))
|
||||
{
|
||||
$ret .= call_user_func($callback,$treename, $p,$current_value,$nest_level, $opt_options);
|
||||
}
|
||||
$ret .= $this->vetted_sub_tree($treename, $callback,$p,$nest_level,$current_value, $perms, $opt_options);
|
||||
}
|
||||
$ret .= $this->vetted_sub_tree($treename, $callback,$p,$nest_level,$current_value, $perms, $opt_options);
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user