@@ -69,7 +69,8 @@ |
||
| 69 | 69 | // Use the DB Factory to resolve the class and to get the object |
| 70 | 70 | try { |
| 71 | 71 | $object = midcom::get()->dbfactory->get_object_by_guid($identifier); |
| 72 | - } catch (midcom_error $e) { |
|
| 72 | + } |
|
| 73 | + catch (midcom_error $e) { |
|
| 73 | 74 | // This is probably a pseudo leaf, store the score to the current node |
| 74 | 75 | $this->_topic->set_parameter('midcom.helper.nav.score', $identifier, $score); |
| 75 | 76 | return true; |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // Approve if possible |
| 92 | - if ( $approval_status |
|
| 92 | + if ($approval_status |
|
| 93 | 93 | && $object->can_do('midcom:approve')) { |
| 94 | 94 | $object->metadata->approve(); |
| 95 | 95 | } |
@@ -132,7 +132,8 @@ |
||
| 132 | 132 | && $nodeobject = $nav->get_node($node->id)) { |
| 133 | 133 | $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id); |
| 134 | 134 | } |
| 135 | - } catch (midcom_error $e) { |
|
| 135 | + } |
|
| 136 | + catch (midcom_error $e) { |
|
| 136 | 137 | $e->log(); |
| 137 | 138 | } |
| 138 | 139 | return $napobject; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | // Get parent from DB and compare to catch moves |
| 72 | 72 | if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) { |
| 73 | 73 | $parent_entry = $this->get_guid($parent->guid); |
| 74 | - if ( $parent_entry |
|
| 74 | + if ($parent_entry |
|
| 75 | 75 | && $parent_entry[MIDCOM_NAV_ID] != $cached_node_id) { |
| 76 | 76 | $this->backend->delete($parent_entry[MIDCOM_NAV_ID] . '-leaves'); |
| 77 | 77 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $parent_id = $napobject[MIDCOM_NAV_NODEID]; |
| 87 | 87 | $parent_entry = $this->get_node($parent_id); |
| 88 | 88 | |
| 89 | - if ( $parent_entry |
|
| 89 | + if ($parent_entry |
|
| 90 | 90 | && array_key_exists(MIDCOM_NAV_SUBNODES, $parent_entry)) { |
| 91 | 91 | unset($parent_entry[MIDCOM_NAV_SUBNODES]); |
| 92 | 92 | $this->put_node($parent_id, $parent_entry); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) { |
| 97 | 97 | $parent_entry_from_object = $this->get_guid($parent->guid); |
| 98 | 98 | |
| 99 | - if ( !empty($parent_entry_from_object[MIDCOM_NAV_ID]) |
|
| 99 | + if (!empty($parent_entry_from_object[MIDCOM_NAV_ID]) |
|
| 100 | 100 | && !empty($parent_entry[MIDCOM_NAV_ID]) |
| 101 | 101 | && $parent_entry_from_object[MIDCOM_NAV_ID] != $parent_entry[MIDCOM_NAV_ID]) { |
| 102 | 102 | unset($parent_entry_from_object[MIDCOM_NAV_SUBNODES]); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $nav = new midcom_helper_nav; |
| 123 | 123 | if ($object instanceof midcom_db_topic) { |
| 124 | 124 | $napobject = $nav->get_node($object->id); |
| 125 | - } elseif ( ($node = $nav->find_closest_topic($object)) |
|
| 125 | + } elseif (($node = $nav->find_closest_topic($object)) |
|
| 126 | 126 | && $nodeobject = $nav->get_node($node->id)) { |
| 127 | 127 | $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id); |
| 128 | 128 | } |
@@ -72,7 +72,8 @@ |
||
| 72 | 72 | |
| 73 | 73 | try { |
| 74 | 74 | $object = midcom::get()->dbfactory->get_object_by_guid($guid); |
| 75 | - } catch (midcom_error $e) { |
|
| 75 | + } |
|
| 76 | + catch (midcom_error $e) { |
|
| 76 | 77 | debug_add("Failed to resolve the GUID {$guid}, this is most probably an access denied error.", MIDCOM_LOG_ERROR); |
| 77 | 78 | debug_add('Last MidCOM error string: ' . $e->getMessage()); |
| 78 | 79 | return null; |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | if ($object instanceof midcom_db_attachment) { |
| 94 | 94 | // Faster linking to attachments |
| 95 | 95 | $parent = $object->get_parent(); |
| 96 | - if ( is_a($parent, midcom_db_topic::class) |
|
| 96 | + if (is_a($parent, midcom_db_topic::class) |
|
| 97 | 97 | && $nav->is_node_in_tree($parent->id, $nav->get_root_node())) { |
| 98 | 98 | $napobj = $nav->get_node($parent->id); |
| 99 | 99 | return $napobj[MIDCOM_NAV_FULLURL] . $object->name; |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | */ |
| 110 | 110 | public function members_to_fields() |
| 111 | 111 | { |
| 112 | - if ( empty($this->topic_guid) |
|
| 112 | + if (empty($this->topic_guid) |
|
| 113 | 113 | || empty($this->topic_url) |
| 114 | 114 | || empty($this->component)) { |
| 115 | 115 | //if one of those is missing, we override all three to ensure consistency |
@@ -104,7 +104,7 @@ |
||
| 104 | 104 | $this->add('Setting: upload_max_filesize', self::OK, ini_get('upload_max_filesize')); |
| 105 | 105 | } else { |
| 106 | 106 | $this->add('Setting: upload_max_filesize', |
| 107 | - self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})"); |
|
| 107 | + self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})"); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $post_limit = $this->ini_get_filesize('post_max_size'); |
@@ -81,7 +81,8 @@ |
||
| 81 | 81 | $class = $config->get_backend_class(); |
| 82 | 82 | new $class(new midcom_db_topic, $config); |
| 83 | 83 | $this->add("MidCOM RCS", self::OK, $class); |
| 84 | - } catch (midcom_error $e) { |
|
| 84 | + } |
|
| 85 | + catch (midcom_error $e) { |
|
| 85 | 86 | $this->add("MidCOM RCS", self::ERROR, $e->getMessage()); |
| 86 | 87 | } |
| 87 | 88 | } else { |
@@ -117,7 +117,8 @@ |
||
| 117 | 117 | } |
| 118 | 118 | break; |
| 119 | 119 | } |
| 120 | - } catch (midcom_error $e) { |
|
| 120 | + } |
|
| 121 | + catch (midcom_error $e) { |
|
| 121 | 122 | $e->log(); |
| 122 | 123 | } |
| 123 | 124 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | ]; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - if ( midcom::get()->config->get('midcom_services_rcs_enable') |
|
| 150 | + if (midcom::get()->config->get('midcom_services_rcs_enable') |
|
| 151 | 151 | && $object->can_do('midgard:update') |
| 152 | 152 | && $object->_use_rcs) { |
| 153 | 153 | $buttons[] = [ |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | private function get_toolbar_update_items($object) : array |
| 209 | 209 | { |
| 210 | 210 | $buttons = []; |
| 211 | - if ( is_a($object, midcom_db_topic::class) |
|
| 211 | + if (is_a($object, midcom_db_topic::class) |
|
| 212 | 212 | && $object->component |
| 213 | 213 | && $object->can_do('midcom:component_config')) { |
| 214 | 214 | $buttons[] = [ |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | MIDCOM_TOOLBAR_ENABLED => $object->can_do('midgard:privileges'), |
| 247 | 247 | ]; |
| 248 | 248 | |
| 249 | - if ( midcom::get()->componentloader->is_installed('midcom.helper.replicator') |
|
| 249 | + if (midcom::get()->componentloader->is_installed('midcom.helper.replicator') |
|
| 250 | 250 | && midcom::get()->auth->admin) { |
| 251 | 251 | $buttons[] = [ |
| 252 | 252 | MIDCOM_TOOLBAR_URL => "__mfa/asgard_midcom.helper.replicator/object/{$object->guid}/", |
@@ -217,7 +217,8 @@ |
||
| 217 | 217 | |
| 218 | 218 | try { |
| 219 | 219 | $account = new midcom_core_account($person); |
| 220 | - } catch (midcom_error $e) { |
|
| 220 | + } |
|
| 221 | + catch (midcom_error $e) { |
|
| 221 | 222 | midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error'); |
| 222 | 223 | return; |
| 223 | 224 | } |
@@ -92,7 +92,8 @@ |
||
| 92 | 92 | $customer = new org_openpsa_contacts_group_dba($customer_id); |
| 93 | 93 | $customer_label = $customer->official; |
| 94 | 94 | $customer = $customer_id; |
| 95 | - } catch (midcom_error $e) { |
|
| 95 | + } |
|
| 96 | + catch (midcom_error $e) { |
|
| 96 | 97 | } |
| 97 | 98 | } |
| 98 | 99 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | $ownerwg = $this->get_parameter('org.openpsa.core', 'orgOpenpsaOwnerWg'); |
| 21 | 21 | $accesstype = $this->get_parameter('org.openpsa.core', 'orgOpenpsaAccesstype'); |
| 22 | 22 | |
| 23 | - if ( $ownerwg |
|
| 23 | + if ($ownerwg |
|
| 24 | 24 | && $accesstype) { |
| 25 | 25 | // Sync the object's ACL properties into MidCOM ACL system |
| 26 | 26 | $sync = new org_openpsa_core_acl_synchronizer(); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | private function _update_parent_timestamp() |
| 42 | 42 | { |
| 43 | 43 | $parent = $this->get_parent(); |
| 44 | - if ( $parent |
|
| 44 | + if ($parent |
|
| 45 | 45 | && $parent->component == 'org.openpsa.documents') { |
| 46 | 46 | midcom::get()->auth->request_sudo('org.openpsa.documents'); |
| 47 | 47 | |