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

Improve settings window and cleanup

Browse Source
This commit is contained in:
Eike Foken
2011-05-06 12:33:43 +02:00
parent 90c27d82cd
commit 6a1ae19983
9 changed files with 299 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/config/autoload.php
View File

@@ -52,7 +52,7 @@ $autoload['packages'] = array(APPPATH.'third_party');
| $autoload['libraries'] = array('database', 'session', 'xmlrpc');
*/
$autoload['libraries'] = array('lang_detect', 'database', 'session');
$autoload['libraries'] = array('lang_detect', 'database', 'session', 'access');
/*

319
application/controllers/auth.php
View File

@@ -7,197 +7,200 @@
*/
class Auth extends CI_Controller {
/**
* Constructor.
*/
public function __construct() {
parent::__construct();
$this->load->library('access');
$this->load->library('form_validation');
$this->load->model('user');
}
/**
* Constructor.
*/
public function __construct() {
parent::__construct();
$this->load->library('access');
$this->load->library('form_validation');
$this->load->model('user');
}
//redirect if needed, otherwise display the user list
public function index() {
if (!$this->access->loggedIn()) {
redirect('auth/login');
} else {
//set the flash data error message if there is one
$this->data['message'] = validation_errors() ? validation_errors() : $this->session->flashdata('message');
/**
* Redirects the user if needed, otherwise display the layout.
*/
public function index() {
if (!$this->access->loggedIn()) {
redirect('auth/login');
} else {
$this->load->view('index');
}
}
//$this->data['users'] = $this->access->getUsers();
$this->load->view('index', $this->data);
}
}
/**
* Logs the user in - or not ;-)
*/
public function login() {
if ($this->access->loggedIn()) {
redirect();
}
/**
* Logs the user in - or not ;-)
*/
public function login() {
if ($this->access->loggedIn()) {
redirect('welcome');
}
// validate form input
$this->form_validation->set_rules('username', "Benutzername", 'required');
$this->form_validation->set_rules('password', "Passwort", 'required');
// validate form input
$this->form_validation->set_rules('username', "Benutzername", 'required');
$this->form_validation->set_rules('password', "Passwort", 'required');
if ($this->form_validation->run() == true) {
// check for "remember me"
$remember = (boolean) $this->input->post('remember');
if ($this->form_validation->run() == true) {
// check for "remember me"
$remember = (boolean) $this->input->post('remember');
if ($this->access->login($this->input->post('username'), $this->input->post('password'), $remember)) {
$this->data['success'] = true;
} else { // if the login was un-successful
$this->data['success'] = false;
$this->data['message'] = $this->access->errors();
}
if ($this->access->login($this->input->post('username'), $this->input->post('password'), $remember)) {
$this->data['success'] = true;
} else { // if the login was un-successful
$this->data['success'] = false;
$this->data['message'] = $this->access->errors();
}
// output JSON data
$this->output->set_content_type('application/json')
->set_output(json_encode($this->data));
} else {
$this->data['message'] = validation_errors() ? validation_errors() : null;
$this->data['username'] = $this->form_validation->set_value('username');
// output json data
$this->output->set_content_type('application/json')
->set_output(json_encode($this->data));
} else {
$this->data['message'] = validation_errors() ? validation_errors() : null;
$this->data['username'] = $this->form_validation->set_value('username');
$this->load->view('auth/login', $this->data);
}
}
$this->load->view('auth/login', $this->data);
}
}
/**
* Logs the user out.
*/
public function logout() {
$logout = $this->access->logout();
/**
* Logs the user out.
*/
public function logout() {
$logout = $this->access->logout();
redirect('auth');
}
// output JSON data
$this->output->set_content_type('application/json')
->set_output(json_encode(array('success' => true)));
}
/**
* Allows users to register.
*/
public function register() {
if ($this->access->loggedIn()) {
redirect('welcome');
}
/**
* Allows users to register.
*/
public function register() {
if ($this->access->loggedIn()) {
redirect('welcome');
}
// validate form input
$this->form_validation->set_rules('username', "Username", 'required');
$this->form_validation->set_rules('realname', "Realname", 'required');
$this->form_validation->set_rules('email', "Email address", 'required|valid_email');
$this->form_validation->set_rules('password', "Password", 'required|min_length[' . $this->config->item('min_password_length', 'access') . ']|max_length[' . $this->config->item('max_password_length', 'access') . ']|matches[password_confirm]');
$this->form_validation->set_rules('password_confirm', "Password confirmation", 'required');
// validate form input
$this->form_validation->set_rules('username', "Username", 'required');
$this->form_validation->set_rules('realname', "Realname", 'required');
$this->form_validation->set_rules('email', "Email address", 'required|valid_email');
$this->form_validation->set_rules('password', "Password", 'required|min_length[' . $this->config->item('min_password_length', 'access') . ']|max_length[' . $this->config->item('max_password_length', 'access') . ']|matches[password_confirm]');
$this->form_validation->set_rules('password_confirm', "Password confirmation", 'required');
if ($this->form_validation->run() == true) {
$username = $this->input->post('username');
$email = $this->input->post('email');
$password = $this->input->post('password');
if ($this->form_validation->run() == true) {
$username = $this->input->post('username');
$email = $this->input->post('email');
$password = $this->input->post('password');
$additional_data = array(
$additional_data = array(
'realname' => $this->input->post('realname'),
);
}
);
}
if ($this->form_validation->run() == true && $this->access->register($username, $password, $email, $additional_data)) {
// redirect them to the login page
$this->session->set_flashdata('message', "Registration successful");
redirect('auth/register_success');
} else {
// set the flash data error message if there is one
$this->data['message'] = validation_errors() ? validation_errors() : ($this->access->errors() ? $this->access->errors() : $this->session->flashdata('message'));
$this->data['username'] = $this->form_validation->set_value('username');
$this->data['email'] = $this->form_validation->set_value('email');
$this->data['realname'] = $this->form_validation->set_value('realname');
$this->data['password'] = $this->form_validation->set_value('password');
$this->data['password_confirm'] = $this->form_validation->set_value('password_confirm');
$this->load->view('auth/register', $this->data);
}
}
if ($this->form_validation->run() == true && $this->access->register($username, $password, $email, $additional_data)) {
// redirect them to the login page
$this->session->set_flashdata('message', "Registration successful");
redirect('auth/register_success');
} else {
// set the flash data error message if there is one
$this->data['message'] = validation_errors() ? validation_errors() : ($this->access->errors() ? $this->access->errors() : $this->session->flashdata('message'));
$this->data['username'] = $this->form_validation->set_value('username');
$this->data['email'] = $this->form_validation->set_value('email');
$this->data['realname'] = $this->form_validation->set_value('realname');
$this->data['password'] = $this->form_validation->set_value('password');
$this->data['password_confirm'] = $this->form_validation->set_value('password_confirm');
$this->load->view('auth/register', $this->data);
}
}
public function register_success() {
$this->load->view('auth/register_success', $this->data);
}
/**
* Allows users to edit their settings.
*/
public function settings() {
if (!$this->access->loggedIn()) {
redirect('auth/login', 'refresh');
}
public function settings() {
if (!$this->access->loggedIn()) {
redirect('auth/login', 'refresh');
}
// validate the form
$this->form_validation->set_rules('new_password', 'New Password', 'min_length[' . $this->config->item('min_password_length', 'auth') . ']|max_length[' . $this->config->item('max_password_length', 'access') . ']|matches[new_password_confirm]');
// validate form
$this->form_validation->set_rules('new_password', 'New Password', 'min_length[' . $this->config->item('min_password_length', 'auth') . ']|max_length[' . $this->config->item('max_password_length', 'access') . ']|matches[new_password_confirm]');
if ($this->form_validation->run() == true) {
// change password if needed
if ($this->input->post('new_password') != '') {
$username = $this->session->userdata('username');
$change = $this->access->changePassword($username, $this->input->post('old_password'), $this->input->post('new_password'));
if ($this->form_validation->run() == true) {
// change password if needed
if ($this->input->post('new_password') != '') {
$username = $this->session->userdata('username');
$change = $this->access->changePassword($username, $this->input->post('old_password'), $this->input->post('new_password'));
if ($change) {
$this->logout();
}
}
if ($change) {
$this->logout();
}
}
// update user
$updateData = array(
// update user
$updateData = array(
'firstname' => $this->input->post('firstname'),
'lastname' => $this->input->post('lastname'),
'institution' => $this->input->post('institution'),
'phone' => $this->input->post('phone'),
'email' => $this->input->post('email'),
);
$this->access->updateUser($this->session->userdata('user_id'), $updateData);
);
$this->access->updateUser($this->session->userdata('user_id'), $updateData);
echo "{success: true}";
} else {
$this->data['success'] = true;
$this->data['data'] = $this->access->getCurrentUser();
// output JSON data
$this->output->set_content_type('application/json')
->set_output(json_encode(array('success' => true)));
} else {
$data['success'] = true;
$data['data'] = $this->access->getCurrentUser();
// output json data
$this->output->set_content_type('application/json')
->set_output(json_encode($this->data));
}
}
// output JSON data
$this->output->set_content_type('application/json')
->set_output(json_encode($data));
}
}
//forgot password
public function forgot_password() {
$this->form_validation->set_rules('email', 'Email Address', 'required');
if ($this->form_validation->run() == false) {
//setup the input
$this->data['email'] = array('name' => 'email',
/**
* Allows users to request a new password.
*/
public function forgot_password() {
$this->form_validation->set_rules('email', 'Email Address', 'required');
if ($this->form_validation->run() == false) {
//setup the input
$this->data['email'] = array('name' => 'email',
'id' => 'email',
);
//set any errors and display the form
$this->data['message'] = (validation_errors()) ? validation_errors() : $this->session->flashdata('message');
$this->load->view('auth/forgot_password', $this->data);
} else {
//run the forgotten password method to email an activation code to the user
$forgotten = $this->access->forgotten_password($this->input->post('email'));
);
//set any errors and display the form
$this->data['message'] = (validation_errors()) ? validation_errors() : $this->session->flashdata('message');
$this->load->view('auth/forgot_password', $this->data);
} else {
//run the forgotten password method to email an activation code to the user
$forgotten = $this->access->forgotten_password($this->input->post('email'));
if ($forgotten) { //if there were no errors
$this->session->set_flashdata('message', $this->access->messages());
redirect("auth/login", 'refresh'); //we should display a confirmation page here instead of the login page
} else {
$this->session->set_flashdata('message', $this->access->errors());
redirect("auth/forgot_password", 'refresh');
}
}
}
if ($forgotten) { //if there were no errors
$this->session->set_flashdata('message', $this->access->messages());
redirect("auth/login", 'refresh'); //we should display a confirmation page here instead of the login page
} else {
$this->session->set_flashdata('message', $this->access->errors());
redirect("auth/forgot_password", 'refresh');
}
}
}
//reset password - final step for forgotten password
public function reset_password($code) {
$reset = $this->access->forgotten_password_complete($code);
/**
* Final step for forgotten password.
*/
public function reset_password($code) {
$reset = $this->access->forgotten_password_complete($code);
if ($reset) { //if the reset worked then send them to the login page
$this->session->set_flashdata('message', $this->access->messages());
redirect('auth/login');
} else { //if the reset didnt work then send them back to the forgot password page
$this->session->set_flashdata('message', $this->access->errors());
redirect('auth/forgot_password');
}
}
if ($reset) { //if the reset worked then send them to the login page
$this->session->set_flashdata('message', $this->access->messages());
redirect('auth/login');
} else { //if the reset didnt work then send them back to the forgot password page
$this->session->set_flashdata('message', $this->access->errors());
redirect('auth/forgot_password');
}
}
public function test() {
echo "{xtype: 'form', title: 'Bla'}";
}
}
/* End of file auth.php */

