From cec620ff6bec597073f47a779b4765b638583701 Mon Sep 17 00:00:00 2001 From: abraar Date: Mon, 6 Dec 2010 15:12:37 +0000 Subject: [PATCH] Added is_object() --- gulliver/system/class.database_mysql.php | 2 +- gulliver/system/class.form.php | 6 ++-- gulliver/system/class.g.php | 34 +++++++++---------- gulliver/system/class.pagedTable.php | 6 ++-- gulliver/system/class.xmlDocument.php | 2 +- gulliver/system/class.ymlTestCases.php | 2 +- .../html2ps_pdf/layout._interface.class.php | 2 +- .../propel/engine/database/model/Table.php | 2 +- .../engine/platform/DefaultPlatform.php | 2 +- .../classes/propel/phing/PropelOMTask.php | 2 +- .../classes/propel/phing/PropelSQLTask.php | 2 +- gulliver/thirdparty/propel/om/BaseObject.php | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php index 31c23522a..154679a43 100644 --- a/gulliver/system/class.database_mysql.php +++ b/gulliver/system/class.database_mysql.php @@ -290,7 +290,7 @@ class database extends database_base { * @param $aKeys array of keys * @return sql sentence */ - public + public function generateAddKeysSQL($sTable, $indexName, $aKeys) { try { $indexType = 'INDEX'; diff --git a/gulliver/system/class.form.php b/gulliver/system/class.form.php index c8d2fc494..d13d045e0 100644 --- a/gulliver/system/class.form.php +++ b/gulliver/system/class.form.php @@ -59,7 +59,7 @@ class Form extends XmlForm function setDefaultValues( ) { foreach($this->fields as $name => $content) { - if (get_class($content) != '__PHP_Incomplete_Class') { + if (is_object($content) && get_class($content) != '__PHP_Incomplete_Class') { if (isset($content->defaultValue)) $this->values[$name] = $content->defaultValue; else @@ -233,7 +233,7 @@ class Form extends XmlForm } } foreach($this->fields as $k => $v){ - if(get_class($this->fields[$k])!='__PHP_Incomplete_Class'){ + if(is_object($this) && get_class($this->fields[$k])!='__PHP_Incomplete_Class'){ $this->fields[$k]->owner =& $this; } } @@ -493,7 +493,7 @@ class Form extends XmlForm $rFields = Array(); $missingFields = Array(); foreach ($this->fields as $o) { - if(property_exists(get_class($o), 'required')) { + if (is_object($o) && property_exists(get_class($o), 'required')) { if( $o->required == 1) { if (!in_array($o->name, $aNoRequiredByJS)) { array_push($rFields, $o->name); diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 5859d99b0..13595b63c 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -2987,37 +2987,37 @@ class G switch($format){ case '@firstName @lastName': - $infoUser = ereg_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $format); - $infoUser = ereg_replace('@lastName', $aUserInfo['USR_LASTNAME'], $infoUser); + $infoUser = str_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $format); + $infoUser = str_replace('@lastName', $aUserInfo['USR_LASTNAME'], $infoUser); break; case '@firstName @lastName (@userName)': - $infoUser = ereg_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $format); - $infoUser = ereg_replace('@lastName', $aUserInfo['USR_LASTNAME'], $infoUser); - $infoUser = ereg_replace('@userName', $aUserInfo['USR_USERNAME'], $infoUser); + $infoUser = str_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $format); + $infoUser = str_replace('@lastName', $aUserInfo['USR_LASTNAME'], $infoUser); + $infoUser = str_replace('@userName', $aUserInfo['USR_USERNAME'], $infoUser); break; case '@userName': - $infoUser = ereg_replace('@userName', $aUserInfo['USR_USERNAME'], $format); + $infoUser = str_replace('@userName', $aUserInfo['USR_USERNAME'], $format); break; case '@userName (@firstName @lastName)': - $infoUser = ereg_replace('@userName', $aUserInfo['USR_USERNAME'], $format); - $infoUser = ereg_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); - $infoUser = ereg_replace('@lastName', $aUserInfo['USR_LASTNAME'], $infoUser); + $infoUser = str_replace('@userName', $aUserInfo['USR_USERNAME'], $format); + $infoUser = str_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); + $infoUser = str_replace('@lastName', $aUserInfo['USR_LASTNAME'], $infoUser); break; case '@lastName @firstName': - $infoUser = ereg_replace('@lastName', $aUserInfo['USR_LASTNAME'], $format); - $infoUser = ereg_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); + $infoUser = str_replace('@lastName', $aUserInfo['USR_LASTNAME'], $format); + $infoUser = str_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); break; case '@lastName, @firstName': - $infoUser = ereg_replace('@lastName', $aUserInfo['USR_LASTNAME'], $format); - $infoUser = ereg_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); + $infoUser = str_replace('@lastName', $aUserInfo['USR_LASTNAME'], $format); + $infoUser = str_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); break; case '@lastName, @firstName (@userName)': - $infoUser = ereg_replace('@lastName', $aUserInfo['USR_LASTNAME'], $format); - $infoUser = ereg_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); - $infoUser = ereg_replace('@userName', $aUserInfo['USR_USERNAME'], $infoUser); + $infoUser = str_replace('@lastName', $aUserInfo['USR_LASTNAME'], $format); + $infoUser = str_replace('@firstName', $aUserInfo['USR_FIRSTNAME'], $infoUser); + $infoUser = str_replace('@userName', $aUserInfo['USR_USERNAME'], $infoUser); break; default : - $infoUser = ereg_replace('@userName', $aUserInfo['USR_USERNAME'], '@userName'); + $infoUser = str_replace('@userName', $aUserInfo['USR_USERNAME'], '@userName'); break; } return $infoUser; diff --git a/gulliver/system/class.pagedTable.php b/gulliver/system/class.pagedTable.php index b7dadefa4..ad4b22f29 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(get_class($this)); + $myAttributes=get_class_vars(is_object($this) && 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( 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)) { + 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)) { $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.xmlDocument.php b/gulliver/system/class.xmlDocument.php index eba29ed08..e0699edf4 100644 --- a/gulliver/system/class.xmlDocument.php +++ b/gulliver/system/class.xmlDocument.php @@ -75,7 +75,7 @@ class Xml_Node */ function addChildNode( $childNode ) { - if (strcasecmp( get_class($childNode), 'Xml_Node' ) == 0 ) { + if (is_object($childNode) && strcasecmp( get_class($childNode), 'Xml_Node' ) == 0 ) { $this->type = 'open'; $childNode->parent = &$this; $this->children[] = &$childNode; diff --git a/gulliver/system/class.ymlTestCases.php b/gulliver/system/class.ymlTestCases.php index 42c672ab0..8a4c8af16 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( get_class($testerObject) ); + $functions=get_class_methods(is_object($testerObject) && get_class($testerObject) ); foreach($functions as $id=>$fn) $functions[$id]=strtolower($fn); foreach($this->testCases as $index => $testCase){ diff --git a/gulliver/thirdparty/html2ps_pdf/layout._interface.class.php b/gulliver/thirdparty/html2ps_pdf/layout._interface.class.php index 0ebf30cc3..0f24b010d 100644 --- a/gulliver/thirdparty/html2ps_pdf/layout._interface.class.php +++ b/gulliver/thirdparty/html2ps_pdf/layout._interface.class.php @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php index 8bb16ffa7..d513ea392 100644 --- a/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php +++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php @@ -427,7 +427,7 @@ class Table extends XMLElement implements IDMethod { $children = $this->inheritanceColumn->getChildren(); $names = array(); for ($i = 0, $size=count($children); $i < $size; $i++) { - $names[] = get_class($children[$i]); + $names[] = is_object($children[$i]) && get_class($children[$i]); } return $names; } diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php index 40ebea295..65ed83775 100644 --- a/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php +++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php @@ -64,7 +64,7 @@ class DefaultPlatform implements Platform { */ public function getDatabaseType() { - $clazz = get_class($this); + $clazz = is_object($this) && get_class($this); $pos = strpos($clazz, 'Platform'); return strtolower(substr($clazz,0,$pos)); } diff --git a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php index e97b02703..24f197921 100644 --- a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php +++ b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php @@ -84,7 +84,7 @@ class PropelOMTask extends AbstractPropelDataModelTask { $_f = new PhingFile($this->getOutputDirectory(), $path); if ($overwrite || !$_f->exists()) { - $this->log("\t\t-> " . $builder->getClassname() . " [builder: " . get_class($builder) . "]"); + $this->log("\t\t-> " . $builder->getClassname() . " [builder: " .is_object($builder) && get_class($builder) . "]"); $script = $builder->build(); file_put_contents($_f->getAbsolutePath(), $script); foreach($builder->getWarnings() as $warning) { diff --git a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php index 651e536b7..a864aa229 100644 --- a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php +++ b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php @@ -175,7 +175,7 @@ class PropelSQLTask extends AbstractPropelDataModelTask { if (!$table->isSkipSql()) { $builder = DataModelBuilder::builderFactory($table, 'ddl'); - $this->log("\t+ " . $table->getName() . " [builder: " . get_class($builder) . "]"); + $this->log("\t+ " . $table->getName() . " [builder: " . is_object($builder) && get_class($builder) . "]"); $ddl .= $builder->build(); foreach($builder->getWarnings() as $warning) { $this->log($warning, PROJECT_MSG_WARN); diff --git a/gulliver/thirdparty/propel/om/BaseObject.php b/gulliver/thirdparty/propel/om/BaseObject.php index d60aff28e..13f376fed 100644 --- a/gulliver/thirdparty/propel/om/BaseObject.php +++ b/gulliver/thirdparty/propel/om/BaseObject.php @@ -181,7 +181,7 @@ abstract class BaseObject { */ protected function log($msg, $priority = Propel::LOG_INFO) { - return Propel::log(get_class($this) . ': ' . $msg, $priority); + return Propel::log(is_object($this) && get_class($this) . ': ' . $msg, $priority); } }