Completed
Push — master ( 309357...7ad46f )
by Andreas
18:00
created
lib/midcom/helper/imagepopup/style/midcom_helper_imagepopup_navigation.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,6 +8,6 @@
 block discarded – undo
8 8
         echo '<li' . ($link['selected'] ? ' class="selected"' : '') . '>';
9 9
         echo '<a href="' . $link['url'] . '/">' . $link['label'] . '</a></li>';
10 10
     }
11
-   ?>
11
+    ?>
12 12
    </ul>
13 13
 </div>
14 14
\ No newline at end of file
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/advanced_form.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,11 +19,11 @@  discard block
 block discarded – undo
19 19
 
20 20
 <table cellspacing="0" cellpadding="3" border="0">
21 21
     <tr>
22
-        <td><?php echo $data['l10n']->get('query');?>:</td>
22
+        <td><?php echo $data['l10n']->get('query'); ?>:</td>
23 23
         <td><input type='text' style="width: 20em;" name='query' value=&(query:h); /></td>
24 24
     </tr>
25 25
     <tr>
26
-        <td><?php echo $data['l10n']->get('limit search by topic tree');?>:</td>
26
+        <td><?php echo $data['l10n']->get('limit search by topic tree'); ?>:</td>
27 27
         <td>
28 28
             <select name="topic" size="1" style="width: 20em;">
29 29
 <?php
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
         </td>
39 39
     </tr>
40 40
     <tr>
41
-        <td><?php echo $data['l10n']->get('limit search by content type');?>:</td>
41
+        <td><?php echo $data['l10n']->get('limit search by content type'); ?>:</td>
42 42
         <td>
43 43
             <select name="component" size="1" style="width: 20em;">
44 44
 <?php
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         </td>
54 54
     </tr>
55 55
     <tr>
56
-        <td><?php echo $data['l10n']->get('limit search by last modified');?>:</td>
56
+        <td><?php echo $data['l10n']->get('limit search by last modified'); ?>:</td>
57 57
         <td>
58 58
             <select name="lastmodified" size="1" style="width: 20em;">
59 59
 <?php
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
         </td>
69 69
     </tr>
70 70
     <tr>
71
-        <td colspan="2"><input type='submit' name='submit' value='<?php echo $data['l10n']->get('search');?>' /></td>
71
+        <td colspan="2"><input type='submit' name='submit' value='<?php echo $data['l10n']->get('search'); ?>' /></td>
72 72
     </tr>
73 73
 </table>
74 74
 </form>
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/basic_form.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,13 +4,13 @@
 block discarded – undo
4 4
 ?>
5 5
 <form method='get' name='midcom_helper_search_form' action='&(prefix);result/' class='midcom.helper.search'>
6 6
 <label for="midcom_helper_search_query">
7
-<?php echo $data['l10n']->get('query');?>:
7
+<?php echo $data['l10n']->get('query'); ?>:
8 8
 <input type='text' size='60' name='query' id='midcom_helper_search_query' value=&(query:h); />
9 9
 </label>
10 10
 <input type='hidden' name='type' value='basic' />
11 11
 <input type='hidden' name='page' value='1' />
12
-<input type='submit' name='submit' value='<?php echo $data['l10n']->get('search');?>' />
12
+<input type='submit' name='submit' value='<?php echo $data['l10n']->get('search'); ?>' />
13 13
 </form>
14 14
 <p>
15
-  <a href="&(prefix);advanced/&(data['params']);"><?php echo $data['l10n']->get('advanced search');?></a>
15
+  <a href="&(prefix);advanced/&(data['params']);"><?php echo $data['l10n']->get('advanced search'); ?></a>
16 16
 </p>
17 17
\ No newline at end of file
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/result_item.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,8 @@
 block discarded – undo
4 4
 
5 5
 try {
6 6
     $topic = midcom_db_topic::get_cached($document->topic_guid);
7
-} catch (midcom_error $e) {
7
+}
8
+catch (midcom_error $e) {
8 9
     $e->log();
9 10
 }
10 11
 ?>
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/no_match.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1
-<h1><?php echo $data['topic']->extra;?></h1>
1
+<h1><?php echo $data['topic']->extra; ?></h1>
2 2
 
3 3
 <div class="midcom_helper_search_form">
