mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-05-04 03:16:23 +02:00
Code Issues Releases Wiki Activity

Issue #55, #101 - userclass numbers not being inserted

Browse Source
This commit is contained in:
SteveD 2013-02-05 21:46:18 +00:00
parent 1dfe9b5e24
commit 2855665d56
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/form_handler.php
View File

@ -1100,7 +1100,7 @@ class e_form
$prefix = '  '.str_repeat('--', $nest_level - 1).'>'; $prefix = '  '.str_repeat('--', $nest_level - 1).'>';
$style = ''; $style = '';
} }
return $this->option($prefix.$this->_uc->uc_get_classname($classnum), '{$classSign}{$classIndex}', ($current_value !== '' && in_array($classnum, $tmp)), array("style"=>"{$style}"))."\n"; return $this->option($prefix.$this->_uc->uc_get_classname($classnum), $classSign.$classIndex, ($current_value !== '' && in_array($classnum, $tmp)), array("style"=>"{$style}"))."\n";
} }

25
e107_handlers/userclass_class.php
View File

@ -50,7 +50,7 @@ define('e_UC_SPECIAL_END' ,255); // Highest 'special' class
define('UC_ICON_DIR', e_IMAGE_ABS.'generic/'); // Directory for the icons used in the admin tree displays define('UC_ICON_DIR', e_IMAGE_ABS.'generic/'); // Directory for the icons used in the admin tree displays
define('e_UC_BLANK' ,'-1'); // Code for internal use define('e_UC_BLANK' ,'-32767'); // Code for internal use - needs to be large to avoid confusion with 'not a member of...'
define('UC_TYPE_STD' , '0'); // User class is 'normal' define('UC_TYPE_STD' , '0'); // User class is 'normal'
define('UC_TYPE_GROUP' , '1'); // User class is a group or list of subsidiary classes define('UC_TYPE_GROUP' , '1'); // User class is a group or list of subsidiary classes
@ -720,7 +720,12 @@ class user_class
$prefix = '  '.str_repeat('--',$nest_level-1).'>'; $prefix = '  '.str_repeat('--',$nest_level-1).'>';
$style = ''; $style = '';
} }
return "<option value='{$classSign}{$classIndex}'{$sel}{$style}>".$prefix.$this->class_tree[$classIndex]['userclass_name']."</option>\n"; $ucString = $this->class_tree[$classIndex]['userclass_name'];
if ($classSign == '-')
{
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
}
return "<option value='{$classSign}{$classIndex}'{$sel}{$style}>".$prefix.$ucString."</option>\n";
} }
@ -743,7 +748,12 @@ class user_class
{ {
$style = " style='text-indent:".(1.2*$nest_level)."em'"; $style = " style='text-indent:".(1.2*$nest_level)."em'";
} }
return "<div {$style}><input type='checkbox' class='checkbox' name='{$treename}[]' id='{$treename}_{$classSign}{$classIndex}' value='{$classSign}{$classIndex}'{$chk} />".$this->class_tree[$classIndex]['userclass_name']."</div>\n"; $ucString = $this->class_tree[$classIndex]['userclass_name'];
if ($classSign == '-')
{
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
}
return "<div {$style}><input type='checkbox' class='checkbox' name='{$treename}[]' id='{$treename}_{$classSign}{$classIndex}' value='{$classSign}{$classIndex}'{$chk} />".$ucString."</div>\n";
} }
@ -769,8 +779,13 @@ class user_class
$id = "{$treename}_{$classnum}"; $id = "{$treename}_{$classnum}";
$ucString = $this->class_tree[$classIndex]['userclass_name'];
if ($classSign == '-')
{
$ucString = str_replace('--CLASS--', $ucString, UC_LAN_INVERT);
}
return "<div {$style}><label> return "<div {$style}><label>
".e107::getForm()->checkbox($treename.'[]', $classnum , $chk, "id=".$id)." ".$this->class_tree[$classIndex]['userclass_name'].' ('.$this->class_tree[$classIndex]['userclass_description'].")</label></div>\n"; ".e107::getForm()->checkbox($treename.'[]', $classnum , $chk, "id=".$id)." ".$ucString.' ('.$this->class_tree[$classIndex]['userclass_description'].")</label></div>\n";
return "<div {$style}><input type='checkbox' class='checkbox' name='{$treename}[]' id='{$treename}_{$classSign}{$classnum}' value='{$classSign}{$classnum}'{$chk} />".$this->class_tree[$classIndex]['userclass_name'].' ('.$this->class_tree[$classIndex]['userclass_description'].")</div>\n"; return "<div {$style}><input type='checkbox' class='checkbox' name='{$treename}[]' id='{$treename}_{$classSign}{$classnum}' value='{$classSign}{$classnum}'{$chk} />".$this->class_tree[$classIndex]['userclass_name'].' ('.$this->class_tree[$classIndex]['userclass_description'].")</div>\n";
} }
@ -810,7 +825,7 @@ class user_class
public function uc_get_classname($id) public function uc_get_classname($id)
{ {
$cn = abs($id); $cn = abs($id);
$ucString = ''; $ucString = 'Class:'.$id; // Debugging aid - this should be overridden
if (isset($this->class_tree[$cn])) if (isset($this->class_tree[$cn]))
{ {