fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added all the changes which done before for php5.3 in pmos9b

Browse Source
This commit is contained in:
abraar
2010-12-03 15:43:29 +00:00
parent 0525681d79
commit 5715059f24
11 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gulliver/system/class.g.php
View File

@@ -1704,6 +1704,7 @@ class G
*/ */
function SendTemporalMessage($msgID, $strType, $sType='LABEL', $time=null, $width=null, $customLabels= null) function SendTemporalMessage($msgID, $strType, $sType='LABEL', $time=null, $width=null, $customLabels= null)
{ {
echo"Inside Send Temporal Message";
if( isset($width) ){ if( isset($width) ){
$_SESSION['G_MESSAGE_WIDTH'] = $width; $_SESSION['G_MESSAGE_WIDTH'] = $width;
} }

2
gulliver/system/class.rbac.php
View File

@@ -164,12 +164,10 @@ class RBAC
return; return;
} }
} }
$this->sSystem = $sSystem; $this->sSystem = $sSystem;
$fieldsSystem = $this->systemObj->loadByCode($sSystem); $fieldsSystem = $this->systemObj->loadByCode($sSystem);
$fieldsRoles = $this->usersRolesObj->getRolesBySystem ($fieldsSystem['SYS_UID'], $sUser ); $fieldsRoles = $this->usersRolesObj->getRolesBySystem ($fieldsSystem['SYS_UID'], $sUser );
$fieldsPermissions = $this->usersRolesObj->getAllPermissions ($fieldsRoles['ROL_UID'], $sUser ); $fieldsPermissions = $this->usersRolesObj->getAllPermissions ($fieldsRoles['ROL_UID'], $sUser );
$this->aUserInfo[ $sSystem ]['SYS_UID'] = $fieldsSystem['SYS_UID']; $this->aUserInfo[ $sSystem ]['SYS_UID'] = $fieldsSystem['SYS_UID'];
$this->aUserInfo[ $sSystem ]['ROLE'] = $fieldsRoles; $this->aUserInfo[ $sSystem ]['ROLE'] = $fieldsRoles;
$this->aUserInfo[ $sSystem ]['PERMISSIONS'] = $fieldsPermissions; $this->aUserInfo[ $sSystem ]['PERMISSIONS'] = $fieldsPermissions;

6
gulliver/thirdparty/pear/DB.php vendored
View File

@@ -307,7 +307,7 @@ class DB
return $tmp; return $tmp;
} }
@$obj =& new $classname; @$obj = new $classname;
foreach ($options as $option => $value) { foreach ($options as $option => $value) {
$test = $obj->setOption($option, $value); $test = $obj->setOption($option, $value);
@@ -381,7 +381,7 @@ class DB
return $tmp; return $tmp;
} }
@$obj =& new $classname; @$obj = new $classname;
foreach ($options as $option => $value) { foreach ($options as $option => $value) {
$test = $obj->setOption($option, $value); $test = $obj->setOption($option, $value);
@@ -887,7 +887,7 @@ class DB_result
if ($object_class == 'stdClass') { if ($object_class == 'stdClass') {
$arr = (object) $arr; $arr = (object) $arr;
} else { } else {
$arr = &new $object_class($arr); $arr = new $object_class($arr);
} }
} }
return $arr; return $arr;

8
workflow/engine/classes/class.pluginRegistry.php
View File

