Completed
Pull Request — master (#198)
by
unknown
19:02
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/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/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_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.
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.
admin/asgard/style/midgard_admin_asgard_object_attachments_header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
                 $workflow = new midcom\workflow\delete(['object' => $file, 'label' => $file->name]);
22 22
                 $revisor = midcom::get()->auth->get_user($file->metadata->revisor);
23 23
                 $class = '';
24
-                if (   isset($data['file'])
24
+                if (isset($data['file'])
25 25
                     && $file->name == $data['file']->name) {
26 26
                     $class = ' class="selected"';
27 27
                 }
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/style/midgard_admin_asgard_shell_runner.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,8 @@
 block discarded – undo
61 61
     try {
62 62
         ?>&(data['code']:p);<?php
63 63
 
64
-    } catch (Exception $e) {
64
+    }
65
+    catch (Exception $e) {
65 66
         echo '<div class="shell-error">' . $e->getMessage() . '</div>';
66 67
         echo htmlentities($e->getTraceAsString());
67 68
     }
Please login to merge, or discard this patch.
lib/midgard/admin/asgard/style/midgard_admin_asgard_trash_type.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
         $child_indent = $indent + 20;
52 52
         echo "{$prefix}<tbody class=\"children\">\n";
53 53
         foreach ($child_types as $type => $children) {
54
-            if (   count($children) < 10
54
+            if (count($children) < 10
55 55
                 || isset($_GET['show_children'][$object->guid][$type])) {
56 56
                 foreach ($children as $child) {
57 57
                     midgard_admin_asgard_trash_type_show($child, $child_indent, "{$prefix}    ", false);
Please login to merge, or discard this patch.
lib/midgard/admin/user/style/midgard-admin-user-generate-passwords.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 
43 43
 }
44 44
 
45
-if (   !is_numeric($n)
45
+if (!is_numeric($n)
46 46
     || $n <= 0
47 47
     || !is_numeric($length)
48 48
     || $length <= 0) {
Please login to merge, or discard this patch.