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

Merge. Remove admin links from sidebar. They are in the footer now

Browse Source 
Merge branch 'master' of disposed.de:scattport

Conflicts:
	application/views/header.php
This commit is contained in:
Karsten Heiken
2011-08-11 02:28:54 +02:00
parent d1209e98c8 2daa1a6fad
commit 2b0ee80534
8 changed files with 231 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/controllers/users.php
View File

@@ -67,7 +67,7 @@ class Users extends MY_Controller {
array(
'field' => 'phone',
'label' => 'lang:field_phone',
'rules' => 'trim|regex_match[/^\+\d{2,4}\w\d{2,4}\w\d{3,10}+$/i]',
'rules' => 'trim|regex_match[/^\+\d{2,4}\s\d{2,4}\s\d{3,10}+$/i]',
)
);
$this->form_validation->set_rules($config);
@@ -127,7 +127,7 @@ class Users extends MY_Controller {
array(
'field' => 'phone',
'label' => 'lang:field_phone',
//'rules' => 'trim|regex_match[/^\+\d{2,4}\w\d{2,4}\w\d{3,10}+$/i]',
'rules' => 'trim|regex_match[/^\+\d{2,4}\s\d{2,4}\s\d{3,10}+$/i]',
)
);
$this->form_validation->set_rules($config);
@@ -156,12 +156,14 @@ class Users extends MY_Controller {
* @param integer $id
*/
public function delete($id = '') {
if (!is_array($this->user->getUserByID())) {
show_404();
}
$user = $this->user->getUserByID($id);
$this->user->delete($id);
$this->messages->add('The selected user was deleted', 'success');
redirect('users', 200);
if (!isset($user) || !is_array($user) || !isset($user['id'])) {
show_404();
} else {
$this->user->delete($user['id']);
$this->messages->add('The selected user was deleted', 'success');
redirect('users', 200);
}
}
}