@@ -36,7 +36,8 @@ discard block |
||
| 36 | 36 | // Add person to campaign |
| 37 | 37 | try { |
| 38 | 38 | $campaign = new org_openpsa_directmarketing_campaign_dba($add_to); |
| 39 | - } catch (midcom_error $e) { |
|
| 39 | + } |
|
| 40 | + catch (midcom_error $e) { |
|
| 40 | 41 | // FIXME: More informative error message |
| 41 | 42 | $this->notify('Failed adding person %s to campaign %s', $add_to, 'error'); |
| 42 | 43 | return; |
@@ -86,7 +87,8 @@ discard block |
||
| 86 | 87 | try { |
| 87 | 88 | $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign); |
| 88 | 89 | $campaign_membership_map[$membership->campaign] = $membership; |
| 89 | - } catch (midcom_error $e) { |
|
| 90 | + } |
|
| 91 | + catch (midcom_error $e) { |
|
| 90 | 92 | debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage()); |
| 91 | 93 | } |
| 92 | 94 | } |
@@ -48,7 +48,8 @@ discard block |
||
| 48 | 48 | // We're creating invoice for chosen customer |
| 49 | 49 | try { |
| 50 | 50 | $this->customer = new org_openpsa_contacts_group_dba($company); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | $contact = new org_openpsa_contacts_person_dba($company); |
| 53 | 54 | $this->contact_id = $contact->id; |
| 54 | 55 | } |
@@ -155,7 +156,8 @@ discard block |
||
| 155 | 156 | if (!empty($this->invoice->customer)) { |
| 156 | 157 | try { |
| 157 | 158 | $this->customer = org_openpsa_contacts_group_dba::get_cached($this->invoice->customer); |
| 158 | - } catch (midcom_error $e) { |
|
| 159 | + } |
|
| 160 | + catch (midcom_error $e) { |
|
| 159 | 161 | $customer_field['hidden'] = true; |
| 160 | 162 | $e->log(); |
| 161 | 163 | } |
@@ -141,8 +141,8 @@ |
||
| 141 | 141 | $schema->get_field('paid')['hidden'] = empty($this->invoice->paid); |
| 142 | 142 | |
| 143 | 143 | $contact = $this->invoice->customerContact ?: $this->contact_id; |
| 144 | - $customer_field =& $schema->get_field('customer'); |
|
| 145 | - $contact_field =& $schema->get_field('customerContact'); |
|
| 144 | + $customer_field = & $schema->get_field('customer'); |
|
| 145 | + $contact_field = & $schema->get_field('customerContact'); |
|
| 146 | 146 | |
| 147 | 147 | if (!empty($contact)) { |
| 148 | 148 | $customer_field['type_config']['options'] = $this->get_customers_for_contact($contact); |
@@ -89,7 +89,8 @@ |
||
| 89 | 89 | } elseif ((int) $group > 0) { |
| 90 | 90 | try { |
| 91 | 91 | $this->parent = new org_openpsa_products_product_group_dba((int) $group); |
| 92 | - } catch (midcom_error $e) { |
|
| 92 | + } |
|
| 93 | + catch (midcom_error $e) { |
|
| 93 | 94 | $e->log(); |
| 94 | 95 | } |
| 95 | 96 | } |
@@ -29,7 +29,8 @@ |
||
| 29 | 29 | $member->require_do('midgard:update'); |
| 30 | 30 | $member->extra = $request->request->get('title'); |
| 31 | 31 | $response->status = $member->update(); |
| 32 | - } catch (midcom_error $e) { |
|
| 32 | + } |
|
| 33 | + catch (midcom_error $e) { |
|
| 33 | 34 | $e->log(); |
| 34 | 35 | } |
| 35 | 36 | $response->message = midcom_connection::get_error_string(); |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | midcom::get()->auth->require_valid_user(); |
| 34 | 34 | midcom::get()->skip_page_style = true; |
| 35 | 35 | |
| 36 | - $this->add_stylesheet(MIDCOM_STATIC_URL ."/midcom.helper.imagepopup/styling.css", 'screen'); |
|
| 36 | + $this->add_stylesheet(MIDCOM_STATIC_URL . "/midcom.helper.imagepopup/styling.css", 'screen'); |
|
| 37 | 37 | |
| 38 | 38 | $data['filetype'] = $filetype; |
| 39 | 39 | $data['object'] = null; |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]); |
| 59 | 59 | $response = $workflow->run($request); |
| 60 | 60 | |
| 61 | - if ( $workflow->get_state() == 'save' |
|
| 61 | + if ($workflow->get_state() == 'save' |
|
| 62 | 62 | && $this->create_account($this->person, $data["controller"]->get_form_values())) { |
| 63 | 63 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), sprintf($this->_l10n->get('person %s created'), $this->person->name)); |
| 64 | 64 | } |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | $accounthelper = new org_openpsa_user_accounthelper($this->person); |
| 149 | 149 | |
| 150 | 150 | // Update account |
| 151 | - if ( !$accounthelper->set_account($controller->get_form_values()["username"], $password) |
|
| 151 | + if (!$accounthelper->set_account($controller->get_form_values()["username"], $password) |
|
| 152 | 152 | && midcom_connection::get_error() != MGD_ERR_OK) { |
| 153 | 153 | // Failure, give a message |
| 154 | 154 | midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.user'), $this->_l10n->get("failed to update the user account, reason") . ': ' . midcom_connection::get_error_string(), 'error'); |
@@ -100,7 +100,8 @@ |
||
| 100 | 100 | try { |
| 101 | 101 | $task = org_openpsa_projects_task_dba::get_cached($hour_report->task); |
| 102 | 102 | $options['success_url'] = $this->router->generate('list_hours_task', ['guid' => $task->guid]); |
| 103 | - } catch (midcom_error $e) { |
|
| 103 | + } |
|
| 104 | + catch (midcom_error $e) { |
|
| 104 | 105 | $e->log(); |
| 105 | 106 | } |
| 106 | 107 | return $this->get_workflow('delete', $options)->run($request); |
@@ -70,13 +70,13 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | } elseif (!$this->form->isSubmitted()) { |
| 72 | 72 | $this->form->handleRequest($request); |
| 73 | - if ( $this->form->isSubmitted() |
|
| 73 | + if ($this->form->isSubmitted() |
|
| 74 | 74 | && $button = $this->form->getClickedButton()) { |
| 75 | 75 | $operation = $button->getConfig()->getOption('operation'); |
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - if ( in_array($operation, [self::SAVE, self::NEXT]) |
|
| 79 | + if (in_array($operation, [self::SAVE, self::NEXT]) |
|
| 80 | 80 | && !$this->form->isValid()) { |
| 81 | 81 | $operation = self::EDIT; |
| 82 | 82 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | if ($storage->get_last_operation() === self::SAVE) { |
| 160 | 160 | // Get GUIDs and such for new-created dependent objects |
| 161 | 161 | $this->dm->set_storage($storage->get_value(), $this->dm->get_schema()->get_name()); |
| 162 | - } elseif ( !$this->form->isValid() |
|
| 162 | + } elseif (!$this->form->isValid() |
|
| 163 | 163 | && $storage->move_uploaded_files() > 0) { |
| 164 | 164 | $form = $this->dm->get_form($this->form->getName(), true); |
| 165 | 165 | $this->copy_errors($this->form, $form); |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $item->title = $data['article']->title; |
| 19 | 19 | $arg = $data['article']->name ?: $data['article']->guid; |
| 20 | 20 | |
| 21 | -if ( $data['config']->get('link_to_external_url') |
|
| 21 | +if ($data['config']->get('link_to_external_url') |
|
| 22 | 22 | && !empty($data['article']->url)) { |
| 23 | 23 | $item->link = $data['article']->url; |
| 24 | 24 | } else { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $item->description .= '<div class="abstract">' . $view['abstract'] . '</div>'; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | -if ( array_key_exists('image', $view) |
|
| 40 | +if (array_key_exists('image', $view) |
|
| 41 | 41 | && $data['config']->get('rss_use_image')) { |
| 42 | 42 | $item->description .= "\n<div class=\"image\">" . $view['image'] . '</div>'; |
| 43 | 43 | } |