@@ -190,7 +190,7 @@ class PMPluginRegistry {
if ( $sNamespace == $namespace ) { if ( $sNamespace == $namespace ) {
$this->registerFolder($sNamespace, $sNamespace, $detail->sPluginFolder ); //register the default directory, later we can have more $this->registerFolder($sNamespace, $sNamespace, $detail->sPluginFolder ); //register the default directory, later we can have more
$this->_aPluginDetails[$sNamespace]->enabled = true; $this->_aPluginDetails[$sNamespace]->enabled = true;
$oPlugin =& new $detail->sClassName( $detail->sNamespace, $detail->sFilename ); $oPlugin = new $detail->sClassName( $detail->sNamespace, $detail->sFilename );
$this->_aPlugins[$detail->sNamespace] =& $oPlugin; $this->_aPlugins[$detail->sNamespace] =& $oPlugin;
if (method_exists($oPlugin, 'enable')) { if (method_exists($oPlugin, 'enable')) {
$oPlugin->enable(); $oPlugin->enable();
@@ -209,7 +209,7 @@ class PMPluginRegistry {
foreach ( $this->_aPluginDetails as $namespace=>$detail ) { foreach ( $this->_aPluginDetails as $namespace=>$detail ) {
if ( $sNamespace == $namespace ) { if ( $sNamespace == $namespace ) {
unset ($this->_aPluginDetails[$sNamespace]); unset ($this->_aPluginDetails[$sNamespace]);
$oPlugin =& new $detail->sClassName( $detail->sNamespace, $detail->sFilename ); $oPlugin = new $detail->sClassName( $detail->sNamespace, $detail->sFilename );
$this->_aPlugins[$detail->sNamespace] =& $oPlugin; $this->_aPlugins[$detail->sNamespace] =& $oPlugin;
if (method_exists($oPlugin, 'disable')) { if (method_exists($oPlugin, 'disable')) {
$oPlugin->disable(); $oPlugin->disable();
@@ -298,7 +298,7 @@ class PMPluginRegistry {
try { try {
foreach ( $this->_aPluginDetails as $namespace=>$detail ) { foreach ( $this->_aPluginDetails as $namespace=>$detail ) {
if ( $sNamespace == $namespace ) { if ( $sNamespace == $namespace ) {
$oPlugin =& new $detail->sClassName( $detail->sNamespace, $detail->sFilename ); $oPlugin = new $detail->sClassName( $detail->sNamespace, $detail->sFilename );
$this->_aPlugins[$detail->sNamespace] =& $oPlugin; $this->_aPlugins[$detail->sNamespace] =& $oPlugin;
$oPlugin->install(); $oPlugin->install();
} }
@@ -769,7 +769,7 @@ class PMPluginRegistry {
$sFilename = PATH_PLUGINS . $aux[ count($aux) -1]; $sFilename = PATH_PLUGINS . $aux[ count($aux) -1];
if (! file_exists($sFilename) ) continue; if (! file_exists($sFilename) ) continue;
require_once( $sFilename); require_once( $sFilename);
$oPlugin =& new $detail->sClassName( $detail->sNamespace, $detail->sFilename ); $oPlugin = new $detail->sClassName( $detail->sNamespace, $detail->sFilename );
$this->_aPlugins[$detail->sNamespace] =& $oPlugin; $this->_aPlugins[$detail->sNamespace] =& $oPlugin;
$iPlugins++; $iPlugins++;

2
workflow/engine/classes/model/Configuration.php
View File

@@ -140,6 +140,6 @@ class Configuration extends BaseConfiguration {
public function exists($CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid) public function exists($CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid)
{ {
$oRow = ConfigurationPeer::retrieveByPK( $CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid ); $oRow = ConfigurationPeer::retrieveByPK( $CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid );
return ( get_class ($oRow) == 'Configuration' ); return ( get_class ($oRow) == 'Configuration' && $oRow != '');
} }
} // Configuration } // Configuration

2
workflow/engine/classes/model/Department.php
View File

@@ -165,7 +165,7 @@ protected $depo_title = '';
$con = Propel::getConnection(DepartmentPeer::DATABASE_NAME); $con = Propel::getConnection(DepartmentPeer::DATABASE_NAME);
try { try {
$oDept = DepartmentPeer::retrieveByPk( $DepUid ); $oDept = DepartmentPeer::retrieveByPk( $DepUid );
if ( get_class ($oDept) == 'Department' ) { if (is_object ($oDept) && get_class ($oDept) == 'Department' ) {
$aFields = $oDept->toArray(BasePeer::TYPE_FIELDNAME); $aFields = $oDept->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME ); $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME );
$aFields['DEPO_TITLE'] = $oDept->getDepTitle(); $aFields['DEPO_TITLE'] = $oDept->getDepTitle();

2
workflow/engine/classes/model/Process.php
View File

@@ -214,7 +214,7 @@ class Process extends BaseProcess {
$con = Propel::getConnection(ProcessPeer::DATABASE_NAME); $con = Propel::getConnection(ProcessPeer::DATABASE_NAME);
try { try {
$oPro = ProcessPeer::retrieveByPk( $ProUid ); $oPro = ProcessPeer::retrieveByPk( $ProUid );
if ( get_class($oPro) == 'Process' ) { if (is_object($oPro) && get_class($oPro) == 'Process' ) {
return true; return true;
} }
else { else {

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

@@ -18,7 +18,10 @@ class UsersProperties extends BaseUsersProperties {
function UserPropertyExists($sUserUID) { function UserPropertyExists($sUserUID) {
try { try {
$oUserProperty = UsersPropertiesPeer::retrieveByPk($sUserUID); $oUserProperty = UsersPropertiesPeer::retrieveByPk($sUserUID);
if (get_class($oUserProperty) == 'UsersProperties') { var_dump($oUserProperty);
var_dump($sUserUID);
if (get_class($oUserProperty) == 'UsersProperties' && $oUserProperty != '') {
echo"inside";
return true; return true;
} }
else { else {

2
workflow/engine/methods/install/install.js
View File

@@ -72,7 +72,7 @@ var installer=function()
var tr = this.table.insertRow(-1); var tr = this.table.insertRow(-1);
$(tr).append( $(tr).append(
new DOM('td',{innerHTML:"PHP Version >= 5.1.x and PHP Version < 5.3.0",className:"inst_td0",colSpan:2}), new DOM('td',{innerHTML:"PHP Version < 5.3.0",className:"inst_td0",colSpan:2}),
this.phpVersion = new DOM('td',{innerHTML:'Loading...',className:"inst_td1",colSpan:2}) this.phpVersion = new DOM('td',{innerHTML:'Loading...',className:"inst_td1",colSpan:2})
); );

2
workflow/engine/methods/install/installServer.php
View File

@@ -66,7 +66,7 @@ if($action==="check")
) )
)); ));
$data=null; $data=null;
$data->phpVersion =(version_compare(PHP_VERSION,"5.1.0",">=") && version_compare(PHP_VERSION,"5.3.0","<") )?true:false; $data->phpVersion =(version_compare(PHP_VERSION,"5.1.0",">="))?true:false;
if(trim($dataClient->mysqlH)=='' || trim($dataClient->mysqlU)=='') if(trim($dataClient->mysqlH)=='' || trim($dataClient->mysqlU)=='')
{ {
$con = array('connection'=>false,'grant'=>false,'message'=>'Please complete the input fields (Hostname/Username)'); $con = array('connection'=>false,'grant'=>false,'message'=>'Please complete the input fields (Hostname/Username)');

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

@@ -31,6 +31,7 @@
try { try {
$frm = $_POST['form']; $frm = $_POST['form'];
$usr = ''; $usr = '';
$pwd = ''; $pwd = '';
@@ -203,6 +204,7 @@ try {
$oUserProperty = new UsersProperties(); $oUserProperty = new UsersProperties();
$aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(md5($currentPwd))))); $aUserProperty = $oUserProperty->loadOrCreateIfNotExists($_SESSION['USER_LOGGED'], array('USR_PASSWORD_HISTORY' => serialize(array(md5($currentPwd)))));
$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']);
if (!empty($aErrors)) { if (!empty($aErrors)) {
if (!defined('NO_DISPLAY_USERNAME')) { if (!defined('NO_DISPLAY_USERNAME')) {
define('NO_DISPLAY_USERNAME', 1); define('NO_DISPLAY_USERNAME', 1);
@@ -251,6 +253,7 @@ try {
$oHeadPublisher->assign('uriReq', $sLocation); $oHeadPublisher->assign('uriReq', $sLocation);
G::RenderPage('publish', 'extJs'); G::RenderPage('publish', 'extJs');
//G::header('Location: ' . $sLocation); //G::header('Location: ' . $sLocation);
die; die;
} }