@@ -35,7 +35,7 @@ |
||
35 | 35 | |
36 | 36 | // Catch first the configuration option for showing editing interface instead |
37 | 37 | // of redirecting administrators |
38 | - if ( $this->_topic->can_do('net.nemein.redirector:noredirect') |
|
38 | + if ($this->_topic->can_do('net.nemein.redirector:noredirect') |
|
39 | 39 | && !$this->_config->get('admin_redirection')) { |
40 | 40 | return new midcom_response_relocate("{$this->_topic->name}/edit/{$args[0]}/"); |
41 | 41 | } |
@@ -108,12 +108,12 @@ |
||
108 | 108 | $this->_master = $master; |
109 | 109 | $this->router = $router; |
110 | 110 | |
111 | - $this->_request_data =& $master->_request_data; |
|
111 | + $this->_request_data = & $master->_request_data; |
|
112 | 112 | $this->_topic = $master->_topic; |
113 | 113 | |
114 | 114 | // Load component specific stuff, special treatment if the handler has |
115 | 115 | // a component different than the master handler set. |
116 | - if ( $this->_component |
|
116 | + if ($this->_component |
|
117 | 117 | && $this->_component != $master->_component) { |
118 | 118 | $this->_config->store_from_object($this->_topic, $this->_component, true); |
119 | 119 | } else { |
@@ -5,13 +5,13 @@ |
||
5 | 5 | ?> |
6 | 6 | <form method='get' name='midcom_helper_search_form' action='&(action);' class='midcom.helper.search'> |
7 | 7 | <label for="midcom_helper_search_query"> |
8 | -<?php echo $data['l10n']->get('query');?>: |
|
8 | +<?php echo $data['l10n']->get('query'); ?>: |
|
9 | 9 | <input type='text' size='60' name='query' id='midcom_helper_search_query' value=&(query:h); /> |
10 | 10 | </label> |
11 | 11 | <input type='hidden' name='type' value='basic' /> |
12 | 12 | <input type='hidden' name='page' value='1' /> |
13 | -<input type='submit' name='submit' value='<?php echo $data['l10n']->get('search');?>' /> |
|
13 | +<input type='submit' name='submit' value='<?php echo $data['l10n']->get('search'); ?>' /> |
|
14 | 14 | </form> |
15 | 15 | <p> |
16 | - <a href="&(advanced);&(data['params']);"><?php echo $data['l10n']->get('advanced search');?></a> |
|
16 | + <a href="&(advanced);&(data['params']);"><?php echo $data['l10n']->get('advanced search'); ?></a> |
|
17 | 17 | </p> |
18 | 18 | \ No newline at end of file |
@@ -7,7 +7,7 @@ |
||
7 | 7 | $link = $data['router']->generate('components_component', ['component' => $component]); |
8 | 8 | |
9 | 9 | echo "<li class=\"component\">"; |
10 | - echo "<a href=\"{$link}\">" . midcom::get()->i18n->get_string($component, $component) ." </a>\n"; |
|
10 | + echo "<a href=\"{$link}\">" . midcom::get()->i18n->get_string($component, $component) . " </a>\n"; |
|
11 | 11 | echo "<ul>\n"; |
12 | 12 | foreach ($elements as $name => $path) { |
13 | 13 | echo "<li>"; |
@@ -61,7 +61,8 @@ |
||
61 | 61 | { |
62 | 62 | try { |
63 | 63 | $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid); |
64 | - } catch (midcom_error $e) { |
|
64 | + } |
|
65 | + catch (midcom_error $e) { |
|
65 | 66 | if (midcom_connection::get_error() == MGD_ERR_OBJECT_DELETED) { |
66 | 67 | $relocate = $this->router->generate('object_deleted', ['guid' => $guid]); |
67 | 68 | midcom::get()->relocate($relocate); |
@@ -223,10 +223,10 @@ |
||
223 | 223 | $new_type_reflector = midcom_helper_reflector::get($new_type); |
224 | 224 | $link_properties = $new_type_reflector->get_link_properties(); |
225 | 225 | foreach ($link_properties as $property => $link) { |
226 | - if ( ($link['class'] && midcom_helper_reflector::is_same_class($link['class'], $this->_object->__mgdschema_class_name__)) |
|
226 | + if (($link['class'] && midcom_helper_reflector::is_same_class($link['class'], $this->_object->__mgdschema_class_name__)) |
|
227 | 227 | || $link['type'] == MGD_TYPE_GUID) { |
228 | 228 | $defaults[$property] = $this->_object->{$link['target']}; |
229 | - } elseif ( $property == $parent_property |
|
229 | + } elseif ($property == $parent_property |
|
230 | 230 | && midcom_helper_reflector::is_same_class($new_type, $this->_object->__mgdschema_class_name__)) { |
231 | 231 | $defaults[$property] = $this->_object->$parent_property; |
232 | 232 | } |
@@ -20,7 +20,7 @@ |
||
20 | 20 | */ |
21 | 21 | private function _populate_node_toolbar() |
22 | 22 | { |
23 | - if ( $this->_topic->can_do('midgard:update') |
|
23 | + if ($this->_topic->can_do('midgard:update') |
|
24 | 24 | && $this->_topic->can_do('midcom:component_config')) { |
25 | 25 | $workflow = $this->get_workflow('datamanager'); |
26 | 26 | $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [ |
@@ -58,7 +58,7 @@ |
||
58 | 58 | } |
59 | 59 | $this->_view_toolbar->add_items($buttons); |
60 | 60 | |
61 | - if ( $this->_topic->can_do('midgard:update') |
|
61 | + if ($this->_topic->can_do('midgard:update') |
|
62 | 62 | && $this->_topic->can_do('midcom:component_config')) { |
63 | 63 | $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [ |
64 | 64 | MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'), |
@@ -171,7 +171,7 @@ |
||
171 | 171 | { |
172 | 172 | $this->prepare_toolbar(false); |
173 | 173 | |
174 | - if ( $this->_topic->can_do('midgard:update') |
|
174 | + if ($this->_topic->can_do('midgard:update') |
|
175 | 175 | && $this->_topic->can_do('midcom:component_config')) { |
176 | 176 | $workflow = $this->get_workflow('datamanager'); |
177 | 177 | $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [ |
@@ -96,7 +96,8 @@ discard block |
||
96 | 96 | $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer); |
97 | 97 | $entry['customer'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $customer->guid])}\">" . $customer->get_label() . "</a>"; |
98 | 98 | $entry['index_customer'] = $customer->get_label(); |
99 | - } catch (midcom_error $e) { |
|
99 | + } |
|
100 | + catch (midcom_error $e) { |
|
100 | 101 | $entry['customer'] = ''; |
101 | 102 | $entry['index_customer'] = ''; |
102 | 103 | } |
@@ -110,7 +111,8 @@ discard block |
||
110 | 111 | $entry['contact'] = "<a href=\"{$this->router->generate('list_customer_all', ['guid' => $contact->guid])}\">" . $contact->get_label() . "</a>"; |
111 | 112 | $entry['contact'] = $contact_widget->show_inline(); |
112 | 113 | $entry['index_contact'] = $contact->get_label(); |
113 | - } catch (midcom_error $e) { |
|
114 | + } |
|
115 | + catch (midcom_error $e) { |
|
114 | 116 | $entry['contact'] = ''; |
115 | 117 | $entry['index_contact'] = ''; |
116 | 118 | } |
@@ -257,7 +259,8 @@ discard block |
||
257 | 259 | { |
258 | 260 | try { |
259 | 261 | $this->_customer = new org_openpsa_contacts_group_dba($guid); |
260 | - } catch (midcom_error $e) { |
|
262 | + } |
|
263 | + catch (midcom_error $e) { |
|
261 | 264 | $this->_customer = new org_openpsa_contacts_person_dba($guid); |
262 | 265 | } |
263 | 266 | $data['customer'] = $this->_customer; |
@@ -169,7 +169,7 @@ |
||
169 | 169 | case 'proposed': |
170 | 170 | $html = $this->render_status($task->manager, "from %s"); |
171 | 171 | $task->get_members(); |
172 | - if ( $task->can_do('midgard:update') |
|
172 | + if ($task->can_do('midgard:update') |
|
173 | 173 | && isset($task->resources[midcom_connection::get_user()])) { |
174 | 174 | $html .= '<form method="post" action="' . $this->router->generate('workflow', ['guid' => $task->guid]) . '">'; |
175 | 175 | //TODO: If we need all resources to accept task hide tools when we have accepted and replace with "pending acceptance from..." |
@@ -291,7 +291,8 @@ discard block |
||
291 | 291 | $url = $this->router->generate('project', ['guid' => $project->guid]); |
292 | 292 | $ret['project'] = '<a href="' . $url . '">' . $project->title . '</a>'; |
293 | 293 | $ret['index_project'] = $project->title; |
294 | - } catch (midcom_error $e) { |
|
294 | + } |
|
295 | + catch (midcom_error $e) { |
|
295 | 296 | $e->log(); |
296 | 297 | } |
297 | 298 | |
@@ -303,7 +304,8 @@ discard block |
||
303 | 304 | $customer_url = "{$contacts_url}group/{$customer->guid}/"; |
304 | 305 | $ret['customer'] = "<a href='{$customer_url}' title='{$customer->official}'>{$customer->get_label()}</a>"; |
305 | 306 | $ret['index_customer'] = $customer->name; |
306 | - } catch (midcom_error $e) { |
|
307 | + } |
|
308 | + catch (midcom_error $e) { |
|
307 | 309 | $ret['customer'] = ''; |
308 | 310 | $ret['index_customer'] = ''; |
309 | 311 | } |