Completed
Pull Request — master (#198)
by
unknown
19:02
created
lib/org/openpsa/mypage/style/workingon.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     <textarea id="working_description" name="description" rows="3" cols="40">&(workingon.description);</textarea>
50 50
     <div id="working_invoiceable_div" >
51 51
     <label for="working_invoiceable">
52
-      <input type="checkbox" name="working_invoiceable" <?php echo $checked;?> id="working_invoiceable"/><?php echo $data['l10n']->get('invoiceable'); ?>
52
+      <input type="checkbox" name="working_invoiceable" <?php echo $checked; ?> id="working_invoiceable"/><?php echo $data['l10n']->get('invoiceable'); ?>
53 53
     </label>
54 54
     </div>
55 55
 
Please login to merge, or discard this patch.
lib/org/openpsa/mypage/style/show-updates.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@
 block discarded – undo
31 31
             }
32 32
             $contact = new org_openpsa_widgets_contact($editor);
33 33
             echo "<li class=\"updated-{$class}\"><a href=\"{$url}\"{$onclick}>{$document->title}</a> <div class=\"metadata\">" . $formatter->datetime($document->edited) . " (" . $contact->show_inline() . ")</div></li>\n";
34
-        } catch (midcom_error $e) {
34
+        }
35
+        catch (midcom_error $e) {
35 36
         }
36 37
     }
37 38
     echo "</ul></div>\n";
Please login to merge, or discard this patch.
lib/org/openpsa/mypage/style/weekreview-day-item-task-status.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
 $target_person_label = midcom::get()->i18n->get_string('system', 'org.openpsa.projects');
5 5
 
6 6
 $fallback_creator = midcom_db_person::get_cached(1);
7
-if (    $task_status->metadata->creator
7
+if ($task_status->metadata->creator
8 8
      && $task_status->metadata->creator != $fallback_creator->guid) {
9 9
     $status_changer = org_openpsa_widgets_contact::get($task_status->metadata->creator);
10 10
     $status_changer_label = $status_changer->show_inline();
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,8 @@
 block discarded – undo
33 33
                 $task_label = "<a href=\"{$data['projects_url']}task/{$task->guid}/\">{$task_label}</a>";
34 34
             }
35 35
             echo $task_label;
36
-        } catch (midcom_error $e) {
36
+        }
37
+        catch (midcom_error $e) {
37 38
 }
38 39
         ?>
39 40
     </td>
Please login to merge, or discard this patch.
lib/org/openpsa/mypage/style/workingon_expenses.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
     echo "<form action=\"{$data['expenses_url']}\" method='post'><div>";
46 46
     $current_user = midcom::get()->auth->user->get_storage();
47 47
     echo "<input type=\"hidden\" name=\"person[]\" value=\"{$current_user->id}\" />";
48
-    echo "<input type=\"submit\" value=\"".sprintf($data['l10n']->get('see all %s hours'), round($total_hours, 2))."\" />";
48
+    echo "<input type=\"submit\" value=\"" . sprintf($data['l10n']->get('see all %s hours'), round($total_hours, 2)) . "\" />";
49 49
     echo "</div></form>";
50 50
 } else {
51 51
     echo "<p><a href=\"{$data['expenses_url']}\">" . midcom::get()->i18n->get_string('report hours', 'org.openpsa.expenses') . "</a></p>\n";
Please login to merge, or discard this patch.
lib/org/openpsa/projects/style/show-project.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,8 @@
 block discarded – undo
19 19
             $customer_html = '<a href="' . $contacts_url . '/group/' . $customer->guid . '/">' . $customer_html . "</a>\n";
20 20
         }
21 21
         echo $customer_html;
22
-    } catch (midcom_error $e) {
22
+    }
23
+    catch (midcom_error $e) {
23 24
     }
24 25
 
