From 3dd41e58add79e0f8680d53957d70c457831c96b Mon Sep 17 00:00:00 2001 From: abraar Date: Wed, 8 Dec 2010 10:14:41 +0000 Subject: [PATCH] Added is_object() --- gulliver/system/class.pagedTable.php | 6 +++--- gulliver/system/class.webResource.php | 4 ++-- gulliver/system/class.ymlTestCases.php | 2 +- gulliver/thirdparty/pear/PEAR/Autoloader.php | 4 ++-- rbac/engine/classes/model/Systems.php | 2 +- workflow/engine/classes/model/AppDelegation.php | 6 +++--- workflow/engine/classes/model/AppThread.php | 2 +- workflow/engine/classes/model/Event.php | 2 +- workflow/engine/classes/model/Groupwf.php | 6 +++--- workflow/engine/classes/model/InputDocument.php | 2 +- workflow/engine/classes/model/OutputDocument.php | 2 +- workflow/engine/classes/model/ReportVar.php | 2 +- workflow/engine/classes/model/SwimlanesElements.php | 2 +- workflow/engine/methods/setup/jasper.php | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gulliver/system/class.pagedTable.php b/gulliver/system/class.pagedTable.php index ad4b22f29..53ab90301 100644 --- a/gulliver/system/class.pagedTable.php +++ b/gulliver/system/class.pagedTable.php @@ -318,7 +318,7 @@ class pagedTable else trigger_Error('Warning: sql query is empty',E_USER_WARNING); // Config attributes from XMLFORM file - $myAttributes=get_class_vars(is_object($this) && get_class($this)); + $myAttributes=get_class_vars(get_class($this)); foreach ($this->xmlForm->xmlform->tree->attribute as $atrib => $value) if (array_key_exists( $atrib, $myAttributes)){ eval('settype($value,gettype($this->'.$atrib.'));'); @@ -637,8 +637,8 @@ class pagedTable $this->xmlForm->setDefaultValues(); $this->xmlForm->setValues( $result ); $this->xmlForm->fields[ $this->fields[$r]['Name'] ]->mode = 'view'; - if ((array_search( 'rendergrid', get_class_methods(is_object($this) && get_class($this->xmlForm->fields[ $this->fields[$r]['Name'] ])) )!==FALSE) - ||(array_search( 'renderGrid', get_class_methods(is_object($this) && get_class($this->xmlForm->fields[ $this->fields[$r]['Name'] ])) )!==FALSE)) { + if ((array_search( 'rendergrid', get_class_methods( get_class($this->xmlForm->fields[ $this->fields[$r]['Name'] ])) )!==FALSE) + ||(array_search( 'renderGrid', get_class_methods( get_class($this->xmlForm->fields[ $this->fields[$r]['Name'] ])) )!==FALSE)) { $htmlField = $this->xmlForm->fields[ $this->fields[$r]['Name'] ]->renderGrid( array($value) , $this->xmlForm ); $this->tpl->assign( "value" , $htmlField[0] ); } else { diff --git a/gulliver/system/class.webResource.php b/gulliver/system/class.webResource.php index 53b892734..2062d0df6 100644 --- a/gulliver/system/class.webResource.php +++ b/gulliver/system/class.webResource.php @@ -111,7 +111,7 @@ class WebResource if (!function_exists('json_encode')) { G::LoadThirdParty('pear/json','class.json'); function json_encode(&$value) { - $json=& new Services_JSON; + $json= new Services_JSON; return $json->encode($value); } } @@ -119,7 +119,7 @@ if (!function_exists('json_encode')) { if (!function_exists('json_decode')) { G::LoadThirdParty('pear/json','class.json'); function json_decode(&$value) { - $json=& new Services_JSON; + $json= new Services_JSON; return $json->decode($value); } } diff --git a/gulliver/system/class.ymlTestCases.php b/gulliver/system/class.ymlTestCases.php index 8a4c8af16..42c672ab0 100644 --- a/gulliver/system/class.ymlTestCases.php +++ b/gulliver/system/class.ymlTestCases.php @@ -194,7 +194,7 @@ class ymlTestCases { $results=array(); //$this->addToPlan( $count, $start ); - $functions=get_class_methods(is_object($testerObject) && get_class($testerObject) ); + $functions=get_class_methods( get_class($testerObject) ); foreach($functions as $id=>$fn) $functions[$id]=strtolower($fn); foreach($this->testCases as $index => $testCase){ diff --git a/gulliver/thirdparty/pear/PEAR/Autoloader.php b/gulliver/thirdparty/pear/PEAR/Autoloader.php index 711a71896..117e49fed 100644 --- a/gulliver/thirdparty/pear/PEAR/Autoloader.php +++ b/gulliver/thirdparty/pear/PEAR/Autoloader.php @@ -38,7 +38,7 @@ require_once "PEAR.php"; * methods, an instance of each class providing separated methods is * stored and called every time the aggregated method is called. * - * @author Stig Sæther Bakken + * @author Stig S�ther Bakken */ class PEAR_Autoloader extends PEAR { @@ -146,7 +146,7 @@ class PEAR_Autoloader extends PEAR $classname = strtolower($classname); reset($this->_method_map); while (list($method, $obj) = each($this->_method_map)) { - if (get_class($obj) == $classname) { + if (is_object($obj) && get_class($obj) == $classname) { unset($this->_method_map[$method]); $ok = true; } diff --git a/rbac/engine/classes/model/Systems.php b/rbac/engine/classes/model/Systems.php index 85c7e0c23..62e7738f2 100644 --- a/rbac/engine/classes/model/Systems.php +++ b/rbac/engine/classes/model/Systems.php @@ -50,7 +50,7 @@ class Systems extends BaseSystems { $con = Propel::getConnection(SystemsPeer::DATABASE_NAME); try { $oSystem = SystemsPeer::retrieveByPk( $SysUid ); - if ( get_class ($oSystem) == 'Systems' ) { + if (is_object($oSystem) && get_class ($oSystem) == 'Systems' ) { $aFields = $oSystem->toArray(BasePeer::TYPE_FIELDNAME); $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME ); return $aFields; diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php index 4ca916ba4..51e24a77a 100644 --- a/workflow/engine/classes/model/AppDelegation.php +++ b/workflow/engine/classes/model/AppDelegation.php @@ -137,7 +137,7 @@ class AppDelegation extends BaseAppDelegation { $con = Propel::getConnection(AppDelegationPeer::DATABASE_NAME); try { $oAppDel = AppDelegationPeer::retrieveByPk( $AppUid, $sDelIndex ); - if ( get_class ($oAppDel) == 'AppDelegation' ) { + if (is_object($oAppDel) && get_class ($oAppDel) == 'AppDelegation' ) { $aFields = $oAppDel->toArray( BasePeer::TYPE_FIELDNAME); $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME ); return $aFields; @@ -163,7 +163,7 @@ class AppDelegation extends BaseAppDelegation { try { $con->begin(); $oApp = AppDelegationPeer::retrieveByPK( $aData['APP_UID'], $aData['DEL_INDEX'] ); - if ( get_class ($oApp) == 'AppDelegation' ) { + if (is_object($oApp) && get_class ($oApp) == 'AppDelegation' ) { $oApp->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); if ($oApp->validate()) { $res = $oApp->save(); @@ -193,7 +193,7 @@ class AppDelegation extends BaseAppDelegation { try { $oConnection->begin(); $oApp = AppDelegationPeer::retrieveByPK( $sApplicationUID, $iDelegationIndex ); - if ( get_class ($oApp) == 'AppDelegation' ) { + if (is_object($oApp) && get_class ($oApp) == 'AppDelegation' ) { $result = $oApp->delete(); } $oConnection->commit(); diff --git a/workflow/engine/classes/model/AppThread.php b/workflow/engine/classes/model/AppThread.php index a65ad8cb7..819a053c0 100644 --- a/workflow/engine/classes/model/AppThread.php +++ b/workflow/engine/classes/model/AppThread.php @@ -93,7 +93,7 @@ class AppThread extends BaseAppThread { try { $con->begin(); $oApp = AppThreadPeer::retrieveByPK( $aData['APP_UID'], $aData['APP_THREAD_INDEX'] ); - if ( get_class ($oApp) == 'AppThread' ) { + if (is_object($oApp) && get_class ($oApp) == 'AppThread' ) { $oApp->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); if ($oApp->validate()) { $res = $oApp->save(); diff --git a/workflow/engine/classes/model/Event.php b/workflow/engine/classes/model/Event.php index a870f4537..e0278015c 100644 --- a/workflow/engine/classes/model/Event.php +++ b/workflow/engine/classes/model/Event.php @@ -733,7 +733,7 @@ class Event extends BaseEvent { function Exists ( $sUid ) { try { $oObj = EventPeer::retrieveByPk($sUid); - return (get_class($oObj) == 'Event'); + return (is_object($oObj) && get_class($oObj) == 'Event'); } catch (Exception $oError) { throw($oError); diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php index a9960f90c..e2ded81ed 100644 --- a/workflow/engine/classes/model/Groupwf.php +++ b/workflow/engine/classes/model/Groupwf.php @@ -142,7 +142,7 @@ class Groupwf extends BaseGroupwf { $con = Propel::getConnection(GroupwfPeer::DATABASE_NAME); try { $oPro = GroupwfPeer::retrieveByPk( $ProUid ); - if ( get_class ($oPro) == 'Groupwf' ) { + if (is_object($oPro) && get_class ($oPro) == 'Groupwf' ) { $aFields = $oPro->toArray(BasePeer::TYPE_FIELDNAME); $this->fromArray ($aFields, BasePeer::TYPE_FIELDNAME ); $aFields['GRP_TITLE'] = $oPro->getGrpTitle(); @@ -170,7 +170,7 @@ class Groupwf extends BaseGroupwf { try { $con->begin(); $oPro = GroupwfPeer::retrieveByPK( $aData['GRP_UID'] ); - if ( get_class ($oPro) == 'Groupwf' ) { + if (is_object($oPro) && get_class ($oPro) == 'Groupwf' ) { $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME ); if ($oPro->validate()) { if ( isset ( $aData['GRP_TITLE'] ) ) @@ -234,7 +234,7 @@ class Groupwf extends BaseGroupwf { $con = Propel::getConnection(GroupwfPeer::DATABASE_NAME); try { $oPro = GroupwfPeer::retrieveByPk( $GrpUid ); - if ( get_class ($oPro) == 'Groupwf' ) { + if (is_object($oPro) && get_class ($oPro) == 'Groupwf' ) { return true; } else { diff --git a/workflow/engine/classes/model/InputDocument.php b/workflow/engine/classes/model/InputDocument.php index 1850a143c..3b8b7a21f 100644 --- a/workflow/engine/classes/model/InputDocument.php +++ b/workflow/engine/classes/model/InputDocument.php @@ -302,7 +302,7 @@ class InputDocument extends BaseInputDocument { $con = Propel::getConnection(InputDocumentPeer::DATABASE_NAME); try { $oObj = InputDocumentPeer::retrieveByPk( $sUid ); - if ( get_class ($oObj) == 'InputDocument' ) { + if (is_object($oObj) && get_class ($oObj) == 'InputDocument' ) { return true; } else { diff --git a/workflow/engine/classes/model/OutputDocument.php b/workflow/engine/classes/model/OutputDocument.php index df03b5971..86a9f49ea 100644 --- a/workflow/engine/classes/model/OutputDocument.php +++ b/workflow/engine/classes/model/OutputDocument.php @@ -781,7 +781,7 @@ class OutputDocument extends BaseOutputDocument { $con = Propel::getConnection(OutputDocumentPeer::DATABASE_NAME); try { $oObj = OutputDocumentPeer::retrieveByPk( $sUid ); - if ( get_class ($oObj) == 'OutputDocument' ) { + if (is_object($oObj) && get_class ($oObj) == 'OutputDocument' ) { return true; } else { diff --git a/workflow/engine/classes/model/ReportVar.php b/workflow/engine/classes/model/ReportVar.php index 58988cd29..9d8ca8272 100644 --- a/workflow/engine/classes/model/ReportVar.php +++ b/workflow/engine/classes/model/ReportVar.php @@ -144,7 +144,7 @@ class ReportVar extends BaseReportVar { $con = Propel::getConnection(ReportVarPeer::DATABASE_NAME); try { $oRepVarUid = ReportVarPeer::retrieveByPk( $sRepVarUid ); - if ( get_class ($oRepVarUid) == 'ReportVar' ) { + if (is_object($oRepVarUid) && get_class ($oRepVarUid) == 'ReportVar' ) { return true; } else { diff --git a/workflow/engine/classes/model/SwimlanesElements.php b/workflow/engine/classes/model/SwimlanesElements.php index 2230a240c..671bb93ef 100644 --- a/workflow/engine/classes/model/SwimlanesElements.php +++ b/workflow/engine/classes/model/SwimlanesElements.php @@ -180,7 +180,7 @@ function swimlanesElementsExists ( $sSwiEleUid ) { $con = Propel::getConnection(SwimlanesElementsPeer::DATABASE_NAME); try { $oSwiEleUid = SwimlanesElementsPeer::retrieveByPk( $sSwiEleUid ); - if ( get_class ($oSwiEleUid) == 'SwimlanesElements' ) { + if (is_object($oSwiEleUid) && get_class ($oSwiEleUid) == 'SwimlanesElements' ) { return true; } else { diff --git a/workflow/engine/methods/setup/jasper.php b/workflow/engine/methods/setup/jasper.php index dd2c1ee0f..65e8b315c 100644 --- a/workflow/engine/methods/setup/jasper.php +++ b/workflow/engine/methods/setup/jasper.php @@ -4,7 +4,7 @@ $response = $oJasper->ws_list("/"); - if (get_class($response) == 'SOAP_Fault') { + if (is_object($response) && get_class($response) == 'SOAP_Fault') { $errorMessage = $response->getFault()->faultstring; } else { @@ -68,7 +68,7 @@ $result = $oJasper->ws_runReport($currentUri, $report_params, $output_params, $attachments); // 4. - if (get_class($result) == 'SOAP_Fault') { + if (is_object($result) && get_class($result) == 'SOAP_Fault') { $errorMessage = $result->getFault()->faultstring; echo $errorMessage;