flack / openpsa

src/midcom/datamanager/extension/transformer/jsdateTransformer.php

Spacing +4 added lines, -4 removed lines

@@ -33,8 +33,8 @@ 
             }
         }
 
-        if (   empty($input)
-            || (   $input instanceof DateTime
+        if (empty($input)
+            || ($input instanceof DateTime
                 && $input->format('Y-m-d H:i:s') == '0001-01-01 00:00:00')) {
             return $result;
         }
@@ -59,8 +59,8 @@ 
             throw new TransformationFailedException('Expected an array.');
         }
 
-        if (   empty($array['date'])
-            || (   $array['date'] instanceof DateTime
+        if (empty($array['date'])
+            || ($array['date'] instanceof DateTime
                 && $array['date']->format('Y-m-d H:i:s') == '0001-01-01 00:00:00')) {
             return;
         }

lib/net/nehmer/blog/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
             net_nemein_rss_manage::add_toolbar_buttons($this->_node_toolbar, $this->_topic->can_do('midgard:create'));
         }
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $buttons[] = $workflow->get_button('config/', [
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
@@ -126,11 +126,11 @@ 
         $this->_request_data['categories'] = explode(',', $this->_config->get('categories'));
 
         foreach ($this->_request_data['schemadb']->all() as $schema) {
-            if (   $schema->has_field('categories')
+            if ($schema->has_field('categories')
                 && $schema->get_field('categories')['type'] == 'select') {
                 // TODO: Merge schema local and component config categories?
                 $options = array_combine($this->_request_data['categories'], $this->_request_data['categories']);
-                $field =& $schema->get_field('categories');
+                $field = & $schema->get_field('categories');
                 $field['type_config']['options'] = $options;
             }
         }

lib/midcom/core/privilege.php

Indentation -1 removed lines

@@ -37,7 +37,6 @@
                 - 1: MIDCOM_PRIVILEGE_ALLOW
                 - 2: MIDCOM_PRIVILEGE_DENY
                 - 3: MIDCOM_PRIVILEGE_INHERIT
-
  * @property string $guid
  * @package midcom
  */

Spacing +4 added lines, -4 removed lines

@@ -246,7 +246,7 @@ 
      */
     public function set_assignee($assignee)
     {
-        if (   is_a($assignee, midcom_core_user::class)
+        if (is_a($assignee, midcom_core_user::class)
             || is_a($assignee, midcom_core_group::class)) {
             $this->assignee = $assignee->id;
         } elseif (is_string($assignee)) {
@@ -304,12 +304,12 @@ 
             }
         }
 
-        if (   !$this->is_magic_assignee()
+        if (!$this->is_magic_assignee()
             && !$this->get_assignee()) {
             debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
-        if (   $this->assignee == 'OWNER'
+        if ($this->assignee == 'OWNER'
             && $this->privilegename == 'midgard:owner') {
             debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO);
             return false;
@@ -321,7 +321,7 @@ 
                 MIDCOM_LOG_INFO);
             return false;
         }
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.",
                 MIDCOM_LOG_INFO);

Braces +2 added lines, -1 removed lines

@@ -128,7 +128,8 @@
         if ($this->__cached_object === null) {
             try {
                 $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
         }

lib/midcom/services/auth/acl.php

Spacing +3 added lines, -3 removed lines

@@ -600,10 +600,10 @@ 
         }
 
         //owner privileges override everything but person privileges, so we have to cross-check those here
-        if (   $privilegename != 'midgard:owner'
+        if ($privilegename != 'midgard:owner'
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
             $owner_privileges = $this->get_owner_default_privileges();
-            if (    array_key_exists($privilegename, $owner_privileges)
+            if (array_key_exists($privilegename, $owner_privileges)
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);
@@ -619,7 +619,7 @@ 
         //if nothing was found, we try to recurse to parent
         list ($parent_guid, $parent_class) = $this->get_parent_data($guid, $class);
 
-        if (   $parent_guid == $guid
+        if ($parent_guid == $guid
             || !mgd_is_guid($parent_guid)) {
             return false;
         }

Indentation +11 added lines, -11 removed lines

@@ -269,17 +269,17 @@
     private static $_default_magic_class_privileges = [];
 
     /**
-    * Internal cache of the content privileges of users on content objects, this is
-    * an associative array using a combination of the user identifier and the object's
-    * guid as index. The privileges for the anonymous user use the magic
-    * EVERYONE as user identifier.
-    *
-    * This must not be merged with the class-wide privileges_cache, because otherwise
-    * class_default_privileges for child objects might be overridden by parent default
-    * privileges
-    *
-    * @var Array
-    */
+     * Internal cache of the content privileges of users on content objects, this is
+     * an associative array using a combination of the user identifier and the object's
+     * guid as index. The privileges for the anonymous user use the magic
+     * EVERYONE as user identifier.
+     *
+     * This must not be merged with the class-wide privileges_cache, because otherwise
+     * class_default_privileges for child objects might be overridden by parent default
+     * privileges
+     *
+     * @var Array
+     */
     private static $_content_privileges_cache = [];
 
     /**

src/midcom/datamanager/extension/subscriber/purifySubscriber.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
     public function purify_content(FormEvent $event)
     {
-        if (   isset($this->config['Cache']['SerializerPath'])
+        if (isset($this->config['Cache']['SerializerPath'])
             && !file_exists($this->config['Cache']['SerializerPath'])) {
             mkdir($this->config['Cache']['SerializerPath']);
         }
@@ -54,7 +54,7 @@ 
 
         // Load custom element/attribute definitions
         $definitions = $this->get_from_global_config('html_purify_HTMLDefinition');
-        if (   !empty($definitions)
+        if (!empty($definitions)
             && $def = $purifier_config->maybeGetRawHTMLDefinition()) {
             if (!empty($definitions['addAttribute'])) {
                 foreach (array_filter((array) $definitions['addAttribute'], 'is_array') as $attrdef) {

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
         $data = $event->getData();
         try {
             $data = $purifier->purify($data);
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e) {
             debug_add("HTML Purifier failed: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }
         $event->setData($data);

src/midcom/datamanager/extension/type/autocompleteType.php

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
                 try {
                     $object = call_user_func([$options['widget_config']['class'], 'get_cached'], $identifier);
                     $preset[$identifier] = autocomplete_helper::create_item_label($object, $options['widget_config']['result_headers'], $options['widget_config']['titlefield']);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                 }
             }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefault('error_bubbling', false);
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
             $widget_defaults = [
                 'creation_mode_enabled' => false,
                 'class' => null,
@@ -66,7 +66,7 @@ 
 
             return helper::normalize($widget_defaults, $value);
         });
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = [
                 'options' => [],
                 'method' => 'GET',

lib/org/openpsa/documents/elFinderVolumeOpenpsa.php

Braces +10 added lines, -5 removed lines

@@ -85,7 +85,8 @@ 
 
         $this->clearcache();
 
-        if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem
+        if ($file && $file['name'] === $name) {
+// file exists and check filename for item ID based filesystem
             if ($this->uploadOverwrite) {
                 if (!$file['write']) {
                     return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -142,11 +143,13 @@ 
     {
         try {
             return org_openpsa_documents_document_dba::get_cached($path);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             try {
                 return org_openpsa_documents_directory::get_cached($path);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -282,7 +285,8 @@ 
         $object = midcom::get()->dbfactory->get_object_by_guid($path);
         try {
             $parentdir = org_openpsa_documents_directory::get_cached($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -579,7 +583,8 @@ 
         try {
             $doc = new org_openpsa_documents_document_dba($path);
             return $doc->delete();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
     }

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
         }
 
         if (($dir = $this->dir($dst)) == false) {
-            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#'.$dst);
+            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#' . $dst);
         }
 
         if (!$dir['write']) {
@@ -253,7 +253,7 @@ 
         $output = [$object->get_label()];
 
         $parent = $object->get_parent();
-        while (   $parent
+        while ($parent
                && $parent->component == 'org.openpsa.documents') {
             $output[] = $parent->extra;
             $parent = $parent->get_parent();
@@ -350,12 +350,12 @@ 
             $data['mime'] = 'directory';
         }
 
-        if (   $owner
+        if ($owner
             && $group = midcom::get()->auth->get_assignee($owner)) {
             $data['group'] = $group->name;
         }
 
-        if (   $this->root !== $path
+        if ($this->root !== $path
             && $parent = $object->get_parent()) {
             $data['phash'] = $this->encode($parent->guid);
         }
@@ -414,7 +414,7 @@ 
      * @param  string $mode open mode
      * @return resource|false
      */
-    protected function _fopen($path, $mode="rb")
+    protected function _fopen($path, $mode = "rb")
     {
         $document = org_openpsa_documents_document_dba::get_cached($path);
         $attachments = org_openpsa_helpers::get_dm2_attachments($document, 'document');
@@ -432,7 +432,7 @@ 
      * @param  string    $path  file path
      * @return bool
      */
-    protected function _fclose($fp, $path='')
+    protected function _fclose($fp, $path = '')
     {
         fclose($fp);
         return true;
@@ -616,7 +616,7 @@ 
     {
         $filename = midcom_db_attachment::safe_filename($name, true);
         $att = $doc->create_attachment($filename, $name, $mimetype);
-        if (   !$att
+        if (!$att
             || !$att->copy_from_handle($fp)) {
             return false;
         }

lib/midcom/helper/search/handler/search.php

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
     {
         $node = $nap->get_node($node_id);
 
-        if (   !array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
+        if (!array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
             && $node[MIDCOM_NAV_COMPONENT] != 'midcom.helper.search') {
             $l10n = $this->_i18n->get_l10n($node[MIDCOM_NAV_COMPONENT]);
             $this->_request_data['components'][$node[MIDCOM_NAV_COMPONENT]] = $l10n->get($node[MIDCOM_NAV_COMPONENT]);
@@ -107,7 +107,7 @@ 
         }
         $this->prepare_formdata($_REQUEST['type']);
 
-        if (   count(explode(' ', $data['query'])) == 1
+        if (count(explode(' ', $data['query'])) == 1
             && strpos($data['query'], '*') === false
             && $this->_config->get('single_term_auto_wildcard')) {
             //If there is only one search term append * to the query if auto_wildcard is enabled
@@ -181,12 +181,12 @@ 
             $this->_request_data['last_document_number'] = $last_document_id + 1;
             $this->_request_data['shown_documents'] = $last_document_id - $first_document_id + 1;
             $this->_request_data['results_per_page'] = $results_per_page;
-            $this->_request_data['all_results'] =& $result;
+            $this->_request_data['all_results'] = & $result;
             $this->_request_data['result'] = array_slice($result, $first_document_id, $results_per_page);
 
             // Register GUIDs for cache engine
             foreach ($this->_request_data['result'] as $doc) {
-                if (   !isset($doc->source)
+                if (!isset($doc->source)
                     || !mgd_is_guid($doc->source)) {
                     // Non-Midgard results don't need to go through cache registration
                     continue;

lib/midcom/admin/rcs/style/midcom-admin-rcs-diff.php

Spacing +2 added lines, -2 removed lines

@@ -27,14 +27,14 @@
 
     $changes = true;
 
-    echo "<dt>". $data['handler']->translate($attribute) ."</dt>\n";
+    echo "<dt>" . $data['handler']->translate($attribute) . "</dt>\n";
     echo "    <dd>\n";
     echo $values['diff'];
     echo "    </dd>\n";
 }
 
 if (!$changes) {
-    echo "<dt>". $data['l10n']->get('no changes in content') ."</dt>\n";
+    echo "<dt>" . $data['l10n']->get('no changes in content') . "</dt>\n";
 }
 ?>
 </dl>
\ No newline at end of file