@@ -40,7 +40,7 @@ |
||
| 40 | 40 | |
| 41 | 41 | public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object) : ?string |
| 42 | 42 | { |
| 43 | - if ( $object instanceof org_openpsa_documents_document_dba |
|
| 43 | + if ($object instanceof org_openpsa_documents_document_dba |
|
| 44 | 44 | && $object->topic == $topic->id) { |
| 45 | 45 | return "document/{$object->guid}/"; |
| 46 | 46 | } |
@@ -6,6 +6,6 @@ |
||
| 6 | 6 | &(view["content"]:h); |
| 7 | 7 | <?php |
| 8 | 8 | } else { |
| 9 | - echo "<p class=\"stub\">" . $data['l10n']->get('this page is stub')."</p>"; |
|
| 9 | + echo "<p class=\"stub\">" . $data['l10n']->get('this page is stub') . "</p>"; |
|
| 10 | 10 | } |
| 11 | 11 | ?> |
| 12 | 12 | \ No newline at end of file |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | <div class="value"><?php echo $formatter->date($invoice->deliverydate); ?></div></div> |
| 35 | 35 | <?php } ?> |
| 36 | 36 | |
| 37 | - <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description');?>: </div> |
|
| 37 | + <div class="field"><div class="title"><?php echo $data['l10n_midcom']->get('description'); ?>: </div> |
|
| 38 | 38 | <div class="description value">&(view['description']:h);</div></div> |
| 39 | 39 | |
| 40 | 40 | <?php |
@@ -8,7 +8,8 @@ |
||
| 8 | 8 | if ($customer->orgOpenpsaObtype < org_openpsa_contacts_group_dba::ORGANIZATION) { |
| 9 | 9 | $customer = false; |
| 10 | 10 | } |
| 11 | -} catch (midcom_error) { |
|
| 11 | +} |
|
| 12 | +catch (midcom_error) { |
|
| 12 | 13 | $customer = false; |
| 13 | 14 | } |
| 14 | 15 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | <?php |
| 47 | 47 | //index is needed for sorting |
| 48 | 48 | echo "'index_name',"; |
| 49 | - echo "'" . $data['l10n']->get('entry title') ."',"; |
|
| 49 | + echo "'" . $data['l10n']->get('entry title') . "',"; |
|
| 50 | 50 | echo "'" . $data['l10n']->get('entry text') . "',"; |
| 51 | 51 | echo "'" . $data['l10n']->get('entry created') . "',"; |
| 52 | 52 | echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',"; |
@@ -25,7 +25,8 @@ |
||
| 25 | 25 | $row['creator_index'] = $creator->rname; |
| 26 | 26 | $creator_card = org_openpsa_widgets_contact::get($entry->metadata->creator); |
| 27 | 27 | $row['creator'] = $creator_card->show_inline(); |
| 28 | - } catch (midcom_error) { |
|
| 28 | + } |
|
| 29 | + catch (midcom_error) { |
|
| 29 | 30 | $row['creator_index'] = ''; |
| 30 | 31 | $row['creator'] = ''; |
| 31 | 32 | } |
@@ -98,13 +98,13 @@ discard block |
||
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | $mimetype = $request->request->get('midgard_admin_asgard_mimetype'); |
| 101 | - if ( !empty($mimetype) |
|
| 101 | + if (!empty($mimetype) |
|
| 102 | 102 | && $local_file->mimetype != $mimetype) { |
| 103 | 103 | $local_file->mimetype = $mimetype; |
| 104 | 104 | $needs_update = true; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - if ( $needs_update |
|
| 107 | + if ($needs_update |
|
| 108 | 108 | && !$local_file->update()) { |
| 109 | 109 | return null; |
| 110 | 110 | } |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | $this->bind_view_to_object($this->_file); |
| 235 | 235 | |
| 236 | 236 | $filename = $this->_process_form($request); |
| 237 | - if ( $filename |
|
| 237 | + if ($filename |
|
| 238 | 238 | && $filename != $data['filename']) { |
| 239 | 239 | return $this->relocate_to_file($filename); |
| 240 | 240 | } |
@@ -48,7 +48,8 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | try { |
| 50 | 50 | $folder = midcom_db_topic::get_cached($this->topic); |
| 51 | - } catch (midcom_error $e) { |
|
| 51 | + } |
|
| 52 | + catch (midcom_error $e) { |
|
| 52 | 53 | $e->log(); |
| 53 | 54 | } |
| 54 | 55 | $folder->delete_attachment(self::FOLDER_THUMBNAIL); |
@@ -58,7 +59,8 @@ discard block |
||
| 58 | 59 | { |
| 59 | 60 | try { |
| 60 | 61 | return new midcom_db_attachment($this->$type); |
| 61 | - } catch (midcom_error $e) { |
|
| 62 | + } |
|
| 63 | + catch (midcom_error $e) { |
|
| 62 | 64 | $e->log(); |
| 63 | 65 | return null; |
| 64 | 66 | } |
@@ -104,7 +104,8 @@ |
||
| 104 | 104 | { |
| 105 | 105 | $ret = ['org_openpsa_relatedto' => []]; |
| 106 | 106 | foreach ($array as $rel) { |
| 107 | - if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { //Matches also 'org_openpsa_relatedto' |
|
| 107 | + if (!midcom::get()->dbfactory->is_a($rel, org_openpsa_relatedto_dba::class)) { |
|
| 108 | +//Matches also 'org_openpsa_relatedto' |
|
| 108 | 109 | //Wrong type of object found in array, cruelly abort the whole procedure |
| 109 | 110 | return null; |
| 110 | 111 | } |
@@ -405,7 +405,7 @@ |
||
| 405 | 405 | { |
| 406 | 406 | // Complete fields |
| 407 | 407 | $this->indexed = time(); |
| 408 | - if ( $this->author == '' |
|
| 408 | + if ($this->author == '' |
|
| 409 | 409 | && isset($this->creator->name)) { |
| 410 | 410 | $this->author = $this->creator->name; |
| 411 | 411 | } |
@@ -510,7 +510,8 @@ |
||
| 510 | 510 | { |
| 511 | 511 | try { |
| 512 | 512 | return midcom_db_person::get_cached($guid); |
| 513 | - } catch (midcom_error) { |
|
| 513 | + } |
|
| 514 | + catch (midcom_error) { |
|
| 514 | 515 | return null; |
| 515 | 516 | } |
| 516 | 517 | } |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']); |
| 89 | 89 | |
| 90 | 90 | if ($dup !== true) { |
| 91 | - if ( !is_object($dup) |
|
| 91 | + if (!is_object($dup) |
|
| 92 | 92 | || !array_key_exists($dup->id, $todelete)) { |
| 93 | 93 | $todelete[$result->id] = $result; |
| 94 | 94 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | - if ( $needs_update |
|
| 100 | + if ($needs_update |
|
| 101 | 101 | && !$result->update()) { |
| 102 | 102 | throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string()); |
| 103 | 103 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | foreach ($results as $result) { |
| 148 | - if ( $result->$field === $object->$field |
|
| 148 | + if ($result->$field === $object->$field |
|
| 149 | 149 | && $result->id !== $object->id) { |
| 150 | 150 | return $result; |
| 151 | 151 | } |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $changed = false; |
| 164 | 164 | foreach ($person2 as $property => $value) { |
| 165 | 165 | // Copy only simple properties not marked to be skipped missing from person1 |
| 166 | - if ( !empty($person2->$property) |
|
| 166 | + if (!empty($person2->$property) |
|
| 167 | 167 | && empty($person1->$property) |
| 168 | 168 | && !isset($skip_properties[$property]) |
| 169 | 169 | && is_scalar($value)) { |