From c0615a85d76315431b0e9cbfef34351b710e463b Mon Sep 17 00:00:00 2001 From: secretr Date: Mon, 29 Dec 2008 16:11:02 +0000 Subject: [PATCH] minor admin area fixes (by steved) --- e107_admin/admin.php | 9 +- e107_admin/userclass2.php | 215 +++++++++++++++++++------------------- 2 files changed, 111 insertions(+), 113 deletions(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 95461192e..95aacb17f 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $ -| $Revision: 1.7 $ -| $Date: 2008-12-22 12:54:30 $ -| $Author: mcfly_e107 $ +| $Revision: 1.8 $ +| $Date: 2008-12-29 16:11:02 $ +| $Author: secretr $ +----------------------------------------------------------------------------+ */ require_once('../class2.php'); @@ -150,6 +150,7 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode $text = ''; if (getperms($perms)) { + $description = strip_tags($description); if ($mode == 'adminb') { $text = " @@ -176,7 +177,7 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode elseif ($mode == 'classis') { $text .= "".$icon."
- ".$tp->toHTML($title,FALSE,"defs, emotes_off")."

"; + ".$tp->toHTML($title,FALSE,"defs, emotes_off")."

"; } elseif ($mode == 'beginner') { diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index ded022f94..b8c29da37 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -1,24 +1,22 @@ db_Select('userclass_classes', '*', "userclass_id = {$class_id}")) - { - if(!$redirect) return false; - header("location:".SITEURL); - exit; - } - $row = $sql->db_Fetch(); - if (!getperms('0') && !check_class($row['userclass_editclass'])) - { - if(!$redirect) return false; - header("location:".SITEURL); - exit; - } - return true; + global $e107; + if (!isset($e107->user_class->class_tree[$class_id])) + { + if(!$redirect) return false; + header("location:".SITEURL); + exit; + } + if (!getperms('0') && !check_class($e107->user_class->class_tree[$class_id]['userclass_editclass'])) + { + if(!$redirect) return false; + header("location:".SITEURL); + exit; + } + return true; } -if (e_QUERY) +if (e_QUERY) { $uc_qs = explode(".", e_QUERY); } $action = varset($uc_qs[0],'config'); $params = varset($uc_qs[1],''); -//AJAX request check is already made by the API -if(e_AJAX_REQUEST) -{ +//AJAX request check is already made by the API +if(e_AJAX_REQUEST) +{ $class_num = intval(varset($uc_qs[2],0)); if(!$class_num && isset($_POST['edit'])) { @@ -73,25 +70,25 @@ if(e_AJAX_REQUEST) { require_once(e_HANDLER.'js_helper.php'); $jshelper = new e_jshelper(); - if(!check_allowed($class_num, false)) + if(!check_allowed($class_num, false)) { //This will raise an error - //'Access denied' is the message which will be thrown + //'Access denied' is the message which will be thrown //by the JS AJAX handler e_jshelper::sendAjaxError('403', 'Access denied. Form update failed!'); } $sql->db_Select('userclass_classes', '*', "userclass_id='".$class_num."' "); $row = $sql->db_Fetch(MYSQL_ASSOC); - + //Response action - reset all group checkboxes $jshelper->addResponseAction('reset-checked', array('group_classes_select' => '0')); - + //it's grouped userclass if ($row['userclass_type'] == UC_TYPE_GROUP) - { + { //Response action - show group, hide standard $jshelper->addResponseAction('element-invoke-by-id', array('show' => 'userclass_type_groups', 'hide' => 'userclass_type_standard')); - + //fill in the classes array $tmp = explode(',',$row['userclass_accum']); foreach ($tmp as $uid) { @@ -105,11 +102,11 @@ if(e_AJAX_REQUEST) $row['createclass'] = UCSLAN_14; //update the submit button value $row['existing'] = $class_num; //required when user tree is clicked //icon - $row['iconview'] = $row['userclass_icon'] ? e_IMAGE_ABS.'userclasses/'.$row['userclass_icon'] : e_IMAGE_ABS."generic/blank.gif"; + $row['iconview'] = $row['userclass_icon'] ? e_IMAGE_ABS.'userclasses/'.$row['userclass_icon'] : e_IMAGE_ABS."generic/blank.gif"; $row['uc_icon_select'] = $row['userclass_icon']; //icons select box //Send the prefered response type - //echo $jshelper->sendJSONResponse('fill-form', $row); + //echo $jshelper->sendJSONResponse('fill-form', $row); echo $jshelper->sendXMLResponse('fill-form', $row); exit; } @@ -117,7 +114,7 @@ if(e_AJAX_REQUEST) /* * Authorization should be done a bit later! - * FIXME - should we call auth.php and header.php separate? + * FIXME - should we call auth.php and header.php separate? * Definitely yes if AJAX is in the game. */ require_once("auth.php"); @@ -157,7 +154,7 @@ if (isset($_POST['delete'])) { $message = UCSLAN_29; } - elseif ($_POST['confirm']) + elseif ($_POST['confirm']) { if ($e_userclass->delete_class($class_id) !== FALSE) { @@ -195,7 +192,7 @@ if (isset($_POST['delete'])) // Add/Edit class information //--------------------------------------------------- if (($action == 'config') && isset($_POST['createclass'])) // Add or edit -{ +{ $class_record = array( 'userclass_name' => varset($tp->toDB($_POST['userclass_name']),''), 'userclass_description' => varset($tp->toDB($_POST['userclass_description']),''), @@ -239,12 +236,12 @@ if (($action == 'config') && isset($_POST['createclass'])) // Add or edit userclass2_adminlog("03","ID:{$class_record['userclass_id']} (".$class_record['userclass_name'].")"); $do_tree = TRUE; $message .= UCSLAN_5; - } + } else { // Creating new class if($class_record['userclass_name']) { - if (getperms("0") || ($class_record['userclass_editclass'] && check_class($class_record['userclass_editclass']))) + if (getperms("0") || ($class_record['userclass_editclass'] && check_class($class_record['userclass_editclass']))) { $i = $e_userclass->findNewClassID(); if ($i === FALSE) @@ -291,9 +288,9 @@ if ($message) switch ($action) { -//----------------------------------- +//----------------------------------- // Class management -//----------------------------------- +//----------------------------------- case 'config' : if(isset($_POST['edit'])) { @@ -363,11 +360,11 @@ switch ($action) else { $text .= "".UCSLAN_8.":"; - $text .= "'; + $text .= "'; $text .= " -