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

BUG 9377 "Formatting files to PSR2" SOLVED

Browse Source 
Formatting files to PSR2
This commit is contained in:
Victor Saisa Lopez
2012-07-09 16:26:17 -04:00
parent df8cfae446
commit e030e259e1
2 changed files with 2969 additions and 2615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

931
workflow/engine/classes/class.wsBase.php
View File

File diff suppressed because it is too large Load Diff

169
workflow/engine/classes/model/Application.php
View File

@@ -24,8 +24,8 @@
*
*/
require_once 'classes/model/om/BaseApplication.php';
require_once 'classes/model/Content.php';
require_once ('classes/model/om/BaseApplication.php');
require_once ('classes/model/Content.php');
/**
@@ -39,7 +39,8 @@ require_once 'classes/model/Content.php';
*
* @package workflow.engine.classes.model
*/
class Application extends BaseApplication {
class Application extends BaseApplication
{
/**
* This value goes in the content table
@@ -58,8 +59,10 @@ class Application extends BaseApplication {
if ($this->getAppUid() == '') {
throw (new Exception( "Error in getAppTitle, the APP_UID can't be blank"));
}
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->app_title = Content::load('APP_TITLE', '', $this->getAppUid(), $lang);
return $this->app_title;
}
@@ -74,6 +77,7 @@ class Application extends BaseApplication {
if ($this->getAppUid() == '') {
throw (new Exception( "Error in setAppTitle, the APP_UID can't be blank"));
}
//Since the native PHP type for this column is string,
//we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
@@ -85,7 +89,6 @@ class Application extends BaseApplication {
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
$res = Content::addContent('APP_TITLE', '', $this->getAppUid(), $lang, $this->app_title);
}
} // set()
/**
@@ -97,20 +100,26 @@ class Application extends BaseApplication {
if ($this->getAppUid() == '') {
throw (new Exception( "Error in getAppDescription, the APP_UID can't be blank"));
}
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
$this->app_description = Content::load('APP_DESCRIPTION', '', $this->getAppUid(), $lang);
return $this->app_description;
}
public function isEmptyInContent ( $content, $field, $lang ) {
public function isEmptyInContent($content, $field, $lang)
{
if (isset($content[$field][$lang])) {
if ( trim( $content[$field][ $lang ] ) != '' )
if (trim($content[$field][$lang]) != '') {
return false;
};
}
}
return true;
}
public function updateInsertContent ( $content, $field, $value ) {
public function updateInsertContent($content, $field, $value)
{
if (isset($content[$field]['en'])) {
//update
$con = ContentPeer::retrieveByPK($field, '', $this->getAppUid(), 'en');
@@ -118,54 +127,59 @@ class Application extends BaseApplication {
if ($con->validate()) {
$res = $con->save();
}
}
else {//insert
} else {
//insert
$con = new Content();
$con->setConCategory($field);
$con->setConParent('');
$con->setConId($this->getAppUid());
$con->setConLang('en');
$con->setConValue($value);
if ($con->validate()) {
$res = $con->save();
}
}
}
public function normalizeContent( $content, $field , $lang ) {
public function normalizeContent($content, $field, $lang)
{
$value = '';
//if the lang row is not empty, update in 'en' row and continue
if (!$this->isEmptyInContent($content, $field, $lang)) {
//update/insert only if this lang is != 'en', with this always we will have an en row with last value
$value = $content[$field][$lang];
if ($lang != 'en') {
$this->updateInsertContent($content, $field, $value);
}
}
else {
} else {
//if the lang row is empty, and 'en' row is not empty return 'en' value
if (!$this->isEmptyInContent($content, $field, 'en')) {
$value = $content[$field]['en'];
}
//if the lang row is empty, and 'en' row is empty get value for 'other' row and update in 'en' row and continue
//if the lang row is empty, and 'en' row is empty get value for 'other' row and update in 'en'
//row and continue
if ($this->isEmptyInContent($content, $field, 'en')) {
if (isset($content[$field]) && is_array($content[$field])) {
foreach ($content[$field] as $lan => $val) {
if (trim($val) != '') {
$value = $val;
if ($lan != 'en') {
$this->updateInsertContent($content, $field , $value);
continue;
}
}
}
}
else {
} else {
$this->updateInsertContent($content, $field, '');
}
}
}
return $value;
}
@@ -178,6 +192,7 @@ class Application extends BaseApplication {
if ($this->getAppUid() == '') {
throw (new Exception("Error in getContentFields, the APP_UID can't be blank"));
}
$lang = defined('SYS_LANG')? SYS_LANG : 'en';
$c = new Criteria();
$c->clearSelectColumns();
@@ -192,11 +207,19 @@ class Application extends BaseApplication {
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
$content = array();
while ($row = $rs->getRow()) {
$conCategory = $row['CON_CATEGORY'];
$conLang = $row['CON_LANG'];
if ( !isset( $content[$conCategory] ) ) $content[$conCategory] = array();
if ( !isset( $content[$conCategory][$conLang] ) ) $content[$conCategory][$conLang] = array();
if (!isset($content[$conCategory])) {
$content[$conCategory] = array();
}
if (!isset($content[$conCategory][$conLang])) {
$content[$conCategory][$conLang] = array();
}
$content[$conCategory][$conLang] = $row['CON_VALUE'];
$rs->next();
$row = $rs->getRow();
@@ -207,6 +230,7 @@ class Application extends BaseApplication {
$res['APP_TITLE'] = $appTitle;
$res['APP_DESCRIPTION'] = $appDescription;
return $res;
}
@@ -221,6 +245,7 @@ class Application extends BaseApplication {
if ($this->getAppUid() == '') {
throw ( new Exception( "Error in setAppTitle, the APP_UID can't be blank") );
}
// Since the native PHP type for this column is string,
// we will cast the input to a string (if it is not).
if ($v !== null && !is_string($v)) {
@@ -234,7 +259,6 @@ class Application extends BaseApplication {
}
} // set()
/**
* Get the [app_proc_code] column value.
* @return string
@@ -281,10 +305,13 @@ class Application extends BaseApplication {
* @return array $Fields the fields
*/
function Load ( $AppUid ) {
public function Load($AppUid)
{
$con = Propel::getConnection(ApplicationPeer::DATABASE_NAME);
try {
$oApplication = ApplicationPeer::retrieveByPk( $AppUid );
if (is_object($oApplication) && get_class ($oApplication) == 'Application' ) {
$aFields = $oApplication->toArray(BasePeer::TYPE_FIELDNAME);
$this->fromArray($aFields, BasePeer::TYPE_FIELDNAME);
@@ -300,13 +327,12 @@ class Application extends BaseApplication {
//$aFields['APP_PROC_CODE'] = $oApplication->getAppProcCode();
//$this->setAppProcCode($oApplication->getAppProcCode());
return $aFields;
}
else {
} else {
throw (new Exception("The Application row '$AppUid' doesn't exist!"));
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw ($oError);
}
}
@@ -319,9 +345,10 @@ class Application extends BaseApplication {
* $sUsrUid the userid
* @return void
*/
function create ($sProUid, $sUsrUid ) {
public function create($sProUid, $sUsrUid)
{
$con = Propel::getConnection('workflow');
try {
//fill the default values for new application row
$this->setAppUid(G::generateUniqueID());
@@ -343,7 +370,10 @@ class Application extends BaseApplication {
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn( 'MAX(' . ApplicationPeer::APP_NUMBER . ')' ); //the appnumber is based in all processes active, not only in the specified process guid
$c->addSelectColumn('MAX(' . ApplicationPeer::APP_NUMBER . ')'); //the appnumber is based in all processes
//active, not only in the specified
//process guid
$result = ApplicationPeer::doSelectRS($c);
$result->next();
@@ -364,18 +394,18 @@ class Application extends BaseApplication {
//Content::insertContent('APP_PROC_CODE', '', $this->getAppUid(), $lang, '');
$con->commit();
return $this->getAppUid();
}
else {
} else {
$msg = '';
foreach($this->getValidationFailures() as $objValidationFailure)
foreach ($this->getValidationFailures() as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "<br/>";
}
throw (new PropelException('The APPLICATION row cannot be created!', new PropelException($msg)));
}
}
catch (Exception $e) {
} catch (Exception $e) {
$con->rollback();
throw ($e);
}
@@ -386,39 +416,47 @@ class Application extends BaseApplication {
* @param array $aData
* @return variant
**/
public function update($aData)
{
$con = Propel::getConnection( ApplicationPeer::DATABASE_NAME );
try {
$con->begin();
$oApp = ApplicationPeer::retrieveByPK($aData['APP_UID']);
if (is_object($oApp) && get_class($oApp) == 'Application') {
$oApp->fromArray($aData, BasePeer::TYPE_FIELDNAME);
if ($oApp->validate()) {
if ( isset ( $aData['APP_TITLE'] ) )
if (isset($aData['APP_TITLE'])) {
$oApp->setAppTitle($aData['APP_TITLE']);
if ( isset ( $aData['APP_DESCRIPTION'] ) )
}
if (isset($aData['APP_DESCRIPTION'])) {
$oApp->setAppDescription($aData['APP_DESCRIPTION']);
}
//if ( isset ( $aData['APP_PROC_CODE'] ) )
//$oApp->setAppProcCode( $aData['APP_PROC_CODE'] );
$res = $oApp->save();
$con->commit();
return $res;
}
else {
} else {
$msg = '';
foreach($this->getValidationFailures() as $objValidationFailure)
foreach ($this->getValidationFailures() as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "<br/>";
}
throw (new PropelException('The row cannot be updated!', new PropelException($msg)));
}
}
else {
} else {
$con->rollback();
throw (new Exception("The row '" . $aData['APP_UID'] . "' in table APPLICATION doesn't exist!"));
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw ($oError);
}
}
@@ -433,30 +471,33 @@ class Application extends BaseApplication {
if (is_array($appUid)) {
$appUid = (isset($appUid['APP_UID'])? $appUid['APP_UID'] : '');
}
try {
$oApp = ApplicationPeer::retrieveByPK($appUid);
if (!is_null($oApp))
{
if (!is_null($oApp)) {
Content::removeContent('APP_TITLE', '', $oApp->getAppUid());
Content::removeContent('APP_DESCRIPTION', '', $oApp->getAppUid());
//Content::removeContent('APP_PROC_CODE', '', $oApp->getAppUid());
return $oApp->delete();
}
else {
} else {
throw (new Exception("The row '$appUid' in table Application doesn't exist!"));
}
}
catch (Exception $oError) {
} catch (Exception $oError) {
throw ($oError);
}
}
function exists( $sAppUid )
public function exists($sAppUid)
{
$oApplicaton = ApplicationPeer::retrieveByPK($sAppUid);
return (!is_null($oApplicaton));
}
function createApplication ($aData ) {
public function createApplication($aData)
{
$c = new Criteria();
$c->clearSelectColumns();
$c->addSelectColumn('MAX(' . ApplicationPeer::APP_NUMBER . ')');
@@ -483,50 +524,54 @@ class Application extends BaseApplication {
/** Start Comment : Sets the $this->Fields['APP_DATA']
Merge between stored APP_DATA with new APP_DATA. **/
if (!$this->getAppData())
{
if (!$this->getAppData()) {
// if (!$this->is_new)
// {
// $this->load($fields['APP_UID']);
// }
}
$this->Fields['APP_DATA'] = isset($this->Fields['APP_DATA'])? $this->Fields['APP_DATA'] : array();
if (isset($fields['APP_DATA']) && is_array($fields['APP_DATA']))
{
foreach($fields['APP_DATA'] as $k=>$v)
{
if (isset($fields['APP_DATA']) && is_array($fields['APP_DATA'])) {
foreach ($fields['APP_DATA'] as $k => $v) {
$this->Fields['APP_DATA'][$k] = $v;
}
}
/** End Comment **/
/** Begin Comment : Replace APP_DATA in APP_TITLE (before to serialize)
/*
Begin Comment : Replace APP_DATA in APP_TITLE (before to serialize)
$pro = new process( $this->_dbc );
$pro->load((isset($fields['PRO_UID']) ? $fields['PRO_UID'] : $this->Fields['PRO_UID']));
$fields['APP_TITLE'] = G::replaceDataField( $pro->Fields['PRO_TITLE'], $this->Fields['APP_DATA']);
/** End Comment **/
End Comment
*/
// parent::save();
// $this->Fields['APP_DATA'] = unserialize($this->Fields['APP_DATA']);
// /** Start Comment: Save in the table CONTENT */
// $this->content->saveContent('APP_TITLE',$fields);
// /** End Comment */
if ($this->validate()) {
$res = $this->save();
$this->setAppTitle('');
$this->setAppDescription('');
$this->setAppProcCode('');
}
else {
} else {
// Something went wrong. We can now get the validationFailures and handle them.
$msg = '';
$validationFailuresArray = $this->getValidationFailures();
foreach ($validationFailuresArray as $objValidationFailure) {
$msg .= $objValidationFailure->getMessage() . "<br/>";
}
//return array ( 'codError' => -100, 'rowsAffected' => 0, 'message' => $msg );
}
return $this->getAppUid();
}
} // Application
}