@@ -72,23 +72,23 @@ |
||
| 72 | 72 | return $collection; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * retrieve UI framework id/name |
|
| 77 | - * @return string the $framework |
|
| 78 | - */ |
|
| 79 | - public function getFramework() { |
|
| 80 | - return $this->framework; |
|
| 81 | - } |
|
| 75 | + /** |
|
| 76 | + * retrieve UI framework id/name |
|
| 77 | + * @return string the $framework |
|
| 78 | + */ |
|
| 79 | + public function getFramework() { |
|
| 80 | + return $this->framework; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * set UI framework id/name |
|
| 85 | - * @param string $framework |
|
| 86 | - * @return \UIComponents\View\Helper\Utilities\Framework |
|
| 87 | - */ |
|
| 88 | - public function setFramework($framework) { |
|
| 89 | - $this->framework = $framework; |
|
| 90 | - return $this; |
|
| 91 | - } |
|
| 83 | + /** |
|
| 84 | + * set UI framework id/name |
|
| 85 | + * @param string $framework |
|
| 86 | + * @return \UIComponents\View\Helper\Utilities\Framework |
|
| 87 | + */ |
|
| 88 | + public function setFramework($framework) { |
|
| 89 | + $this->framework = $framework; |
|
| 90 | + return $this; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | |
@@ -38,10 +38,10 @@ discard block |
||
| 38 | 38 | * @param string $framework [optional] framework classnames collection to relate to |
| 39 | 39 | * @return \Zend\Config\Config |
| 40 | 40 | */ |
| 41 | - public function __invoke( $framework = null ) |
|
| 41 | + public function __invoke($framework = null) |
|
| 42 | 42 | { |
| 43 | 43 | if ($framework !== null) { |
| 44 | - $classname = $this->NS . "\\" . $framework; |
|
| 44 | + $classname = $this->NS."\\".$framework; |
|
| 45 | 45 | if (!class_exists($classname)) { |
| 46 | 46 | throw new \Zend\View\Exception\InvalidArgumentException(sprintf( |
| 47 | 47 | $this->translate("Invalid framework collection '%s' specified"), |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function getCollection() |
| 63 | 63 | { |
| 64 | - $classname = $this->NS . "\\" . $this->framework; |
|
| 64 | + $classname = $this->NS."\\".$this->framework; |
|
| 65 | 65 | if (!class_exists($classname)) { |
| 66 | 66 | throw new \Zend\View\Exception\InvalidArgumentException(sprintf( |
| 67 | 67 | $this->translate("Invalid framework collection '%s' specified"), |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | abstract class ClassnameCollectionAbstract { |
| 23 | 23 | |
| 24 | - /** @var string $framework framework names, these classnames are related to */ |
|
| 25 | - public $framework = "Bootstrap"; |
|
| 24 | + /** @var string $framework framework names, these classnames are related to */ |
|
| 25 | + public $framework = "Bootstrap"; |
|
| 26 | 26 | |
| 27 | - /** @var string $version framework version, these classnames are related to */ |
|
| 28 | - public $version = "3.3.0"; |
|
| 27 | + /** @var string $version framework version, these classnames are related to */ |
|
| 28 | + public $version = "3.3.0"; |
|
| 29 | 29 | |
| 30 | - /** @var array $size generic sizes */ |
|
| 31 | - public $size = array( |
|
| 30 | + /** @var array $size generic sizes */ |
|
| 31 | + public $size = array( |
|
| 32 | 32 | "xs" => "xs", |
| 33 | 33 | "s" => "s", |
| 34 | 34 | "m" => "m", |
@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | "xl" => "xl", |
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | - /** @var array $column generic column classname */ |
|
| 39 | + /** @var array $column generic column classname */ |
|
| 40 | 40 | public $column = "columns"; |
| 41 | - /** @var array $columnsize column sizes classnames*/ |
|
| 41 | + /** @var array $columnsize column sizes classnames*/ |
|
| 42 | 42 | public $columnsize = array( |
| 43 | 43 | "xs" => "col-xs-", |
| 44 | 44 | "s" => "col-s-", |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | "xl" => "col-xl-", |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | - /** @var array $status status related classnames */ |
|
| 50 | + /** @var array $status status related classnames */ |
|
| 51 | 51 | public $status = array( |
| 52 | 52 | "default" => "default", |
| 53 | 53 | "info" => "info", |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | "error" => "error", |
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | - /** @var array $panel panel related classnames */ |
|
| 60 | + /** @var array $panel panel related classnames */ |
|
| 61 | 61 | public $panel = array( |
| 62 | 62 | "prefix" => "panel-", |
| 63 | 63 | "wrapper" => "panel", |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | "footer" => "panel-footer", |
| 67 | 67 | ); |
| 68 | 68 | |
| 69 | - /** @var array $control control related classnames */ |
|
| 69 | + /** @var array $control control related classnames */ |
|
| 70 | 70 | public $control = array( |
| 71 | 71 | "button" => array( |
| 72 | 72 | "prefix" => "btn-", |
@@ -77,18 +77,18 @@ discard block |
||
| 77 | 77 | ), |
| 78 | 78 | ); |
| 79 | 79 | |
| 80 | - /** @var array $form form generation related classnames */ |
|
| 80 | + /** @var array $form form generation related classnames */ |
|
| 81 | 81 | public $form = array( |
| 82 | 82 | "formgroup" => array( |
| 83 | 83 | "wrapper" => "form-group", |
| 84 | 84 | ), |
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | - /** @var array $table table related classnames */ |
|
| 87 | + /** @var array $table table related classnames */ |
|
| 88 | 88 | public $table = array( |
| 89 | 89 | ); |
| 90 | 90 | |
| 91 | - /** @var array $widget widgets' classnames */ |
|
| 91 | + /** @var array $widget widgets' classnames */ |
|
| 92 | 92 | public $widget = array( |
| 93 | 93 | "navigation" => array( |
| 94 | 94 | "wrapper" => "navbar navbar-inverse", |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | ), |
| 114 | 114 | ); |
| 115 | 115 | |
| 116 | - /** |
|
| 117 | - * create classname collection object |
|
| 118 | - * @see \Zend\Config\Config |
|
| 119 | - */ |
|
| 120 | - public function __contruct() { |
|
| 121 | - return new \Zend\Config\Config( get_object_vars($this) ); |
|
| 122 | - } |
|
| 116 | + /** |
|
| 117 | + * create classname collection object |
|
| 118 | + * @see \Zend\Config\Config |
|
| 119 | + */ |
|
| 120 | + public function __contruct() { |
|
| 121 | + return new \Zend\Config\Config( get_object_vars($this) ); |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | 124 | } |
@@ -118,7 +118,7 @@ |
||
| 118 | 118 | * @see \Zend\Config\Config |
| 119 | 119 | */ |
| 120 | 120 | public function __contruct() { |
| 121 | - return new \Zend\Config\Config( get_object_vars($this) ); |
|
| 121 | + return new \Zend\Config\Config(get_object_vars($this)); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | } |
@@ -21,13 +21,13 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | class Bootstrap3 extends ClassnameCollectionAbstract { |
| 23 | 23 | |
| 24 | - /** @var string $framework framework names, these classnames are related to */ |
|
| 25 | - public $framework = "Bootstrap"; |
|
| 24 | + /** @var string $framework framework names, these classnames are related to */ |
|
| 25 | + public $framework = "Bootstrap"; |
|
| 26 | 26 | |
| 27 | - /** @var string $version framework version, these classnames are related to */ |
|
| 28 | - public $version = "3.3.0"; |
|
| 27 | + /** @var string $version framework version, these classnames are related to */ |
|
| 28 | + public $version = "3.3.0"; |
|
| 29 | 29 | |
| 30 | - /** @var array $size generic sizes */ |
|
| 30 | + /** @var array $size generic sizes */ |
|
| 31 | 31 | public $size = array( |
| 32 | 32 | "xs" => "xs", |
| 33 | 33 | "s" => "s", |
@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | "xl" => "xl", |
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | - /** @var array $column generic column classname */ |
|
| 39 | + /** @var array $column generic column classname */ |
|
| 40 | 40 | public $column = "columns"; |
| 41 | - /** @var array $columnsize column sizes classnames*/ |
|
| 41 | + /** @var array $columnsize column sizes classnames*/ |
|
| 42 | 42 | public $columnsize = array( |
| 43 | 43 | "xs" => "col-xs-", |
| 44 | 44 | "s" => "col-s-", |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | "xl" => "col-xl-", |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | - /** @var array $status status related classnames */ |
|
| 50 | + /** @var array $status status related classnames */ |
|
| 51 | 51 | public $status = array( |
| 52 | 52 | "default" => "default", |
| 53 | 53 | "info" => "info", |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | "error" => "error", |
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | - /** @var array $panel panel related classnames */ |
|
| 60 | + /** @var array $panel panel related classnames */ |
|
| 61 | 61 | public $panel = array( |
| 62 | 62 | "prefix" => "panel-", |
| 63 | 63 | "wrapper" => "panel", |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | "footer" => "panel-footer", |
| 67 | 67 | ); |
| 68 | 68 | |
| 69 | - /** @var array $control control related classnames */ |
|
| 69 | + /** @var array $control control related classnames */ |
|
| 70 | 70 | public $control = array( |
| 71 | 71 | "button" => array( |
| 72 | 72 | "prefix" => "btn-", |
@@ -77,18 +77,18 @@ discard block |
||
| 77 | 77 | ), |
| 78 | 78 | ); |
| 79 | 79 | |
| 80 | - /** @var array $form form generation related classnames */ |
|
| 80 | + /** @var array $form form generation related classnames */ |
|
| 81 | 81 | public $form = array( |
| 82 | 82 | "formgroup" => array( |
| 83 | 83 | "wrapper" => "form-group", |
| 84 | 84 | ), |
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | - /** @var array $table table related classnames */ |
|
| 87 | + /** @var array $table table related classnames */ |
|
| 88 | 88 | public $table = array( |
| 89 | 89 | ); |
| 90 | 90 | |
| 91 | - /** @var array $widget widgets' classnames */ |
|
| 91 | + /** @var array $widget widgets' classnames */ |
|
| 92 | 92 | public $widget = array( |
| 93 | 93 | "navigation" => array( |
| 94 | 94 | "wrapper" => "navbar navbar-inverse", |
@@ -21,13 +21,13 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | class Foundation6 extends ClassnameCollectionAbstract { |
| 23 | 23 | |
| 24 | - /** @var string $framework framework names, these classnames are related to */ |
|
| 25 | - public $framework = "Foundation"; |
|
| 24 | + /** @var string $framework framework names, these classnames are related to */ |
|
| 25 | + public $framework = "Foundation"; |
|
| 26 | 26 | |
| 27 | - /** @var string $version framework version, these classnames are related to */ |
|
| 28 | - public $version = "6.1.2"; |
|
| 27 | + /** @var string $version framework version, these classnames are related to */ |
|
| 28 | + public $version = "6.1.2"; |
|
| 29 | 29 | |
| 30 | - /** @var array $size generic sizes */ |
|
| 30 | + /** @var array $size generic sizes */ |
|
| 31 | 31 | public $size = array( |
| 32 | 32 | "xs" => "tiny", |
| 33 | 33 | "s" => "small", |
@@ -36,9 +36,9 @@ discard block |
||
| 36 | 36 | "xl" => "xlarge", |
| 37 | 37 | ); |
| 38 | 38 | |
| 39 | - /** @var array $column generic column classname */ |
|
| 39 | + /** @var array $column generic column classname */ |
|
| 40 | 40 | public $column = "columns"; |
| 41 | - /** @var array $columnsize column sizes classnames*/ |
|
| 41 | + /** @var array $columnsize column sizes classnames*/ |
|
| 42 | 42 | public $columnsize = array( |
| 43 | 43 | "xs" => "tiny-", |
| 44 | 44 | "s" => "small-", |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | "xl" => "xlargel-", |
| 48 | 48 | ); |
| 49 | 49 | |
| 50 | - /** @var array $status status related classnames */ |
|
| 50 | + /** @var array $status status related classnames */ |
|
| 51 | 51 | public $status = array( |
| 52 | 52 | "default" => "", |
| 53 | 53 | "info" => "info", |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | "error" => "alert", |
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | - /** @var array $panel panel related classnames */ |
|
| 60 | + /** @var array $panel panel related classnames */ |
|
| 61 | 61 | public $panel = array( |
| 62 | 62 | "prefix" => "panel-", |
| 63 | 63 | "wrapper" => "panel", |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | "footer" => "panel-footer", |
| 67 | 67 | ); |
| 68 | 68 | |
| 69 | - /** @var array $control control related classnames */ |
|
| 69 | + /** @var array $control control related classnames */ |
|
| 70 | 70 | public $control = array( |
| 71 | 71 | "button" => array( |
| 72 | 72 | "prefix" => "button-", |
@@ -77,18 +77,18 @@ discard block |
||
| 77 | 77 | ), |
| 78 | 78 | ); |
| 79 | 79 | |
| 80 | - /** @var array $form form generation related classnames */ |
|
| 80 | + /** @var array $form form generation related classnames */ |
|
| 81 | 81 | public $form = array( |
| 82 | 82 | "formgroup" => array( |
| 83 | 83 | "wrapper" => "form-group", |
| 84 | 84 | ), |
| 85 | 85 | ); |
| 86 | 86 | |
| 87 | - /** @var array $table table related classnames */ |
|
| 87 | + /** @var array $table table related classnames */ |
|
| 88 | 88 | public $table = array( |
| 89 | 89 | ); |
| 90 | 90 | |
| 91 | - /** @var array $widget widgets' classnames */ |
|
| 91 | + /** @var array $widget widgets' classnames */ |
|
| 92 | 92 | public $widget = array( |
| 93 | 93 | "navigation" => array( |
| 94 | 94 | "wrapper" => "top-bar", |
@@ -144,6 +144,5 @@ |
||
| 144 | 144 | return $this->router->assemble(array(), array('name' => 'zfcuser')); |
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | - |
|
| 148 | - */ |
|
| 147 | + */ |
|
| 149 | 148 | } |
@@ -32,20 +32,20 @@ discard block |
||
| 32 | 32 | class AclController extends BaseActionController |
| 33 | 33 | { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @var array|\Admin\Model\AclTable |
|
| 37 | - */ |
|
| 38 | - protected $AclTable; |
|
| 35 | + /** |
|
| 36 | + * @var array|\Admin\Model\AclTable |
|
| 37 | + */ |
|
| 38 | + protected $AclTable; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @var array|\Admin\Model\AclroleTable |
|
| 42 | - */ |
|
| 43 | - protected $AclroleTable; |
|
| 40 | + /** |
|
| 41 | + * @var array|\Admin\Model\AclroleTable |
|
| 42 | + */ |
|
| 43 | + protected $AclroleTable; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var array|\Admin\Model\AclresourceTable |
|
| 47 | - */ |
|
| 48 | - protected $AclresourceTable; |
|
| 45 | + /** |
|
| 46 | + * @var array|\Admin\Model\AclresourceTable |
|
| 47 | + */ |
|
| 48 | + protected $AclresourceTable; |
|
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | 51 | * initialize titles and toolbar items |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | 'action' => 'roles', |
| 97 | 97 | 'resource' => 'mvc:user', |
| 98 | 98 | ), |
| 99 | - ), |
|
| 100 | - "roles" => array( |
|
| 99 | + ), |
|
| 100 | + "roles" => array( |
|
| 101 | 101 | array( |
| 102 | 102 | 'label' => 'add role', |
| 103 | 103 | 'icon' => 'plus', |
@@ -127,8 +127,8 @@ discard block |
||
| 127 | 127 | 'action' => 'resources', |
| 128 | 128 | 'resource' => 'mvc:user', |
| 129 | 129 | ), |
| 130 | - ), |
|
| 131 | - "resources" => array( |
|
| 130 | + ), |
|
| 131 | + "resources" => array( |
|
| 132 | 132 | array( |
| 133 | 133 | 'label' => 'add resource', |
| 134 | 134 | 'icon' => 'plus', |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | 'action' => 'roles', |
| 159 | 159 | 'resource' => 'mvc:user', |
| 160 | 160 | ), |
| 161 | - ), |
|
| 161 | + ), |
|
| 162 | 162 | ) |
| 163 | 163 | ); |
| 164 | 164 | $this->setActionTitles( |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function acldataAction() |
| 214 | 214 | { |
| 215 | - if ( $this->isXHR() ) { |
|
| 215 | + if ($this->isXHR()) { |
|
| 216 | 216 | $roles = $this->getAclroleTable()->fetchAll()->toArray(); |
| 217 | 217 | $resources = $this->getAclresourceTable()->fetchAll()->toArray(); |
| 218 | 218 | $acls = array(); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | ); |
| 236 | 236 | $oController = $this; |
| 237 | 237 | $datatablesData['data'] = array_map( |
| 238 | - function ($row) use ($oController) { |
|
| 238 | + function($row) use ($oController) { |
|
| 239 | 239 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 240 | 240 | (empty($row["acl_id"]) ? |
| 241 | 241 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
@@ -269,11 +269,11 @@ discard block |
||
| 269 | 269 | public function rolesAction() |
| 270 | 270 | { |
| 271 | 271 | |
| 272 | - if ( $this->isXHR() ) { |
|
| 272 | + if ($this->isXHR()) { |
|
| 273 | 273 | $datatablesData = array('data' => $this->getAclroleTable()->fetchAll()->toArray()); |
| 274 | 274 | $oController = $this; |
| 275 | 275 | $datatablesData['data'] = array_map( |
| 276 | - function ($row) use ($oController) { |
|
| 276 | + function($row) use ($oController) { |
|
| 277 | 277 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 278 | 278 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 279 | 279 | 'admin/acledit', |
@@ -305,11 +305,11 @@ discard block |
||
| 305 | 305 | */ |
| 306 | 306 | public function resourcesAction() |
| 307 | 307 | { |
| 308 | - if ( $this->isXHR() ) { |
|
| 308 | + if ($this->isXHR()) { |
|
| 309 | 309 | $datatablesData = array('data' => $this->getAclresourceTable()->fetchAll()->toArray()); |
| 310 | 310 | $oController = $this; |
| 311 | 311 | $datatablesData['data'] = array_map( |
| 312 | - function ($row) use ($oController) { |
|
| 312 | + function($row) use ($oController) { |
|
| 313 | 313 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 314 | 314 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 315 | 315 | 'admin/acledit', |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | |
| 388 | 388 | // Redirect to list of Acl |
| 389 | 389 | $this->flashMessenger()->addSuccessMessage($this->translate("permission has been saved")); |
| 390 | - if ( $this->isXHR() ) { |
|
| 390 | + if ($this->isXHR()) { |
|
| 391 | 391 | $tmplVars["showForm"] = false; |
| 392 | 392 | } else { |
| 393 | 393 | return $this->redirect()->toRoute('admin/acledit', array()); |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | |
| 467 | 467 | // Redirect to list of Acl |
| 468 | 468 | $this->flashMessenger()->addSuccessMessage($this->translate("permission has been saved")); |
| 469 | - if ( $this->isXHR() ) { |
|
| 469 | + if ($this->isXHR()) { |
|
| 470 | 470 | $tmplVars["showForm"] = false; |
| 471 | 471 | } else { |
| 472 | 472 | return $this->redirect()->toRoute('admin/acledit', array()); |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | // Redirect to list of albums |
| 524 | - if ( $this->isXHR() ) { |
|
| 524 | + if ($this->isXHR()) { |
|
| 525 | 525 | $tmplVars["showForm"] = false; |
| 526 | 526 | } else { |
| 527 | 527 | return $this->redirect()->toRoute('admin/acledit', array()); |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | |
| 562 | 562 | // Redirect to list of Acl |
| 563 | 563 | $this->flashMessenger()->addSuccessMessage($this->translate("role has been saved")); |
| 564 | - if ( $this->isXHR() ) { |
|
| 564 | + if ($this->isXHR()) { |
|
| 565 | 565 | $tmplVars["showForm"] = false; |
| 566 | 566 | } else { |
| 567 | 567 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
| 601 | 601 | } |
| 602 | 602 | |
| 603 | - $form = new AclroleForm(); |
|
| 603 | + $form = new AclroleForm(); |
|
| 604 | 604 | $form->bind($Aclrole); |
| 605 | 605 | |
| 606 | 606 | $request = $this->getRequest(); |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | // Redirect to list of Acl |
| 617 | 617 | $this->flashMessenger()->addSuccessMessage($this->translate("role has been saved")); |
| 618 | - if ( $this->isXHR() ) { |
|
| 618 | + if ($this->isXHR()) { |
|
| 619 | 619 | $tmplVars["showForm"] = false; |
| 620 | 620 | } else { |
| 621 | 621 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | // Redirect to list of albums |
| 674 | - if ( $this->isXHR() ) { |
|
| 674 | + if ($this->isXHR()) { |
|
| 675 | 675 | $tmplVars["showForm"] = false; |
| 676 | 676 | } else { |
| 677 | 677 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | |
| 714 | 714 | // Redirect to list of Acl |
| 715 | 715 | $this->flashMessenger()->addSuccessMessage($this->translate("resource has been saved")); |
| 716 | - if ( $this->isXHR() ) { |
|
| 716 | + if ($this->isXHR()) { |
|
| 717 | 717 | $tmplVars["showForm"] = false; |
| 718 | 718 | } else { |
| 719 | 719 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
| 753 | 753 | } |
| 754 | 754 | |
| 755 | - $form = new AclresourceForm(); |
|
| 755 | + $form = new AclresourceForm(); |
|
| 756 | 756 | $form->bind($Aclresource); |
| 757 | 757 | |
| 758 | 758 | $request = $this->getRequest(); |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | |
| 768 | 768 | // Redirect to list of Acl |
| 769 | 769 | $this->flashMessenger()->addSuccessMessage($this->translate("resource has been saved")); |
| 770 | - if ( $this->isXHR() ) { |
|
| 770 | + if ($this->isXHR()) { |
|
| 771 | 771 | $tmplVars["showForm"] = false; |
| 772 | 772 | } else { |
| 773 | 773 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | // Redirect to list of albums |
| 827 | - if ( $this->isXHR() ) { |
|
| 827 | + if ($this->isXHR()) { |
|
| 828 | 828 | $tmplVars["showForm"] = false; |
| 829 | 829 | } else { |
| 830 | 830 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
@@ -839,8 +839,8 @@ discard block |
||
| 839 | 839 | * re-initialize, respectively clear ACL cache entries |
| 840 | 840 | * @return self |
| 841 | 841 | */ |
| 842 | - private function reinitACLCache () { |
|
| 843 | - if ( \Application\Module::getService('CacheService') ) { |
|
| 842 | + private function reinitACLCache() { |
|
| 843 | + if (\Application\Module::getService('CacheService')) { |
|
| 844 | 844 | \Application\Module::getService('CacheService')->removeItem('ACL'); |
| 845 | 845 | \Admin\Module::initACL($this->getServiceLocator()); |
| 846 | 846 | } |
@@ -23,15 +23,15 @@ |
||
| 23 | 23 | class ApplicationsController extends BaseActionController |
| 24 | 24 | { |
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * @var array|\Admin\Model\ClientsTable |
|
| 28 | - */ |
|
| 29 | - protected $clientsTable; |
|
| 26 | + /** |
|
| 27 | + * @var array|\Admin\Model\ClientsTable |
|
| 28 | + */ |
|
| 29 | + protected $clientsTable; |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * @var array|\Admin\Model\ApplicationsTable |
|
| 33 | - */ |
|
| 34 | - protected $applicationsTable; |
|
| 31 | + /** |
|
| 32 | + * @var array|\Admin\Model\ApplicationsTable |
|
| 33 | + */ |
|
| 34 | + protected $applicationsTable; |
|
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * initialize titles and toolbar items |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | $dataObj = array(); |
| 84 | 84 | foreach ($aApplicationslist as $row) { |
| 85 | 85 | $data[] = $row; |
| 86 | - $dataObj[] = (object)$row; |
|
| 86 | + $dataObj[] = (object) $row; |
|
| 87 | 87 | } |
| 88 | - if ( $this->isXHR() ) { |
|
| 88 | + if ($this->isXHR()) { |
|
| 89 | 89 | $datatablesData = array('data' => $data); |
| 90 | 90 | $datatablesData['data'] = array_map( |
| 91 | - function ($row) use ($oController) { |
|
| 91 | + function($row) use ($oController) { |
|
| 92 | 92 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 93 | 93 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 94 | 94 | 'admin/applicationsedit', |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $applications->exchangeArray($form->getData()); |
| 144 | 144 | $this->getApplicationsTable()->saveApplication($applications); |
| 145 | 145 | $this->flashMessenger()->addSuccessMessage($this->translate('application has been saved')); |
| 146 | - if ( $this->isXHR() ) { |
|
| 146 | + if ($this->isXHR()) { |
|
| 147 | 147 | $tmplVars["showForm"] = false; |
| 148 | 148 | } else { |
| 149 | 149 | return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index')); |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | return $this->redirect()->toRoute('admin/applicationsedit'); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - $form = new ApplicationsForm(); |
|
| 186 | + $form = new ApplicationsForm(); |
|
| 187 | 187 | $form->bind($applications); |
| 188 | 188 | |
| 189 | 189 | $clients = $this->getClientsTable()->fetchAll()->toArray(); |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | if ($form->isValid()) { |
| 202 | 202 | $this->getApplicationsTable()->saveApplication($applications); |
| 203 | 203 | $this->flashMessenger()->addSuccessMessage($this->translate("application has been saved")); |
| 204 | - if ( $this->isXHR() ) { |
|
| 204 | + if ($this->isXHR()) { |
|
| 205 | 205 | $tmplVars["showForm"] = false; |
| 206 | 206 | } else { |
| 207 | 207 | return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index')); |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $id = (int) $request->getPost('id'); |
| 250 | 250 | $this->getApplicationsTable()->deleteApplication($id); |
| 251 | 251 | $this->flashMessenger()->addSuccessMessage($this->translate("application has been deleted")); |
| 252 | - if ( $this->isXHR() ) { |
|
| 252 | + if ($this->isXHR()) { |
|
| 253 | 253 | $tmplVars["showForm"] = false; |
| 254 | 254 | } else { |
| 255 | 255 | return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index')); |
@@ -23,10 +23,10 @@ |
||
| 23 | 23 | class ClientsController extends BaseActionController |
| 24 | 24 | { |
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * @var array|\Admin\Model\ClientsTable |
|
| 28 | - */ |
|
| 29 | - protected $clientsTable; |
|
| 26 | + /** |
|
| 27 | + * @var array|\Admin\Model\ClientsTable |
|
| 28 | + */ |
|
| 29 | + protected $clientsTable; |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * initialize titles and toolbar items |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $tmplVars = $this->getTemplateVars(); |
| 71 | 71 | $aClientslist = $this->getClientsTable()->fetchAll(); |
| 72 | - if ( $this->isXHR() ) { |
|
| 72 | + if ($this->isXHR()) { |
|
| 73 | 73 | $datatablesData = array('data' => $aClientslist->toArray()); |
| 74 | 74 | $oController = $this; |
| 75 | 75 | $datatablesData['data'] = array_map( |
| 76 | - function ($row) use ($oController) { |
|
| 76 | + function($row) use ($oController) { |
|
| 77 | 77 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 78 | 78 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 79 | 79 | 'admin/clientsedit', |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $clients->exchangeArray($form->getData()); |
| 122 | 122 | $this->getClientsTable()->saveClients($clients); |
| 123 | 123 | $this->flashMessenger()->addSuccessMessage($this->translate('client has been saved')); |
| 124 | - if ( $this->isXHR() ) { |
|
| 124 | + if ($this->isXHR()) { |
|
| 125 | 125 | $tmplVars["showForm"] = false; |
| 126 | 126 | } else { |
| 127 | 127 | return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index')); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | return $this->redirect()->toRoute('admin/clientsedit'); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $form = new ClientsForm(); |
|
| 164 | + $form = new ClientsForm(); |
|
| 165 | 165 | $form->bind($clients); |
| 166 | 166 | |
| 167 | 167 | $request = $this->getRequest(); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($form->isValid()) { |
| 173 | 173 | $this->getClientsTable()->saveClients($clients); |
| 174 | 174 | $this->flashMessenger()->addSuccessMessage($this->translate("client has been saved")); |
| 175 | - if ( $this->isXHR() ) { |
|
| 175 | + if ($this->isXHR()) { |
|
| 176 | 176 | $tmplVars["showForm"] = false; |
| 177 | 177 | } else { |
| 178 | 178 | return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index')); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $id = (int) $request->getPost('id'); |
| 222 | 222 | $this->getClientsTable()->deleteClients($id); |
| 223 | 223 | $this->flashMessenger()->addSuccessMessage($this->translate("client has been deleted")); |
| 224 | - if ( $this->isXHR() ) { |
|
| 224 | + if ($this->isXHR()) { |
|
| 225 | 225 | $tmplVars["showForm"] = false; |
| 226 | 226 | } else { |
| 227 | 227 | return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index')); |
@@ -23,9 +23,9 @@ |
||
| 23 | 23 | class SettingsController extends BaseActionController |
| 24 | 24 | { |
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * @var array|\Admin\Model\SettingsTable |
|
| 28 | - */ |
|
| 26 | + /** |
|
| 27 | + * @var array|\Admin\Model\SettingsTable |
|
| 28 | + */ |
|
| 29 | 29 | protected $settingsTable; |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $tmplVars = $this->getTemplateVars(); |
| 71 | 71 | $aSettingslist = $this->getSettingsTable()->fetchAll(); |
| 72 | - if ( $this->isXHR() ) { |
|
| 72 | + if ($this->isXHR()) { |
|
| 73 | 73 | $datatablesData = array('data' => $aSettingslist->toArray()); |
| 74 | 74 | $oController = $this; |
| 75 | 75 | $datatablesData['data'] = array_map( |
| 76 | - function ($row) use ($oController) { |
|
| 76 | + function($row) use ($oController) { |
|
| 77 | 77 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 78 | 78 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 79 | 79 | 'admin/settingsedit', |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $settings->exchangeArray($form->getData()); |
| 122 | 122 | $this->getSettingsTable()->saveSettings($settings); |
| 123 | 123 | $this->flashMessenger()->addSuccessMessage($this->translate('setting has been saved')); |
| 124 | - if ( $this->isXHR() ) { |
|
| 124 | + if ($this->isXHR()) { |
|
| 125 | 125 | $tmplVars["showForm"] = false; |
| 126 | 126 | } else { |
| 127 | 127 | return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index')); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | return $this->redirect()->toRoute('admin/settingsedit'); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $form = new SettingsForm(); |
|
| 164 | + $form = new SettingsForm(); |
|
| 165 | 165 | $form->bind($settings); |
| 166 | 166 | |
| 167 | 167 | $request = $this->getRequest(); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($form->isValid()) { |
| 173 | 173 | $this->getSettingsTable()->saveSettings($settings); |
| 174 | 174 | $this->flashMessenger()->addSuccessMessage($this->translate("setting has been saved")); |
| 175 | - if ( $this->isXHR() ) { |
|
| 175 | + if ($this->isXHR()) { |
|
| 176 | 176 | $tmplVars["showForm"] = false; |
| 177 | 177 | } else { |
| 178 | 178 | return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index')); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $id = (int) $request->getPost('id'); |
| 222 | 222 | $this->getSettingsTable()->deleteSettings($id); |
| 223 | 223 | $this->flashMessenger()->addSuccessMessage($this->translate("setting has been deleted")); |
| 224 | - if ( $this->isXHR() ) { |
|
| 224 | + if ($this->isXHR()) { |
|
| 225 | 225 | $tmplVars["showForm"] = false; |
| 226 | 226 | } else { |
| 227 | 227 | return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index')); |