fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
jennylee
2014-06-17 12:57:26 -04:00
parent 266661fcd6 bdd98c2d6b
commit 75388ccab3
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/model/UsersProperties.php
View File

@@ -123,7 +123,7 @@ class UsersProperties extends BaseUsersProperties
return $aUserProperty;
}
public function validatePassword ($sPassword, $sLastUpdate, $iChangePasswordNextTime)
public function validatePassword ($sPassword, $sLastUpdate, $iChangePasswordNextTime, $nowLogin = false)
{
if (! defined( 'PPP_MINIMUM_LENGTH' )) {
define( 'PPP_MINIMUM_LENGTH', 5 );
@@ -149,24 +149,24 @@ class UsersProperties extends BaseUsersProperties
$iLength = strlen( $sPassword );
}
$aErrors = array ();
if ($iLength < PPP_MINIMUM_LENGTH) {
if ($iLength < PPP_MINIMUM_LENGTH || $nowLogin) {
$aErrors[] = 'ID_PPP_MINIMUM_LENGTH';
}
if ($iLength > PPP_MAXIMUM_LENGTH) {
if ($iLength > PPP_MAXIMUM_LENGTH || $nowLogin) {
$aErrors[] = 'ID_PPP_MAXIMUM_LENGTH';
}
if (PPP_NUMERICAL_CHARACTER_REQUIRED == 1) {
if (preg_match_all( '/[0-9]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0) {
if (preg_match_all( '/[0-9]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) {
$aErrors[] = 'ID_PPP_NUMERICAL_CHARACTER_REQUIRED';
}
}
if (PPP_UPPERCASE_CHARACTER_REQUIRED == 1) {
if (preg_match_all( '/[A-Z]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0) {
if (preg_match_all( '/[A-Z]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) {
$aErrors[] = 'ID_PPP_UPPERCASE_CHARACTER_REQUIRED';
}
}
if (PPP_SPECIAL_CHARACTER_REQUIRED == 1) {
if (preg_match_all( '/[<5B><>\\!|"@<40>#$~%<25>&<26>\/()=\'?<3F><>*+\-_.:,;]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0) {
if (preg_match_all( '/[<5B><>\\!|"@<40>#$~%<25>&<26>\/()=\'?<3F><>*+\-_.:,;]/', $sPassword, $aMatch, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE ) == 0 || $nowLogin) {
$aErrors[] = 'ID_PPP_SPECIAL_CHARACTER_REQUIRED';
}
}
@@ -180,7 +180,7 @@ class UsersProperties extends BaseUsersProperties
}
$fDays = $oCalendar->calculateDuration( date( 'Y-m-d H:i:s' ), $sLastUpdate );
if ($fDays > (PPP_EXPIRATION_IN * 24)) {
if ($fDays > (PPP_EXPIRATION_IN * 24) || $nowLogin) {
$aErrors[] = 'ID_PPP_EXPIRATION_IN';
}
}

2
workflow/engine/config/schema.xml
View File

@@ -781,7 +781,7 @@
<column name="OUT_DOC_PDF_SECURITY_OPEN_PASSWORD" type="VARCHAR" size="32" required="false" default=""/>
<column name="OUT_DOC_PDF_SECURITY_OWNER_PASSWORD" type="VARCHAR" size="32" required="false" default=""/>
<column name="OUT_DOC_PDF_SECURITY_PERMISSIONS" type="VARCHAR" size="150" required="false" default=""/>
<column name="OUT_DOC_OPEN_TYPE" type="INTEGER" default="0"/>
<column name="OUT_DOC_OPEN_TYPE" type="INTEGER" default="1"/>
<validator column="OUT_DOC_UID">
<rule name="maxLength" value="32" message="Output Document UID can be no larger than ${value} in size"/>
<rule name="required" message="Output Document UID is required."/>

2
workflow/engine/data/mssql/schema.sql
View File

@@ -852,7 +852,7 @@ CREATE TABLE [OUTPUT_DOCUMENT]
[OUT_DOC_PDF_SECURITY_OPEN_PASSWORD] VARCHAR(32) default '' NULL,
[OUT_DOC_PDF_SECURITY_OWNER_PASSWORD] VARCHAR(32) default '' NULL,
[OUT_DOC_PDF_SECURITY_PERMISSIONS] VARCHAR(150) default '' NULL,
[OUT_DOC_OPEN_TYPE] INT default 0 NULL,
[OUT_DOC_OPEN_TYPE] INT default 1 NULL,
CONSTRAINT OUTPUT_DOCUMENT_PK PRIMARY KEY ([OUT_DOC_UID])
);

2
workflow/engine/data/mysql/schema.sql
View File

@@ -374,7 +374,7 @@ CREATE TABLE `OUTPUT_DOCUMENT`
`OUT_DOC_PDF_SECURITY_OPEN_PASSWORD` VARCHAR(32) default '',
`OUT_DOC_PDF_SECURITY_OWNER_PASSWORD` VARCHAR(32) default '',
`OUT_DOC_PDF_SECURITY_PERMISSIONS` VARCHAR(150) default '',
`OUT_DOC_OPEN_TYPE` INTEGER default 0,
`OUT_DOC_OPEN_TYPE` INTEGER default 1,
PRIMARY KEY (`OUT_DOC_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
#-----------------------------------------------------------------------------

2
workflow/engine/data/oracle/schema.sql
View File

@@ -471,7 +471,7 @@ CREATE TABLE "OUTPUT_DOCUMENT"
"OUT_DOC_PDF_SECURITY_OPEN_PASSWORD" VARCHAR2(32) default '',
"OUT_DOC_PDF_SECURITY_OWNER_PASSWORD" VARCHAR2(32) default '',
"OUT_DOC_PDF_SECURITY_PERMISSIONS" VARCHAR2(150) default '',
"OUT_DOC_OPEN_TYPE" NUMBER default 0
"OUT_DOC_OPEN_TYPE" NUMBER default 1
);
ALTER TABLE "OUTPUT_DOCUMENT"

4
workflow/engine/methods/login/authentication.php
View File

@@ -262,9 +262,9 @@ try {
}
$aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(md5($pwd)))));
$aErrors = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME']);
$aErrors = $oUserProperty->validatePassword($_POST['form']['USR_PASSWORD'], $aUserProperty['USR_LAST_UPDATE_DATE'], $aUserProperty['USR_LOGGED_NEXT_TIME'], true);
if (!empty($aErrors)) {
if (!empty($aErrors) && in_array("ID_PPP_CHANGE_PASSWORD_AFTER_NEXT_LOGIN", $aErrors)) {
if (!defined('NO_DISPLAY_USERNAME')) {
define('NO_DISPLAY_USERNAME', 1);
}

2
workflow/engine/methods/services/soap2.php
View File

@@ -681,7 +681,7 @@ function NewCaseImpersonate ($params)
///////
$ws = new wsBase();
$res = $ws->newCaseImpersonate( $params->processId, $params->userId, $params->variables );
$res = $ws->newCaseImpersonate($params->processId, $params->userId, $params->variables, $params->taskId);
return $res;
}