@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | 'packagefile' => 'package.xml', |
58 | 58 | 'ignore' => $ignore, |
59 | 59 | 'dir_roles' => array( |
60 | - 'intraface.dk' => 'www' |
|
60 | + 'intraface.dk' => 'www' |
|
61 | 61 | ), |
62 | 62 | 'exceptions' => array( |
63 | - 'intraface.dk/*.*' => 'www' |
|
63 | + 'intraface.dk/*.*' => 'www' |
|
64 | 64 | ), |
65 | 65 | 'simpleoutput' => true, |
66 | 66 | 'addhiddenfiles' => true |
@@ -221,29 +221,29 @@ discard block |
||
221 | 221 | $post_install_script = $pfm->initPostinstallScript('intraface.php'); |
222 | 222 | $post_install_script->addParamGroup('setup', |
223 | 223 | array($post_install_script->getParam('db_user', 'User', 'string', 'root'), |
224 | - $post_install_script->getParam('db_pass', 'Password', 'string', ''), |
|
225 | - $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'), |
|
226 | - $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'), |
|
227 | - $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'), |
|
228 | - $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'), |
|
229 | - $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'), |
|
230 | - $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'), |
|
231 | - $post_install_script->getParam('path_include_path', 'Include path', 'string', ''), |
|
232 | - $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'), |
|
233 | - $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'), |
|
234 | - $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true), |
|
235 | - $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'), |
|
236 | - $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL), |
|
237 | - $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE), |
|
238 | - $post_install_script->getParam('error_report_email', 'Error report email', 'string', '[email protected]'), |
|
239 | - $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'), |
|
240 | - $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'), |
|
241 | - $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'), |
|
242 | - $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''), |
|
243 | - $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'), |
|
244 | - $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''), |
|
245 | - $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '') |
|
246 | - ), |
|
224 | + $post_install_script->getParam('db_pass', 'Password', 'string', ''), |
|
225 | + $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'), |
|
226 | + $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'), |
|
227 | + $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'), |
|
228 | + $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'), |
|
229 | + $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'), |
|
230 | + $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'), |
|
231 | + $post_install_script->getParam('path_include_path', 'Include path', 'string', ''), |
|
232 | + $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'), |
|
233 | + $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'), |
|
234 | + $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true), |
|
235 | + $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'), |
|
236 | + $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL), |
|
237 | + $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE), |
|
238 | + $post_install_script->getParam('error_report_email', 'Error report email', 'string', '[email protected]'), |
|
239 | + $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'), |
|
240 | + $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'), |
|
241 | + $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'), |
|
242 | + $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''), |
|
243 | + $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'), |
|
244 | + $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''), |
|
245 | + $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '') |
|
246 | + ), |
|
247 | 247 | ''); |
248 | 248 | |
249 | 249 | $pfm->addPostInstallTask($post_install_script, 'intraface.php'); |
@@ -250,7 +250,7 @@ |
||
250 | 250 | |
251 | 251 | foreach ($web_files AS $file) { |
252 | 252 | $src_file = substr($file, 4); |
253 | - $formatted_file = substr($file, strlen($web_dir . '/')); |
|
253 | + $formatted_file = substr($file, strlen($web_dir.'/')); |
|
254 | 254 | if (in_array($src_file, $ignore)) continue; |
255 | 255 | $pfm->addInstallAs($src_file, $formatted_file); |
256 | 256 | } |
@@ -251,7 +251,9 @@ |
||
251 | 251 | foreach ($web_files AS $file) { |
252 | 252 | $src_file = substr($file, 4); |
253 | 253 | $formatted_file = substr($file, strlen($web_dir . '/')); |
254 | - if (in_array($src_file, $ignore)) continue; |
|
254 | + if (in_array($src_file, $ignore)) { |
|
255 | + continue; |
|
256 | + } |
|
255 | 257 | $pfm->addInstallAs($src_file, $formatted_file); |
256 | 258 | } |
257 | 259 |
@@ -127,7 +127,7 @@ |
||
127 | 127 | |
128 | 128 | if (realpath($_SERVER['SCRIPT_FILENAME']) == __FILE__) { |
129 | 129 | k() |
130 | - ->setIdentityLoader(new MyIdentityLoader()) |
|
131 | - ->setComponentCreator(new k_InjectorAdapter(create_container())) |
|
132 | - ->run('Intraface_Tools_Controller_Root')->out(); |
|
130 | + ->setIdentityLoader(new MyIdentityLoader()) |
|
131 | + ->setComponentCreator(new k_InjectorAdapter(create_container())) |
|
132 | + ->run('Intraface_Tools_Controller_Root')->out(); |
|
133 | 133 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | { |
106 | 106 | function create($filename) |
107 | 107 | { |
108 | - $filename = $filename . '.tpl.php'; |
|
108 | + $filename = $filename.'.tpl.php'; |
|
109 | 109 | $__template_filename__ = k_search_include_path($filename); |
110 | 110 | if (!is_file($__template_filename__)) { |
111 | 111 | throw new Exception("Failed opening '".$filename."' for inclusion. (include_path=".ini_get('include_path').")"); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | { |
120 | 120 | $factory = new ToolsFactory(); |
121 | 121 | $container = new bucket_Container($factory); |
122 | - $factory->db_dsn = 'mysql://' . DB_USER . ':' . DB_PASS . '@' . DB_HOST . '/' . DB_NAME; |
|
122 | + $factory->db_dsn = 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/'.DB_NAME; |
|
123 | 123 | $factory->error_log = ERROR_LOG; |
124 | 124 | return $container; |
125 | 125 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | define('NET_DIRECTORY', '/src/intraface.dk/'); // subdirectory. if non keep empty |
23 | 23 | |
24 | 24 | // define paths - remember trailing slahs |
25 | -define('PATH_ROOT', dirname(__FILE__) . '/../'); |
|
25 | +define('PATH_ROOT', dirname(__FILE__).'/../'); |
|
26 | 26 | |
27 | 27 | // optional upload path - remember trailing slash |
28 | 28 | define('PATH_UPLOAD', '/var/cache/intraface/upload/'); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | define('PATH_CACHE', '/var/cache/intraface/'); |
32 | 32 | |
33 | 33 | // set include path |
34 | -define('PATH_INCLUDE_PATH', PATH_ROOT . PATH_SEPARATOR . get_include_path()); |
|
34 | +define('PATH_INCLUDE_PATH', PATH_ROOT.PATH_SEPARATOR.get_include_path()); |
|
35 | 35 | set_include_path(PATH_INCLUDE_PATH); |
36 | 36 | |
37 | 37 | // error logs |
@@ -14,7 +14,7 @@ |
||
14 | 14 | $HTTP_RAW_POST_DATA = file_get_contents('php://input'); |
15 | 15 | |
16 | 16 | $options = array('prefix' => 'cms.', |
17 | - 'encoding' => 'utf-8'); |
|
17 | + 'encoding' => 'utf-8'); |
|
18 | 18 | |
19 | 19 | $server = XML_RPC2_Server::create(new Intraface_XMLRPC_CMS_Server0300(), $options); |
20 | 20 | $server->handleCall(); |
@@ -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 |