Completed
Push — master ( 309357...7ad46f )
by Andreas
18:00
created
lib/org/openpsa/relatedto/style/show_entries_html.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -52,14 +52,14 @@
 block discarded – undo
52 52
         data: entries,
53 53
         colNames: ["id",
54 54
                   <?php
55
-                  //index is needed for sorting
56
-                  echo "'index_name',";
57
-                  echo "'" . $data['l10n']->get('entry title') ."',";
58
-                  echo "'" . $data['l10n']->get('entry text') . "',";
59
-                  echo "'" . $data['l10n']->get('entry created') . "',";
60
-                  echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',";
61
-                  echo "'" . $data['l10n']->get('status') . "'";
62
-                  ?>
55
+                    //index is needed for sorting
56
+                    echo "'index_name',";
57
+                    echo "'" . $data['l10n']->get('entry title') ."',";
58
+                    echo "'" . $data['l10n']->get('entry text') . "',";
59
+                    echo "'" . $data['l10n']->get('entry created') . "',";
60
+                    echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',";
61
+                    echo "'" . $data['l10n']->get('status') . "'";
62
+                    ?>
63 63
         ],
64 64
         colModel: [
65 65
                   {name:'id',index:'id', hidden: true, key: true },
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
                   <?php
55 55
                   //index is needed for sorting
56 56
                   echo "'index_name',";
57
-                  echo "'" . $data['l10n']->get('entry title') ."',";
57
+                  echo "'" . $data['l10n']->get('entry title') . "',";
58 58
                   echo "'" . $data['l10n']->get('entry text') . "',";
59 59
                   echo "'" . $data['l10n']->get('entry created') . "',";
60 60
                   echo "'index_creator', '" . $data['l10n_midcom']->get('creator') . "',";
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,8 @@
 block discarded – undo
28 28
                 $row['creator_index'] = $creator->rname;
29 29
                 $creator_card = org_openpsa_widgets_contact::get($entry->metadata->creator);
30 30
                 $row['creator'] = $creator_card->show_inline();
31
-            } catch (midcom_error $e) {
31
+            }
32
+            catch (midcom_error $e) {
32 33
                 $row['creator_index'] = '';
33 34
                 $row['creator'] = '';
34 35
             }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/style/show_entries_list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 $("#journalgrid").jqGrid({
10 10
     scroll: 1,
11
-    url: '<?php echo $data['url_prefix'] ; ?>xml/',
11
+    url: '<?php echo $data['url_prefix']; ?>xml/',
12 12
     datatype: "xml",
13 13
     mtype: "POST",
14 14
     height: 150,
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     <?php
18 18
         //index is needed for sorting
19 19
         echo "'index_name',";
20
-echo "'" . midcom::get()->i18n->get_string('entry title', 'org.openpsa.relatedto') ."',";
20
+echo "'" . midcom::get()->i18n->get_string('entry title', 'org.openpsa.relatedto') . "',";
21 21
 echo "'" . midcom::get()->i18n->get_string('entry text', 'org.openpsa.relatedto') . "',";
22 22
 echo "'" . midcom::get()->i18n->get_string('followup', 'org.openpsa.relatedto') . "',";
23 23
 echo "'index_object',";
Please login to merge, or discard this patch.
lib/org/openpsa/slideshow/style/edit.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,8 @@
 block discarded – undo
21 21
         $original = new midcom_db_attachment($image->attachment);
22 22
         $original_url = midcom_db_attachment::get_url($original);
23 23
         $name = $original->name;
24
-    } catch (midcom_error $e) {
24
+    }
25
+    catch (midcom_error $e) {
25 26
         $url = MIDCOM_STATIC_URL . '/stock-icons/mime/gnome-text-blank.png';
26 27
         $name = $data['l10n']->get('attachment missing');
27 28
         $original_url = '';
Please login to merge, or discard this patch.
lib/org/openpsa/reports/style/projects_report-basic-header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
                         <th><?php echo $data['l10n']->get('type'); ?></th>
25 25
 <?php 
26 26
         }   ?>
27
-<?php   if (   array_key_exists('invoiceable_filter', $query_data)) {
27
+<?php   if (array_key_exists('invoiceable_filter', $query_data)) {
28 28
             ?>
29 29
                         <th><?php echo midcom::get()->i18n->get_string('invoiceable', 'org.openpsa.projects'); ?></th>
30 30
 <?php 
Please login to merge, or discard this patch.
lib/org/openpsa/reports/style/invoices_report-grid.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -120,13 +120,13 @@
 block discarded – undo
120 120
 $grid->set_option('loadonce', true)
121 121
     ->set_option('grouping', true)
122 122
     ->set_option('groupingView', [
123
-             'groupField' => ['status'],
124
-             'groupColumnShow' => [false],
125
-             'groupText' => ['<strong>{0}</strong> ({1})'],
126
-             'groupOrder' => ['asc'],
127
-             'groupSummary' => [true],
128
-             'showSummaryOnHide' => true
129
-         ])
123
+                'groupField' => ['status'],
124
+                'groupColumnShow' => [false],
125
+                'groupText' => ['<strong>{0}</strong> ({1})'],
126
+                'groupOrder' => ['asc'],
127
+                'groupSummary' => [true],
128
+                'showSummaryOnHide' => true
129
+            ])
130 130
     ->set_option('sortname', $sortname)
131 131
     ->set_option('sortorder', $sortorder);
132 132
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,7 +73,8 @@  discard block
 block discarded – undo
73 73
         } else {
74 74
             $entry['customer'] = $customer->official;
75 75
         }
