psr2

src/QUI/Bricks/Controls/Banner.php

@@ -34,7 +34,7 @@ public function __construct($attributes = array())
             dirname(__FILE__).'/Banner.css'
         );
 
-        parent::setAttributes($attributes);
+        parent::__construct($attributes);
     }
 
     /**
@@ -52,4 +52,4 @@ public function getBody()
 
         return $Engine->fetch(dirname(__FILE__).'/Banner.html');
     }
-}
+}
\ No newline at end of file

src/QUI/Bricks/Controls/SideBox1.php

@@ -61,7 +61,7 @@ public function getBody()
      */
     protected function getSite()
     {
-        $Project = $this->_getProject();
+        $Project = $this->getProject();
         $site    = $this->getAttribute('site');
 
         if (is_numeric($site)) {

src/QUI/Bricks/Events.php

@@ -23,15 +23,14 @@ class Events
      *
      * @param Site|Edit $Site
      */
-    static function onSiteSave($Site)
+    public static function onSiteSave($Site)
     {
         QUI\Rights\Permission::checkPermission('quiqqer.bricks.assign');
 
+        $areas = $Site->getAttribute('quiqqer.bricks.areas');
+        $areas = json_decode($areas, true);
 
-        $areas = $Site->getAttribute( 'quiqqer.bricks.areas' );
-        $areas = json_decode( $areas, true );
-
-        if ( !$areas || empty( $areas ) ) {
+        if (!$areas ||empty($areas)) {
             return;
         }
 
@@ -39,25 +38,24 @@ static function onSiteSave($Site)
 
         // get inharitance areas
         $Project      = $Site->getProject();
-        $projectAreas = $Manager->getAreasByProject( $Project );
-        $projectTable = QUI::getDBProjectTableName( Manager::TABLE_CACHE, $Project );
+        $projectAreas = $Manager->getAreasByProject($Project);
+        $projectTable = QUI::getDBProjectTableName(Manager::TABLE_CACHE, $Project);
 
 
-        foreach ( $projectAreas as $area )
-        {
-            if ( !$area[ 'inheritance' ] ) {
+        foreach ($projectAreas as $area) {
+            if (!$area['inheritance']) {
                 continue;
             }
 
-            if ( !isset( $areas[ $area[ 'name' ] ] ) ) {
+            if (!isset($areas[$area['name']])) {
                 continue;
             }
 
-            if ( empty( $areas[ $area[ 'name' ] ] ) ) {
+            if (empty($areas[$area['name']])) {
                 continue;
             }
 
-            $bricks = $areas[ $area[ 'name' ] ];
+            $bricks = $areas[$area['name']];
 
             // clear area and new data set
             QUI::getDataBase()->delete($projectTable, array(
@@ -66,8 +64,7 @@ static function onSiteSave($Site)
             ));
 
             // check if deactivated
-            if ( isset( $bricks[ 0 ] ) && isset( $bricks[ 0 ][ 'deactivate' ] ) )
-            {
+            if (isset($bricks[0]) && isset($bricks[0]['deactivate'])) {
                 QUI::getDataBase()->insert($projectTable, array(
                     'id'    => $Site->getId(),
                     'area'  => $area[ 'name' ],
@@ -78,19 +75,21 @@ static function onSiteSave($Site)
             }
 
 
-            foreach ( $bricks as $brick )
-            {
+            foreach ($bricks as $brick) {
                 $customFields = array();
 
-                if (isset($brick['customfields']) && is_string($brick['customfields'])) {
+                if (isset($brick['customfields'])
+                    && is_string($brick['customfields'])) {
                     $customFields = json_decode($brick['customfields'], true);
                 }
 
-                if (isset($brick['customfields']) && is_array($brick['customfields'])) {
+                if (isset($brick['customfields'])
+                    && is_array($brick['customfields'])) {
                     $customFields = $brick['customfields'];
                 }
 
-                if (!isset($customFields['inheritance']) || !(int)$customFields['inheritance']) {
+                if (!isset($customFields['inheritance'])
+                    || !(int)$customFields['inheritance']) {
                     continue;
                 }
 
@@ -107,13 +106,12 @@ static function onSiteSave($Site)
      * Event : on smarty init
      * add new brickarea function
      */
-    static function onSmartyInit($Smarty)
+    public static function onSmartyInit($Smarty)
     {
         // {brickarea}
-        if ( !isset( $Smarty->registered_plugins['function'] ) ||
-             !isset( $Smarty->registered_plugins['function']['brickarea'] )
-        )
-        {
+        if (!isset($Smarty->registered_plugins['function'])
+            || !isset($Smarty->registered_plugins['function']['brickarea'])
+        ) {
             $Smarty->registerPlugin("function", "brickarea", "\QUI\Bricks\Events::brickarea");
         }
     }
@@ -124,15 +122,14 @@ static function onSmartyInit($Smarty)
      * @param Array $params - function parameter
      * @param \Smarty
      */
-    static function brickarea($params, $smarty)
+    public static function brickarea($params, $smarty)
     {
-        if ( !isset( $params['Site'] ) || !isset( $params['area'] ) )
-        {
-            if ( !isset( $params['assign'] ) ) {
+        if (!isset($params['Site']) || !isset($params['area'])) {
+            if (!isset($params['assign'])) {
                 return array();
             }
 
-            $smarty->assign( $params['assign'], array() );
+            $smarty->assign($params['assign'], array());
             return;
         }
 
@@ -142,12 +139,12 @@ static function brickarea($params, $smarty)
         $Site = $params['Site'];
         $area = $params['area'];
 
-        $result = $BricksManager->getBricksByArea( $area, $Site );
+        $result = $BricksManager->getBricksByArea($area, $Site);
 
-        if ( !isset( $params['assign'] ) ) {
+        if (!isset($params['assign'])) {
             return $result;
         }
 
-        $smarty->assign( $params['assign'], $result );
+        $smarty->assign($params['assign'], $result);
     }
-}
+}
\ No newline at end of file

src/QUI/Bricks/Manager.php

@@ -32,27 +32,27 @@ class Manager
      *
      * @var array
      */
-    protected $_bricks = array();
+    protected $bricks = array();
 
     /**
      * Initialized brick manager
      *
      * @var null
      */
-    static $_BrickManager = null;
+    public static $BrickManager = null;
 
     /**
      * Return the global QUI\Bricks\Manager
      *
      * @return Manager
      */
-    static function init()
+    public static function init()
     {
-        if (is_null(self::$_BrickManager)) {
-            self::$_BrickManager = new QUI\Bricks\Manager(true);
+        if (is_null(self::$BrickManager)) {
+            self::$BrickManager = new QUI\Bricks\Manager(true);
         }
 
-        return self::$_BrickManager;
+        return self::$BrickManager;
     }
 
     /**
@@ -254,8 +254,8 @@ public function getAvailableBricks()
      */
     public function getBrickById($id)
     {
-        if (isset($this->_bricks[$id])) {
-            return $this->_bricks[$id];
+        if (isset($this->bricks[$id])) {
+            return $this->bricks[$id];
         }
 
         $data = QUI::getDataBase()->fetch(array(
@@ -270,10 +270,10 @@ public function getBrickById($id)
             throw new QUI\Exception('Brick not found');
         }
 
-        $this->_bricks[$id] = new Brick($data[0]);
-        $this->_bricks[$id]->setAttribute('id', $id);
+        $this->bricks[$id] = new Brick($data[0]);
+        $this->bricks[$id]->setAttribute('id', $id);
 
-        return $this->_bricks[$id];
+        return $this->bricks[$id];
     }
 
     /**