capwelton / libapp

programs/controller.class.php

Spacing +40 added lines, -40 removed lines

@@ -21,10 +21,10 @@ 
  * @copyright Copyright (c) 2008 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once $GLOBALS['babInstallPath'] . 'utilit/controller.class.php';
-require_once $GLOBALS['babInstallPath'] . 'utilit/json.php';
+require_once $GLOBALS['babInstallPath'].'utilit/controller.class.php';
+require_once $GLOBALS['babInstallPath'].'utilit/json.php';
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $App = app_App();
 if ($App) {
@@ -36,7 +36,7 @@ 
 {
 	public function __construct($action, $code = 0)
 	{
-		$message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
+		$message = 'Unknown method "'.$action->getController().'::'.$action->getMethod().'"';
 		parent::__construct($message, $code);
 	}
 }
@@ -201,11 +201,11 @@ 
         // we try to select one according to the classname prefix.
         list($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
-        $App = @bab_functionality::get('App/' . $functionalityName);
+        $App = @bab_functionality::get('App/'.$functionalityName);
 
         if (!$App)
         {
-            throw new app_Exception('Faild to autodetect functionality App/' . $functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
+            throw new app_Exception('Faild to autodetect functionality App/'.$functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
         }
 
         $controller = $App->ControllerProxy($classname, $proxy);
@@ -224,9 +224,9 @@ 
     static function getProxyInstance(Func_App $App, $classname)
     {
         $class = new ReflectionClass($classname);
-        $proxyClassname = $class->getShortName() . self::PROXY_CLASS_SUFFIX;
+        $proxyClassname = $class->getShortName().self::PROXY_CLASS_SUFFIX;
         if (!class_exists($proxyClassname)) {
-            $classStr = 'class ' . $proxyClassname . ' extends ' . $class->name . ' {' . "\n";
+            $classStr = 'class '.$proxyClassname.' extends '.$class->name.' {'."\n";
             $methods = $class->getMethods();
 
             $classStr .= '	public function __construct(Func_App $App) {
@@ -239,24 +239,24 @@ 
                 }
 
 
-                $classStr .= '	public function ' . $method->name . '(';
+                $classStr .= '	public function '.$method->name.'(';
                 $parameters = $method->getParameters();
                 $parametersStr = array();
                 foreach ($parameters as $parameter) {
 
                     if ($parameter->isDefaultValueAvailable()) {
-                        $parametersStr[] = '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
+                        $parametersStr[] = '$'.$parameter->name.' = '.var_export($parameter->getDefaultValue(), true);
                     } else {
-                        $parametersStr[] = '$' . $parameter->name;
+                        $parametersStr[] = '$'.$parameter->name;
                     }
                 }
                 $classStr .= implode(', ', $parametersStr);
-                $classStr .= ') {' . "\n";
-                $classStr .= '		$args = func_get_args();' . "\n";
-                $classStr .= '		return $this->getMethodAction(__FUNCTION__, $args);' . "\n";
-                $classStr .= '	}' . "\n";
+                $classStr .= ') {'."\n";
+                $classStr .= '		$args = func_get_args();'."\n";
+                $classStr .= '		return $this->getMethodAction(__FUNCTION__, $args);'."\n";
+                $classStr .= '	}'."\n";
             }
-            $classStr .= '}' . "\n";
+            $classStr .= '}'."\n";
 
             // We define the proxy class
             eval($classStr);
@@ -297,7 +297,7 @@ 
     protected function getObjectName($classname)
     {
         list($objectname) = explode('Controller', $classname);
-        if($this->App()->getComponentByName($objectname)){
+        if ($this->App()->getComponentByName($objectname)) {
             return strtolower($objectname);
         }
         list(, $objectname) = explode('_Ctrl', $classname);
@@ -319,7 +319,7 @@ 
 
         $reflector = new ReflectionClass(get_class($this));
         $parent = $reflector->getParentClass();
-        if($parent){
+        if ($parent) {
             $parentMethod = $parent->getMethod('__construct');
             $docComment = $parentMethod->getDocComment();
             if (strpos($docComment, '@isComponentController') !== false) {
@@ -330,7 +330,7 @@ 
         $rc = new ReflectionClass($fullClassName);
 
         if (!$rc->hasMethod($methodName)) {
-            throw new bab_InvalidActionException($fullClassName . '::' . $methodName);
+            throw new bab_InvalidActionException($fullClassName.'::'.$methodName);
         }
         $method = new ReflectionMethod($fullClassName, $methodName);
 
@@ -353,7 +353,7 @@ 
 
         $action = new Widget_Action();
 
-        $action->setMethod($this->getControllerTg(), $objectName . '.' . $methodName, $actionParams);
+        $action->setMethod($this->getControllerTg(), $objectName.'.'.$methodName, $actionParams);
 
         $docComment = $method->getDocComment();
         if (strpos($docComment, '@ajax') !== false) {
@@ -394,7 +394,7 @@ 
         $action->setParameters($actionParams);
 
 
-        list(,,$file) = explode('/', $App->controllerTg);
+        list(,, $file) = explode('/', $App->controllerTg);
 
         $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
@@ -420,24 +420,24 @@ 
             return false;
         }
 
-        list($objectName, ) = explode('.', $method);
+        list($objectName,) = explode('.', $method);
 
         if (!method_exists($this, $objectName)) {
             /* @var $component app_Component */
             $component = $this->app->getComponentByName(ucfirst($objectName));
-            if($component){
+            if ($component) {
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
             }
-            else{
+            else {
                 header('HTTP/1.0 400 Bad Request');
                 throw new app_UnknownActionException($action);
             }
         }
 
-        if(!isset($component)){
+        if (!isset($component)) {
             $objectController = $this->{$objectName}(false);
-            if ( ! ($objectController instanceof app_Controller)) {
+            if (!($objectController instanceof app_Controller)) {
                 return false;
             }
         }
@@ -451,7 +451,7 @@ 
             } else {
                 if ($this->isAjaxRequest()) {
 
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+                    header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
 
                     die(
                         bab_json_encode(
@@ -472,7 +472,7 @@ 
         } catch (app_SaveException $e) {
 
             if ($this->isAjaxRequest()) {
-                header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+                header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
                 header('Cache-Control: no-cache, must-revalidate');
                 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                 header('Content-type: application/json');
@@ -527,7 +527,7 @@ 
                         if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         } else {
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -586,7 +586,7 @@ 
     private function deletedItemPage(Widget_Action $action, app_DeletedRecordException $e)
     {
         if ($this->isAjaxRequest()) {
-            header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+            header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
             header('Cache-Control: no-cache, must-revalidate');
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Content-type: application/json');
@@ -603,7 +603,7 @@ 
                 );
 
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
 
         $App = $this->App();
         $W = bab_Widgets();
@@ -637,7 +637,7 @@ 
     private function notFoundPage(Widget_Action $action, app_NotFoundException $e)
     {
         if ($this->isAjaxRequest()) {
-            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle() . ' (' . $e->getId() . ')');
+            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle().' ('.$e->getId().')');
             $json = array(
                 'messages' => array(
                     array(
@@ -649,7 +649,7 @@ 
             echo bab_json_encode($json);
             die;
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 
@@ -669,14 +669,14 @@ 
 
     private function errorPage(Exception $e)
     {
-        header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal server error', true, 500);
+        header($_SERVER['SERVER_PROTOCOL'].' 500 Internal server error', true, 500);
 
-        require_once $GLOBALS['babInstallPath'] . 'utilit/uiutil.php';
+        require_once $GLOBALS['babInstallPath'].'utilit/uiutil.php';
         $popup = new babBodyPopup();
         $popup->babEcho(
-            '<h1>' . $this->App()->translate('There was a problem when trying to perform this operation') . '</h1>'
-            . '<h2 class="error">' . $this->App()->translate('Additional debugging information:') . '</h2>'
-            . '<p class="error">' . $e->getMessage() . ' ' .  $e->getFile() . ' ' . $e->getLine()  . ' ' . $e->getTraceAsString() . '</p>'
+            '<h1>'.$this->App()->translate('There was a problem when trying to perform this operation').'</h1>'
+            . '<h2 class="error">'.$this->App()->translate('Additional debugging information:').'</h2>'
+            . '<p class="error">'.$e->getMessage().' '.$e->getFile().' '.$e->getLine().' '.$e->getTraceAsString().'</p>'
             );
 
 
@@ -721,7 +721,7 @@ 
      */
     public function CustomField($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'customfield.ctrl.php';
+        require_once APP_CTRL_PATH.'customfield.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlCustomField', $proxy);
     }
 
@@ -732,7 +732,7 @@ 
      */
     public function CustomSection($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'customsection.ctrl.php';
+        require_once APP_CTRL_PATH.'customsection.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlCustomSection', $proxy);
     }
 }

Braces +1 added lines, -2 removed lines

@@ -428,8 +428,7 @@
             if($component){
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
-            }
-            else{
+            } else{
                 header('HTTP/1.0 400 Bad Request');
                 throw new app_UnknownActionException($action);
             }

programs/customfield.ctrl.php

Indentation +92 added lines, -92 removed lines

@@ -86,122 +86,122 @@
 

 

 

-	/**

-	 * @return Widget_Page

-	 */

-	public function edit($customfield = null)

-	{

-		$W = bab_Widgets();

-		$App = $this->App();

-		$Ui = $App->Ui();

-		$page = $Ui->Page();

+    /**

+     * @return Widget_Page

+     */

+    public function edit($customfield = null)

+    {

+        $W = bab_Widgets();

+        $App = $this->App();

+        $Ui = $App->Ui();

+        $page = $Ui->Page();

 

-		$page->addClass('app-page-editor');

-		$page->setTitle($App->translate('Edit custom field'));

+        $page->addClass('app-page-editor');

+        $page->setTitle($App->translate('Edit custom field'));

 

-		if (null !== $customfield) {

-		    $set = $App->CustomFieldSet();

-			$customfield = $set->request($customfield);

-		}

+        if (null !== $customfield) {

+            $set = $App->CustomFieldSet();

+            $customfield = $set->request($customfield);

+        }

 

-		$form = $Ui->CustomFieldEditor($customfield);

+        $form = $Ui->CustomFieldEditor($customfield);

 

-		$page->addItem($form);

+        $page->addItem($form);

 

-		if ($customfield instanceof app_CustomField) {

-			$actionsFrame = $page->ActionsFrame();

-			$page->addContextItem($actionsFrame);

+        if ($customfield instanceof app_CustomField) {

+            $actionsFrame = $page->ActionsFrame();

+            $page->addContextItem($actionsFrame);

 

-			$actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));

-		}

+            $actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));

+        }

 

-		return $page;

-	}

+        return $page;

+    }

 

 

-	/**

-	 * @return bool

-	 */

-	public function save($customfield = null)

-	{

-	    $App = $this->App();

+    /**

+     * @return bool

+     */

+    public function save($customfield = null)

+    {

+        $App = $this->App();

 

-	    $set = $App->CustomFieldSet();

+        $set = $App->CustomFieldSet();

 

-		if (empty($customfield['id'])) {

-			$record = $set->newRecord();

-		} else {

-			$record = $set->get($customfield['id']);

-		}

+        if (empty($customfield['id'])) {

+            $record = $set->newRecord();

+        } else {

+            $record = $set->get($customfield['id']);

+        }

 

-		if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {

-		    $enumvalues = array();

-		    foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {

-		        $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);

-		    }

-			$record->enumvalues = serialize($enumvalues);

-		} else {

-			$record->enumvalues = '';

-		}

+        if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {

+            $enumvalues = array();

+            foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {

+                $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);

+            }

+            $record->enumvalues = serialize($enumvalues);

+        } else {

+            $record->enumvalues = '';

+        }

 

-		unset($customfield['enumvalues']);

-		$record->setFormInputValues($customfield);

+        unset($customfield['enumvalues']);

+        $record->setFormInputValues($customfield);

 

-		$record->save();

+        $record->save();

 

-		// refresh target table structure

+        // refresh target table structure

 

-		$object = $record->object.'Set';

-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

+        $object = $record->object.'Set';

+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

 

-		$recordSet = $App->$object();

-		if (method_exists($recordSet, 'useLang')) {

-		    // This is necessary if the recordSet constructor uses a setLang().

-		    // We need to revert to multilang fields before synchronizing.

-		    $recordSet->useLang(false);

-		}

+        $recordSet = $App->$object();

+        if (method_exists($recordSet, 'useLang')) {

+            // This is necessary if the recordSet constructor uses a setLang().

+            // We need to revert to multilang fields before synchronizing.

+            $recordSet->useLang(false);

+        }

 

-		$sql = $mysqlbackend->setToSql($recordSet);

+        $sql = $mysqlbackend->setToSql($recordSet);

 

-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

-		$synchronize = new bab_synchronizeSql();

-		$synchronize->fromSqlString($sql);

+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

+        $synchronize = new bab_synchronizeSql();

+        $synchronize->fromSqlString($sql);

 

-		return true;

-	}

+        return true;

+    }

 

 

     /**

      * {@inheritDoc}

      * @see app_CtrlRecord::delete()

      */

-	public function delete($customfield)

-	{

-	    $App = $this->App();

-

-	    if (!$customfield) {

-		    throw new app_AccessException($App->translate('Access denied'));

-		}

-

-		$set = $App->CustomFieldSet();

-		$record = $set->request($customfield);

-		$object = $record->object.'Set';

-		$set->delete($set->id->is($customfield));

-

-		$recordSet = $App->$object();

-		if (method_exists($recordSet, 'useLang')) {

-		    // This is necessary if the recordSet constructor uses a setLang().

-		    // We need to revert to multilang fields before synchronizing.

-		    $recordSet->useLang(false);

-		}

-

-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

-		$sql = $mysqlbackend->setToSql($recordSet);

-

-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

-		$synchronize = new bab_synchronizeSql();

-		$synchronize->fromSqlString($sql);

-

-		return true;

-	}

+    public function delete($customfield)

+    {

+        $App = $this->App();

+

+        if (!$customfield) {

+            throw new app_AccessException($App->translate('Access denied'));

+        }

+

+        $set = $App->CustomFieldSet();

+        $record = $set->request($customfield);

+        $object = $record->object.'Set';

+        $set->delete($set->id->is($customfield));

+

+        $recordSet = $App->$object();

+        if (method_exists($recordSet, 'useLang')) {

+            // This is necessary if the recordSet constructor uses a setLang().

+            // We need to revert to multilang fields before synchronizing.

+            $recordSet->useLang(false);

+        }

+

+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

+        $sql = $mysqlbackend->setToSql($recordSet);

+

+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

+        $synchronize = new bab_synchronizeSql();

+        $synchronize->fromSqlString($sql);

+

+        return true;

+    }

 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2008 by CANTICO ({@link http://www.cantico.fr})

  */

 

-require_once APP_CTRL_PATH . '/record.ctrl.php';

+require_once APP_CTRL_PATH.'/record.ctrl.php';

 

 /**

  * This controller manages actions that can be performed on custom fields

@@ -39,7 +39,7 @@ 
             $W->Link(

                 $App->translate('Add a custom field'),

                 $this->proxy()->edit()

-            )->addClass('icon',  Func_Icons::ACTIONS_LIST_ADD)

+            )->addClass('icon', Func_Icons::ACTIONS_LIST_ADD)

             ->setOpenMode(Widget_Link::OPEN_DIALOG_AND_RELOAD)

         );

 

programs/customfield.class.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
             throw new app_SaveException($this->App()->translate('The name is mandatory'));

         }

         

-        return '_' . $name;

+        return '_'.$name;

     }

     

     

programs/record.class.php

Spacing +11 added lines, -11 removed lines

@@ -191,7 +191,7 @@ 
     {
         $App = $this->App();
 
-        $customFieldSet= $App->CustomFieldSet();
+        $customFieldSet = $App->CustomFieldSet();
         $object = mb_substr(get_class($this), mb_strlen($App->classPrefix), -mb_strlen('Set'));
 
         $customFields = $customFieldSet->select($customFieldSet->object->is($object));
@@ -317,7 +317,7 @@ 
 
         $linkSet->hasOne('sourceId', get_class($this));
 
-        $criteria =	$linkSet->targetClass->is(get_class($target))
+        $criteria = $linkSet->targetClass->is(get_class($target))
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is($this->getRecordClassName()));
         if (isset($linkType)) {
@@ -347,7 +347,7 @@ 
 
         $linkSet->hasOne('targetId', get_class($this));
 
-        $criteria =	$linkSet->sourceClass->is(get_class($source))
+        $criteria = $linkSet->sourceClass->is(get_class($source))
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($this->getRecordClassName()));
         if (isset($linkType)) {
@@ -391,7 +391,7 @@ 
             $sourcesCriteria[] = $linkSet->sourceClass->is($sourceClass)->_AND_($linkSet->sourceId->in($sourceIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is($this->getRecordClassName()),
             $linkSet->any($sourcesCriteria)
         );
@@ -436,7 +436,7 @@ 
             $targetsCriteria[] = $linkSet->targetClass->is($targetClass)->_AND_($linkSet->targetId->in($targetIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->sourceClass->is($this->getRecordClassName()),
             $linkSet->any($targetsCriteria)
         );
@@ -673,7 +673,7 @@ 
         $App = $this->App();
         $rClass = new ReflectionClass(get_class($this));
         $component = $App->getComponentByName($rClass->getShortName());
-        if(isset($component)){
+        if (isset($component)) {
             return $component->getRecordClassName();
 //             list(, $classname) = explode('_', $component->getRecordClassName());
 //             return $classname;
@@ -694,7 +694,7 @@ 
             throw new app_Exception('Trying to get the reference string of a record without an id.');
         }
         $classname = $this->getClassName();
-        return $classname . ':' . $this->id;
+        return $classname.':'.$this->id;
     }
 
 
@@ -934,7 +934,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->sourceClass->is(get_class($source))
+        $criteria = $linkSet->sourceClass->is(get_class($source))
         ->_AND_($linkSet->sourceId->is($source->id))
         ->_AND_($linkSet->targetClass->is(get_class($this)))
         ->_AND_($linkSet->targetId->is($this->id));
@@ -964,7 +964,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is(get_class($target)),
             $linkSet->targetId->is($target->id),
             $linkSet->sourceClass->is(get_class($this)),
@@ -1059,13 +1059,13 @@ 
      */
     protected function importDate($name, $value)
     {
-        if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/',$value)) {
+        if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/', $value)) {
             return $this->importProperty($name, $value);
         }
 
         // try in DD/MM/YYYY format
 
-        if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/',$value, $matches)) {
+        if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/', $value, $matches)) {
 
             $value = sprintf('%04d-%02d-%02d', (int) $matches['year'], (int) $matches['month'], (int) $matches['day']);