76
-    } catch (midcom_error $e) {
76
+    }
77
+    catch (midcom_error $e) {
77 78
     }
78 79
 
79 80
     if ($entry['status'] === 'canceled') {
@@ -85,7 +86,8 @@  discard block
 block discarded – undo
85 86
         $entry['index_contact'] = $contact->rname;
86 87
         $contact_card = org_openpsa_widgets_contact::get($invoice->customerContact);
87 88
         $entry['contact'] = $contact_card->show_inline();
88
-    } catch (midcom_error $e) {
89
+    }
90
+    catch (midcom_error $e) {
89 91
     }
90 92
 
91 93
     $entries[] = $entry;
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/style/midgard_admin_asgard_footer.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 
17 17
                             $edited = (int) $view_metadata->get('revised');
18 18
                             $revision = $view_metadata->get('revision');
19
-                            if (   $revision > 1
19
+                            if ($revision > 1
20 20
                                 && $edited != $created) {
21 21
                                 try {
22 22
                                     $editor = new midcom_db_person($view_metadata->get('revisor'));
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,8 @@  discard block
 block discarded – undo
8 8
                             try {
9 9
                                 $creator = new midcom_db_person($view_metadata->get('creator'));
10 10
                                 $creator_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$creator->guid}/\">$creator->name</a>";
11
-                            } catch (midcom_error $e) {
11
+                            }
12
+                            catch (midcom_error $e) {
12 13
                                 $creator_string = $data['l10n']->get('unknown person');
13 14
                             }
14 15
                             $created = (int) $view_metadata->get('created');
@@ -21,7 +22,8 @@  discard block
 block discarded – undo
21 22
                                 try {
22 23
                                     $editor = new midcom_db_person($view_metadata->get('revisor'));
23 24
                                     $editor_string = "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$editor->guid}/\">$editor->name</a>";
24
-                                } catch (midcom_error $e) {
25
+                                }
26
+                                catch (midcom_error $e) {
25 27
                                     $editor_string = $data['l10n']->get('unknown person');
26 28
                                 }
27 29
 
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/style/midgard_admin_asgard_rcs_preview.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 <dl class="midgard_admin_asgard_rcs_diff">
12 12
 <?php
13 13
 foreach ($preview as $attribute => $value) {
14
-    if (   $value == ''
14
+    if ($value == ''
15 15
         || $value == '0000-00-00'
16 16
         || !midcom_services_rcs::is_field_showable($attribute)
17 17
         || is_array($value)) {
Please login to merge, or discard this patch.
admin/asgard/style/midgard_admin_asgard_stylehelper_elementnames.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
             if ($component == 'midcom') {
12 12
                 echo "Midgard CMS\n";
13 13
             } else {
14
-                echo "<a href=\"{$prefix}__mfa/asgard/components/{$component}/\">" . midcom::get()->i18n->get_string($component, $component) ." </a>\n";
14
+                echo "<a href=\"{$prefix}__mfa/asgard/components/{$component}/\">" . midcom::get()->i18n->get_string($component, $component) . " </a>\n";
15 15
             }
16 16
 
17 17
             echo "<ul>\n";
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/style/midgard_admin_asgard_object_permissions.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php echo $data['renderer']->block($data['form'], 'form_start'); ?>
2 2
 <div class="maa_permissions_assignees">
3 3
 	<?php
4
-	if (empty($data['form']->children['add_assignee']->vars['value'])) {
5
-	    echo $data['renderer']->label($data['form']->children['add_assignee']);
4
+    if (empty($data['form']->children['add_assignee']->vars['value'])) {
5
+        echo $data['renderer']->label($data['form']->children['add_assignee']);
6 6
         echo $data['renderer']->widget($data['form']->children['add_assignee']);
7
-	}
8
-	?>
7
+    }
8
+    ?>
9 9
 </div>
10 10
 <table class="maa_permissions_items">
11 11
     <thead>
Please login to merge, or discard this patch.