@@ -192,7 +192,8 @@ |
||
192 | 192 | foreach ($this->$identifier as $member) { |
193 | 193 | try { |
194 | 194 | $this->_request_data['group'] = org_openpsa_contacts_group_dba::get_cached($member->gid); |
195 | - } catch (midcom_error $e) { |
|
195 | + } |
|
196 | + catch (midcom_error $e) { |
|
196 | 197 | $e->log(); |
197 | 198 | continue; |
198 | 199 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $invoices_url = $siteconfig->get_node_full_url('org.openpsa.invoices'); |
106 | 106 | $user_url = $siteconfig->get_node_full_url('org.openpsa.user'); |
107 | 107 | |
108 | - if ( $invoices_url |
|
108 | + if ($invoices_url |
|
109 | 109 | && midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_invoices_invoice_dba::class) |
110 | 110 | && $this->_contact->can_do('midgard:update')) { |
111 | 111 | $buttons[] = $workflow->get_button($invoices_url . "billingdata/" . $this->_contact->guid . '/', [ |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | ]); |
115 | 115 | } |
116 | 116 | |
117 | - if ( $user_url |
|
118 | - && ( midcom::get()->auth->user->guid == $this->_contact->guid |
|
117 | + if ($user_url |
|
118 | + && (midcom::get()->auth->user->guid == $this->_contact->guid |
|
119 | 119 | || midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class))) { |
120 | 120 | $buttons[] = [ |
121 | 121 | MIDCOM_TOOLBAR_URL => $user_url . "view/{$this->_contact->guid}/", |
@@ -114,7 +114,7 @@ |
||
114 | 114 | { |
115 | 115 | $nap = new midcom_helper_nav(); |
116 | 116 | $node = $nap->get_node($nap->get_current_node()); |
117 | - $compose_url = $node[MIDCOM_NAV_RELATIVEURL] . 'message/compose/' . $data['message']->guid .'/'; |
|
117 | + $compose_url = $node[MIDCOM_NAV_RELATIVEURL] . 'message/compose/' . $data['message']->guid . '/'; |
|
118 | 118 | $this->batch_url_base_full = $node[MIDCOM_NAV_RELATIVEURL] . 'message/send_bg/' . $data['message']->guid . '/'; |
119 | 119 | debug_add("compose_url: {$compose_url}"); |
120 | 120 | debug_add("batch_url base: {$this->batch_url_base_full}"); |
@@ -59,7 +59,7 @@ |
||
59 | 59 | |
60 | 60 | public function __set($name, $value) |
61 | 61 | { |
62 | - if ( $name == 'homepage' |
|
62 | + if ($name == 'homepage' |
|
63 | 63 | && !empty($value) |
64 | 64 | && $value != $this->homepage) { |
65 | 65 | $this->_register_prober = true; |
@@ -51,7 +51,8 @@ |
||
51 | 51 | if ($root_topic->style) { |
52 | 52 | $scope = midcom_db_style::id_from_path($root_topic->style); |
53 | 53 | } |
54 | - } catch (midcom_error_forbidden $e) { |
|
54 | + } |
|
55 | + catch (midcom_error_forbidden $e) { |
|
55 | 56 | $e->log(); |
56 | 57 | } |
57 | 58 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | ]); |
49 | 49 | } |
50 | 50 | |
51 | - if ( $this->_article->topic === $this->_topic->id |
|
51 | + if ($this->_article->topic === $this->_topic->id |
|
52 | 52 | && $this->_article->can_do('midgard:delete')) { |
53 | 53 | $delete = $this->get_workflow('delete', ['object' => $this->_article]); |
54 | 54 | $buttons[] = $delete->get_button("delete/{$this->_article->guid}/"); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | if ($this->_config->get('comments_enable')) { |
84 | 84 | if ($node = net_nehmer_comments_interface::get_node($this->_topic, $this->_config->get('comments_topic'))) { |
85 | 85 | $data['comments_url'] = $node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}"; |
86 | - if ( $this->_topic->can_do('midgard:update') |
|
86 | + if ($this->_topic->can_do('midgard:update') |
|
87 | 87 | && $this->_topic->can_do('net.nehmer.comments:moderation')) { |
88 | 88 | net_nehmer_comments_viewer::add_head_elements(); |
89 | 89 | } |
@@ -140,7 +140,7 @@ |
||
140 | 140 | return; |
141 | 141 | } |
142 | 142 | |
143 | - if ( !is_writable($config['filename']) |
|
143 | + if (!is_writable($config['filename']) |
|
144 | 144 | && !is_writable(dirname($config['filename']))) { |
145 | 145 | debug_add("Error logging file {$config['filename']} is not writable", MIDCOM_LOG_WARN); |
146 | 146 | return; |
@@ -47,7 +47,8 @@ |
||
47 | 47 | $target = new midcom_db_topic($request->request->getInt('move_to')); |
48 | 48 | $this->_move_object($target); |
49 | 49 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label())); |
50 | - } catch (midcom_error $e) { |
|
50 | + } |
|
51 | + catch (midcom_error $e) { |
|
51 | 52 | midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error'); |
52 | 53 | } |
53 | 54 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid); |
35 | 35 | |
36 | - if ( !($this->_object instanceof midcom_db_topic) |
|
36 | + if (!($this->_object instanceof midcom_db_topic) |
|
37 | 37 | && !($this->_object instanceof midcom_db_article)) { |
38 | 38 | throw new midcom_error_notfound("Moving only topics and articles is supported."); |
39 | 39 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $folder = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC); |
75 | 75 | } |
76 | 76 | |
77 | - if ( $this->_object instanceof midcom_db_topic |
|
77 | + if ($this->_object instanceof midcom_db_topic |
|
78 | 78 | && $folder->up == $this->_object->id) { |
79 | 79 | $tree_disabled = true; |
80 | 80 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | $selected = ' checked="checked"'; |
88 | 88 | } |
89 | 89 | |
90 | - if ( !($this->_object instanceof midcom_db_topic) |
|
90 | + if (!($this->_object instanceof midcom_db_topic) |
|
91 | 91 | && $folder->component !== $this->current_folder->component) { |
92 | 92 | // Non-topic objects may only be moved under folders of same component |
93 | 93 | $class = 'wrong_component'; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $result = $this->is_username_available($fields); |
48 | 48 | |
49 | 49 | $accounthelper = new org_openpsa_user_accounthelper(); |
50 | - if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])){ |
|
50 | + if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])) { |
|
51 | 51 | $result = ['password' => midcom::get()->i18n->get_string('password weak', 'org.openpsa.user')]; |
52 | 52 | } |
53 | 53 | |
@@ -149,10 +149,10 @@ discard block |
||
149 | 149 | $user = new midcom_db_person($fields["person"]); |
150 | 150 | |
151 | 151 | $accounthelper = new org_openpsa_user_accounthelper($user); |
152 | - if (!$accounthelper->check_password_reuse($fields['new_password'])){ |
|
152 | + if (!$accounthelper->check_password_reuse($fields['new_password'])) { |
|
153 | 153 | $result['password'] = midcom::get()->i18n->get_string('password was already used', 'org.openpsa.user'); |
154 | 154 | } |
155 | - if (!$accounthelper->check_password_strength($fields['new_password'])){ |
|
155 | + if (!$accounthelper->check_password_strength($fields['new_password'])) { |
|
156 | 156 | $result['password'] = midcom::get()->i18n->get_string('password weak', 'org.openpsa.user'); |
157 | 157 | } |
158 | 158 | return $result ?: true; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $result = $this->is_username_available($fields); |
48 | 48 | |
49 | 49 | $accounthelper = new org_openpsa_user_accounthelper(); |
50 | - if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])){ |
|
50 | + if ($fields['password']['switch'] && !$accounthelper->check_password_strength($fields['password']['password'])) { |
|
51 | 51 | $result = ['password' => midcom::get()->i18n->get_string('password weak', 'org.openpsa.user')]; |
52 | 52 | } |
53 | 53 | |
@@ -149,10 +149,10 @@ discard block |
||
149 | 149 | $user = new midcom_db_person($fields["person"]); |
150 | 150 | |
151 | 151 | $accounthelper = new org_openpsa_user_accounthelper($user); |
152 | - if (!$accounthelper->check_password_reuse($fields['new_password'])){ |
|
152 | + if (!$accounthelper->check_password_reuse($fields['new_password'])) { |
|
153 | 153 | $result['password'] = midcom::get()->i18n->get_string('password was already used', 'org.openpsa.user'); |
154 | 154 | } |
155 | - if (!$accounthelper->check_password_strength($fields['new_password'])){ |
|
155 | + if (!$accounthelper->check_password_strength($fields['new_password'])) { |
|
156 | 156 | $result['password'] = midcom::get()->i18n->get_string('password weak', 'org.openpsa.user'); |
157 | 157 | } |
158 | 158 | return $result ?: true; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | $result_cache[$cache_key] = []; |
77 | - $ret =& $result_cache[$cache_key]; |
|
77 | + $ret = & $result_cache[$cache_key]; |
|
78 | 78 | |
79 | 79 | if (empty($up)) { |
80 | 80 | // TODO: use reflection to see what kind of property this is ? |