25 26
     if ($project->manager) {
Please login to merge, or discard this patch.
lib/org/openpsa/projects/style/show-prospects-xml.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,8 @@
 block discarded – undo
6 6
     foreach ($data['prospects'] as $prospect) {
7 7
         try {
8 8
             $person = org_openpsa_contacts_person_dba::get_cached($prospect->person);
9
-        } catch (midcom_error $e) {
9
+        }
10
+        catch (midcom_error $e) {
10 11
             continue;
11 12
         } ?>
12 13
         <person>
Please login to merge, or discard this patch.
lib/org/openpsa/projects/style/show-frontpage.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@
 block discarded – undo
31 31
         try {
32 32
             $customer = new org_openpsa_contacts_group_dba($customer);
33 33
             $customer_title = $customer->official;
34
-        } catch (midcom_error $e) {
34
+        }
35
+        catch (midcom_error $e) {
35 36
             $customer_title = $data['l10n']->get('no customer');
36 37
         }
37 38
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
             echo "        <td class=\"numeric\"><span title=\"" . $data['l10n']->get('ongoing') . "\">{$task_count['ongoing']}</span></td>\n";
69 69
             echo "        <td class=\"numeric\"><span title=\"" . $data['l10n']->get('on_hold') . "\">{$task_count['on_hold']}</span></td>\n";
70 70
             echo "        <td class=\"numeric\"><span title=\"" . $data['l10n']->get('closed') . "\">{$task_count['closed']}</span></td>\n";
71
-            echo "        <td class=\"numeric\"> " ;
71
+            echo "        <td class=\"numeric\"> ";
72 72
             echo "            <span title=\"" . $data['l10n']->get('reported') . "\">" . round($hours['reportedHours'], 2) . "</span>";
73 73
             if ($hours['plannedHours'] > 0) {
74 74
                 echo          " / <span title=\"" . $data['l10n']->get('planned hours') . "\">" . round($hours['plannedHours'], 2) . "</span>";
Please login to merge, or discard this patch.
lib/org/openpsa/qbpager/style/show_pages_as_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
         echo "\n<li class=\"separator\"></li>";
15 15
         echo "\n<li class=\"page splitter\">...</li>";
16 16
     }
17
-    if (   $i > 0
17
+    if ($i > 0
18 18
             && $i < $total_links) {
19 19
         echo "\n<li class=\"separator\"></li>";
20 20
     }
Please login to merge, or discard this patch.
lib/org/openpsa/sales/style/show-salesproject-grid.php 2 patches
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,7 +35,8 @@  discard block
 block discarded – undo
35 35
                 if ($data['contacts_url']) {
36 36
                     $row['customer'] = "<a href=\"{$data['contacts_url']}group/{$customer->guid}/\">{$label}</a>";
37 37
                 }
38
-            } catch (midcom_error $e) {
38
+            }
39
+            catch (midcom_error $e) {
39 40
                 $e->log();
40 41
             }
41 42
         }
@@ -51,7 +52,8 @@  discard block
 block discarded – undo
51 52
             if ($data['contacts_url']) {
52 53
                 $row['customerContact'] = "<a href=\"{$data['contacts_url']}person/{$customer->guid}/\">{$label}</a>";
53 54
             }
54
-        } catch (midcom_error $e) {
55
+        }
56
+        catch (midcom_error $e) {
55 57
             $e->log();
56 58
         }
57 59
     }
@@ -63,7 +65,8 @@  discard block
 block discarded – undo
63 65
         $owner_widget = org_openpsa_widgets_contact::get($salesproject->owner);
64 66
         $row['index_owner'] = $owner->rname;
65 67
         $row['owner'] = $owner_widget->show_inline();
66
-    } catch (midcom_error $e) {
68
+    }
69
+    catch (midcom_error $e) {
67 70
         $row['index_owner'] = '';
68 71
         $row['owner'] = '';
69 72
     }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
           created: '<?php echo $data['l10n']->get('created'); ?>',
139 139
           index_title: '<?php echo $data['l10n']->get('title'); ?>',
140 140
           <?php
141
-          if ($data['mode'] != 'customer') {
141
+            if ($data['mode'] != 'customer') {
142 142
     ?>
143 143
             index_customer: '<?php echo $data['l10n']->get('customer'); ?>',
144 144
           <?php
Please login to merge, or discard this patch.