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

- Including files for new customer UI features left out of last commit

Browse Source
This commit is contained in:
Remi
2013-08-26 18:50:30 -04:00
parent 9f6d3fd802
commit 3376984ec9
3 changed files with 99 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ class ControllerCustomerList extends Controller {
$this->id = "content";
$this->template = "customer/list.tpl";
$this->layout = "common/layout";
$this->layout = "common/layout-customer";
$request = Registry::get('request');
@ -34,12 +34,6 @@ class ControllerCustomerList extends Controller {
if(isset($this->request->get['id'])) { $this->data['id'] = $this->request->get['id']; }
$this->data['search'] = '';
if(isset($this->request->post['search'])) { $this->data['search'] = $this->request->post['search']; }
else if(isset($this->request->get['search'])) { $this->data['search'] = $this->request->get['search']; }
/* check if we are admin */
if(Registry::get('admin_user') == 1) {
@ -78,7 +72,7 @@ class ControllerCustomerList extends Controller {
$this->data['a'] = $this->model_saas_customer->get($this->data['id']);
}
else {
$this->data['entries'] = $this->model_saas_customer->search($this->data['search']);
$this->data['entries'] = $this->model_saas_customer->get();
}
if ( isset($this->data['errorstring']) ) {
@ -88,8 +82,7 @@ class ControllerCustomerList extends Controller {
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'];}
if (isset($this->request->post['colour'])) { $this->data['a']['colour'] = $this->request->post['colour'];}
}
}
@ -113,13 +106,10 @@ class ControllerCustomerList extends Controller {
$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['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(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) {
return true;
} else {