@@ -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( |
@@ -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 |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * redirect to acl section |
| 25 | 25 | * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
| 26 | 26 | */ |
| 27 | - public function indexAction() |
|
| 27 | + public function indexAction() |
|
| 28 | 28 | { |
| 29 | 29 | return $this->redirect()->toRoute('admin/acledit', array()); |
| 30 | 30 | } |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | class ZfcuserController extends UserController |
| 48 | 48 | { |
| 49 | - use ControllerTranslatorTrait; |
|
| 50 | - use ControllerActiontitlesTrait; |
|
| 51 | - use ControllerToolbarTrait; |
|
| 49 | + use ControllerTranslatorTrait; |
|
| 50 | + use ControllerActiontitlesTrait; |
|
| 51 | + use ControllerToolbarTrait; |
|
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | // ...redirect to the login redirect route |
| 211 | 211 | return $this->redirect()->toRoute('zfcuser/login'); //$this->getOptions()->getLoginRedirectRoute()); |
| 212 | 212 | } |
| 213 | - $oIdentity = $this->zfcUserAuthentication()->getIdentity(); |
|
| 213 | + $oIdentity = $this->zfcUserAuthentication()->getIdentity(); |
|
| 214 | 214 | $oProfile = new \Admin\Model\UserProfile(); |
| 215 | 215 | $oProfile->load($oIdentity->getId()); |
| 216 | 216 | |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | $sm = $this->getServiceLocator(); |
| 767 | 767 | $this->userTable = $sm->get('Admin\Model\UserTable'); |
| 768 | 768 | if (!$this->userTable instanceof \Admin\Model\UserTable) { |
| 769 | - throw new \Exception("invalid user table object: ".gettype($this->userTable)); |
|
| 769 | + throw new \Exception("invalid user table object: ".gettype($this->userTable)); |
|
| 770 | 770 | } |
| 771 | 771 | } |
| 772 | 772 | return $this->userTable; |
@@ -784,7 +784,7 @@ discard block |
||
| 784 | 784 | $sm = $this->getServiceLocator(); |
| 785 | 785 | $this->aclroleTable = $sm->get('Admin\Model\AclroleTable'); |
| 786 | 786 | if (!$this->aclroleTable instanceof \Admin\Model\AclroleTable) { |
| 787 | - throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable)); |
|
| 787 | + throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable)); |
|
| 788 | 788 | } |
| 789 | 789 | } |
| 790 | 790 | return $this->aclroleTable; |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | */ |
| 799 | 799 | public function getOptions() |
| 800 | 800 | { |
| 801 | - return \Application\Module::getService('zfcuser_module_options'); |
|
| 801 | + return \Application\Module::getService('zfcuser_module_options'); |
|
| 802 | 802 | } |
| 803 | 803 | |
| 804 | 804 | } |
@@ -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 |
@@ -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 | /** |
@@ -82,11 +82,11 @@ |
||
| 82 | 82 | array( |
| 83 | 83 | 'name' => 'facebook', |
| 84 | 84 | 'attributes' => array( |
| 85 | - 'type' => 'url', |
|
| 86 | - ), |
|
| 87 | - 'options' => array( |
|
| 88 | - 'label' => 'Facebook', |
|
| 89 | - ), |
|
| 85 | + 'type' => 'url', |
|
| 86 | + ), |
|
| 87 | + 'options' => array( |
|
| 88 | + 'label' => 'Facebook', |
|
| 89 | + ), |
|
| 90 | 90 | ) |
| 91 | 91 | ); |
| 92 | 92 | $this->add( |
@@ -76,10 +76,10 @@ |
||
| 76 | 76 | array( |
| 77 | 77 | 'name' => 'reset', |
| 78 | 78 | 'attributes' => array( |
| 79 | - 'type' => 'reset', |
|
| 80 | - 'value' => 'reset', |
|
| 81 | - 'id' => 'resetbutton', |
|
| 82 | - ), |
|
| 79 | + 'type' => 'reset', |
|
| 80 | + 'value' => 'reset', |
|
| 81 | + 'id' => 'resetbutton', |
|
| 82 | + ), |
|
| 83 | 83 | 'options' => array( |
| 84 | 84 | 'label' => 'reset', |
| 85 | 85 | ), |
@@ -215,7 +215,7 @@ |
||
| 215 | 215 | public function getClient() |
| 216 | 216 | { |
| 217 | 217 | /** |
| 218 | - * @var \Admin\Model\ClientsTable $clients |
|
| 218 | + * @var \Admin\Model\ClientsTable $clients |
|
| 219 | 219 | */ |
| 220 | 220 | if ($this->client_id) { |
| 221 | 221 | $clients = \Application\Module::getService('AdminClientsTable'); |