@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | public function useModule($module_name, $ignore_user_access = false) |
79 | 79 | { |
80 | 80 | if (!self::isValidModuleName($module_name)) { |
81 | - throw new Exception($module_name . ' is not a valid module name'); |
|
81 | + throw new Exception($module_name.' is not a valid module name'); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | if (!empty($this->modules[$module_name]) and is_object($this->modules[$module_name])) { |
@@ -116,11 +116,11 @@ discard block |
||
116 | 116 | } |
117 | 117 | |
118 | 118 | if ($access !== true) { |
119 | - throw new Exception('You need access to a required module to see this page, maybe it is ' . $module_name); |
|
119 | + throw new Exception('You need access to a required module to see this page, maybe it is '.$module_name); |
|
120 | 120 | } |
121 | 121 | |
122 | - $main_class_name = "Main" . ucfirst($module_name); |
|
123 | - $main_class_path = PATH_INCLUDE_MODULE . $module_name . "/" . $main_class_name . ".php"; |
|
122 | + $main_class_name = "Main".ucfirst($module_name); |
|
123 | + $main_class_path = PATH_INCLUDE_MODULE.$module_name."/".$main_class_name.".php"; |
|
124 | 124 | |
125 | 125 | if (file_exists($main_class_path)) { |
126 | 126 | require_once($main_class_path); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | return $object; |
131 | 131 | } else { |
132 | 132 | // @TODO this should not fail as hard - but what should happen then? |
133 | - throw new Exception('ModuleHandler: ' . $main_class_path . ' does not exist'); |
|
133 | + throw new Exception('ModuleHandler: '.$main_class_path.' does not exist'); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | public function useShared($shared_name) |
145 | 145 | { |
146 | 146 | if (!self::isValidModuleName($shared_name)) { |
147 | - throw new Exception($shared_name. ' is not a valid shared module name'); |
|
147 | + throw new Exception($shared_name.' is not a valid shared module name'); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | // Tjekker om shared allerede er loaded |
@@ -152,8 +152,8 @@ discard block |
||
152 | 152 | return $this->shared[$shared_name]; |
153 | 153 | } |
154 | 154 | |
155 | - $main_shared_name = 'Shared' . ucfirst($shared_name); |
|
156 | - $main_shared_path = PATH_INCLUDE_SHARED . $shared_name . '/' . $main_shared_name . '.php'; |
|
155 | + $main_shared_name = 'Shared'.ucfirst($shared_name); |
|
156 | + $main_shared_path = PATH_INCLUDE_SHARED.$shared_name.'/'.$main_shared_name.'.php'; |
|
157 | 157 | |
158 | 158 | if (file_exists($main_shared_path)) { |
159 | 159 | require_once $main_shared_path; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $this->shared[$shared_name] = $object; |
163 | 163 | return $object; |
164 | 164 | } else { |
165 | - throw new Exception($shared_name . ' cannot be found on ' . $main_shared_path . ' with PATH_INCLUDE_SHARED: ' . PATH_INCLUDE_SHARED); |
|
165 | + throw new Exception($shared_name.' cannot be found on '.$main_shared_path.' with PATH_INCLUDE_SHARED: '.PATH_INCLUDE_SHARED); |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | if (is_object($this->modules[$name])) { |
179 | 179 | return($this->modules[$name]); |
180 | 180 | } else { |
181 | - throw new Exception('getModule() module ' . $name . ' not loaded'); |
|
181 | + throw new Exception('getModule() module '.$name.' not loaded'); |
|
182 | 182 | } |
183 | 183 | } |
184 | 184 |
@@ -10,32 +10,32 @@ discard block |
||
10 | 10 | * @version @package-version@ |
11 | 11 | */ |
12 | 12 | // required files |
13 | -require_once dirname(__FILE__) . '/../../vendor/autoload.php'; |
|
13 | +require_once dirname(__FILE__).'/../../vendor/autoload.php'; |
|
14 | 14 | require_once 'Intraface/functions.php'; |
15 | 15 | |
16 | 16 | // paths |
17 | 17 | if (!defined('PATH_INCLUDE_IHTML')) { |
18 | - define('PATH_INCLUDE_IHTML', PATH_ROOT.'Intraface/ihtml' . DIRECTORY_SEPARATOR); |
|
18 | + define('PATH_INCLUDE_IHTML', PATH_ROOT.'Intraface/ihtml'.DIRECTORY_SEPARATOR); |
|
19 | 19 | } |
20 | 20 | if (!defined('PATH_INCLUDE_MODULE')) { |
21 | - define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules' . DIRECTORY_SEPARATOR); |
|
21 | + define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules'.DIRECTORY_SEPARATOR); |
|
22 | 22 | } |
23 | 23 | if (!defined('PATH_INCLUDE_SHARED')) { |
24 | - define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared' . DIRECTORY_SEPARATOR); |
|
24 | + define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared'.DIRECTORY_SEPARATOR); |
|
25 | 25 | } |
26 | 26 | if (!defined('PATH_INCLUDE_CONFIG')) { |
27 | 27 | define('PATH_INCLUDE_CONFIG', PATH_ROOT.'/Intraface/config'.DIRECTORY_SEPARATOR); |
28 | 28 | } |
29 | 29 | if (!defined('PATH_UPLOAD')) { |
30 | - define('PATH_UPLOAD', PATH_ROOT . 'upload/'); // Directory for upload of files. |
|
30 | + define('PATH_UPLOAD', PATH_ROOT.'upload/'); // Directory for upload of files. |
|
31 | 31 | }if (!defined('PATH_UPLOAD_TEMPORARY')) { |
32 | 32 | define('PATH_UPLOAD_TEMPORARY', 'tempdir/'); // Mappen i Upload_path, under intranetid, hvor temp-filer placeres. |
33 | 33 | }if (!defined('PATH_CAPTCHA')) { |
34 | - define('PATH_CAPTCHA', PATH_ROOT . 'captcha/'); // remember trailing slash - used for the demo formular |
|
34 | + define('PATH_CAPTCHA', PATH_ROOT.'captcha/'); // remember trailing slash - used for the demo formular |
|
35 | 35 | }if (!defined('PATH_CACHE')) { |
36 | - define('PATH_CACHE', PATH_ROOT . 'cache/'); // remember trailing slash - path to cache |
|
36 | + define('PATH_CACHE', PATH_ROOT.'cache/'); // remember trailing slash - path to cache |
|
37 | 37 | }if (!defined('PATH_INCLUDE_BACKUP')) { |
38 | - define('PATH_INCLUDE_BACKUP', PATH_ROOT . 'backup/'); |
|
38 | + define('PATH_INCLUDE_BACKUP', PATH_ROOT.'backup/'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | // paths on www |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | define('PATH_WWW_MODULE', PATH_WWW.'modules/'); |
45 | 45 | define('PATH_WWW_SHARED', PATH_WWW.'shared/'); |
46 | 46 | // filehandler |
47 | - define('FILE_VIEWER', PATH_WWW . 'file'); |
|
47 | + define('FILE_VIEWER', PATH_WWW.'file'); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | // wiring |
@@ -109,7 +109,7 @@ |
||
109 | 109 | */ |
110 | 110 | function hasModuleAccess($module) |
111 | 111 | { |
112 | - $filename = PATH_INCLUDE_MODULE . $module . '/Main' . ucfirst($module) . '.php'; |
|
112 | + $filename = PATH_INCLUDE_MODULE.$module.'/Main'.ucfirst($module).'.php'; |
|
113 | 113 | if (file_exists($filename)) { |
114 | 114 | require_once $filename; |
115 | 115 | $module_class = 'Main'.ucfirst($module); |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<h1><?php e(t('Add keywords to') . ' ' . $object->get('name')); ?></h1> |
|
1 | +<h1><?php e(t('Add keywords to').' '.$object->get('name')); ?></h1> |
|
2 | 2 | |
3 | 3 | <?php echo $keyword->error->view(); ?> |
4 | 4 | |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | } ?> |
17 | 17 | /> |
18 | 18 | <label for="k<?php e($k["id"]); ?>"> |
19 | - <a href="<?php e(url('../' . $k['id'])); ?>"><?php e($k['keyword']); ?> (#<?php e($k["id"]); ?>)</a></label> |
|
20 | - - <a href="<?php e(url('../'. $k["id"], array('delete'))); ?>" class="confirm"><?php e(t('delete')); ?></a><br /> |
|
19 | + <a href="<?php e(url('../'.$k['id'])); ?>"><?php e($k['keyword']); ?> (#<?php e($k["id"]); ?>)</a></label> |
|
20 | + - <a href="<?php e(url('../'.$k["id"], array('delete'))); ?>" class="confirm"><?php e(t('delete')); ?></a><br /> |
|
21 | 21 | <?php } |
22 | 22 | ?> |
23 | 23 | </fieldset> |
@@ -64,12 +64,12 @@ |
||
64 | 64 | $result = $this->db->createTable($this->table_name, $this->table_definition); |
65 | 65 | |
66 | 66 | if (PEAR::isError($result)) { |
67 | - throw new Exception('create ' . $result->getMessage()); |
|
67 | + throw new Exception('create '.$result->getMessage()); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | $result = $this->db->createConstraint($this->table_name, 'PRIMARY', $this->definition); |
71 | 71 | if (PEAR::isError($result)) { |
72 | - throw new Exception('primary ' . $result->getMessage()); |
|
72 | + throw new Exception('primary '.$result->getMessage()); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 |
@@ -32,9 +32,9 @@ |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | if ($object = $adapter->auth()) { |
35 | - $this->notifyObservers('login', $identification . ' logged in'); |
|
35 | + $this->notifyObservers('login', $identification.' logged in'); |
|
36 | 36 | } else { |
37 | - $this->notifyObservers('login', $identification . ' could not login'); |
|
37 | + $this->notifyObservers('login', $identification.' could not login'); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | return $object; |
@@ -19,7 +19,7 @@ |
||
19 | 19 | <tr> |
20 | 20 | <td rowspan="5" style="width: 280px;"> |
21 | 21 | <?php if ($this_filemanager->get('is_picture')) : ?> |
22 | - <?php $this_filemanager->createInstance('small');?> |
|
22 | + <?php $this_filemanager->createInstance('small'); ?> |
|
23 | 23 | <img src="<?php e($this_filemanager->instance->get('file_uri')); ?>" alt="" /> |
24 | 24 | <?php else : ?> |
25 | 25 | <img src="<?php e($this_filemanager->get('icon_uri')); ?>" alt="" /> |
@@ -149,7 +149,7 @@ |
||
149 | 149 | if (is_array($keywords) and count($keywords) > 0) { |
150 | 150 | echo '<ul>'; |
151 | 151 | foreach ($keywords as $k) { |
152 | - echo '<li>' . e($k['keyword']) . '</li>'; |
|
152 | + echo '<li>'.e($k['keyword']).'</li>'; |
|
153 | 153 | } |
154 | 154 | echo '</ul>'; |
155 | 155 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | |
61 | 61 | <?php |
62 | 62 | if (count($keywords) > 0) { |
63 | - echo '<div>'. e(t('keywords', 'keyword')) . ': <ul style="display: inline;">'; |
|
63 | + echo '<div>'.e(t('keywords', 'keyword')).': <ul style="display: inline;">'; |
|
64 | 64 | foreach ($keywords as $value) { |
65 | 65 | if (in_array($value['id'], $selected_keywords) === true) { |
66 | 66 | $checked = 'checked="checked"'; |