@@ -99,11 +99,11 @@ |
||
99 | 99 | public static function getBelongToTypes() |
100 | 100 | { |
101 | 101 | return array(1 => 'intranet', |
102 | - 2 => 'user', |
|
103 | - 3 => 'contact', |
|
104 | - 4 => 'contact_delivery', |
|
105 | - 5 => 'contact_invoice', |
|
106 | - 6 => 'contactperson'); |
|
102 | + 2 => 'user', |
|
103 | + 3 => 'contact', |
|
104 | + 4 => 'contact_delivery', |
|
105 | + 5 => 'contact_invoice', |
|
106 | + 6 => 'contactperson'); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -42,11 +42,11 @@ discard block |
||
42 | 42 | // Notice that the placement of the characters are different in the two tables. Placement is correct in the first. |
43 | 43 | |
44 | 44 | $diff = array(230 => 'ae', |
45 | - 198 => 'AE', |
|
46 | - 248 => 'oslash', |
|
47 | - 216 => 'Oslash', |
|
48 | - 229 => 'aring', |
|
49 | - 197 => 'Aring'); |
|
45 | + 198 => 'AE', |
|
46 | + 248 => 'oslash', |
|
47 | + 216 => 'Oslash', |
|
48 | + 229 => 'aring', |
|
49 | + 197 => 'Aring'); |
|
50 | 50 | |
51 | 51 | parent::selectFont('Helvetica.afm', array('differences' => $diff)); |
52 | 52 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $this->setY(0); |
163 | 163 | } |
164 | 164 | |
165 | - /** |
|
165 | + /** |
|
166 | 166 | * create a round rectangle |
167 | 167 | * |
168 | 168 | * @param integer $x The starting x point |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | parent::partEllipse($x+$width-$round, $y+$round, 270, 360, $round); |
188 | 188 | } |
189 | 189 | |
190 | - /** |
|
190 | + /** |
|
191 | 191 | * write the document to a file |
192 | 192 | * |
193 | 193 | * @param string $data The data to write |
@@ -41,7 +41,7 @@ |
||
41 | 41 | private function getCredentials() |
42 | 42 | { |
43 | 43 | return array("private_key" => $this->context->getPrivateKey(), |
44 | - "session_id" => md5($this->session()->sessionId())); |
|
44 | + "session_id" => md5($this->session()->sessionId())); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | private function intranetHasOnlinePaymentAccess() |
@@ -32,13 +32,13 @@ |
||
32 | 32 | $HTTP_RAW_POST_DATA = file_get_contents('php://input'); |
33 | 33 | |
34 | 34 | k() |
35 | - ->setIdentityLoader(new MyIdentityLoader()) |
|
36 | - // Use container for wiring of components |
|
37 | - ->setComponentCreator(new k_InjectorAdapter(new bucket_Container(new Intraface_Factory))) |
|
38 | - // Enable file logging |
|
39 | - //->setLog(dirname(__FILE__) . '/../log/debug.log') |
|
40 | - // Uncomment the next line to enable in-browser debugging |
|
41 | - //->setDebug() |
|
42 | - // Dispatch request |
|
43 | - ->run('Intraface_XMLRPC_Controller') |
|
44 | - ->out(); |
|
35 | + ->setIdentityLoader(new MyIdentityLoader()) |
|
36 | + // Use container for wiring of components |
|
37 | + ->setComponentCreator(new k_InjectorAdapter(new bucket_Container(new Intraface_Factory))) |
|
38 | + // Enable file logging |
|
39 | + //->setLog(dirname(__FILE__) . '/../log/debug.log') |
|
40 | + // Uncomment the next line to enable in-browser debugging |
|
41 | + //->setDebug() |
|
42 | + // Dispatch request |
|
43 | + ->run('Intraface_XMLRPC_Controller') |
|
44 | + ->out(); |
@@ -310,7 +310,7 @@ |
||
310 | 310 | * Translates a string. |
311 | 311 | */ |
312 | 312 | function __($str) { |
313 | - return $GLOBALS['k_current_context']->translator()->translate($str); |
|
313 | + return $GLOBALS['k_current_context']->translator()->translate($str); |
|
314 | 314 | } |
315 | 315 | |
316 | 316 | if (realpath($_SERVER['SCRIPT_FILENAME']) == __FILE__) { |
@@ -17,29 +17,29 @@ |
||
17 | 17 | |
18 | 18 | while ($row = $result->fetchRow()) { |
19 | 19 | |
20 | - $auth_adapter = new Intraface_Auth_PublicKeyLogin(MDB2::singleton(DB_DSN), md5(session_id()), $row['public_key']); |
|
21 | - $weblogin = $auth_adapter->auth(); |
|
20 | + $auth_adapter = new Intraface_Auth_PublicKeyLogin(MDB2::singleton(DB_DSN), md5(session_id()), $row['public_key']); |
|
21 | + $weblogin = $auth_adapter->auth(); |
|
22 | 22 | |
23 | - if (!$weblogin) { |
|
24 | - throw new Exception('Access to the intranet denied. The private key is probably wrong.'); |
|
25 | - } |
|
23 | + if (!$weblogin) { |
|
24 | + throw new Exception('Access to the intranet denied. The private key is probably wrong.'); |
|
25 | + } |
|
26 | 26 | |
27 | 27 | $kernel = new Intraface_Kernel(); |
28 | 28 | $kernel->intranet = new Intraface_Intranet($weblogin->getActiveIntranetId()); |
29 | 29 | $kernel->setting = new Intraface_Setting($kernel->intranet->get('id')); |
30 | 30 | |
31 | - if (!$kernel->intranet->hasModuleAccess('order')) { |
|
32 | - continue; |
|
33 | - } |
|
31 | + if (!$kernel->intranet->hasModuleAccess('order')) { |
|
32 | + continue; |
|
33 | + } |
|
34 | 34 | |
35 | - $gateway = new Intraface_modules_order_OrderGateway($kernel); |
|
36 | - if ($number = $gateway->anyNew()) { |
|
37 | - //echo $kernel->intranet->get('name') . ' has ' . $number . ' new orders'; |
|
35 | + $gateway = new Intraface_modules_order_OrderGateway($kernel); |
|
36 | + if ($number = $gateway->anyNew()) { |
|
37 | + //echo $kernel->intranet->get('name') . ' has ' . $number . ' new orders'; |
|
38 | 38 | |
39 | - // @hack |
|
40 | - if ($kernel->intranet->get('name') == 'Discimport.dk') { |
|
41 | - mail('[email protected]', $number . ' new orders', 'Do not come back complaining I did not warn you about new orders in Intraface.dk.'); |
|
42 | - } |
|
43 | - } |
|
39 | + // @hack |
|
40 | + if ($kernel->intranet->get('name') == 'Discimport.dk') { |
|
41 | + mail('[email protected]', $number . ' new orders', 'Do not come back complaining I did not warn you about new orders in Intraface.dk.'); |
|
42 | + } |
|
43 | + } |
|
44 | 44 | |
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -25,21 +25,21 @@ |
||
25 | 25 | echo "Sending for intranet ".$row['name'].": "; |
26 | 26 | |
27 | 27 | $auth_adapter = new Intraface_Auth_PublicKeyLogin($db, md5(uniqid()), $row['public_key']); |
28 | - $weblogin = $auth_adapter->auth(); |
|
28 | + $weblogin = $auth_adapter->auth(); |
|
29 | 29 | |
30 | - if (!$weblogin) { |
|
31 | - throw new Exception('Access to the intranet denied. The private key is probably wrong.'); |
|
32 | - } |
|
30 | + if (!$weblogin) { |
|
31 | + throw new Exception('Access to the intranet denied. The private key is probably wrong.'); |
|
32 | + } |
|
33 | 33 | |
34 | 34 | $kernel = new Intraface_Kernel(); |
35 | 35 | $kernel->intranet = new Intraface_Intranet($weblogin->getActiveIntranetId()); |
36 | 36 | $kernel->setting = new Intraface_Setting($kernel->intranet->get('id')); |
37 | 37 | |
38 | - $kernel->useShared('email'); |
|
38 | + $kernel->useShared('email'); |
|
39 | 39 | |
40 | - if (!$kernel->intranet->hasModuleAccess('contact')) { |
|
41 | - continue; |
|
42 | - } |
|
40 | + if (!$kernel->intranet->hasModuleAccess('contact')) { |
|
41 | + continue; |
|
42 | + } |
|
43 | 43 | |
44 | 44 | $gateway = new Intraface_shared_email_EmailGateway($kernel); |
45 | 45 | $mails = $gateway->getEmailsToSend(); |
@@ -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'); |
@@ -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 | } |