karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean-up user administration

Browse Source
This commit is contained in:
Eike Foken
2011-08-15 00:58:12 +02:00
parent dfba3049f1
commit 086631fe74
5 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/controllers/admin/users.php
View File

@@ -15,7 +15,6 @@ class Users extends CI_Controller {
parent::__construct(); parent::__construct();
$this->load->library('form_validation'); $this->load->library('form_validation');
$this->load->model('user'); $this->load->model('user');
$this->load->config('form_validation');
} }
/** /**
@@ -23,7 +22,7 @@ class Users extends CI_Controller {
*/ */
public function index() { public function index() {
$data['users'] = $this->user->getAll(); $data['users'] = $this->user->getAll();
$this->load->view('admin/users/index', $data); $this->load->view('admin/users/list', $data);
} }
/** /**
@@ -41,7 +40,7 @@ class Users extends CI_Controller {
); );
if ($this->user->register($username, $this->input->post('password'), $this->input->post('email'), $data)) { if ($this->user->register($username, $this->input->post('password'), $this->input->post('email'), $data)) {
$this->messages->add(sprintf(_("The user '%s' was created"), $username), 'success'); $this->messages->add(sprintf(_("The user '%s' has been created successfully"), $username), 'success');
redirect('admin/users', 303); redirect('admin/users', 303);
} }
} }
@@ -71,7 +70,7 @@ class Users extends CI_Controller {
); );
if ($this->user->update($user['id'], $data)) { if ($this->user->update($user['id'], $data)) {
$this->messages->add(sprintf(_("The user '%s' was updated"), $user['username']), 'success'); $this->messages->add(sprintf(_("The user '%s' has been updated successfully"), $user['username']), 'success');
redirect('admin/users', 303); redirect('admin/users', 303);
} }
} }
@@ -91,7 +90,7 @@ class Users extends CI_Controller {
show_404(); show_404();
} else { } else {
$this->user->delete($user['id']); $this->user->delete($user['id']);
$this->messages->add(_("The selected user was deleted"), 'success'); $this->messages->add(_("The selected user has been deleted successfully"), 'success');
redirect('admin/users', 303); redirect('admin/users', 303);
} }
} }

1
application/models/user.php
View File

@@ -251,7 +251,6 @@ class User extends CI_Model {
if ($this->storeSalt) { if ($this->storeSalt) {
$data['salt'] = $salt; $data['salt'] = $salt;
} }
print_r($data);
$this->db->insert('users', array_merge($data, $additionalData)); $this->db->insert('users', array_merge($data, $additionalData));

13
application/views/admin/users/create.php
View File

@@ -12,6 +12,7 @@
<ul> <ul>
<li> <li>
<?=form_label(_('Username'), 'username');?> <?=form_label(_('Username'), 'username');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="username" id="username" class="short text" value="<?=set_value('username');?>" /> <input type="text" name="username" id="username" class="short text" value="<?=set_value('username');?>" />
<?=form_error('username')?> <?=form_error('username')?>
@@ -20,6 +21,7 @@
</li> </li>
<li> <li>
<?=form_label(_('Email address'), 'email');?> <?=form_label(_('Email address'), 'email');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email');?>" /> <input type="text" name="email" id="email" class="medium text" value="<?=set_value('email');?>" />
<?=form_error('email')?> <?=form_error('email')?>
@@ -27,6 +29,7 @@
</li> </li>
<li> <li>
<?=form_label(_('Password'), 'password');?> <?=form_label(_('Password'), 'password');?>
<span class="req">*</span>
<div> <div>
<input type="password" name="password" id="password" class="short text" /> <input type="password" name="password" id="password" class="short text" />
<?=form_error('password')?> <?=form_error('password')?>
@@ -34,6 +37,7 @@
</li> </li>
<li> <li>
<?=form_label(_('Confirm password'), 'password_confirm');?> <?=form_label(_('Confirm password'), 'password_confirm');?>
<span class="req">*</span>
<div> <div>
<input type="password" name="password_confirm" id="password_confirm" class="short text" /> <input type="password" name="password_confirm" id="password_confirm" class="short text" />
<?=form_error('password_confirm')?> <?=form_error('password_confirm')?>
@@ -41,6 +45,7 @@
</li> </li>
<li> <li>
<?=form_label(_('First name'), 'firstname');?> <?=form_label(_('First name'), 'firstname');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname');?>" /> <input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname');?>" />
<?=form_error('firstname')?> <?=form_error('firstname')?>
@@ -48,6 +53,7 @@
</li> </li>
<li> <li>
<?=form_label(_('Last name'), 'lastname');?> <?=form_label(_('Last name'), 'lastname');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname');?>" /> <input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname');?>" />
<?=form_error('lastname')?> <?=form_error('lastname')?>
@@ -71,13 +77,6 @@
</div> </div>
<label class="note"><?=('Example');?>: +49 123 456789</label> <label class="note"><?=('Example');?>: +49 123 456789</label>
</li> </li>
<li>
<?=form_label(_('Language'), 'language');?>
<div>
<?=form_dropdown('language', array('English'), null, 'id="language" class="drop"');?>
<?=form_error('language')?>
</div>
</li>
</ul> </ul>
<p> <p>
<a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();"><?=_('Save');?></a> <a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();"><?=_('Save');?></a>

10
application/views/admin/users/edit.php
View File

@@ -12,6 +12,7 @@
<ul> <ul>
<li> <li>
<?=form_label(_('Email address'), 'email');?> <?=form_label(_('Email address'), 'email');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email', $user['email']);?>" /> <input type="text" name="email" id="email" class="medium text" value="<?=set_value('email', $user['email']);?>" />
<?=form_error('email')?> <?=form_error('email')?>
@@ -19,6 +20,7 @@
</li> </li>
<li> <li>
<?=form_label(_('First name'), 'firstname');?> <?=form_label(_('First name'), 'firstname');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname', $user['firstname']);?>" /> <input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname', $user['firstname']);?>" />
<?=form_error('firstname')?> <?=form_error('firstname')?>
@@ -26,6 +28,7 @@
</li> </li>
<li> <li>
<?=form_label(_('Last name'), 'lastname');?> <?=form_label(_('Last name'), 'lastname');?>
<span class="req">*</span>
<div> <div>
<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname', $user['lastname']);?>" /> <input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname', $user['lastname']);?>" />
<?=form_error('lastname')?> <?=form_error('lastname')?>
@@ -49,13 +52,6 @@
</div> </div>
<label class="note"><?=_('Example');?>: +49 123 456789</label> <label class="note"><?=_('Example');?>: +49 123 456789</label>
</li> </li>
<li>
<?=form_label(_('Language'), 'language');?>
<div>
<?=form_dropdown('language', array('English'), null, 'id="language" class="drop"');?>
<?=form_error('language')?>
</div>
</li>
</ul> </ul>
<p> <p>
<a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();"><?=_('Save');?></a> <a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();"><?=_('Save');?></a>

2
application/views/admin/users/index.php → application/views/admin/users/list.php
View File

@@ -16,6 +16,7 @@
<th scope="col"><?=_('Actions');?></th> <th scope="col"><?=_('Actions');?></th>
</tr> </tr>
</thead> </thead>
<tbody>
<?php <?php
foreach ($users as $user): foreach ($users as $user):
?> ?>
@@ -27,7 +28,6 @@
<?php <?php
endforeach; endforeach;
?> ?>
<tbody>
</tbody> </tbody>
</table> </table>