@@ -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 | } |
@@ -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", |
@@ -23,21 +23,21 @@ discard block |
||
23 | 23 | |
24 | 24 | /** |
25 | 25 | * user's confirmation/activation token |
26 | - * |
|
26 | + * |
|
27 | 27 | * @var string |
28 | 28 | */ |
29 | 29 | protected $token; |
30 | 30 | |
31 | 31 | /** |
32 | 32 | * user's ACL role |
33 | - * |
|
33 | + * |
|
34 | 34 | * @var string |
35 | 35 | */ |
36 | 36 | protected $aclrole; |
37 | 37 | |
38 | 38 | /** |
39 | 39 | * user's ID |
40 | - * |
|
40 | + * |
|
41 | 41 | * @var int |
42 | 42 | */ |
43 | 43 | protected $user_id; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | /** |
120 | 120 | * set user's object property data |
121 | - * |
|
121 | + * |
|
122 | 122 | * @param array $data |
123 | 123 | * @param boolean $forceEncryptPassword |
124 | 124 | * @return \Admin\Entity\User |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | /** |
158 | 158 | * get copy of user's object properties in an assosiative array |
159 | - * |
|
159 | + * |
|
160 | 160 | * @return array |
161 | 161 | */ |
162 | 162 | public function __getArrayCopy() |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | /** |
179 | 179 | * get copy of user's object properties in an assosiative array |
180 | - * |
|
180 | + * |
|
181 | 181 | * @return array |
182 | 182 | * / |
183 | 183 | public function getArrayCopy() |
@@ -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( |
@@ -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 | } |