@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | $HTTP_RAW_POST_DATA = file_get_contents('php://input'); |
14 | 14 | $options = array('prefix' => 'cms.', |
15 | - 'encoding' => 'iso-8859-1'); |
|
15 | + 'encoding' => 'iso-8859-1'); |
|
16 | 16 | |
17 | 17 | XML_RPC2_Backend::setBackend('php'); |
18 | 18 | $server = XML_RPC2_Server::create(new Intraface_XMLRPC_CMS_Server(), $options); |
@@ -13,10 +13,10 @@ |
||
13 | 13 | throw new Exception('This file cannot be accessed directly'); |
14 | 14 | } |
15 | 15 | |
16 | -$config_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.local.php'; |
|
16 | +$config_file = dirname(__FILE__).DIRECTORY_SEPARATOR.'config.local.php'; |
|
17 | 17 | |
18 | 18 | if (!file_exists($config_file)) { |
19 | - $config_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'config.local.default.php'; |
|
19 | + $config_file = dirname(__FILE__).DIRECTORY_SEPARATOR.'config.local.default.php'; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | require_once $config_file; |
@@ -24,7 +24,7 @@ |
||
24 | 24 | readfile('forms.css'); |
25 | 25 | |
26 | 26 | $theme = intval($_GET['theme']); |
27 | - readfile('skins/' . $themes[$theme]['label'] . '/typo.css'); |
|
27 | + readfile('skins/'.$themes[$theme]['label'].'/typo.css'); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | exit; |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once dirname(__FILE__) . '/../common.php'; |
|
2 | +require_once dirname(__FILE__).'/../common.php'; |
|
3 | 3 | |
4 | -$install_class = realpath(dirname(__FILE__) . '/../../../install/') . '/Install.php'; |
|
4 | +$install_class = realpath(dirname(__FILE__).'/../../../install/').'/Install.php'; |
|
5 | 5 | |
6 | 6 | if (!file_exists($install_class)) { |
7 | 7 | throw new Exception('The install class is not present. Probably because you should not run it now!'); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | - delete_cache_files_from_demo(dirname(__FILE__) . '/../demo/'); |
|
36 | + delete_cache_files_from_demo(dirname(__FILE__).'/../demo/'); |
|
37 | 37 | |
38 | 38 | if (!empty($_GET['login'])) { |
39 | 39 | echo 'staging server reset. Go to <a href="../core/testlogin">login</a>.'; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | if (is_dir($f)) { |
54 | 54 | foreach (scandir($f) as $item) { |
55 | 55 | if (strpos($item, 'cache_') !== false) { |
56 | - unlink($f . $item); |
|
56 | + unlink($f.$item); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | } |
@@ -8,7 +8,7 @@ |
||
8 | 8 | <style type="text/css"> |
9 | 9 | <?php foreach ($context->document()->styles() as $style) : ?> |
10 | 10 | @import "<?php e($style); ?>"; |
11 | - <?php endforeach;?> |
|
11 | + <?php endforeach; ?> |
|
12 | 12 | </style> |
13 | 13 | </head> |
14 | 14 |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | |
21 | 21 | function renderHtml() |
22 | 22 | { |
23 | - return get_class($this) . ' intentionally left blank'; |
|
23 | + return get_class($this).' intentionally left blank'; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function getPathToTemplate($template) |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | "private_key" => $this->context->getPrivateKey(), |
35 | 35 | "session_id" => md5($this->session()->sessionId())); |
36 | 36 | $debug = true; |
37 | - $client = new IntrafacePublic_CMS_Client_XMLRPC($credentials, $this->name(), $debug, INTRAFACE_XMLPRC_SERVER_PATH . "cms/server0300.php"); |
|
37 | + $client = new IntrafacePublic_CMS_Client_XMLRPC($credentials, $this->name(), $debug, INTRAFACE_XMLPRC_SERVER_PATH."cms/server0300.php"); |
|
38 | 38 | return new IntrafacePublic_CMS($client, $this->cache); |
39 | 39 | } |
40 | 40 | } |
@@ -227,20 +227,20 @@ |
||
227 | 227 | { |
228 | 228 | return array( |
229 | 229 | 1 => array( |
230 | - 'label' => 'system', |
|
231 | - 'dir' => '/system/', |
|
230 | + 'label' => 'system', |
|
231 | + 'dir' => '/system/', |
|
232 | 232 | 'name' => 'Web 2.0', |
233 | 233 | 'description' => 'Spr�lsk, vildt og pastel.' |
234 | 234 | ), |
235 | 235 | 2 => array( |
236 | - 'label' => 'newsystem', |
|
237 | - 'dir' => '/newsystem/', |
|
236 | + 'label' => 'newsystem', |
|
237 | + 'dir' => '/newsystem/', |
|
238 | 238 | 'name' => 'Standard', |
239 | 239 | 'description' => 'Standard.' |
240 | 240 | ), |
241 | 241 | 3 => array( |
242 | - 'label' => 'black', |
|
243 | - 'dir' => '/black/', |
|
242 | + 'label' => 'black', |
|
243 | + 'dir' => '/black/', |
|
244 | 244 | 'name' => 'Den sorte ridder', |
245 | 245 | 'description' => 'Det gamle tema. Nydeligt og kedeligt.' |
246 | 246 | ) |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | foreach ($res->fetchAll() as $row) { |
96 | 96 | if ($this->kernel->user->hasModuleAccess($row['name'])) { |
97 | 97 | $this->menu[$i]['name'] = $this->t($row['name'], $row['name']); |
98 | - $this->menu[$i]['url'] = url('/core/restricted/module/' . $row["name"]); |
|
98 | + $this->menu[$i]['url'] = url('/core/restricted/module/'.$row["name"]); |
|
99 | 99 | $i++; |
100 | 100 | } |
101 | 101 | } |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | |
135 | 135 | if ($access) { |
136 | 136 | $this->submenu[$j]['name'] = $this->t($all_submenu[$i]['label'], $this->primary_module->getName()); |
137 | - $this->submenu[$j]['url'] = $this->primary_module->getPath(). $all_submenu[$i]['url']; |
|
137 | + $this->submenu[$j]['url'] = $this->primary_module->getPath().$all_submenu[$i]['url']; |
|
138 | 138 | $j++; |
139 | 139 | } |
140 | 140 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $javascript = ''; |
145 | 145 | if (!empty($this->javascript_path) and count($this->javascript_path) > 0) { |
146 | 146 | for ($i = 0, $max = count($this->javascript_path); $i < $max; $i++) { |
147 | - $javascript .= '<script type="text/javascript" src="'.$this->javascript_path[$i].'"></script>' . "\n"; |
|
147 | + $javascript .= '<script type="text/javascript" src="'.$this->javascript_path[$i].'"></script>'."\n"; |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | /* |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | throw new Exception('Der er mere end 1 aktiv adresse', FATAL); |
123 | 123 | } elseif ($this->db->nextRecord()) { |
124 | 124 | $this->value['address_id'] = $this->db->f('id'); |
125 | - for ($i = 0, $max = count($this->fields); $i<$max; $i++) { |
|
125 | + for ($i = 0, $max = count($this->fields); $i < $max; $i++) { |
|
126 | 126 | $this->value[$this->fields[$i]] = $this->db->f($this->fields[$i]); |
127 | 127 | } |
128 | 128 | return $this->db->f('id'); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $db->query("SELECT * FROM address WHERE id = ".$this->address_id); |
150 | 150 | if ($db->nextRecord()) { |
151 | 151 | $do_update = 0; |
152 | - for ($i = 0, $max = count($this->fields), $sql=''; $i<$max; $i++) { |
|
152 | + for ($i = 0, $max = count($this->fields), $sql = ''; $i < $max; $i++) { |
|
153 | 153 | if (array_key_exists($this->fields[$i], $array_var) and isset($array_var[$this->fields[$i]])) { |
154 | 154 | $sql .= $this->fields[$i]." = '".$array_var[$this->fields[$i]]."', "; |
155 | 155 | if ($db->f($this->fields[$i]) != $array_var[$this->fields[$i]]) { |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | } else { |
163 | 163 | // Kun hvis der rent faktisk gemmes nogle v�rdier opdaterer vi |
164 | 164 | $do_update = 0; |
165 | - for ($i = 0, $max = count($this->fields), $sql = ''; $i<$max; $i++) { |
|
165 | + for ($i = 0, $max = count($this->fields), $sql = ''; $i < $max; $i++) { |
|
166 | 166 | if (array_key_exists($this->fields[$i], $array_var) and isset($array_var[$this->fields[$i]])) { |
167 | 167 | $sql .= $this->fields[$i]." = '".$array_var[$this->fields[$i]]."', "; |
168 | 168 | $do_update = 1; |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | } elseif ($this->id == 0) { |
206 | 206 | throw new Exception("Id kan ikke v�re 0 n�r du fors�ger at gemme adresse", FATAL); |
207 | 207 | } else { |
208 | - for ($i = 0, $max = count($this->fields), $sql = ''; $i<$max; $i++) { |
|
208 | + for ($i = 0, $max = count($this->fields), $sql = ''; $i < $max; $i++) { |
|
209 | 209 | if (isset($array_var[$this->fields[$i]])) { |
210 | 210 | $sql .= $this->fields[$i]." = \"".$array_var[$this->fields[$i]]."\", "; |
211 | 211 | } else { |
@@ -196,7 +196,7 @@ |
||
196 | 196 | function intrafaceBackendErrorhandler($errno, $errstr, $errfile, $errline, $errcontext) |
197 | 197 | { |
198 | 198 | if (!defined('ERROR_LOG')) { |
199 | - define('ERROR_LOG', dirname(__FILE__) . '/../log/error.log'); |
|
199 | + define('ERROR_LOG', dirname(__FILE__).'/../log/error.log'); |
|
200 | 200 | } |
201 | 201 | $errorhandler = new ErrorHandler; |
202 | 202 | if (!defined('ERROR_LEVEL_CONTINUE_SCRIPT')) { |
@@ -58,6 +58,7 @@ |
||
58 | 58 | /** |
59 | 59 | * This function is dynamically redefinable. |
60 | 60 | * @see $GLOBALS['_global_function_callback_email'] |
61 | + * @param string $args |
|
61 | 62 | */ |
62 | 63 | function autoop($args) |
63 | 64 | { |