Index: html/pages/adduser.inc.php
===================================================================
--- html/pages/adduser.inc.php (revision 7152)
+++ html/pages/adduser.inc.php (working copy)
@@ -18,18 +18,15 @@
return;
}
-?>
-<h2>Observium User Management: Add User</h2>
-<?php
+include($config['html_dir']."/pages/usermenu.inc.php");
-include("usermenu.inc.php");
-
- $page_title[] = "Add user";
+ $page_title[] = "Add User";
$errors = array();
+ $readonly = $_SESSION['userlevel'] < 10;
if (auth_usermanagement())
{
- if ($vars['action'] == "add")
+ if ($vars['submit'] == 'add_user')
{
if ($vars['new_username'])
{
@@ -51,80 +48,103 @@
print_error('User with this name already exists!');
}
} else {
- $errors["username"] = "<span class=\"help-inline\">Please enter a username!</span>";
+ print_warning("Please enter a username!");
}
if (!$vars['new_password'])
{
- $errors["passwd"] = "<span class=\"help-inline\">Please enter a password</span>";
+ print_warning("Please enter a password!");
}
}
-?>
-<!-- <ul class="nav nav-tabs" id="addBillTab">
- <li class="active"><a href="#properties" data-toggle="tab">User Properties</a></li>
- </ul> -->
+$user_levels = array(1 => 'Normal User', 5 => 'Global Read', 10 => 'Administrator');
- <div class="tabcontent tab-content" id="addUserTabContent" style="min-height: 50px; padding-bottom: 18px;">
- <div class="tab-pane fade active in" id="properties">
- <form name="form1" method="post" action="adduser/" class="form-horizontal">
- <input type="hidden" name="action" value="add">
- <fieldset>
- <legend>User Properties</legend>
- <div class="control-group<?php if (isset($errors["username"])) { echo " error"; } ?>">
- <label class="control-label" for="new_username"><strong>Username</strong></label>
- <div class="controls">
- <input class="col-lg-4" type="text" id="new_username" name="new_username" value="<?php echo $vars['new_username']; ?>">
- <?php if (isset($errors["username"])) { echo $errors["username"]; } ?>
- </div>
- </div>
- <div class="control-group<?php if (isset($errors["passwd"])) { echo " error"; } ?>">
- <label class="control-label" for="new_password"><strong>Password</strong></label>
- <div class="controls">
- <input class="col-lg-4" type="password" id="new_password" name="new_password" value="<?php echo $vars['new_password']; ?>">
- <?php if (isset($errors["passwd"])) { echo $errors["passwd"]; } ?>
- <input type="checkbox" checked="checked" name="can_modify_passwd"> Allow the user to change his password.
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="new_realname"><strong>Real Name</strong></label>
- <div class="controls">
- <input class="col-lg-4" type="text" id="new_realname" name="new_realname" value="<?php echo $vars['new_realname']; ?>">
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="new_level"><strong>User Level</strong></label>
- <div class="controls">
- <select id="new_level" name="new_level" class="col-lg-2">
- <option <?php if ($vars['new_level'] == "1") { echo "selected"; } ?> value="1">Normal User</option>
- <option <?php if ($vars['new_level'] == "5") { echo "selected"; } ?> value="5">Global Read</option>
- <option <?php if ($vars['new_level'] == "10") { echo "selected"; } ?> value="10">Administrator</option>
- </select>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <legend>Optional Information</legend>
- <div class="control-group">
- <label class="control-label" for="new_email"><strong>E-mail</strong></label>
- <div class="controls">
- <input class="col-lg-4" type="text" id="new_email" name="new_email" value="<?php echo $vars['new_email']; ?>">
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="new_description"><strong>Description</strong></label>
- <div class="controls">
- <input class="col-lg-4" type="text" id="new_description" name="new_description" value="<?php echo $vars['new_description']; ?>">
- </div>
- </div>
- </fieldset>
- <div class="form-actions">
- <button type="submit" class="btn btn-primary"><i class="icon-ok-sign icon-white"></i> <strong>Add User</strong></button>
- </div>
- </form>
- </div>
- </div>
-<?php
+ $form = array('type' => 'horizontal',
+ 'id' => 'add_user',
+ //'space' => '20px',
+ //'title' => 'Add User',
+ //'icon' => 'oicon-gear',
+ //'class' => 'widget',
+ );
+ // top row div
+ $form['fieldset']['user'] = array('div' => 'top',
+ 'title' => 'User Properties',
+ 'icon' => 'oicon-user--pencil',
+ 'class' => 'col-md-6');
+ $form['fieldset']['info'] = array('div' => 'top',
+ 'title' => 'Optional Information',
+ 'icon' => 'oicon-information',
+ //'right' => TRUE,
+ 'class' => 'col-md-6 col-md-pull-0');
+ // bottom row div
+ $form['fieldset']['submit'] = array('div' => 'bottom',
+ 'style' => 'padding: 0px;',
+ 'class' => 'col-md-12');
+
+ //$form['row'][0]['editing'] = array(
+ // 'type' => 'hidden',
+ // 'value' => 'yes');
+ // left fieldset
+ $form['row'][1]['new_username'] = array(
+ 'type' => 'text',
+ 'fieldset' => 'user',
+ 'name' => 'Username',
+ 'width' => '250px',
+ 'value' => escape_html($vars['new_username']));
+ $form['row'][2]['new_password'] = array(
+ 'type' => 'password',
+ 'fieldset' => 'user',
+ 'name' => 'Password',
+ 'width' => '250px',
+ 'show_password' => !$readonly,
+ 'value' => escape_html($vars['new_password'])); // FIXME. For passwords we should use filter instead escape!
+ $form['row'][3]['can_modify_passwd'] = array(
+ 'type' => 'checkbox',
+ 'fieldset' => 'user',
+ 'name' => '',
+ 'placeholder' => 'Allow the user to change his password',
+ 'width' => '250px',
+ 'value' => 1);
+ $form['row'][4]['new_realname'] = array(
+ 'type' => 'text',
+ 'fieldset' => 'user',
+ 'name' => 'Real Name',
+ 'width' => '250px',
+ 'value' => escape_html($vars['new_realname']));
+ $form['row'][5]['new_level'] = array(
+ 'type' => 'select',
+ 'fieldset' => 'user',
+ 'name' => 'User Level',
+ 'width' => '250px',
+ 'values' => $user_levels,
+ 'value' => escape_html($vars['new_level']));
+
+ // right fieldset
+ $form['row'][15]['new_email'] = array(
+ 'type' => 'text',
+ 'fieldset' => 'info',
+ 'name' => 'E-mail',
+ 'width' => '250px',
+ 'value' => escape_html($vars['new_email']));
+ $form['row'][16]['new_description'] = array(
+ 'type' => 'text',
+ 'fieldset' => 'info',
+ 'name' => 'Description',
+ 'width' => '250px',
+ 'value' => escape_html($vars['new_description']));
+
+ $form['row'][30]['submit'] = array(
+ 'type' => 'submit',
+ 'fieldset' => 'submit',
+ 'name' => 'Add User',
+ 'icon' => 'icon-ok icon-white',
+ //'right' => TRUE,
+ 'class' => 'btn-primary',
+ 'value' => 'add_user');
+
+ print_form_widget($form);
+ unset($form);
+
} else {
print_error('Auth module does not allow user management!');
}