bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-08 01:51:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

gui fixes

Browse Source
This commit is contained in:
SJ 2013-08-25 22:18:01 +02:00
parent d977dfcf89
commit 98c15c4ff1
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/webserver/piler-nginx.conf
View File

@ -1,11 +1,10 @@
#### IMPORTANT!!! #### IMPORTANT!!!
#### ####
#### Fix the listen IP-address, and the hostname #### Fix the hostname
#### ####
server { server {
listen 1.2.3.4:80;
server_name piler.yourdomain.com; server_name piler.yourdomain.com;
root /var/www/piler.piler.yourdomain.com; root /var/www/piler.piler.yourdomain.com;
@ -43,6 +42,11 @@ server {
rewrite /login.php /index.php?route=login/login; rewrite /login.php /index.php?route=login/login;
rewrite /logout.php /index.php?route=login/logout; rewrite /logout.php /index.php?route=login/logout;
rewrite /google.php /index.php?route=login/google; rewrite /google.php /index.php?route=login/google;
rewrite /domain.php /index.php?route=domain/domain;
rewrite /ldap.php /index.php?route=ldap/list;
rewrite /customer.php /index.php?route=customer/list;
rewrite /retention.php /index.php?route=policy/retention;
rewrite /archiving.php /index.php?route=policy/archiving;
rewrite /view/javascript/piler.js /js.php; rewrite /view/javascript/piler.js /js.php;
} }

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

@ -93,23 +93,14 @@ class ControllerUserEdit extends Controller {
private function validate() { 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']) > 1) {
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) { if(strlen(@$this->request->post['password']) < MIN_PASSWORD_LENGTH || strlen(@$this->request->post['password2']) < MIN_PASSWORD_LENGTH) {
$this->error['password'] = $this->data['text_invalid_password']; $this->error['password'] = $this->data['text_invalid_password'];
} }
if($this->request->post['password'] != $this->request->post['password2']) { if($this->request->post['password'] != $this->request->post['password2']) {
$this->error['password'] = $this->data['text_password_mismatch']; $this->error['password2'] = $this->data['text_password_mismatch'];
} }
} }