4 4
   <?php midcom_show_style("{$data['type']}_form"); ?>
5 5
 </div>
6 6
 
7
-<h2><?php echo $data['l10n']->get('search results');?>:</h2>
7
+<h2><?php echo $data['l10n']->get('search results'); ?>:</h2>
8 8
 
9 9
 <div class="midcom_helper_search_results">
10 10
 <p><?php echo $data['l10n']->get('your query returned no results'); ?></p>
11 11
 </div>
12 12
 
13
-<h2><?php echo $data['l10n']->get('search hints');?>:</h2>
13
+<h2><?php echo $data['l10n']->get('search hints'); ?>:</h2>
14 14
 <p><?php
15 15
     $string = 'search hints ' . $data['config']->get('search_help_message');
16 16
     echo $data['l10n']->get($string);
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/search_form.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1
-<h1><?php echo $data['topic']->extra;?></h1>
1
+<h1><?php echo $data['topic']->extra; ?></h1>
2 2
 
3 3
 <?php midcom_show_style("{$data['type']}_form"); ?>
4 4
 
5
-<h2><?php echo $data['l10n']->get('search hints');?>:</h2>
5
+<h2><?php echo $data['l10n']->get('search hints'); ?>:</h2>
6 6
 <p><?php
7 7
     $string = 'search hints ' . $data['config']->get('search_help_message');
8 8
     echo $data['l10n']->get($string);
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/results.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1
-<h1><?php echo $data['topic']->extra;?></h1>
1
+<h1><?php echo $data['topic']->extra; ?></h1>
2 2
 
3 3
 <div class="midcom_helper_search_form">
4 4
   <?php midcom_show_style("{$data['type']}_form"); ?>
5 5
 </div>
6 6
 
7
-<h2><?php echo $data['l10n']->get('search results');?>:</h2>
7
+<h2><?php echo $data['l10n']->get('search results'); ?>:</h2>
8 8
 <?php
9 9
 midcom_show_style('result_summary');
10 10
 midcom_show_style('result_nav');
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 midcom_show_style('result_nav');
20 20
 ?>
21 21
 
22
-<h2><?php echo $data['l10n']->get('search hints');?>:</h2>
22
+<h2><?php echo $data['l10n']->get('search hints'); ?>:</h2>
23 23
 <p><?php
24 24
     $string = 'search hints ' . $data['config']->get('search_help_message');
25 25
     echo $data['l10n']->get($string);
Please login to merge, or discard this patch.
lib/org/openpsa/reports/style/generic_query_form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <div class="wide">
2
-    <?php  $data['controller']->display_form();  ?>
2
+    <?php  $data['controller']->display_form(); ?>
3 3
     <!-- To open the report in new window we need to set the target via JS -->
4 4
     <script type="text/javascript">
5 5
     $('.datamanager2 button[type="submit"].save').attr('formtarget', '_blank');
Please login to merge, or discard this patch.
lib/midcom/core/dbaobject.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         if (is_object($id)) {
85 85
             $this->__object = midcom::get()->dbfactory->convert_midcom_to_midgard($id);
86 86
         } else {
87
-            if (   is_int($id)
87
+            if (is_int($id)
88 88
                 && $id < 1) {
89 89
                 throw new midcom_error($id . ' is not a valid database ID');
90 90
             }
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             }
99 99
 
100 100
             //Some useful information for performance tuning
101
-            if (   midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
101
+            if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
102 102
                 && $this->__object->guid) {
103 103
                 static $guids = [];
104 104
                 static $total = 0;
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
     }
636 636
     public function enable_rcs()
637 637
     {
638
-        $this->_use_rcs  = true;
638
+        $this->_use_rcs = true;
639 639
     }
640 640
     public function set_rcs_message($msg)
641 641
     {
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,8 @@
 block discarded – undo
93 93
             try {
94 94
                 $mgdschemaclass = $this->__mgdschema_class_name__;
95 95
                 $this->__object = new $mgdschemaclass($id);
96
-            } catch (mgd_exception $e) {
96
+            }
97
+            catch (mgd_exception $e) {
97 98
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN);
98 99
                 throw new midcom_error_midgard($e, $id);
99 100
             }
Please login to merge, or discard this patch.