Completed
Push — master ( 309357...7ad46f )
by Andreas
18:00
created
lib/org/openpsa/relatedto/style/relatedto_list_item_invoice.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
     </div>
36 36
 
37 37
   <?php
38
-  //TODO: necessary JS stuff to load details (which should in turn include the invoice's own relatedtos) via AHAH
39
-  org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
40
-  ?>
38
+    //TODO: necessary JS stuff to load details (which should in turn include the invoice's own relatedtos) via AHAH
39
+    org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
40
+    ?>
41 41
 </li>
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/style/relatedto_list_item_salesproject.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
   <div id="org_openpsa_relatedto_details_&(salesproject.guid);" class="details hidden" style="display: none;">
28 28
   </div>
29 29
   <?php
30
-  //TODO: necessary JS stuff to load details (which should in turn include the invoice's own relatedtos) via AHAH
31
-  org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
32
-  ?>
30
+    //TODO: necessary JS stuff to load details (which should in turn include the invoice's own relatedtos) via AHAH
31
+    org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
32
+    ?>
33 33
 </li>
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/style/relatedto_list_item_document.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
   <div id="org_openpsa_relatedto_details_&(document.guid);" class="details hidden" style="display: none;">
32 32
   </div>
33 33
   <?php
34
-  //TODO: get correct node and via it then handle details trough AHAH (and when we have node we can use proper link in document_url as well
35
-  org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
36
-  ?>
34
+    //TODO: get correct node and via it then handle details trough AHAH (and when we have node we can use proper link in document_url as well
35
+    org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
36
+    ?>
37 37
 </li>
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/style/relatedto_list_item_event.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
     </div>
26 26
 <?php
27 27
 //TODO: necessary JS stuff to load details (which should in turn include the events own relatedtos) via AHAH
28
-  org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
29
-  ?>
28
+    org_openpsa_relatedto_handler_relatedto::render_line_controls($link, $data['other_obj']);
29
+    ?>
30 30
 </li>
Please login to merge, or discard this patch.
lib/midcom/services/i18n/l10n.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -474,7 +474,7 @@
 block discarded – undo
474 474
     {
475 475
         return
476 476
         (
477
-               $this->string_exists($string, $this->_language)
477
+                $this->string_exists($string, $this->_language)
478 478
             || $this->string_exists($string, $this->_fallback_language)
479 479
         );
480 480
     }
Please login to merge, or discard this patch.
lib/midcom/helper/metadata.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,6 @@
 block discarded – undo
58 58
  * @property string $revisor The person that modified the object, read-only.
59 59
  * @property integer $approved The time of approval of the object, or 0 if not approved. Set automatically through approve/unapprove.
60 60
  * @property string $approver The person that approved/unapproved the object. Set automatically through approve/unapprove.
61
-
62 61
  * @package midcom.helper
63 62
  */
64 63
 class midcom_helper_metadata
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -658,7 +658,8 @@
 block discarded – undo
658 658
             && mgd_is_guid($guid)) {
659 659
             try {
660 660
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
661
-            } catch (midcom_error $e) {
661
+            }
662
+            catch (midcom_error $e) {
662 663
                 debug_add("Failed to create a metadata instance for the GUID {$guid}: " . $e->getMessage(), MIDCOM_LOG_WARN);
663 664
                 debug_print_r("Source was:", $source);
664 665
 
Please login to merge, or discard this patch.
lib/midcom/core/user.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -407,7 +407,7 @@
 block discarded – undo
407 407
 
408 408
                 $parent = $parent->get_parent_group();
409 409
             }
410
-            */
410
+             */
411 411
             $this->_inheritance_chains[$id] = $inheritance_chain;
412 412
         }
413 413
     }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -182,7 +182,8 @@  discard block
 block discarded – undo
182 182
             }
183 183
             try {
184 184
                 $this->_storage = new $person_class($id);
185
-            } catch (mgd_exception $e) {
185
+            }
186
+            catch (mgd_exception $e) {
186 187
                 debug_add("Failed to retrieve the person ID {$id}: " . $e->getMessage(), MIDCOM_LOG_INFO);
187 188
                 throw new midcom_error_midgard($e, $id);
188 189
             }
@@ -230,7 +231,8 @@  discard block
 block discarded – undo
230 231
         if (mgd_is_guid($id)) {
231 232
             try {
232 233
                 return new $person_class($id);
233
-            } catch (mgd_exception $e) {
234
+            }
235
+            catch (mgd_exception $e) {
234 236
                 debug_add("Failed to retrieve the person GUID {$id}: " . $e->getMessage(), MIDCOM_LOG_INFO);
235 237
                 throw new midcom_error_midgard($e, $id);
236 238
             }
Please login to merge, or discard this patch.
lib/org/openpsa/calendar/event/resource.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,8 @@
 block discarded – undo
42 42
         }
43 43
         try {
44 44
             $resource = org_openpsa_calendar_resource_dba::get_cached($this->resource);
45
-        } catch (midcom_error $e) {
45
+        }
46
+        catch (midcom_error $e) {
46 47
             debug_add("Cannot fetch resource #{$this->resource} returning false", MIDCOM_LOG_INFO);
47 48
             return false;
48 49
         }
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/invoice/item.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,8 @@  discard block
 block discarded – undo
66 66
             try {
67 67
                 $task = org_openpsa_projects_task_dba::get_cached($this->task);
68 68
                 $url = $projects_url . 'task/' . $task->guid . '/';
69
-            } catch (midcom_error $e) {
69
+            }
70
+            catch (midcom_error $e) {
70 71
             }
71 72
         }
72 73
         if (   $url == ''
@@ -74,7 +75,8 @@  discard block
 block discarded – undo
74 75
             try {
75 76
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable);
76 77
                 $url = $sales_url . 'deliverable/' . $deliverable->guid . '/';
77
-            } catch (midcom_error $e) {
78
+            }
79
+            catch (midcom_error $e) {
78 80
             }
79 81
         }
80 82
         if ($url != '') {
@@ -96,7 +98,8 @@  discard block
 block discarded – undo
96 98
                     $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable);
97 99
                     self::update_deliverable($deliverable);
98 100
                 }
99
-            } catch (midcom_error $e) {
101
+            }
102
+            catch (midcom_error $e) {
100 103
                 $e->log();
101 104
             }
102 105
         }
Please login to merge, or discard this patch.