diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/cat_list.php | 2 | ||||
| -rw-r--r-- | admin/themes/default/default-colors.css | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/extend_for_templates.tpl | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/user_list.tpl | 13 | ||||
| -rw-r--r-- | admin/user_list.php | 22 |
5 files changed, 3 insertions, 38 deletions
diff --git a/admin/cat_list.php b/admin/cat_list.php index 98dfecc03..e485a3d21 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -102,7 +102,7 @@ $navigation.= '</a>'; // +-----------------------------------------------------------------------+ // | virtual categories management | // +-----------------------------------------------------------------------+ -// request to delete a virtual category / not for an adviser +// request to delete a virtual category if (isset($_GET['delete']) and is_numeric($_GET['delete'])) { delete_categories(array($_GET['delete'])); diff --git a/admin/themes/default/default-colors.css b/admin/themes/default/default-colors.css index d786a9d33..915df5a9b 100644 --- a/admin/themes/default/default-colors.css +++ b/admin/themes/default/default-colors.css @@ -29,7 +29,7 @@ INPUT.radio, INPUT.checkbox { /** - * Header message like upgrade or adviser mode + * Header message like upgrade */ .header_msgs { text-align:center; diff --git a/admin/themes/default/template/extend_for_templates.tpl b/admin/themes/default/template/extend_for_templates.tpl index bbaa48b5c..07998128a 100644 --- a/admin/themes/default/template/extend_for_templates.tpl +++ b/admin/themes/default/template/extend_for_templates.tpl @@ -28,10 +28,8 @@ </tr> {/foreach} </table> - {if !is_adviser()} <p> <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit"> </p> - {/if} </form> {/if} diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index ec0fd29f3..03772e104 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -120,19 +120,6 @@ </select> </td> </tr> - - {if isset($adviser)} - <tr> - <td>{'Adviser'|@translate}</td> - <td> - <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label> - / {'set to'|@translate} - <label><input type="radio" name="adviser" value="true">{'Yes'|@translate}</label> - <label><input type="radio" name="adviser" value="false">{'No'|@translate}</label> - </td> - </tr> - {/if} - </table> </fieldset> diff --git a/admin/user_list.php b/admin/user_list.php index fb220753c..9e28415c9 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -86,7 +86,6 @@ SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id, u.'.$conf['user_fields']['username'].' AS username, u.'.$conf['user_fields']['email'].' AS email, ui.status, - ui.adviser, ui.enabled_high, ui.level FROM '.USERS_TABLE.' AS u @@ -392,11 +391,6 @@ DELETE FROM '.USER_GROUP_TABLE.' $true_false_fields = array('expand', 'show_nb_comments', 'show_nb_hits', 'enabled_high'); - if ($conf['allow_adviser']) - { - array_push($formfields, 'adviser'); - array_push($true_false_fields, 'adviser'); - } foreach ($formfields as $formfield) { @@ -458,12 +452,6 @@ DELETE FROM '.USER_GROUP_TABLE.' $data['status'] = 'guest'; } } - - // could not be adivser - if (isset($data['adviser'])) - { - $data['adviser'] = 'false'; - } } array_push($datas, $data); @@ -523,12 +511,6 @@ $template->assign( 'F_FILTER_ACTION' => get_root_url().'admin.php' )); -// Hide radio-button if not allow to assign adviser -if ($conf['allow_adviser']) -{ - $template->assign('adviser', true); -} - // Display or Hide double password type $template->assign('Double_Password', $conf['double_password_type_in_admin'] ); @@ -707,9 +689,7 @@ foreach ($visible_user_list as $local_user) ? '<br>['.l10n('guest').']' : '') .($local_user['id'] == $conf['default_user_id'] ? '<br>['.l10n('default values').']' : ''), - 'STATUS' => l10n('user_status_'. - $local_user['status']).(($local_user['adviser'] == 'true') - ? '<br>['.l10n('Adviser').']' : ''), + 'STATUS' => l10n('user_status_'.$local_user['status']), 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, 'PROPERTIES' => implode( ', ', $properties), |