← Back to branch summary

~ubuntu-dev/ubuntu/lucid/zabbix/lucid-201002110857

« back to all changes in this revision

Viewing changes to frontends/php/profile.php

  • Committer: Bazaar Package Importer
  • Author(s): Stephan Hermann
  • Date: 2008-06-04 09:22:37 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080604092237-zgwq7kmraj1oohoz
Tags: 1:1.4.5-1ubuntu1
https://launchpad.net/bugs/172775
* Merge from debian unstable, remaining changes: 
  + fixing missing pid directory in /var/run
* Added the same patch to debian/zabbix-server-{mysql,pgsql}.zabbix-server.init
  (LP: #172775)

Show diffs side-by-side

added added

removed removed

Lines of Context:
frontends/php/profile.php
38
38
<?php
39
39
//              VAR                     TYPE    OPTIONAL FLAGS  VALIDATION      EXCEPTION
40
40
        $fields=array(
41
 
                "password1"=>   array(T_ZBX_STR, O_OPT, null,   null,           'isset({save})&&{form}!="update"&&isset({change_password})'),
42
 
                "password2"=>   array(T_ZBX_STR, O_OPT, null,   null,           'isset({save})&&{form}!="update"&&isset({change_password})'),
 
41
                "password1"=>   array(T_ZBX_STR, O_OPT, null,   null,           'isset({save})&&isset({form})&&({form}!="update")&&isset({change_password})'),
 
42
                "password2"=>   array(T_ZBX_STR, O_OPT, null,   null,           'isset({save})&&isset({form})&&({form}!="update")&&isset({change_password})'),
43
43
                "lang"=>        array(T_ZBX_STR, O_OPT, null,   NOT_EMPTY,      'isset({save})'),
44
44
                "autologout"=>  array(T_ZBX_INT, O_OPT, null,   BETWEEN(0,3600),'isset({save})'),
45
45
                "url"=>         array(T_ZBX_STR, O_OPT, null,   null,           'isset({save})'),