Merge remote branch 'upstream/master'

This commit is contained in:
Julio Cesar Laura
2014-06-02 16:19:05 -04:00
9 changed files with 92 additions and 80 deletions

View File

@@ -3080,7 +3080,6 @@ class wsBase
return $result;
}
if (empty( $userUid )) {
$result = new wsResponse( 100, G::LoadTranslation( "ID_REQUIRED_FIELD" ) . " userUid" );
@@ -3088,8 +3087,7 @@ class wsBase
return $result;
}
if (! empty( $unpauseDate )) {
if( strlen($unpauseDate) >=10 ){
if (! preg_match( "/^\d{4}-\d{2}-\d{2}| \d{2}:\d{2}:\d{2}$/", $unpauseDate )) {
$result = new wsResponse( 100, G::LoadTranslation( "ID_INVALID_DATA" ) . " $unpauseDate" );
@@ -3097,8 +3095,9 @@ class wsBase
return $result;
}
} else {
$unpauseDate = null;
}
$case = new Cases();
$case->pauseCase( $caseUid, $delIndex, $userUid, $unpauseDate );
@@ -3109,7 +3108,6 @@ class wsBase
);
$g->sessionVarRestore();
return $result;
} catch (Exception $e) {
$result = new wsResponse(100, $e->getMessage());