@@ -100,12 +100,12 @@ |
||
100 | 100 | { |
101 | 101 | $this->_master = $master; |
102 | 102 | |
103 | - $this->_request_data =& $master->_request_data; |
|
103 | + $this->_request_data = & $master->_request_data; |
|
104 | 104 | $this->_topic = $master->_topic; |
105 | 105 | |
106 | 106 | // Load component specific stuff, special treatment if the handler has |
107 | 107 | // a component different than the master handler set. |
108 | - if ( $this->_component |
|
108 | + if ($this->_component |
|
109 | 109 | && $this->_component != $master->_component) { |
110 | 110 | $this->_config->store_from_object($this->_topic, $this->_component, true); |
111 | 111 | } else { |
@@ -242,7 +242,7 @@ |
||
242 | 242 | */ |
243 | 243 | public function can_handle($current_object, $argc, $argv, $contextid) |
244 | 244 | { |
245 | - $data =& $this->_context_data[$contextid]; |
|
245 | + $data = & $this->_context_data[$contextid]; |
|
246 | 246 | $loader = midcom::get()->componentloader; |
247 | 247 | $class = $loader->path_to_prefix($this->_component) . '_' . $this->_site_class_suffix; |
248 | 248 | $data['handler'] = new $class($current_object, $data['config']); |
@@ -4,7 +4,8 @@ |
||
4 | 4 | try { |
5 | 5 | $person = new midcom_db_person($metadata->locker); |
6 | 6 | $name = $person->name; |
7 | -} catch (midcom_error $e) { |
|
7 | +} |
|
8 | +catch (midcom_error $e) { |
|
8 | 9 | $name = $this->data['handler']->_l10n_midcom->get('unknown user'); |
9 | 10 | $e->log(); |
10 | 11 | } |
@@ -37,7 +37,7 @@ |
||
37 | 37 | $schemadb = midcom_helper_datamanager2_schema::load_database(midcom::get()->config->get('metadata_schema')); |
38 | 38 | |
39 | 39 | $this->_controller = midcom_helper_datamanager2_controller::create('simple'); |
40 | - $this->_controller->schemadb =& $schemadb; |
|
40 | + $this->_controller->schemadb = & $schemadb; |
|
41 | 41 | |
42 | 42 | $object_schema = midcom_helper_metadata::find_schemaname($schemadb, $this->_object); |
43 | 43 |
@@ -16,7 +16,8 @@ |
||
16 | 16 | foreach ($atts as $att) { |
17 | 17 | try { |
18 | 18 | $att->file_to_cache(); |
19 | - } catch (midcom_error $e) { |
|
19 | + } |
|
20 | + catch (midcom_error $e) { |
|
20 | 21 | echo 'Error: ' . $e->getMessage() . "\n"; |
21 | 22 | } |
22 | 23 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | |
56 | 56 | $http_client = new org_openpsa_httplib(); |
57 | 57 | $http_client->set_param('timeout', 300); |
58 | -if ( !empty($_SERVER['PHP_AUTH_USER']) |
|
58 | +if (!empty($_SERVER['PHP_AUTH_USER']) |
|
59 | 59 | && !empty($_SERVER['PHP_AUTH_PW'])) { |
60 | 60 | $http_client->basicauth['user'] = $_SERVER['PHP_AUTH_USER']; |
61 | 61 | $http_client->basicauth['password'] = $_SERVER['PHP_AUTH_PW']; |
@@ -62,7 +62,8 @@ |
||
62 | 62 | try { |
63 | 63 | $this->__object = call_user_func(array($this->__midcom_class_name__, 'get_cached'), $this->__identifier); |
64 | 64 | return true; |
65 | - } catch (midcom_error $e) { |
|
65 | + } |
|
66 | + catch (midcom_error $e) { |
|
66 | 67 | $e->log(); |
67 | 68 | } |
68 | 69 | return false; |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | // show_unapproved_objects). Disabled by default. Unsafe to Link Prefetching! |
439 | 439 | 'metadata_approval' => false, |
440 | 440 | 'metadata_scheduling' => false, |
441 | - 'metadata_lock_timeout' => 60, // Time in minutes |
|
441 | + 'metadata_lock_timeout' => 60, // Time in minutes |
|
442 | 442 | 'staging2live_staging' => false, |
443 | 443 | |
444 | 444 | // Set the DM2 schema used by the Metadata Service |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | } |
564 | 564 | |
565 | 565 | // Check the midcom_config site prefix for absolute local urls |
566 | - if ( $key === 'midcom_site_url' |
|
566 | + if ($key === 'midcom_site_url' |
|
567 | 567 | && substr($this->_merged_config[$key], 0, 1) === '/') { |
568 | 568 | $this->_merged_config[$key] = midcom::get()->get_page_prefix() . substr($this->_merged_config[$key], 1); |
569 | 569 | } |
@@ -86,7 +86,7 @@ |
||
86 | 86 | return; |
87 | 87 | } |
88 | 88 | $initialized = true; |
89 | - if ( !midcom::get()->auth->user |
|
89 | + if (!midcom::get()->auth->user |
|
90 | 90 | || !midcom::get()->config->get('toolbars_enable_centralized') |
91 | 91 | || !midcom::get()->auth->can_user_do('midcom:centralized_toolbar', null, $this)) { |
92 | 92 | return; |