@@ -300,7 +300,8 @@ |
||
| 300 | 300 | $organization = $this->_import_subscribers_organization($subscriber); |
| 301 | 301 | $this->_import_subscribers_organization_member($subscriber, $person, $organization); |
| 302 | 302 | } |
| 303 | - } catch (midcom_error $e) { |
|
| 303 | + } |
|
| 304 | + catch (midcom_error $e) { |
|
| 304 | 305 | $e->log(); |
| 305 | 306 | // Clean up possibly created data |
| 306 | 307 | $this->_clean_new_objects(); |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | - if ( !$person |
|
| 124 | + if (!$person |
|
| 125 | 125 | && !empty($subscriber['person']['handphone'])) { |
| 126 | 126 | // Perform a simple cell phone test. More complicated duplicate checking is best left to the o.o.contacts duplicate checker |
| 127 | 127 | $qb = org_openpsa_contacts_person_dba::new_query_builder(); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | // User is or has been subscriber earlier, update status |
| 168 | 168 | $member = $members[0]; |
| 169 | 169 | |
| 170 | - if ( $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED |
|
| 170 | + if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED |
|
| 171 | 171 | || $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL) { |
| 172 | 172 | $this->_import_status['already_subscribed']++; |
| 173 | 173 | return; |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | |
| 208 | 208 | $qb = org_openpsa_contacts_group_dba::new_query_builder(); |
| 209 | 209 | $schema = $this->_schemadbs['organization']->get('default'); |
| 210 | - if ( $schema->has_field('company_id') |
|
| 210 | + if ($schema->has_field('company_id') |
|
| 211 | 211 | && !empty($subscriber['organization']['company_id'])) { |
| 212 | 212 | // Imported data has a company id, we use that instead of name |
| 213 | 213 | $qb->add_constraint($schema->get_field('company_id')['storage']['location'], '=', $subscriber['organization']['company_id']); |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | // Seek by official name |
| 216 | 216 | $qb->add_constraint('official', '=', $subscriber['organization']['official']); |
| 217 | 217 | |
| 218 | - if ( $schema->has_field('city') |
|
| 218 | + if ($schema->has_field('city') |
|
| 219 | 219 | && !empty($subscriber['organization']['city'])) { |
| 220 | 220 | // Imported data has a city, we use also that for matching |
| 221 | 221 | $qb->add_constraint($schema->get_field('city')['storage']['location'], '=', $subscriber['organization']['city']); |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | echo " <th>{$type}</th>\n"; |
| 35 | 35 | echo " <td style=\"text-align: right;\">" . number_format($count) . "</td>\n"; |
| 36 | 36 | if (isset($cleanups_kept[$type])) { |
| 37 | - echo " <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) ."</td>\n"; |
|
| 37 | + echo " <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) . "</td>\n"; |
|
| 38 | 38 | } |
| 39 | 39 | echo " </tr>\n"; |
| 40 | 40 | } |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | $button_config[MIDCOM_TOOLBAR_URL] = $url; |
| 74 | 74 | //The constants are numeric, so array_merge won't work... |
| 75 | 75 | foreach ($options as $key => $value) { |
| 76 | - if ( is_array($value) |
|
| 76 | + if (is_array($value) |
|
| 77 | 77 | && !empty($button_config[$key])) { |
| 78 | 78 | $value = array_merge($button_config[$key], $value); |
| 79 | 79 | } |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | midcom::get()->auth->require_admin_user(); |
| 3 | 3 | |
| 4 | -if ( empty($_POST['to']) |
|
| 4 | +if (empty($_POST['to']) |
|
| 5 | 5 | || empty($_POST['from'])) { |
| 6 | 6 | ?> |
| 7 | 7 | <h2>Send test email</h2> |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | include dirname(__DIR__) . '/config-default.inc.php'; |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | -if (! defined('MIDCOM_STATIC_URL')) { |
|
| 26 | +if (!defined('MIDCOM_STATIC_URL')) { |
|
| 27 | 27 | define('MIDCOM_STATIC_URL', '/midcom-static'); |
| 28 | 28 | } |
| 29 | 29 | |
@@ -48,7 +48,8 @@ |
||
| 48 | 48 | try { |
| 49 | 49 | $pdf_helper->render_and_attach(); |
| 50 | 50 | return $this->reply(true, $this->_l10n->get('pdf created')); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage()); |
| 53 | 54 | } |
| 54 | 55 | } |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | $this->_add_visibility_checks(); |
| 107 | 107 | |
| 108 | - if ( empty($this->_limit) |
|
| 108 | + if (empty($this->_limit) |
|
| 109 | 109 | && empty($this->_offset)) { |
| 110 | 110 | // No point to do windowing |
| 111 | 111 | $newresult = $this->_execute_and_check_privileges(); |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | $this->_query->set_limit($window_size); |
| 152 | 152 | |
| 153 | - while ( ($resultset = $this->_execute_and_check_privileges()) |
|
| 153 | + while (($resultset = $this->_execute_and_check_privileges()) |
|
| 154 | 154 | || $this->denied > $denied) { |
| 155 | 155 | $size = count($resultset); |
| 156 | 156 | $total_size = $size + ($this->denied - $denied); |
@@ -25,7 +25,8 @@ |
||
| 25 | 25 | { |
| 26 | 26 | try { |
| 27 | 27 | $viewer->register_plugin_namespace('__feeds', ['rss' => ['class' => __CLASS__]]); |
| 28 | - } catch (midcom_error $e) { |
|
| 28 | + } |
|
| 29 | + catch (midcom_error $e) { |
|
| 29 | 30 | $e->log(); |
| 30 | 31 | } |
| 31 | 32 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | // Hide the articles that have the publish time in the future and if |
| 43 | 43 | // the user is not administrator |
| 44 | - if ( $this->_config->get('enable_scheduled_publishing') |
|
| 44 | + if ($this->_config->get('enable_scheduled_publishing') |
|
| 45 | 45 | && !midcom::get()->auth->admin) { |
| 46 | 46 | // Show the article only if the publishing time has passed or the viewer |
| 47 | 47 | // is the author |
@@ -83,14 +83,14 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | private function _add_pseudo_leaves(array &$leaves) |
| 85 | 85 | { |
| 86 | - if ( $this->_config->get('archive_enable') |
|
| 86 | + if ($this->_config->get('archive_enable') |
|
| 87 | 87 | && $this->_config->get('archive_in_navigation')) { |
| 88 | 88 | $leaves["{$this->_topic->id}_ARCHIVE"] = [ |
| 89 | 89 | MIDCOM_NAV_URL => "archive/", |
| 90 | 90 | MIDCOM_NAV_NAME => $this->_l10n->get('archive'), |
| 91 | 91 | ]; |
| 92 | 92 | } |
| 93 | - if ( $this->_config->get('rss_enable') |
|
| 93 | + if ($this->_config->get('rss_enable') |
|
| 94 | 94 | && $this->_config->get('feeds_in_navigation')) { |
| 95 | 95 | $leaves[self::LEAFID_FEEDS] = [ |
| 96 | 96 | MIDCOM_NAV_URL => "feeds/", |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | ]; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - if ( $this->_config->get('categories_in_navigation') |
|
| 101 | + if ($this->_config->get('categories_in_navigation') |
|
| 102 | 102 | && $this->_config->get('categories') != '') { |
| 103 | 103 | $categories = explode(',', $this->_config->get('categories')); |
| 104 | 104 | foreach ($categories as $category) { |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - if ( $this->_config->get('archive_years_in_navigation') |
|
| 112 | + if ($this->_config->get('archive_years_in_navigation') |
|
| 113 | 113 | && $this->_config->get('archive_years_enable')) { |
| 114 | 114 | $qb = midcom_db_article::new_query_builder(); |
| 115 | 115 | $qb->add_constraint('topic', '=', $this->_topic->id); |
| 116 | 116 | |
| 117 | 117 | // Hide the articles that have the publish time in the future and if |
| 118 | 118 | // the user is not administrator |
| 119 | - if ( $this->_config->get('enable_scheduled_publishing') |
|
| 119 | + if ($this->_config->get('enable_scheduled_publishing') |
|
| 120 | 120 | && !midcom::get()->auth->admin) { |
| 121 | 121 | // Show the article only if the publishing time has passed or the viewer |
| 122 | 122 | // is the author |