Completed
Pull Request — master (#194)
by
unknown
15:06
created
src/midcom/dba/parameters.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
         if (   !$this->can_do('midgard:update')
219 219
             || !$this->can_do('midgard:parameters')) {
220 220
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
221
-                      MIDCOM_LOG_ERROR);
221
+                        MIDCOM_LOG_ERROR);
222 222
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
223 223
             return false;
224 224
         }
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
         if (   !$this->can_do('midgard:update')
272 272
             || !$this->can_do('midgard:parameters')) {
273 273
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
274
-                      MIDCOM_LOG_ERROR);
274
+                        MIDCOM_LOG_ERROR);
275 275
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
276 276
             return false;
277 277
         }
Please login to merge, or discard this patch.
lib/midcom/services/rcs/backend/rcs.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -105,12 +105,12 @@
 block discarded – undo
105 105
         return $status;
106 106
     }
107 107
 
108
-   /**
109
-    * Get the object of a revision
110
-    *
111
-    * @param string $revision identifier of revision wanted
112
-    * @return array array representation of the object
113
-    */
108
+    /**
109
+     * Get the object of a revision
110
+     *
111
+     * @param string $revision identifier of revision wanted
112
+     * @return array array representation of the object
113
+     */
114 114
     public function get_revision($revision)
115 115
     {
116 116
         if (empty($this->_guid)) {
Please login to merge, or discard this patch.
lib/org/openpsa/user/style/show-group.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <div class="content-with-sidebar">
2 2
     <div class="main">
3 3
 	    <?php
4
-	    $data['view']->display_view();
4
+        $data['view']->display_view();
5 5
         $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX);
6 6
         midcom::get()->dynamic_load($prefix . 'members/' . $data['group']->guid . '/');
7 7
         ?>
Please login to merge, or discard this patch.
lib/org/openpsa/sales/style/show-salesproject.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
              <div class="value"><?php echo $formatter->number($salesproject->profit); ?></div>
41 41
             </div>
42 42
             <?php
43
-             $owner_card = org_openpsa_widgets_contact::get($salesproject->owner);
43
+                $owner_card = org_openpsa_widgets_contact::get($salesproject->owner);
44 44
             ?>
45 45
             <div class="field">
46 46
              <div class="title"><?php echo $data['l10n']->get('owner'); ?></div>
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/billing/data.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object)
42 42
     {
43 43
         if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
44
-               // check if the customerContact is set and has invoice_data
44
+                // check if the customerContact is set and has invoice_data
45 45
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
46 46
             $bd = new org_openpsa_invoices_billing_data_dba();
47 47
             $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days');
Please login to merge, or discard this patch.
lib/org/openpsa/user/style/show-person-account.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
             echo '<span class="toolbar_label">' . $data['l10n_midcom']->get('delete') . '</span></a></li>';
27 27
             if (    midcom::get()->config->get('auth_allow_trusted') === true
28 28
                  && $data['person']->can_do('org.openpsa.user:su')) {
29
-                 echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n";
29
+                    echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n";
30 30
             }
31 31
             echo "</ul>\n";
32 32
         }
Please login to merge, or discard this patch.
lib/midcom/core/privilege.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,6 @@
 block discarded – undo
37 37
                 - 1: MIDCOM_PRIVILEGE_ALLOW
38 38
                 - 2: MIDCOM_PRIVILEGE_DENY
39 39
                 - 3: MIDCOM_PRIVILEGE_INHERIT
40
-
41 40
  * @property string $guid
42 41
  * @package midcom
43 42
  */
Please login to merge, or discard this patch.
lib/midcom/services/auth/acl.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -269,17 +269,17 @@
 block discarded – undo
269 269
     private static $_default_magic_class_privileges = [];
270 270
 
271 271
     /**
272
-    * Internal cache of the content privileges of users on content objects, this is
273
-    * an associative array using a combination of the user identifier and the object's
274
-    * guid as index. The privileges for the anonymous user use the magic
275
-    * EVERYONE as user identifier.
276
-    *
277
-    * This must not be merged with the class-wide privileges_cache, because otherwise
278
-    * class_default_privileges for child objects might be overridden by parent default
279
-    * privileges
280
-    *
281
-    * @var Array
282
-    */
272
+     * Internal cache of the content privileges of users on content objects, this is
273
+     * an associative array using a combination of the user identifier and the object's
274
+     * guid as index. The privileges for the anonymous user use the magic
275
+     * EVERYONE as user identifier.
276
+     *
277
+     * This must not be merged with the class-wide privileges_cache, because otherwise
278
+     * class_default_privileges for child objects might be overridden by parent default
279
+     * privileges
280
+     *
281
+     * @var Array
282
+     */
283 283
     private static $_content_privileges_cache = [];
284 284
 
285 285
     /**
Please login to merge, or discard this patch.
lib/org/openpsa/helpers/main.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -40,31 +40,31 @@
 block discarded – undo
40 40
         return $output;
41 41
     }
42 42
 
43
-     /**
44
-      * @param midcom_core_dbaobject $object The object we're working on
45
-      * @param string $field The schema field name
46
-      * @return midcom_db_attachment[] List of attachments, indexed by identifier
47
-      */
48
-     public static function get_dm2_attachments($object, $field)
49
-     {
50
-         $attachments = [];
51
-         $identifiers = explode(',', $object->get_parameter('midcom.helper.datamanager2.type.blobs', 'guids_' . $field));
52
-         if (empty($identifiers)) {
53
-             return $attachments;
54
-         }
55
-         foreach ($identifiers as $identifier) {
56
-             $parts = explode(':', $identifier);
57
-             if (count($parts) != 2) {
58
-                 continue;
59
-             }
60
-             $guid = $parts[1];
61
-             try {
62
-                 $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
63
-             } catch (midcom_error $e) {
64
-                 $e->log();
65
-             }
66
-         }
43
+        /**
44
+         * @param midcom_core_dbaobject $object The object we're working on
45
+         * @param string $field The schema field name
46
+         * @return midcom_db_attachment[] List of attachments, indexed by identifier
47
+         */
48
+        public static function get_dm2_attachments($object, $field)
49
+        {
50
+            $attachments = [];
51
+            $identifiers = explode(',', $object->get_parameter('midcom.helper.datamanager2.type.blobs', 'guids_' . $field));
52
+            if (empty($identifiers)) {
53
+                return $attachments;
54
+            }
55
+            foreach ($identifiers as $identifier) {
56
+                $parts = explode(':', $identifier);
57
+                if (count($parts) != 2) {
58
+                    continue;
59
+                }
60
+                $guid = $parts[1];
61
+                try {
62
+                    $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
63
+                } catch (midcom_error $e) {
64
+                    $e->log();
65
+                }
66
+            }
67 67
 
68
-         return $attachments;
69
-     }
68
+            return $attachments;
69
+        }
70 70
 }
Please login to merge, or discard this patch.