1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 18:30:53 +02:00

minor admin area fixes (by steved)

This commit is contained in:
secretr
2008-12-29 16:11:02 +00:00
parent 887df36f03
commit c0615a85d7
2 changed files with 111 additions and 113 deletions

View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $
| $Revision: 1.7 $ | $Revision: 1.8 $
| $Date: 2008-12-22 12:54:30 $ | $Date: 2008-12-29 16:11:02 $
| $Author: mcfly_e107 $ | $Author: secretr $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
require_once('../class2.php'); require_once('../class2.php');
@@ -150,6 +150,7 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode
$text = ''; $text = '';
if (getperms($perms)) if (getperms($perms))
{ {
$description = strip_tags($description);
if ($mode == 'adminb') if ($mode == 'adminb')
{ {
$text = "<tr><td class='forumheader3'> $text = "<tr><td class='forumheader3'>
@@ -176,7 +177,7 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode
elseif ($mode == 'classis') elseif ($mode == 'classis')
{ {
$text .= "<td style='text-align:center; vertical-align:top; width:20%'><a href='".$link."' title='{$description}'>".$icon."</a><br /> $text .= "<td style='text-align:center; vertical-align:top; width:20%'><a href='".$link."' title='{$description}'>".$icon."</a><br />
<a href='".$link."' title='$description'><b>".$tp->toHTML($title,FALSE,"defs, emotes_off")."</b></a><br /><br /></td>"; <a href='".$link."' title='{$description}'><b>".$tp->toHTML($title,FALSE,"defs, emotes_off")."</b></a><br /><br /></td>";
} }
elseif ($mode == 'beginner') elseif ($mode == 'beginner')
{ {

View File

@@ -1,20 +1,18 @@
<?php <?php
/* /*
+ ----------------------------------------------------------------------------+ * e107 website system
| e107 website system *
| * Copyright (C) 2001-2008 e107 Inc (e107.org)
| <20>Steve Dunstan 2001-2002 * Released under the terms and conditions of the
| http://e107.org * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
| jalist@e107.org *
| * Administration Area - User classes
| Released under the terms and conditions of the *
| GNU General Public License (http://gnu.org). * $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
| * $Revision: 1.19 $
| $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $ * $Date: 2008-12-29 16:11:02 $
| $Revision: 1.18 $ * $Author: secretr $
| $Date: 2008-12-07 16:37:37 $ *
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/ */
require_once("../class2.php"); require_once("../class2.php");
@@ -35,15 +33,14 @@ $message = '';
function check_allowed($class_id, $redirect = true) function check_allowed($class_id, $redirect = true)
{ {
global $sql; global $e107;
if (!$sql->db_Select('userclass_classes', '*', "userclass_id = {$class_id}")) if (!isset($e107->user_class->class_tree[$class_id]))
{ {
if(!$redirect) return false; if(!$redirect) return false;
header("location:".SITEURL); header("location:".SITEURL);
exit; exit;
} }
$row = $sql->db_Fetch(); if (!getperms('0') && !check_class($e107->user_class->class_tree[$class_id]['userclass_editclass']))
if (!getperms('0') && !check_class($row['userclass_editclass']))
{ {
if(!$redirect) return false; if(!$redirect) return false;
header("location:".SITEURL); header("location:".SITEURL);
@@ -363,11 +360,11 @@ switch ($action)
else else
{ {
$text .= "<span class='defaulttext'>".UCSLAN_8.":</span>"; $text .= "<span class='defaulttext'>".UCSLAN_8.":</span>";
$text .= "<select name='existing' class='tbox'>".$e_userclass->vetted_tree('existing',array($e_userclass,'select'), $userclass_id,"main,admin,classes,matchclass").'</select>'; $text .= "<select name='existing' class='tbox'>".$e_userclass->vetted_tree('existing',array($e_userclass,'select'), $userclass_id,"main,admin,new,classes,matchclass").'</select>';
$text .= " $text .= "
<input class='button' type='submit' id='edit' name='edit' value='".LAN_EDIT."' /> <input class='button' type='submit' id='edit' name='edit' value='".LAN_EDIT."' />
<input class='button' type='submit' name='delete' value='".LAN_DELETE."' /> <input class='button' type='submit' name='delete' value='".LAN_DELETE."' />
<input type='checkbox' name='confirm' id='confirm' value='1' /><label for='confirm' class='smalltext'> ".UCSLAN_11."</span> <input type='checkbox' name='confirm' id='confirm' value='1' /><label for='confirm' class='smalltext'> ".UCSLAN_11."</label>
</td> </td>
</tr>"; </tr>";
} }