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

admin->userclass - display icon correctly now.

Browse Source
This commit is contained in:
CaMer0n
2009-11-05 12:26:44 +00:00
parent 1fd046a0ef
commit 276fa19298
2 changed files with 59 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
e107_admin/userclass2.php
View File

@@ -9,9 +9,9 @@
* Administration Area - User classes * Administration Area - User classes
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $
* $Revision: 1.30 $ * $Revision: 1.31 $
* $Date: 2009-11-01 17:19:26 $ * $Date: 2009-11-05 12:26:43 $
* $Author: e107steved $ * $Author: e107coders $
* *
*/ */
@@ -29,10 +29,15 @@ $e_sub_cat = 'userclass';
require_once(e_HANDLER.'userclass_class.php'); // Modified class handler require_once(e_HANDLER.'userclass_class.php'); // Modified class handler
$e_userclass = new user_class_admin; // Admin functions - should just obliterate any previous object created in class2.php $e_userclass = new user_class_admin; // Admin functions - should just obliterate any previous object created in class2.php
require_once (e_HANDLER.'form_handler.php');
require_once(e_HANDLER."form_handler.php");
$frm = new e_form(); $frm = new e_form();
$uc = new uclass_manager; $uc = new uclass_manager;
$message = ''; $message = '';
function check_allowed($class_id, $redirect = true) function check_allowed($class_id, $redirect = true)
@@ -307,14 +312,30 @@ if ($message)
$emessage->add($message, E_MESSAGE_SUCCESS); $emessage->add($message, E_MESSAGE_SUCCESS);
} }
class uclassFrm extends e_form
{
function userclass_type($curVal,$mode)
{
$types = array(
UC_TYPE_STD => UCSLAN_80,
UC_TYPE_GROUP => UCSLAN_81
);
return varset($types[$curVal]);
}
}
if(!e_QUERY || $action == 'list') if(!e_QUERY || $action == 'list')
{ {
$ns->tablerender(UCSLAN_21, $emessage->render(). $uc->show_existing()); $ns->tablerender(UCSLAN_21, $emessage->render(). $uc->show_existing());
} }
if($_GET['uc']) if(varset($_GET['id']) && varset($_GET['action'])=='edit')
{ {
$action = 'config'; $action = 'config';
$_POST['existing'] = $_GET['uc']; $_POST['existing'] = $_GET['id'];
} }
switch ($action) switch ($action)
@@ -834,6 +855,7 @@ function userclass2_adminmenu()
} }
class uclass_manager class uclass_manager
{ {
function uclass_manager() function uclass_manager()
@@ -845,18 +867,18 @@ class uclass_manager
save_prefs('user'); save_prefs('user');
} }
$this->fieldpref = (varset($user_pref['admin_userclass_columns'])) ? $user_pref['admin_userclass_columns'] : array("userclass_id","userclass_name","userclass_description"); ; $this->fieldpref = (varset($user_pref['admin_userclass_columns'])) ? $user_pref['admin_userclass_columns'] : array("userclass_id","userclass_name","userclass_description");
$this->fields = array( $this->fields = array(
'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'text', 'width' => '10%', 'thclass' => 'center' ), // No real vetting 'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'icon', 'width' => '5%', 'thclass' => 'center', 'class' => 'center'),
'userclass_id' => array('title'=> ID, 'width'=>'5%', 'thclass' => 'left'), 'userclass_id' => array('title'=> ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'),
'userclass_name' => array('title'=> UCSLAN_12, 'width'=>'auto', 'thclass' => 'left'), 'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'),
'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), // Display name 'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),
'userclass_parent' => array('title'=> UCSLAN_35, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), // User name 'userclass_parent' => array('title'=> UCSLAN_35, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),
'userclass_visibility' => array('title'=> UCSLAN_34, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), // Photo 'userclass_visibility' => array('title'=> UCSLAN_34, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'),
'userclass_type' => array('title'=> UCSLAN_79, 'type' => 'text', 'width' => '10%', 'thclass' => 'center' ), // Real name (no real vetting) 'userclass_type' => array('title'=> UCSLAN_79, 'type' => 'method', 'width' => '10%', 'thclass' => 'left', 'class'=>'left' ),
'options' => array('title'=> LAN_OPTIONS, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last') 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'width' => '10%', 'thclass' => 'center last', 'forced'=>TRUE, 'class'=>'center')
); );
} }
@@ -864,10 +886,13 @@ class uclass_manager
function show_existing() function show_existing()
{ {
global $e_userclass, $sql, $frm, $tp; global $e_userclass;
// $text = "<div>";
$total = $sql->db_Select('userclass_classes', '*'); $tp = e107::getParser();
if ($total == "0") $sql = e107::getDb();
$frm = new uclassFrm;
if (!$total = $sql->db_Select('userclass_classes', '*'))
{ {
$text .= UCSLAN_7; $text .= UCSLAN_7;
} }
@@ -883,48 +908,9 @@ class uclass_manager
"<tbody>"; "<tbody>";
$classes = $sql->db_getList('ALL', FALSE, FALSE); $classes = $sql->db_getList('ALL', FALSE, FALSE);
foreach($classes as $row) foreach($classes as $row)
{ {
if(varset($row['userclass_icon'])) $text .= $frm->trow($this->fields, $this->fieldpref, $row, 'userclass_id');
{
$iconpath = $tp->replaceConstants($row['userclass_icon']);
$icon = is_readable($iconpath) ? "<img src='".$iconpath."' alt='' />" : "&nbsp;";
}
// $disp = key($row);
//
$text .= "
<tr>";
foreach($this->fieldpref as $key)
{
$class = vartrue($this->fields[$key]['thclass']) ? "class='".$this->fields[$key]['thclass']."'" : "";
$text .= "<td ".$class.">";
$text .= $this->renderValue($key, $row);
$text .= "</td>";
}
/*
$text .= (in_array("userclass_icon",$this->fieldpref)) ? "<td ".$class.">".$icon."</td>" : "";
$text .= (in_array("userclass_id",$this->fieldpref)) ? "<td ".$class.">".$row['userclass_id']."</td>" : "";
$text .= (in_array("userclass_name",$this->fieldpref)) ? "<td ".$class.">".($row['userclass_name'])."</td>" : "";
$text .= (in_array("userclass_description",$this->fieldpref)) ? "<td ".$class.">".($row['userclass_description'])."</td>" : "";
$text .= (in_array("userclass_editclass",$this->fieldpref)) ? "<td ".$class.">".r_userclass_name($row['userclass_editclass'])."</td>" : "";
$text .= (in_array("userclass_parent",$this->fieldpref)) ? "<td ".$class.">".(r_userclass_name($row['userclass_parent']))."</td>" : "";
$text .= (in_array("userclass_visibility",$this->fieldpref)) ? "<td ".$class.">".(r_userclass_name($row['userclass_visibility']))."</td>" : "";
$text .= (in_array("userclass_type",$this->fieldpref)) ? "<td ".$class.">".($types[$row['userclass_type']])."</td>" : "";
*/
$text .= "<td class='center'>
<a class='action edit' href='".e_SELF."?uc=".$row['userclass_id']."'>".ADMIN_EDIT_ICON."</a>
<input type='image' class='action delete' name='delete[{$row['userclass_id']}]' src='".ADMIN_DELETE_ICON_PATH."' title='".LAN_DELETE." [ ID: {$row['userclass_id']} ]' />
</td>
</tr>
";
} }
} }
$text .= "</tbody></table></fieldset></form>"; $text .= "</tbody></table></fieldset></form>";
@@ -933,28 +919,6 @@ class uclass_manager
} }
function renderValue($key,$row)
{
$types = array(
UC_TYPE_STD => UCSLAN_80,
UC_TYPE_GROUP => UCSLAN_81
);
if($this->fields[$key]['type']=='userclass')
{
return r_userclass_name($row[$key]);
}
if($key == "userclass_type")
{
return $types[$row['userclass_type']];
}
return $row[$key];
}
} }
require_once("footer.php"); require_once("footer.php");

15
e107_handlers/form_handler.php
View File

@@ -9,9 +9,9 @@
* Form Handler * Form Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.67 $ * $Revision: 1.68 $
* $Date: 2009-11-04 23:47:14 $ * $Date: 2009-11-05 12:26:44 $
* $Author: secretr $ * $Author: e107coders $
* *
*/ */
@@ -840,7 +840,14 @@ class e_form
"; ";
} }
/**
* Render Table cells from field listing.
* @param array $fieldarray - eg. $this->fields
* @param array $currentlist - eg $this->fieldpref
* @param array $fieldvalues - eg. $row
* @param string $pid - eg. table_id
* @return
*/
function trow($fieldarray, $currentlist, $fieldvalues, $pid) function trow($fieldarray, $currentlist, $fieldvalues, $pid)
{ {
$cnt = 0; $cnt = 0;