@@ -11,6 +11,9 @@ discard block |
||
11 | 11 | protected $_arguments; |
12 | 12 | protected $_content; |
13 | 13 | |
14 | + /** |
|
15 | + * @param Nip_Tool_Generator_Class $class |
|
16 | + */ |
|
14 | 17 | public function setClass($class) |
15 | 18 | { |
16 | 19 | $this->_class = $class; |
@@ -25,12 +28,18 @@ discard block |
||
25 | 28 | return $this->_class; |
26 | 29 | } |
27 | 30 | |
31 | + /** |
|
32 | + * @param string $comments |
|
33 | + */ |
|
28 | 34 | public function setComments($comments) |
29 | 35 | { |
30 | 36 | $this->_comments = $comments; |
31 | 37 | return $this; |
32 | 38 | } |
33 | 39 | |
40 | + /** |
|
41 | + * @return string |
|
42 | + */ |
|
34 | 43 | public function getComments() |
35 | 44 | { |
36 | 45 | return $this->_comments; |
@@ -75,6 +84,9 @@ discard block |
||
75 | 84 | return $this; |
76 | 85 | } |
77 | 86 | |
87 | + /** |
|
88 | + * @return string |
|
89 | + */ |
|
78 | 90 | public function getContent() |
79 | 91 | { |
80 | 92 | return $this->_content; |
@@ -110,7 +110,7 @@ |
||
110 | 110 | public function generateHeader() |
111 | 111 | { |
112 | 112 | $content = $this->getClass()->getTab() .$this->getScope(). " function {$this->_name} (" . $this->generateArguments() .")". "\n". |
113 | - $this->getClass()->getTab() ."{" . "\n"; |
|
113 | + $this->getClass()->getTab() ."{" . "\n"; |
|
114 | 114 | return $content; |
115 | 115 | } |
116 | 116 |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $lines = explode("\n", $comments); |
100 | 100 | $content[] = $this->getClass()->getTab() . '/**'; |
101 | 101 | foreach ($lines as $line) { |
102 | - $content[] = $this->getClass()->getTab() . ' * '. $line; |
|
102 | + $content[] = $this->getClass()->getTab() . ' * ' . $line; |
|
103 | 103 | } |
104 | 104 | $content[] = $this->getClass()->getTab() . ' */'; |
105 | 105 | return implode("\n", $content) . "\n"; |
@@ -109,14 +109,14 @@ discard block |
||
109 | 109 | |
110 | 110 | public function generateHeader() |
111 | 111 | { |
112 | - $content = $this->getClass()->getTab() .$this->getScope(). " function {$this->_name} (" . $this->generateArguments() .")". "\n". |
|
113 | - $this->getClass()->getTab() ."{" . "\n"; |
|
112 | + $content = $this->getClass()->getTab() . $this->getScope() . " function {$this->_name} (" . $this->generateArguments() . ")" . "\n" . |
|
113 | + $this->getClass()->getTab() . "{" . "\n"; |
|
114 | 114 | return $content; |
115 | 115 | } |
116 | 116 | |
117 | 117 | public function generateScope() |
118 | 118 | { |
119 | - $content = $this->getScope() ? $this->getScope(). ' ' : 'public '; |
|
119 | + $content = $this->getScope() ? $this->getScope() . ' ' : 'public '; |
|
120 | 120 | return $content; |
121 | 121 | } |
122 | 122 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | public function generateFooter() |
148 | 148 | { |
149 | - $content = $this->getClass()->getTab() .'}'. "\n\n"; |
|
149 | + $content = $this->getClass()->getTab() . '}' . "\n\n"; |
|
150 | 150 | return $content; |
151 | 151 | } |
152 | 152 |
@@ -10,6 +10,9 @@ |
||
10 | 10 | protected $_value; |
11 | 11 | |
12 | 12 | |
13 | + /** |
|
14 | + * @param Nip_Tool_Generator_Class $class |
|
15 | + */ |
|
13 | 16 | public function setClass($class) |
14 | 17 | { |
15 | 18 | $this->_class = $class; |
@@ -64,7 +64,7 @@ |
||
64 | 64 | { |
65 | 65 | $this->_content = $this->getClass()->getTab(); |
66 | 66 | $this->_content .= $this->getScope() ? $this->getScope() . ' ' : ''; |
67 | - $this->_content .= '$'. $this->getName(); |
|
67 | + $this->_content .= '$' . $this->getName(); |
|
68 | 68 | $this->_content .= $this->getValue() ? ' = ' . $this->getValue() : ''; |
69 | 69 | $this->_content .= ';' . "\n"; |
70 | 70 |
@@ -9,6 +9,9 @@ |
||
9 | 9 | protected $_parts = null; |
10 | 10 | protected $_seconds = null; |
11 | 11 | |
12 | + /** |
|
13 | + * @return double |
|
14 | + */ |
|
12 | 15 | public function getSeconds() |
13 | 16 | { |
14 | 17 | if ($this->_seconds === null) { |
@@ -46,7 +46,7 @@ |
||
46 | 46 | |
47 | 47 | public function parseParts() |
48 | 48 | { |
49 | - if ($this->_value && substr_count($this->_value, ':') ==2) { |
|
49 | + if ($this->_value && substr_count($this->_value, ':') == 2) { |
|
50 | 50 | list ($h, $m, $s) = explode(':', $this->_value); |
51 | 51 | $this->_parts = array( |
52 | 52 | 'h' => $h, |
@@ -75,6 +75,9 @@ discard block |
||
75 | 75 | $this->_blocks[$name] = $block; |
76 | 76 | } |
77 | 77 | |
78 | + /** |
|
79 | + * @param string $path |
|
80 | + */ |
|
78 | 81 | public function setBasePath($path) |
79 | 82 | { |
80 | 83 | $this->_basePath = $path; |
@@ -128,7 +131,6 @@ discard block |
||
128 | 131 | /** |
129 | 132 | * Assigns variables in bulk in the current scope |
130 | 133 | * |
131 | - * @param array $array |
|
132 | 134 | */ |
133 | 135 | public function assign($input = array()) |
134 | 136 | { |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * @param string $host |
16 | 16 | * @param string $username |
17 | 17 | * @param string $password |
18 | - * @return Nip_ViewEmail |
|
18 | + * @return Nip_View_Email |
|
19 | 19 | */ |
20 | 20 | public function authSMTP($host, $username, $password) |
21 | 21 | { |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Sets flag to show SMTP debugging information |
28 | - * @return Nip_ViewEmail |
|
28 | + * @return Nip_View_Email |
|
29 | 29 | */ |
30 | 30 | public function debugSMTP() |
31 | 31 | { |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | /** |
37 | 37 | * @param string $address |
38 | 38 | * @param string $name |
39 | - * @return Nip_ViewEmail |
|
39 | + * @return Nip_View_Email |
|
40 | 40 | */ |
41 | 41 | public function setFrom($address, $name = false) |
42 | 42 | { |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | /** |
48 | 48 | * @param string $address |
49 | 49 | * @param string $name |
50 | - * @return Nip_ViewEmail |
|
50 | + * @return Nip_View_Email |
|
51 | 51 | */ |
52 | 52 | public function addTo($address, $name = false) |
53 | 53 | { |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | /** |
59 | 59 | * @param string $address |
60 | 60 | * @param string $name |
61 | - * @return Nip_ViewEmail |
|
61 | + * @return Nip_View_Email |
|
62 | 62 | */ |
63 | 63 | public function addBCC($address, $name = '') |
64 | 64 | { |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | /** |
70 | 70 | * @param string $address |
71 | 71 | * @param string $name |
72 | - * @return Nip_ViewEmail |
|
72 | + * @return Nip_View_Email |
|
73 | 73 | */ |
74 | 74 | public function addReplyTo($address, $name = false) |
75 | 75 | { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | /** |
90 | 90 | * @param string $subject |
91 | - * @return Nip_ViewEmail |
|
91 | + * @return Nip_View_Email |
|
92 | 92 | */ |
93 | 93 | public function setSubject($subject) |
94 | 94 | { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * |
102 | 102 | * @param string $path |
103 | 103 | * @param string $name |
104 | - * @return Nip_ViewEmail |
|
104 | + * @return Nip_View_Email |
|
105 | 105 | */ |
106 | 106 | public function addAttachment($path, $name = '') |
107 | 107 | { |
@@ -124,6 +124,9 @@ discard block |
||
124 | 124 | $this->_layout = $layout; |
125 | 125 | } |
126 | 126 | |
127 | + /** |
|
128 | + * @param string|null $body |
|
129 | + */ |
|
127 | 130 | public function setBody($body) |
128 | 131 | { |
129 | 132 | $this->_mail->setBody($body); |
@@ -3,135 +3,135 @@ |
||
3 | 3 | class Nip_View_Email extends Nip_View |
4 | 4 | { |
5 | 5 | |
6 | - protected $_layout = "/layouts/email"; |
|
7 | - |
|
8 | - public function __construct() |
|
9 | - { |
|
10 | - $this->_mail = new Nip_Mailer(); |
|
11 | - $this->setBasePath(MODULES_PATH . Nip_Request::instance()->module . '/views/'); |
|
12 | - } |
|
13 | - |
|
14 | - /** |
|
15 | - * @param string $host |
|
16 | - * @param string $username |
|
17 | - * @param string $password |
|
18 | - * @return Nip_ViewEmail |
|
19 | - */ |
|
20 | - public function authSMTP($host, $username, $password) |
|
21 | - { |
|
22 | - $this->_mail->authSMTP($host, $username, $password); |
|
23 | - return $this; |
|
24 | - } |
|
25 | - |
|
26 | - /** |
|
27 | - * Sets flag to show SMTP debugging information |
|
28 | - * @return Nip_ViewEmail |
|
29 | - */ |
|
30 | - public function debugSMTP() |
|
31 | - { |
|
32 | - $this->_mail->debugSMTP(); |
|
33 | - return $this; |
|
34 | - } |
|
35 | - |
|
36 | - /** |
|
37 | - * @param string $address |
|
38 | - * @param string $name |
|
39 | - * @return Nip_ViewEmail |
|
40 | - */ |
|
41 | - public function setFrom($address, $name = false) |
|
42 | - { |
|
43 | - $this->_mail->setFrom($address, $name = false); |
|
44 | - return $this; |
|
45 | - } |
|
46 | - |
|
47 | - /** |
|
48 | - * @param string $address |
|
49 | - * @param string $name |
|
50 | - * @return Nip_ViewEmail |
|
51 | - */ |
|
52 | - public function addTo($address, $name = false) |
|
53 | - { |
|
54 | - $this->_mail->addTo($address, $name); |
|
55 | - return $this; |
|
56 | - } |
|
57 | - |
|
58 | - /** |
|
59 | - * @param string $address |
|
60 | - * @param string $name |
|
61 | - * @return Nip_ViewEmail |
|
62 | - */ |
|
63 | - public function addBCC($address, $name = '') |
|
64 | - { |
|
65 | - $this->_mail->AddBCC($address, $name); |
|
66 | - return $this; |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * @param string $address |
|
71 | - * @param string $name |
|
72 | - * @return Nip_ViewEmail |
|
73 | - */ |
|
74 | - public function addReplyTo($address, $name = false) |
|
75 | - { |
|
76 | - $this->_mail->AddReplyTo($address, $name); |
|
77 | - return $this; |
|
78 | - } |
|
79 | - |
|
80 | - /** |
|
81 | - * @return Nip_View_Email |
|
82 | - */ |
|
83 | - public function clearAllRecipients() |
|
84 | - { |
|
85 | - $this->_mail->ClearAllRecipients(); |
|
86 | - return $this; |
|
87 | - } |
|
88 | - |
|
89 | - /** |
|
90 | - * @param string $subject |
|
91 | - * @return Nip_ViewEmail |
|
92 | - */ |
|
93 | - public function setSubject($subject) |
|
94 | - { |
|
95 | - $this->_mail->setSubject($subject); |
|
96 | - return $this; |
|
97 | - } |
|
98 | - |
|
99 | - /** |
|
100 | - * Adds attachment |
|
101 | - * |
|
102 | - * @param string $path |
|
103 | - * @param string $name |
|
104 | - * @return Nip_ViewEmail |
|
105 | - */ |
|
106 | - public function addAttachment($path, $name = '') |
|
107 | - { |
|
108 | - $this->_mail->AddAttachment($path, $name); |
|
109 | - return $this; |
|
110 | - } |
|
111 | - |
|
112 | - public function send() |
|
113 | - { |
|
114 | - if (!$this->getBody()) { |
|
115 | - $this->setBody($this->load($this->_layout, array(), true)); |
|
116 | - } |
|
117 | - $this->_mail->setAltBody($this->getBody()); |
|
118 | - |
|
119 | - return $this->_mail->Send(); |
|
120 | - } |
|
121 | - |
|
122 | - public function setLayout($layout) |
|
123 | - { |
|
124 | - $this->_layout = $layout; |
|
125 | - } |
|
126 | - |
|
127 | - public function setBody($body) |
|
128 | - { |
|
129 | - $this->_mail->setBody($body); |
|
130 | - return $this; |
|
131 | - } |
|
132 | - |
|
133 | - public function getBody() |
|
134 | - { |
|
135 | - return $this->_mail->getBody(); |
|
136 | - } |
|
6 | + protected $_layout = "/layouts/email"; |
|
7 | + |
|
8 | + public function __construct() |
|
9 | + { |
|
10 | + $this->_mail = new Nip_Mailer(); |
|
11 | + $this->setBasePath(MODULES_PATH . Nip_Request::instance()->module . '/views/'); |
|
12 | + } |
|
13 | + |
|
14 | + /** |
|
15 | + * @param string $host |
|
16 | + * @param string $username |
|
17 | + * @param string $password |
|
18 | + * @return Nip_ViewEmail |
|
19 | + */ |
|
20 | + public function authSMTP($host, $username, $password) |
|
21 | + { |
|
22 | + $this->_mail->authSMTP($host, $username, $password); |
|
23 | + return $this; |
|
24 | + } |
|
25 | + |
|
26 | + /** |
|
27 | + * Sets flag to show SMTP debugging information |
|
28 | + * @return Nip_ViewEmail |
|
29 | + */ |
|
30 | + public function debugSMTP() |
|
31 | + { |
|
32 | + $this->_mail->debugSMTP(); |
|
33 | + return $this; |
|
34 | + } |
|
35 | + |
|
36 | + /** |
|
37 | + * @param string $address |
|
38 | + * @param string $name |
|
39 | + * @return Nip_ViewEmail |
|
40 | + */ |
|
41 | + public function setFrom($address, $name = false) |
|
42 | + { |
|
43 | + $this->_mail->setFrom($address, $name = false); |
|
44 | + return $this; |
|
45 | + } |
|
46 | + |
|
47 | + /** |
|
48 | + * @param string $address |
|
49 | + * @param string $name |
|
50 | + * @return Nip_ViewEmail |
|
51 | + */ |
|
52 | + public function addTo($address, $name = false) |
|
53 | + { |
|
54 | + $this->_mail->addTo($address, $name); |
|
55 | + return $this; |
|
56 | + } |
|
57 | + |
|
58 | + /** |
|
59 | + * @param string $address |
|
60 | + * @param string $name |
|
61 | + * @return Nip_ViewEmail |
|
62 | + */ |
|
63 | + public function addBCC($address, $name = '') |
|
64 | + { |
|
65 | + $this->_mail->AddBCC($address, $name); |
|
66 | + return $this; |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * @param string $address |
|
71 | + * @param string $name |
|
72 | + * @return Nip_ViewEmail |
|
73 | + */ |
|
74 | + public function addReplyTo($address, $name = false) |
|
75 | + { |
|
76 | + $this->_mail->AddReplyTo($address, $name); |
|
77 | + return $this; |
|
78 | + } |
|
79 | + |
|
80 | + /** |
|
81 | + * @return Nip_View_Email |
|
82 | + */ |
|
83 | + public function clearAllRecipients() |
|
84 | + { |
|
85 | + $this->_mail->ClearAllRecipients(); |
|
86 | + return $this; |
|
87 | + } |
|
88 | + |
|
89 | + /** |
|
90 | + * @param string $subject |
|
91 | + * @return Nip_ViewEmail |
|
92 | + */ |
|
93 | + public function setSubject($subject) |
|
94 | + { |
|
95 | + $this->_mail->setSubject($subject); |
|
96 | + return $this; |
|
97 | + } |
|
98 | + |
|
99 | + /** |
|
100 | + * Adds attachment |
|
101 | + * |
|
102 | + * @param string $path |
|
103 | + * @param string $name |
|
104 | + * @return Nip_ViewEmail |
|
105 | + */ |
|
106 | + public function addAttachment($path, $name = '') |
|
107 | + { |
|
108 | + $this->_mail->AddAttachment($path, $name); |
|
109 | + return $this; |
|
110 | + } |
|
111 | + |
|
112 | + public function send() |
|
113 | + { |
|
114 | + if (!$this->getBody()) { |
|
115 | + $this->setBody($this->load($this->_layout, array(), true)); |
|
116 | + } |
|
117 | + $this->_mail->setAltBody($this->getBody()); |
|
118 | + |
|
119 | + return $this->_mail->Send(); |
|
120 | + } |
|
121 | + |
|
122 | + public function setLayout($layout) |
|
123 | + { |
|
124 | + $this->_layout = $layout; |
|
125 | + } |
|
126 | + |
|
127 | + public function setBody($body) |
|
128 | + { |
|
129 | + $this->_mail->setBody($body); |
|
130 | + return $this; |
|
131 | + } |
|
132 | + |
|
133 | + public function getBody() |
|
134 | + { |
|
135 | + return $this->_mail->getBody(); |
|
136 | + } |
|
137 | 137 | } |
138 | 138 | \ No newline at end of file |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | } elseif (null === $baseUrl) { |
227 | 227 | return $requestUri; |
228 | 228 | } |
229 | - return (string)$pathInfo; |
|
229 | + return (string) $pathInfo; |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
@@ -377,8 +377,7 @@ discard block |
||
377 | 377 | // PHP also converts "+" to spaces when filling the global _GET or when using the function parse_str. This is why we use urldecode and then normalize to |
378 | 378 | // RFC 3986 with rawurlencode. |
379 | 379 | $parts[] = isset($keyValuePair[1]) ? |
380 | - rawurlencode(urldecode($keyValuePair[0])) . '=' . rawurlencode(urldecode($keyValuePair[1])) : |
|
381 | - rawurlencode(urldecode($keyValuePair[0])); |
|
380 | + rawurlencode(urldecode($keyValuePair[0])) . '=' . rawurlencode(urldecode($keyValuePair[1])) : rawurlencode(urldecode($keyValuePair[0])); |
|
382 | 381 | $order[] = urldecode($keyValuePair[0]); |
383 | 382 | } |
384 | 383 | array_multisort($order, SORT_ASC, $parts); |
@@ -3,47 +3,47 @@ |
||
3 | 3 | class Nip_Config |
4 | 4 | { |
5 | 5 | |
6 | - protected $_data; |
|
6 | + protected $_data; |
|
7 | 7 | |
8 | - public function parse($filename) |
|
9 | - { |
|
10 | - $config = parse_ini_file($filename, true); |
|
11 | - foreach ($config as $key => $value) { |
|
12 | - if (is_array($value)) { |
|
13 | - if (!isset($this->_data[$key])) { |
|
14 | - $this->_data[$key] = new stdClass; |
|
15 | - } |
|
16 | - foreach ($value as $subKey => $subValue) { |
|
17 | - $this->_data[$key]->$subKey = $subValue; |
|
18 | - } |
|
19 | - } else { |
|
20 | - $this->_data[$key] = $value; |
|
21 | - } |
|
22 | - } |
|
23 | - return $this; |
|
24 | - } |
|
8 | + public function parse($filename) |
|
9 | + { |
|
10 | + $config = parse_ini_file($filename, true); |
|
11 | + foreach ($config as $key => $value) { |
|
12 | + if (is_array($value)) { |
|
13 | + if (!isset($this->_data[$key])) { |
|
14 | + $this->_data[$key] = new stdClass; |
|
15 | + } |
|
16 | + foreach ($value as $subKey => $subValue) { |
|
17 | + $this->_data[$key]->$subKey = $subValue; |
|
18 | + } |
|
19 | + } else { |
|
20 | + $this->_data[$key] = $value; |
|
21 | + } |
|
22 | + } |
|
23 | + return $this; |
|
24 | + } |
|
25 | 25 | |
26 | - public function __get($name) |
|
27 | - { |
|
28 | - return $this->_data[$name]; |
|
29 | - } |
|
26 | + public function __get($name) |
|
27 | + { |
|
28 | + return $this->_data[$name]; |
|
29 | + } |
|
30 | 30 | |
31 | - public function __isset($name) |
|
32 | - { |
|
33 | - return isset($this->_data[$name]); |
|
34 | - } |
|
31 | + public function __isset($name) |
|
32 | + { |
|
33 | + return isset($this->_data[$name]); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * Singleton |
|
38 | - * |
|
39 | - * @return Nip_Config |
|
40 | - */ |
|
41 | - static public function instance() |
|
42 | - { |
|
43 | - static $instance; |
|
44 | - if (!($instance instanceof self)) { |
|
45 | - $instance = new self(); |
|
46 | - } |
|
47 | - return $instance; |
|
48 | - } |
|
36 | + /** |
|
37 | + * Singleton |
|
38 | + * |
|
39 | + * @return Nip_Config |
|
40 | + */ |
|
41 | + static public function instance() |
|
42 | + { |
|
43 | + static $instance; |
|
44 | + if (!($instance instanceof self)) { |
|
45 | + $instance = new self(); |
|
46 | + } |
|
47 | + return $instance; |
|
48 | + } |
|
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -3,35 +3,35 @@ |
||
3 | 3 | class ACL_Permission extends Record |
4 | 4 | { |
5 | 5 | |
6 | - protected $_resource; |
|
7 | - protected $_role; |
|
6 | + protected $_resource; |
|
7 | + protected $_role; |
|
8 | 8 | |
9 | - public function setResource(ACL_Resource $resource) |
|
10 | - { |
|
11 | - $this->_resource = $resource; |
|
12 | - $this->id_acl_resource = ACL::instance()->getResourcePathString($resource); |
|
13 | - } |
|
9 | + public function setResource(ACL_Resource $resource) |
|
10 | + { |
|
11 | + $this->_resource = $resource; |
|
12 | + $this->id_acl_resource = ACL::instance()->getResourcePathString($resource); |
|
13 | + } |
|
14 | 14 | |
15 | - public function getResource() |
|
16 | - { |
|
17 | - if (!$this->_resource) { |
|
18 | - $this->_resource = ACL::instance()->getResource($this->id_acl_resource); |
|
19 | - } |
|
20 | - return $this->_resource; |
|
21 | - } |
|
15 | + public function getResource() |
|
16 | + { |
|
17 | + if (!$this->_resource) { |
|
18 | + $this->_resource = ACL::instance()->getResource($this->id_acl_resource); |
|
19 | + } |
|
20 | + return $this->_resource; |
|
21 | + } |
|
22 | 22 | |
23 | - public function setRole(ACL_Role $role) |
|
24 | - { |
|
25 | - $this->_role = $role; |
|
26 | - $this->id_acl_role = ACL::instance()->getRoleID($role); |
|
27 | - } |
|
23 | + public function setRole(ACL_Role $role) |
|
24 | + { |
|
25 | + $this->_role = $role; |
|
26 | + $this->id_acl_role = ACL::instance()->getRoleID($role); |
|
27 | + } |
|
28 | 28 | |
29 | - public function getRole() |
|
30 | - { |
|
31 | - if (!$this->_role) { |
|
32 | - $this->_role = ACL::instance()->getRole($this->id_acl_role); |
|
33 | - } |
|
34 | - return $this->_role; |
|
35 | - } |
|
29 | + public function getRole() |
|
30 | + { |
|
31 | + if (!$this->_role) { |
|
32 | + $this->_role = ACL::instance()->getRole($this->id_acl_role); |
|
33 | + } |
|
34 | + return $this->_role; |
|
35 | + } |
|
36 | 36 | |
37 | 37 | } |
38 | 38 | \ No newline at end of file |
@@ -3,18 +3,18 @@ |
||
3 | 3 | class ACL_Permissions extends Records |
4 | 4 | { |
5 | 5 | |
6 | - /** |
|
7 | - * Singleton |
|
8 | - * |
|
9 | - * @return ACL_Permissions |
|
10 | - */ |
|
11 | - public static function instance() |
|
12 | - { |
|
13 | - static $instance; |
|
14 | - if (!($instance instanceof self)) { |
|
15 | - $instance = new self(); |
|
16 | - } |
|
17 | - return $instance; |
|
18 | - } |
|
6 | + /** |
|
7 | + * Singleton |
|
8 | + * |
|
9 | + * @return ACL_Permissions |
|
10 | + */ |
|
11 | + public static function instance() |
|
12 | + { |
|
13 | + static $instance; |
|
14 | + if (!($instance instanceof self)) { |
|
15 | + $instance = new self(); |
|
16 | + } |
|
17 | + return $instance; |
|
18 | + } |
|
19 | 19 | |
20 | 20 | } |
21 | 21 | \ No newline at end of file |