diff --git a/lib/QUI/Bricks/Brick.php b/lib/QUI/Bricks/Brick.php
index 6ab83c2c9807b5767496dc64a405b9fc4d884e3d..7a92874ead14ccbed5de0107032b1604f3ab41ce 100644
--- a/lib/QUI/Bricks/Brick.php
+++ b/lib/QUI/Bricks/Brick.php
@@ -22,35 +22,35 @@ class Brick extends QUI\QDOM
*
* @var
*/
- protected $_id = false;
+ protected $id = false;
/**
* Brick settings
*
* @var array
*/
- protected $_settings = array();
+ protected $settings = array();
/**
* Fields can be overwritten by another user
*
* @var array
*/
- protected $_customfields = array();
+ protected $customfields = array();
/**
* Internal control
*
* @var null
*/
- protected $_Control = null;
+ protected $Control = null;
/**
* List of extra css classes
*
* @var array
*/
- protected $_cssClasses = array();
+ protected $cssClasses = array();
/**
* Constructor
@@ -61,15 +61,15 @@ public function __construct($params = array())
{
// default
$default = array(
- 'type' => 'content',
- 'content' => '',
- 'title' => '',
+ 'type' => 'content',
+ 'content' => '',
+ 'title' => '',
'description' => '',
- 'project' => '',
- 'areas' => '',
- 'height' => '',
- 'width' => '',
- 'classes' => ''
+ 'project' => '',
+ 'areas' => '',
+ 'height' => '',
+ 'width' => '',
+ 'classes' => ''
);
$this->setAttributes($default);
@@ -81,7 +81,7 @@ public function __construct($params = array())
}
if (isset($params['id'])) {
- $this->_id = $params['id'];
+ $this->id = $params['id'];
}
// default settings from control
@@ -93,16 +93,16 @@ public function __construct($params = array())
);
foreach ($availableSettings as $entry) {
- $this->_settings[$entry['name']] = false;
+ $this->settings[$entry['name']] = false;
}
// control default settings
if (is_object($Control)) {
$controlSettings = $Control->getAttributes();
- foreach ($this->_settings as $key => $value) {
+ foreach ($this->settings as $key => $value) {
if (isset($controlSettings[$key])) {
- $this->_settings[$key] = $controlSettings[$key];
+ $this->settings[$key] = $controlSettings[$key];
}
}
}
@@ -116,9 +116,9 @@ public function __construct($params = array())
}
if (is_array($settings)) {
- foreach ($this->_settings as $key => $value) {
+ foreach ($this->settings as $key => $value) {
if (isset($settings[$key])) {
- $this->_settings[$key] = $settings[$key];
+ $this->settings[$key] = $settings[$key];
}
}
}
@@ -133,7 +133,7 @@ public function __construct($params = array())
}
if (is_array($customfields)) {
- $this->_customfields = $customfields;
+ $this->customfields = $customfields;
}
}
}
@@ -185,12 +185,11 @@ public function check()
public function create()
{
if ($this->getAttribute('type') == 'content') {
-
$_classes = array(
- 'brick-' . $this->_id
+ 'brick-' . $this->id
);
- foreach ($this->_cssClasses as $cssClass) {
+ foreach ($this->cssClasses as $cssClass) {
$_classes[] = $cssClass;
}
@@ -231,11 +230,11 @@ public function create()
}
}
- if ($this->_id) {
- $Control->addCSSClass('brick-' . $this->_id);
+ if ($this->id) {
+ $Control->addCSSClass('brick-' . $this->id);
}
- foreach ($this->_cssClasses as $cssClass) {
+ foreach ($this->cssClasses as $cssClass) {
$Control->addCSSClass($cssClass);
}
@@ -249,8 +248,8 @@ public function create()
*/
protected function getControl()
{
- if ($this->_Control) {
- return $this->_Control;
+ if ($this->Control) {
+ return $this->Control;
}
$Ctrl = $this->getAttribute('type');
@@ -275,7 +274,7 @@ protected function getControl()
return false;
}
- $this->_Control = $Control;
+ $this->Control = $Control;
return $Control;
}
@@ -287,7 +286,7 @@ protected function getControl()
*/
public function getSettings()
{
- return $this->_settings;
+ return $this->settings;
}
/**
@@ -313,8 +312,8 @@ public function setSettings($settings)
*/
public function getSetting($name)
{
- if (isset($this->_settings[$name])) {
- return $this->_settings[$name];
+ if (isset($this->settings[$name])) {
+ return $this->settings[$name];
}
return false;
@@ -323,15 +322,15 @@ public function getSetting($name)
/**
* Set a brick setting
*
- * @param string $name - name of the setting
+ * @param string $name - name of the setting
* @param string $value - value of the setting
*
* @return void
*/
public function setSetting($name, $value)
{
- if (isset($this->_settings[$name])) {
- $this->_settings[$name] = $value;
+ if (isset($this->settings[$name])) {
+ $this->settings[$name] = $value;
}
}
@@ -342,7 +341,7 @@ public function setSetting($name, $value)
*/
public function getCustomFields()
{
- return $this->_customfields;
+ return $this->customfields;
}
/**
@@ -354,7 +353,7 @@ public function getCustomFields()
*/
public function addCSSClass($cssClass)
{
- $this->_cssClasses[] = $cssClass;
+ $this->cssClasses[] = $cssClass;
}
/**
@@ -372,11 +371,11 @@ public function hasCSSClass($pattern)
return true;
}
- if (empty($this->_cssClasses)) {
+ if (empty($this->cssClasses)) {
return false;
}
- foreach ($this->_cssClasses as $cssClass) {
+ foreach ($this->cssClasses as $cssClass) {
if (fnmatch($pattern, $cssClass)) {
return true;
}
diff --git a/lib/QUI/Bricks/Controls/Banner.php b/lib/QUI/Bricks/Controls/Banner.php
index 01dc2e54130f1fc8c64063d7a06a61851901f26b..67fa4e692a8c586e19a01ec65491fea7106edc34 100644
--- a/lib/QUI/Bricks/Controls/Banner.php
+++ b/lib/QUI/Bricks/Controls/Banner.php
@@ -18,7 +18,7 @@ class Banner extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
diff --git a/lib/QUI/Bricks/Controls/BoxContent.php b/lib/QUI/Bricks/Controls/BoxContent.php
index 6656fc0a741a658fd9e7b300a95c01ba70312d5b..04fed284d22399360a612b67527060881699f9ee 100644
--- a/lib/QUI/Bricks/Controls/BoxContent.php
+++ b/lib/QUI/Bricks/Controls/BoxContent.php
@@ -18,21 +18,21 @@ class BoxContent extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
// default options
$this->setAttributes(array(
- 'title' => 'Box Content',
+ 'title' => 'Box Content',
'contentList' => false,
- 'entries' => array()
+ 'entries' => array()
));
parent::__construct($attributes);
$this->addCSSFile(
- dirname(__FILE__).'/BoxContent.css'
+ dirname(__FILE__) . '/BoxContent.css'
);
}
@@ -43,18 +43,17 @@ public function __construct($attributes = array())
*/
public function getBody()
{
- $Engine = QUI::getTemplateManager()->getEngine();
+ $Engine = QUI::getTemplateManager()->getEngine();
$entries = $this->getAttribute('entries');
if (is_string($entries)) {
$entries = json_decode($entries, true);
}
- $count = count($entries);
+ $count = count($entries);
$extraClass = '';
switch ($count) {
-
case 1:
$extraClass = ' box-content-entry-1';
break;
@@ -88,15 +87,12 @@ public function getBody()
}
-
-
$Engine->assign(array(
'this' => $this,
- 'entries' => $entries,
+ 'entries' => $entries,
'extraClass' => $extraClass
));
-
- return $Engine->fetch(dirname(__FILE__).'/BoxContent.html');
+ return $Engine->fetch(dirname(__FILE__) . '/BoxContent.html');
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Controls/ContentSwitcher.php b/lib/QUI/Bricks/Controls/ContentSwitcher.php
index 32b712d1b40ce8824a77db4f9222fdcfb10170ae..8a4f54a35dfd24326e96bacde3043623939db8dc 100644
--- a/lib/QUI/Bricks/Controls/ContentSwitcher.php
+++ b/lib/QUI/Bricks/Controls/ContentSwitcher.php
@@ -18,21 +18,21 @@ class ContentSwitcher extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
// default options
$this->setAttributes(array(
- 'title' => 'Content Switcher',
+ 'title' => 'Content Switcher',
'contentList' => false,
- 'entries' => array()
+ 'entries' => array()
));
parent::__construct($attributes);
$this->addCSSFile(
- dirname(__FILE__).'/ContentSwitcher.css'
+ dirname(__FILE__) . '/ContentSwitcher.css'
);
}
@@ -43,7 +43,7 @@ public function __construct($attributes = array())
*/
public function getBody()
{
- $Engine = QUI::getTemplateManager()->getEngine();
+ $Engine = QUI::getTemplateManager()->getEngine();
$entries = $this->getAttribute('entries');
if (is_string($entries)) {
@@ -51,11 +51,11 @@ public function getBody()
}
$Engine->assign(array(
- 'this' => $this,
+ 'this' => $this,
'entries' => $entries
));
- return $Engine->fetch(dirname(__FILE__).'/ContentSwitcher.html');
+ return $Engine->fetch(dirname(__FILE__) . '/ContentSwitcher.html');
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Controls/Image.php b/lib/QUI/Bricks/Controls/Image.php
index 0ee2f1e00562c7aed4515384cce214b9ef014da9..10d1f323e680bf80cbdf898693c1a9339242941e 100644
--- a/lib/QUI/Bricks/Controls/Image.php
+++ b/lib/QUI/Bricks/Controls/Image.php
@@ -13,14 +13,12 @@
*
* @package quiqqer/bricks
*/
-
-
class Image extends QUI\Control
{
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -37,7 +35,6 @@ public function __construct($attributes = array())
);
}
-
/**
* (non-PHPdoc)
*
@@ -50,16 +47,12 @@ public function getBody()
$brickLink = $this->getAttribute('link');
$Engine->assign(array(
- 'this' => $this,
- 'brickImage' => $brickImage,
- 'brickLink' => $brickLink
+ 'this' => $this,
+ 'brickImage' => $brickImage,
+ 'brickLink' => $brickLink
));
- return $Engine->fetch(dirname(__FILE__).'/Image.html');
+ return $Engine->fetch(dirname(__FILE__) . '/Image.html');
}
}
-
-
-
-
diff --git a/lib/QUI/Bricks/Controls/Pagination.php b/lib/QUI/Bricks/Controls/Pagination.php
index 8596f0b0fdde16d1686274cfd05b9d8667fd9e56..857fe425787b1882620fcbca74f288b96a5407a5 100644
--- a/lib/QUI/Bricks/Controls/Pagination.php
+++ b/lib/QUI/Bricks/Controls/Pagination.php
@@ -21,19 +21,19 @@ class Pagination extends QUI\Control
*
* @var array
*/
- protected $_getParams = array();
+ protected $getParams = array();
/**
* URL Params
*
* @var array
*/
- protected $_urlParams = array();
+ protected $urlParams = array();
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -156,11 +156,11 @@ public function getBody()
$order = $this->getAttribute('order');
$sheet = $this->getAttribute('sheet');
- $this->_getParams['sheet'] = $sheet;
- $this->_getParams['limit'] = $limit;
+ $this->getParams['sheet'] = $sheet;
+ $this->getParams['limit'] = $limit;
if (!empty($order)) {
- $this->_getParams['order'] = $order;
+ $this->getParams['order'] = $order;
}
if ((!$count || $count == 1)
@@ -175,8 +175,8 @@ public function getBody()
'start' => $start,
'end' => $end,
'active' => $active,
- 'pathParams' => $this->_urlParams,
- 'getParams' => $this->_getParams,
+ 'pathParams' => $this->urlParams,
+ 'getParams' => $this->getParams,
'anchor' => $anchor,
'limit' => $limit,
'limits' => $limits,
@@ -212,7 +212,7 @@ public function loadFromRequest()
$this->setAttribute('order', $order);
$this->setAttribute('sheet', $sheet);
- $this->_urlParams = QUI::getRewrite()->getUrlParamsList();
+ $this->urlParams = QUI::getRewrite()->getUrlParamsList();
}
/**
@@ -237,7 +237,7 @@ public function getSQLParams()
if ($this->getAttribute('order')) {
$result['order'] = $this->getAttribute('order');
}
-
+
return $result;
}
@@ -266,15 +266,14 @@ public function setGetParams($name, $value)
$value = QUI\Utils\Security\Orthos::clearFormRequest($value);
if (empty($value)) {
-
- if (isset($this->_getParams[$name])) {
- unset($this->_getParams[$name]);
+ if (isset($this->getParams[$name])) {
+ unset($this->getParams[$name]);
}
return;
}
- $this->_getParams[$name] = urlencode($value);
+ $this->getParams[$name] = urlencode($value);
}
/**
@@ -289,14 +288,13 @@ public function setUrlParams($name, $value)
$value = QUI\Utils\Security\Orthos::clear($value);
if (empty($value)) {
-
- if (isset($this->_urlParams[$name])) {
- unset($this->_urlParams[$name]);
+ if (isset($this->urlParams[$name])) {
+ unset($this->urlParams[$name]);
}
return;
}
- $this->_urlParams[$name] = $value;
+ $this->urlParams[$name] = $value;
}
}
diff --git a/lib/QUI/Bricks/Controls/SideBox1.php b/lib/QUI/Bricks/Controls/SideBox1.php
index 6d420792692c23eed7a2065767a5b03f64942183..2f40224ca530acd2f142ab5776ea1251e8e524a8 100644
--- a/lib/QUI/Bricks/Controls/SideBox1.php
+++ b/lib/QUI/Bricks/Controls/SideBox1.php
@@ -18,7 +18,7 @@ class SideBox1 extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -48,7 +48,7 @@ public function getBody()
$Engine->assign(array(
'this' => $this,
- 'Site' => $this->_getSite()
+ 'Site' => $this->getSite()
));
return $Engine->fetch(dirname(__FILE__) . '/SideBox1.html');
@@ -59,7 +59,7 @@ public function getBody()
*
* @return QUI\Projects\Site
*/
- protected function _getSite()
+ protected function getSite()
{
$Project = $this->_getProject();
$site = $this->getAttribute('site');
@@ -97,7 +97,7 @@ protected function _getSite()
}
$children = QUI\Projects\Site\Utils::getSitesByInputList(
- $this->_getProject(),
+ $this->getProject(),
$this->getAttribute('site'),
array(
'limit' => 1,
@@ -111,4 +111,4 @@ protected function _getSite()
return $Project->firstChild();
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Controls/SideBox2.php b/lib/QUI/Bricks/Controls/SideBox2.php
index 6cbd13f78a82b9d66b08a195423b50e20fe7d04c..83cf05a16c380d1b6f1449a2e35cd936edecc11e 100644
--- a/lib/QUI/Bricks/Controls/SideBox2.php
+++ b/lib/QUI/Bricks/Controls/SideBox2.php
@@ -18,7 +18,7 @@ class SideBox2 extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -75,7 +75,7 @@ public function getBody()
}
$children = QUI\Projects\Site\Utils::getSitesByInputList(
- $this->_getProject(),
+ $this->getProject(),
$this->getAttribute('site'),
array(
'limit' => $limit,
@@ -90,4 +90,4 @@ public function getBody()
return $Engine->fetch(dirname(__FILE__) . '/SideBox2.html');
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Controls/SideBox3.php b/lib/QUI/Bricks/Controls/SideBox3.php
index 4cd42babdca3ac6f71544366398c3fb73c0232b3..5fd18df4c1c7c28a595f9b415d7002b980da5a9b 100644
--- a/lib/QUI/Bricks/Controls/SideBox3.php
+++ b/lib/QUI/Bricks/Controls/SideBox3.php
@@ -18,7 +18,7 @@ class SideBox3 extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -75,7 +75,7 @@ public function getBody()
}
$children = QUI\Projects\Site\Utils::getSitesByInputList(
- $this->_getProject(),
+ $this->getProject(),
$this->getAttribute('site'),
array(
'limit' => $limit,
@@ -90,4 +90,4 @@ public function getBody()
return $Engine->fetch(dirname(__FILE__) . '/SideBox3.html');
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Controls/SideBox3TitleTop.php b/lib/QUI/Bricks/Controls/SideBox3TitleTop.php
index 02e4ebd199a55ecefabcc673e40102b3f9019d81..1198b3a8ba763462d2f992a9dfcb2a2bb51886c5 100644
--- a/lib/QUI/Bricks/Controls/SideBox3TitleTop.php
+++ b/lib/QUI/Bricks/Controls/SideBox3TitleTop.php
@@ -23,7 +23,7 @@ class SideBox3TitleTop extends QUI\Bricks\Controls\SideBox3
public function getBody()
{
$Engine = QUI::getTemplateManager()->getEngine();
- $limit = $this->getAttribute('limit');
+ $limit = $this->getAttribute('limit');
if (!$limit) {
$limit = 3;
@@ -50,7 +50,7 @@ public function getBody()
}
$children = QUI\Projects\Site\Utils::getSitesByInputList(
- $this->_getProject(),
+ $this->getProject(),
$this->getAttribute('site'),
array(
'limit' => $limit,
@@ -58,12 +58,11 @@ public function getBody()
)
);
-
$Engine->assign(array(
'this' => $this,
'children' => $children
));
- return $Engine->fetch(dirname(__FILE__).'/SideBox3TitleTop.html');
+ return $Engine->fetch(dirname(__FILE__) . '/SideBox3TitleTop.html');
}
}
diff --git a/lib/QUI/Bricks/Controls/SideBox4.php b/lib/QUI/Bricks/Controls/SideBox4.php
index b7e04bd6f48c9432ac0356f668c6307b8f190164..deee65c06964a884b9bb9298a03632995aaa4a07 100644
--- a/lib/QUI/Bricks/Controls/SideBox4.php
+++ b/lib/QUI/Bricks/Controls/SideBox4.php
@@ -18,7 +18,7 @@ class SideBox4 extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -73,7 +73,7 @@ public function getBody()
}
$children = QUI\Projects\Site\Utils::getSitesByInputList(
- $this->_getProject(),
+ $this->getProject(),
$this->getAttribute('site'),
array(
'limit' => $limit,
@@ -88,4 +88,4 @@ public function getBody()
return $Engine->fetch(dirname(__FILE__) . '/SideBox4.html');
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Controls/SimpleGoogleMaps.php b/lib/QUI/Bricks/Controls/SimpleGoogleMaps.php
index 82eab0c631886c00139c412abb19395abf6863a2..01d02565bac0d158454f3dc7ea77fff3fa0fb2db 100644
--- a/lib/QUI/Bricks/Controls/SimpleGoogleMaps.php
+++ b/lib/QUI/Bricks/Controls/SimpleGoogleMaps.php
@@ -18,7 +18,7 @@ class SimpleGoogleMaps extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -56,7 +56,7 @@ public function getBody()
$url = 'https://www.google.com/maps/embed/v1/place?' . $query . "&zoom=" . $zoom . "&";
$Engine->assign(array(
- 'url' => $url
+ 'url' => $url
));
return $Engine->fetch(dirname(__FILE__) . '/SimpleGoogleMaps.html');
diff --git a/lib/QUI/Bricks/Controls/SocialBox.php b/lib/QUI/Bricks/Controls/SocialBox.php
index 8f8654f72cde77630a72ec0f3dc118e04914303b..0f6f2e3f10e0f7283986facd427da8296c4b3517 100644
--- a/lib/QUI/Bricks/Controls/SocialBox.php
+++ b/lib/QUI/Bricks/Controls/SocialBox.php
@@ -18,7 +18,7 @@ class SocialBox extends QUI\Control
/**
* constructor
*
- * @param Array $attributes
+ * @param array $attributes
*/
public function __construct($attributes = array())
{
@@ -28,10 +28,10 @@ public function __construct($attributes = array())
'socialList' => false
));
- parent::setAttributes($attributes);
+ parent::__construct($attributes);
$this->addCSSFile(
- dirname(__FILE__).'/SocialBox.css'
+ dirname(__FILE__) . '/SocialBox.css'
);
}
@@ -42,20 +42,18 @@ public function __construct($attributes = array())
*/
public function getBody()
{
- $Engine = QUI::getTemplateManager()->getEngine();
+ $Engine = QUI::getTemplateManager()->getEngine();
$socialList = $this->getAttribute('socialList');
if ($socialList) {
$socialList = json_decode($socialList, true);
}
-
$Engine->assign(array(
'this' => $this,
'socialList' => $socialList
));
-
- return $Engine->fetch(dirname(__FILE__).'/SocialBox.html');
+ return $Engine->fetch(dirname(__FILE__) . '/SocialBox.html');
}
-}
\ No newline at end of file
+}
diff --git a/lib/QUI/Bricks/Manager.php b/lib/QUI/Bricks/Manager.php
index c81cf6a9c361518411be048987128ca577ab196a..4a3a7b781f3fa95f1eb8d68243b8b03fbe7dbe7b 100644
--- a/lib/QUI/Bricks/Manager.php
+++ b/lib/QUI/Bricks/Manager.php
@@ -84,11 +84,11 @@ public function createBrickForProject(Project $Project, Brick $Brick)
QUI::getDataBase()->insert(
$this->getTable(),
array(
- 'project' => $Project->getName(),
- 'lang' => $Project->getLang(),
- 'title' => $Brick->getAttribute('title'),
+ 'project' => $Project->getName(),
+ 'lang' => $Project->getLang(),
+ 'title' => $Brick->getAttribute('title'),
'description' => $Brick->getAttribute('description'),
- 'type' => $Brick->getAttribute('type')
+ 'type' => $Brick->getAttribute('type')
)
);
@@ -220,19 +220,18 @@ public function getAvailableBricks()
return QUI\Cache\Manager::get($cache);
} catch (QUI\Exception $Exception) {
-
}
$xmlFiles = $this->getBricksXMLFiles();
$result = array();
$result[] = array(
- 'title' => array('quiqqer/bricks', 'brick.content.title'),
+ 'title' => array('quiqqer/bricks', 'brick.content.title'),
'description' => array(
'quiqqer/bricks',
'brick.content.description'
),
- 'control' => 'content'
+ 'control' => 'content'
);
foreach ($xmlFiles as $bricksXML) {
@@ -260,7 +259,7 @@ public function getBrickById($id)
}
$data = QUI::getDataBase()->fetch(array(
- 'from' => $this->getTable(),
+ 'from' => $this->getTable(),
'where' => array(
'id' => (int)$id
),
@@ -296,7 +295,6 @@ public function getAvailableBrickSettingsByBrickType($brickType)
return QUI\Cache\Manager::get($cache);
} catch (QUI\Exception $Exception) {
-
}
@@ -327,22 +325,18 @@ public function getAvailableBrickSettingsByBrickType($brickType)
foreach ($optionElements as $Option) {
$options[] = array(
'value' => $Option->getAttribute('value'),
- 'text' => QUI\Utils\DOM::getTextFromNode(
- $Option, false
- )
+ 'text' => QUI\Utils\DOM::getTextFromNode($Option, false)
);
}
}
$settings[] = array(
- 'name' => $Setting->getAttribute('name'),
- 'text' => QUI\Utils\DOM::getTextFromNode(
- $Setting, false
- ),
- 'type' => $Setting->getAttribute('type'),
- 'class' => $Setting->getAttribute('class'),
+ 'name' => $Setting->getAttribute('name'),
+ 'text' => QUI\Utils\DOM::getTextFromNode($Setting, false),
+ 'type' => $Setting->getAttribute('type'),
+ 'class' => $Setting->getAttribute('class'),
'data-qui' => $Setting->getAttribute('data-qui'),
- 'options' => $options
+ 'options' => $options
);
}
@@ -391,7 +385,6 @@ public function getBricksByArea($brickArea, Site $Site)
$result = array();
foreach ($bricks as $brickData) {
-
$brickId = (int)$brickData['brickId'];
try {
@@ -432,10 +425,10 @@ public function getBricksFromProject(Project $Project)
$result = array();
$list = QUI::getDataBase()->fetch(array(
- 'from' => $this->getTable(),
+ 'from' => $this->getTable(),
'where' => array(
'project' => $Project->getName(),
- 'lang' => $Project->getLang()
+ 'lang' => $Project->getLang()
)
));
@@ -500,9 +493,7 @@ public function saveBrick($brickId, array $brickData)
// fields
if (isset($brickData['attributes'])) {
-
foreach ($brickData['attributes'] as $key => $value) {
-
if ($key == 'areas') {
continue;
}
@@ -542,16 +533,16 @@ public function saveBrick($brickId, array $brickData)
// update
QUI::getDataBase()->update($this->getTable(), array(
- 'title' => $Brick->getAttribute('title'),
- 'description' => $Brick->getAttribute('description'),
- 'content' => $Brick->getAttribute('content'),
- 'type' => $Brick->getAttribute('type'),
- 'settings' => json_encode($Brick->getSettings()),
+ 'title' => $Brick->getAttribute('title'),
+ 'description' => $Brick->getAttribute('description'),
+ 'content' => $Brick->getAttribute('content'),
+ 'type' => $Brick->getAttribute('type'),
+ 'settings' => json_encode($Brick->getSettings()),
'customfields' => json_encode($customfields),
- 'areas' => $areaString,
- 'height' => $Brick->getAttribute('height'),
- 'width' => $Brick->getAttribute('width'),
- 'classes' => $Brick->getAttribute('classes')
+ 'areas' => $areaString,
+ 'height' => $Brick->getAttribute('height'),
+ 'width' => $Brick->getAttribute('width'),
+ 'classes' => $Brick->getAttribute('classes')
), array(
'id' => (int)$brickId
));
@@ -580,7 +571,6 @@ protected function getBricksXMLFiles()
return QUI\Cache\Manager::get($cache);
} catch (QUI\Exception $Exception) {
-
}
$PKM = QUI::getPackageManager();
@@ -664,11 +654,10 @@ protected function getInheritedBricks($brickArea, Site $Site)
);
foreach ($parentIds as $parentId) {
-
$bricks = QUI::getDataBase()->fetch(array(
- 'from' => $projectCacheTable,
+ 'from' => $projectCacheTable,
'where' => array(
- 'id' => $parentId,
+ 'id' => $parentId,
'area' => $brickArea
)
));
diff --git a/lib/QUI/Bricks/Utils.php b/lib/QUI/Bricks/Utils.php
index aff3f3c84362f896654a9e97cdd77c2624d93fc3..9cf0a37c4ece15251b948af4e179ae7dcaa809c9 100644
--- a/lib/QUI/Bricks/Utils.php
+++ b/lib/QUI/Bricks/Utils.php
@@ -26,7 +26,7 @@ class Utils
*
* @return array
*/
- static function getBricksFromXML($file)
+ public static function getBricksFromXML($file)
{
if (!file_exists($file)) {
return array();
@@ -57,7 +57,7 @@ static function getBricksFromXML($file)
*
* @return array
*/
- static function getTemplateAreasFromXML($file, $layoutType = false)
+ public static function getTemplateAreasFromXML($file, $layoutType = false)
{
if (!file_exists($file)) {
return array();
@@ -97,14 +97,16 @@ static function getTemplateAreasFromXML($file, $layoutType = false)
return $list;
}
-
- static function getGlobalTemplateAreasFromXML()
+ public static function getGlobalTemplateAreasFromXML()
{
}
-
- static function getTypeTemplateAreasFromXML($file, $siteType)
+ /**
+ * @param $file
+ * @param $siteType
+ */
+ public static function getTypeTemplateAreasFromXML($file, $siteType)
{
}
@@ -117,7 +119,7 @@ static function getTypeTemplateAreasFromXML($file, $siteType)
*
* @return array
*/
- static function parseAreaToArray(\DOMElement $Brick, \DOMXPath $Path)
+ public static function parseAreaToArray(\DOMElement $Brick, \DOMXPath $Path)
{
$control = $Brick->getAttribute('control');
$name = $Brick->getAttribute('name');
@@ -130,21 +132,21 @@ static function parseAreaToArray(\DOMElement $Brick, \DOMXPath $Path)
if ($titleLocale->length) {
$title = array(
'group' => $titleLocale->item(0)->getAttribute('group'),
- 'var' => $titleLocale->item(0)->getAttribute('var')
+ 'var' => $titleLocale->item(0)->getAttribute('var')
);
}
if ($descLocale->length) {
$description = array(
'group' => $descLocale->item(0)->getAttribute('group'),
- 'var' => $descLocale->item(0)->getAttribute('var')
+ 'var' => $descLocale->item(0)->getAttribute('var')
);
}
return array(
- 'control' => $control,
- 'name' => $name,
- 'title' => $title,
+ 'control' => $control,
+ 'name' => $name,
+ 'title' => $title,
'description' => $description,
'inheritance' => $Brick->getAttribute('inheritance')
);
@@ -157,7 +159,7 @@ static function parseAreaToArray(\DOMElement $Brick, \DOMXPath $Path)
*
* @return bool
*/
- static function hasInheritance(Project $Project, $areaName)
+ public static function hasInheritance(Project $Project, $areaName)
{
$template = $Project->getAttribute('template');