2
application/views/header.php
View File

@@ -24,7 +24,7 @@
<?=img(array('src' => 'assets/images/logo.png', 'style' => 'margin-left: 5px'));?>
<div style="float: right; margin-top: 15px; margin-right: 10px; color: #ccc;">
<a href="javascript:void(0);" onclick="settings.show();" style="padding: 5px">Einstellungen</a> |
<?=anchor('auth/logout', "Logout", array('style' => 'padding: 5px;'));?>
<a href="javascript:void(0);" onclick="logout();" style="padding: 5px">Logout</a>
</div>
<?=img(array('src' => 'assets/images/lang_' . $this->config->item('lang_selected') . '.png', 'style' => 'float: right; margin-top: 18px; margin-right: 5px;'));?>
</div>

31
application/views/index.php
View File

@@ -25,7 +25,7 @@ var projectTree = new Ext.tree.TreePanel({
dataUrl: BASE_URL + 'projects/getAvailable',
root: {
nodeType: 'async',
text: 'Projekte',
text: "Projekte",
expanded: true,
id: 'projects'
}
@@ -48,7 +48,7 @@ var tabPanel = new Ext.TabPanel({
id: 'tab_welcome',
bodyStyle: 'padding: 10px',
title: "Willkommen",
closable: true,
closable: true
}]
});
@@ -85,32 +85,21 @@ var layoutMain = new Ext.Viewport({
}, layoutCenter]
});
function logout() {
Ext.Ajax.request({
url: BASE_URL + 'auth/logout',
method: 'post',
success: function(xhr) {
window.location = BASE_URL + 'auth/login';
}
});
}
function loadProjectInfo(n) {
if(n.isLeaf()){
if (n.isLeaf()) {
Ext.Ajax.request({
url: BASE_URL + 'projects/detail/' + n.prjId,
method: 'get',
success: function ( result, request ) {
success: function(result, request) {
var theResponse = Ext.util.JSON.decode(result.responseText);
tabPanel.add({
title: 'New Tab ',
html: 'Lade Projekt...',
closable:true
title: "New Tab",
html: "Lade Projekt...",
closable: true
}).show();
},
failure: function ( result, request ) {
failure: function(result, request) {
switch(result.status) {
case 404:
Ext.MessageBox.alert("Fehler", "Das gewünschte Projekt konnte nicht gefunden werden.");
@@ -119,13 +108,11 @@ function loadProjectInfo(n) {
Ext.MessageBox.alert("Fehler", "Sie besitzen nicht die nötigen Zugriffsrechte, um dieses Projekt zu lesen."
+ "Wenden Sie sich an den Projektbesitzer, um Zugriff zu erhalten.");
break;
}
};
}
});
}
}
</script>
<div id="main"></div>