bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-07-04 00:49:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

This commit wraps up:

Browse Source 
-Better Navbar formatting
-AJAX delete confirmation
-Enhanced validation feedback on admin pages
This commit is contained in:
Remi S
2013-08-07 13:05:03 -04:00
parent f0ba727978
commit 6567a0decd
21 changed files with 237 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
webui/controller/customer/list.php
View File

@ -35,44 +35,56 @@ class ControllerCustomerList extends Controller {
if(isset($this->request->get['id'])) { $this->data['id'] = $this->request->get['id']; }
/* check if we are admin */
if(Registry::get('admin_user') == 1) {
if($this->request->server['REQUEST_METHOD'] == 'POST') {
if($this->validate() == true) {
if(isset($this->request->post['id'])) {
if($this->model_saas_customer->update($this->request->post) == 1) {
$this->data['x'] = $this->data['text_successfully_modified'];
} else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = $this->data['text_failed_to_modify'];
// set customer ID to be the submitted id
if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; }
}
}
else {
if($this->model_saas_customer->add($this->request->post) == 1) {
$this->data['x'] = $this->data['text_successfully_added'];
} else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = $this->data['text_failed_to_add'];
}
}
}
else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = array_pop($this->error);
else {
$this->data['errorstring'] = $this->data['text_error_message'];
$this->data['errors'] = $this->error;
// set customer ID to be the submitted id
if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; print_r($this->data['id']);}
}
}
$this->data['domains'] = $this->model_domain_domain->get_mapped_domains();
if(isset($this->request->get['id'])) {
$this->data['a'] = $this->model_saas_customer->get($this->request->get['id']);
if($this->data['id'] != -1) {
$this->data['a'] = $this->model_saas_customer->get($this->data['id']);
}
else {
$this->data['entries'] = $this->model_saas_customer->get();
}
if ( isset($this->data['errorstring']) ) {
// use posted values if they differ from database values (ie - form was submitted but failed validation)
if (isset($this->request->post['domain'])) { $this->data['a']['domain'] = $this->request->post['domain'];}
if (isset($this->request->post['branding_text'])) { $this->data['a']['branding_text'] = $this->request->post['branding_text'];}
if (isset($this->request->post['branding_url'])) { $this->data['a']['branding_url'] = $this->request->post['branding_url'];}
if (isset($this->request->post['branding_logo'])) { $this->data['a']['branding_logo'] = $this->request->post['branding_logo'];}
if (isset($this->request->post['support_link'])) { $this->data['a']['support_link'] = $this->request->post['support_link'];}
if (isset($this->request->post['colour'])) { $this->data['a']['colour'] = $this->request->post['colour'];}
}
}
else {
$this->template = "common/error.tpl";
@ -85,15 +97,19 @@ class ControllerCustomerList extends Controller {
private function validate() {
// domain is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['domain']) || strlen($this->request->post['domain']) < 1) {
$this->error['domain'] = $this->data['text_invalid_data'];
}
// branding text is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['branding_text']) || strlen($this->request->post['branding_text']) < 1) {
$this->error['branding_text'] = $this->data['text_invalid_data'];
$this->error['branding_text'] = $this->data['text_field_required'];
}
// if colour is provided it must be in the format #fcfcfc or #fcf
if(isset($this->request->post['colour']) && strlen($this->request->post['colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['colour'])) {
$this->error['colour'] = $this->data['text_field_colour'];
}
if (!$this->error) {
return true;
} else {

4
webui/controller/customer/remove.php
View File

@ -24,7 +24,7 @@ class ControllerCustomerRemove extends Controller {
$this->data['username'] = Registry::get('username');
$this->data['id'] = $this->request->get['id'];
$this->data['domain'] = $this->request->get['domain'];
$this->data['domain'] = $this->request->get['name'];
$this->data['confirmed'] = (int)$this->request->get['confirmed'];
@ -57,7 +57,7 @@ class ControllerCustomerRemove extends Controller {
$this->error['admin'] = $this->data['text_you_are_not_admin'];
}
if(!isset($this->request->get['domain']) || strlen($this->request->get['domain']) < 1) {
if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 1) {
$this->error['domain'] = $this->data['text_invalid_data'];
}

6
webui/controller/domain/domain.php
View File

@ -21,7 +21,11 @@ class ControllerDomainDomain extends Controller {
if(ENABLE_SAAS == 1) {
$this->load->model('saas/ldap');
$this->data['ldap'] = $this->model_saas_ldap->get();
$ldap_id = $this->request->post['ldap_id'];
if ( isset($this->request->post['ldap_id']) ) {
$ldap_id = $this->request->post['ldap_id'];
} else {
$ldap_id = 0;
}
}
$this->document->title = $this->data['text_domain'];

2
webui/controller/domain/remove.php
View File

@ -56,7 +56,7 @@ class ControllerDomainRemove extends Controller {
$this->error['admin'] = $this->data['text_you_are_not_admin'];
}
if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['domain'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->get['name'])) ) {
if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['name'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->get['name'])) ) {
$this->error['domain'] = $this->data['text_invalid_data'];
}

38
webui/controller/ldap/list.php
View File

@ -46,22 +46,24 @@ class ControllerLdapList extends Controller {
if($this->model_saas_ldap->update($this->request->post) == 1) {
$this->data['x'] = $this->data['text_successfully_modified'];
} else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = $this->data['text_failed_to_modify'];
// set ldap ID to be the submitted id
if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; }
}
}
else {
if($this->model_saas_ldap->add($this->request->post) == 1) {
$this->data['x'] = $this->data['text_successfully_added'];
} else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = $this->data['text_failed_to_add'];
}
}
}
else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = array_pop($this->error);
$this->data['errorstring'] = $this->data['text_error_message'];
$this->data['errors'] = $this->error;
// set ldap ID to be the submitted id
if (isset($this->request->post['id'])) { $this->data['id'] = $this->request->post['id']; }
}
}
@ -71,7 +73,13 @@ class ControllerLdapList extends Controller {
else {
$this->data['entries'] = $this->model_saas_ldap->get();
}
if ( isset($this->data['errorstring']) ) {
// use posted values if they differ from database values (ie - form was submitted but failed validation)
if (isset($this->request->post['ldap_type'])) { $this->data['a']['ldap_type'] = $this->request->post['ldap_type'];}
if (isset($this->request->post['description'])) { $this->data['a']['description'] = $this->request->post['description'];}
}
}
else {
$this->template = "common/error.tpl";
@ -84,25 +92,25 @@ class ControllerLdapList extends Controller {
private function validate() {
// description is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['description']) || strlen($this->request->post['description']) < 1) {
$this->error['description'] = $this->data['text_invalid_data'];
$this->error['description'] = $this->data['text_field_required'];
}
// ldap_host is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['ldap_host']) || strlen($this->request->post['ldap_host']) < 1) {
$this->error['ldap_host'] = $this->data['text_invalid_data'];
$this->error['ldap_host'] = $this->data['text_field_required'];
}
// ldap_base_dn is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['ldap_base_dn']) || strlen($this->request->post['ldap_base_dn']) < 1) {
$this->error['ldap_base_dn'] = $this->data['text_invalid_data'];
$this->error['ldap_base_dn'] = $this->data['text_field_required'];
}
// ldap_bind_dn is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['ldap_bind_dn']) || strlen($this->request->post['ldap_bind_dn']) < 1) {
$this->error['ldap_bind_dn'] = $this->data['text_invalid_data'];
$this->error['ldap_bind_dn'] = $this->data['text_field_required'];
}
// ldap_bind_pw is required and must be 1 or more characters in length to meet this
if(!isset($this->request->post['ldap_bind_pw']) || strlen($this->request->post['ldap_bind_pw']) < 1) {
$this->error['ldap_bind_pw'] = $this->data['text_invalid_data'];
$this->error['ldap_bind_pw'] = $this->data['text_field_required'];
}
if (!$this->error) {

4
webui/controller/ldap/remove.php
View File

@ -24,7 +24,7 @@ class ControllerLdapRemove extends Controller {
$this->data['username'] = Registry::get('username');
$this->data['id'] = $this->request->get['id'];
$this->data['description'] = $this->request->get['description'];
$this->data['description'] = $this->request->get['name'];
$this->data['confirmed'] = (int)$this->request->get['confirmed'];
@ -57,7 +57,7 @@ class ControllerLdapRemove extends Controller {
$this->error['admin'] = $this->data['text_you_are_not_admin'];
}
if(!isset($this->request->get['description']) || strlen($this->request->get['description']) < 1) {
if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 1) {
$this->error['description'] = $this->data['text_invalid_data'];
}