bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:17:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui fixes

Browse Source
This commit is contained in:
SJ
2013-08-14 23:40:52 +02:00
parent b3cea9de7f
commit 29482ffb1d
47 changed files with 1065 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,44 +35,57 @@ 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['text_colour'])) { $this->data['a']['text_colour'] = $this->request->post['text_colour'];}
if (isset($this->request->post['background_colour'])) { $this->data['a']['background_colour'] = $this->request->post['background_colour'];}
}
}
else {
$this->template = "common/error.tpl";
@ -85,13 +98,20 @@ 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['text_colour']) && strlen($this->request->post['text_colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['text_colour'])) {
$this->error['text_colour'] = $this->data['text_field_colour'];
}
if(isset($this->request->post['background_colour']) && strlen($this->request->post['background_colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['background_colour'])) {
$this->error['background_colour'] = $this->data['text_field_colour'];
}
if (!$this->error) {

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'];
}

27
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'];
@ -64,18 +68,17 @@ class ControllerDomainDomain extends Controller {
if($this->model_domain_domain->addDomain($this->request->post['domain'], $this->request->post['mapped'], $ldap_id) == 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;
$this->data['post'] = $this->request->post;
}
}
/* get list of current policies */
/* get list of domains */
$this->data['domains'] = $this->model_domain_domain->getDomains();
}
@ -98,20 +101,24 @@ class ControllerDomainDomain extends Controller {
private function validate() {
if(!isset($this->request->post['domain']) || strlen($this->request->post['domain']) < 3) {
$this->error['email'] = $this->data['text_invalid_data'];
$this->data['text_field_length'] = str_replace("?",3,$this->data['text_field_length']);
$this->error['domain'] = $this->data['text_field_length'];
}
else {
$domains = explode("\n", $this->request->post['domain']);
foreach ($domains as $domain) {
$domain = rtrim($domain);
if(!preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $domain) ) {
$this->error['email'] = $this->data['text_invalid_data'] . ": $domain";
$this->error['domain'] = $this->data['text_field_domain'];
}
}
}
if(!isset($this->request->post['mapped']) || strlen($this->request->post['mapped']) < 3 || !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->post['mapped']) ) {
$this->error['domain'] = $this->data['text_invalid_data'] . ": " . $this->request->post['mapped'];
if(!isset($this->request->post['mapped']) || strlen($this->request->post['mapped']) < 3) {
$this->data['text_field_length'] = str_replace("?",3,$this->data['text_field_length']);
$this->error['mapped'] = $this->data['text_field_length'];
} elseif( !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->post['mapped']) ) {
$this->error['mapped'] = $this->data['text_field_domain'];
}
if (!$this->error) {

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

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

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

@ -40,38 +40,47 @@ class ControllerLdapList extends Controller {
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_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']; }
}
}
if(isset($this->request->get['id'])) {
$this->data['a'] = $this->model_saas_ldap->get($this->request->get['id']);
$this->data['a'] = $this->model_saas_ldap->get($this->data['id']);
}
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 +93,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'];
}

39
webui/controller/user/add.php
View File

@ -50,7 +50,8 @@ class ControllerUserAdd extends Controller {
}
}
else {
$this->data['errorstring'] = array_pop($this->error);
$this->data['errorstring'] = $this->data['text_error_message'];
$this->data['errors'] = $this->error;
}
if($ret == 0) {
@ -62,6 +63,7 @@ class ControllerUserAdd extends Controller {
}
else {
$this->data['next_user_id'] = $this->model_user_user->get_next_uid();
// not sure these are needed
$this->data['groups'] = $this->model_group_group->get_groups();
$this->data['folders'] = $this->model_folder_folder->get_folders();
}
@ -71,31 +73,32 @@ class ControllerUserAdd extends Controller {
$this->data['errorstring'] = $this->data['text_you_are_not_admin'];
}
$this->render();
}
private function validate() {
if(!isset($this->request->post['password']) || !isset($this->request->post['password2']) ) {
private function validate() {
//password is required and must be greater than the MIN_PASSWORD_LENGTH
if(!isset($this->request->post['password'])) {
$this->error['password'] = $this->data['text_missing_password'];
}
if(strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH || strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {
} elseif (strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH) {
$this->error['password'] = $this->data['text_too_short_password'];
}
if($this->request->post['password'] != $this->request->post['password2']) {
$this->error['password'] = $this->data['text_password_mismatch'];
//password2 is required and must be greater than the MIN_PASSWORD_LENGTH
if(!isset($this->request->post['password2'])) {
$this->error['password2'] = $this->data['text_missing_password'];
} elseif (strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {
$this->error['password2'] = $this->data['text_too_short_password'];
}
//passwords must match (put here to override the password2 missing message, if also present)
if($this->request->post['password'] != $this->request->post['password2']) {
$this->error['password2'] = $this->data['text_password_mismatch'];
}
//uid is required and must be numeric & 0 or greater
if(!isset($this->request->post['uid']) || !is_numeric($this->request->post['uid']) || $this->request->post['uid'] < 0) {
$this->error['uid'] = $this->data['text_invalid_uid'];
}
//email address is required and must be in the proper format
if(!isset($this->request->post['email']) || strlen($this->request->post['email']) < 3) {
$this->error['email'] = $this->data['text_invalid_email'];
}
@ -114,15 +117,15 @@ class ControllerUserAdd extends Controller {
}
}
}
//username is required and must be greater than 2 chars
if(!isset($this->request->post['username']) || strlen($this->request->post['username']) < 2) {
$this->error['username'] = $this->data['text_invalid_username'];
}
//username is required and must be unique
if(isset($this->request->post['username']) && $this->model_user_user->get_uid_by_name($this->request->post['username']) > 0) {
$this->error['username'] = $this->data['text_existing_user'];
}
//primary domain is required
if(!isset($this->request->post['domain'])) {
$this->error['domain'] = $this->data['text_missing_data'];
}

20
webui/controller/user/edit.php
View File

@ -66,11 +66,11 @@ class ControllerUserEdit extends Controller {
$__username = $this->request->post['username'];
}
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;
}
}
else {
//else {
$this->data['user'] = $this->model_user_user->get_user_by_uid($this->data['uid']);
$this->data['user']['domains'] = $this->model_user_user->get_domains_by_uid($this->data['uid']);
@ -80,22 +80,28 @@ class ControllerUserEdit extends Controller {
$this->data['emails'] = $this->model_user_user->get_emails($this->data['user']['username']);
}
//}
}
else {
$this->template = "common/error.tpl";
$this->data['errorstring'] = $this->data['text_you_are_not_admin'];
}
$this->render();
}
private function validate() {
//if provided, the password must be greater than the MIN_PASSWORD_LENGTH
if(isset($this->request->post['password']) && strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH) {
$this->error['password'] = $this->data['text_too_short_password'];
}
//if provided, the password2 must be greater than the MIN_PASSWORD_LENGTH
if(isset($this->request->post['password2']) && strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {
$this->error['password2'] = $this->data['text_too_short_password'];
}
if(isset($this->request->post['password']) && strlen(@$this->request->post['password']) > 1) {
if(strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH || strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {

3
webui/controller/user/list.php
View File

@ -91,6 +91,9 @@ class ControllerUserList extends Controller {
$this->data['total_pages'] = floor($this->data['total_users'] / $this->data['page_len']);
$this->data['querystring'] = '';
if ($this->data['page'] != 1) { $this->data['querystring'] .= "&amp;page=".$this->data['page']; }
if (strlen($this->data['search']) > 0) { $this->data['querystring'] .= "&amp;search=".$this->data['search']; }
$this->render();
}

5
webui/controller/user/remove.php
View File

@ -23,7 +23,7 @@ class ControllerUserRemove extends Controller {
$this->data['username'] = Registry::get('username');
$this->data['uid'] = (int)@$this->request->get['uid'];
$this->data['uid'] = (int)@$this->request->get['id'];
$this->data['user'] = @$this->request->get['user'];
$this->data['confirmed'] = (int)@$this->request->get['confirmed'];
@ -57,7 +57,7 @@ class ControllerUserRemove extends Controller {
$this->error['admin'] = $this->data['text_you_are_not_admin'];
}
if(!isset($this->request->get['uid']) || !is_numeric($this->request->get['uid']) || $this->request->get['uid'] < 1 ) {
if(!isset($this->request->get['id']) || !is_numeric($this->request->get['id']) || $this->request->get['id'] < 1 ) {
$this->error['username'] = $this->data['text_invalid_uid'];
}
@ -70,7 +70,6 @@ class ControllerUserRemove extends Controller {
}
}
?>