flack / openpsa

src/midcom/datamanager/storage/blobs.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 
         if (!empty($this->config['widget_config']['sortable']))
         {
-            uasort($this->map, function ($a, $b)
+            uasort($this->map, function($a, $b)
             {
                 if ($a->metadata->score == $b->metadata->score)
                 {

Braces +3 added lines, -6 removed lines

@@ -40,8 +40,7 @@ 
             try
             {
                 $results[$identifier] = new midcom_db_attachment($guid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -77,8 +76,7 @@ 
                         {
                             $identifier = md5(time() . $data['file']['name'] . $data['file']['tmp_name']);
                         }
-                    }
-                    else
+                    } else
                     {
                         if ($attachment->name != $filename)
                         {
@@ -92,8 +90,7 @@ 
                     {
                         throw new midcom_error('Failed to copy attachment: ' . midcom_connection::get_error_string());
                     }
-                }
-                else if ($attachment === null)
+                } else if ($attachment === null)
                 {
                     continue;
                 }

src/midcom/datamanager/storage/parameter.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         //workaround for weird mgd API behavior where setting falsy (i.e. deleting) a nonexistent parameter
         //returns an error
-        if (   !$this->value
+        if (!$this->value
             && $this->load() === null)
         {
             return true;

src/midcom/datamanager/storage/photo.php

Braces +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
             }
 
             return $this->save_attachment_list();
-        }
-        elseif (!empty($this->value['delete']))
+        } elseif (!empty($this->value['delete']))
         {
             $this->map = array();
             return $this->save_attachment_list();

src/midcom/workflow/viewer.php

Spacing +2 added lines, -4 removed lines

@@ -19,11 +19,9 @@
 {
     public function get_button_config()
     {
-        return array
-        (
+        return array(
             MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('view', 'midcom'),
-            MIDCOM_TOOLBAR_OPTIONS => array
-            (
+            MIDCOM_TOOLBAR_OPTIONS => array(
                 'data-dialog' => 'dialog',
             )
         );

src/midcom/workflow/delete.php

Spacing +3 added lines, -6 removed lines

@@ -80,8 +80,7 @@ 
         }
 
         $resolver
-            ->setDefaults(array
-            (
+            ->setDefaults(array(
                 'recursive' => false,
                 'success_url' => '',
                 'label' => null,
@@ -113,13 +112,11 @@ 
             $dialog_text .= '<div id="delete-child-list"></div>';
         }
 
-        return array
-        (
+        return array(
             MIDCOM_TOOLBAR_LABEL => $this->l10n_midcom->get('delete'),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/trash.png',
             MIDCOM_TOOLBAR_ACCESSKEY => 'd',
-            MIDCOM_TOOLBAR_OPTIONS => array
-            (
+            MIDCOM_TOOLBAR_OPTIONS => array(
                 'data-dialog' => 'delete',
                 'data-form-id' => $this->form_identifier,
                 'data-dialog-heading' => $this->l10n_midcom->get('confirm delete'),

Braces +1 added lines, -2 removed lines

@@ -246,8 +246,7 @@
             {
                 $result = array();
                 $size = 0;
-            }
-            else
+            } else
             {
                 $result = array_slice($result, $this->_offset);
                 $size = $size - $this->_offset;

src/midcom/workflow/dialog.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         //The constants are numeric, so array_merge won't work...
         foreach ($options as $key => $value)
         {
-            if (   is_array($value)
+            if (is_array($value)
                 && !empty($button_config[$key]))
             {
                 $value = array_merge($button_config[$key], $value);

src/midcom/workflow/datamanager2.php

Spacing +5 added lines, -8 removed lines

@@ -36,8 +36,7 @@ 
     public function configure(OptionsResolver $resolver)
     {
         $resolver
-            ->setDefaults(array
-            (
+            ->setDefaults(array(
                 'controller' => null,
                 'save_callback' => null
             ))
@@ -46,12 +45,10 @@ 
 
     public function get_button_config()
     {
-        return array
-        (
+        return array(
             MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_l10n('midcom')->get('edit'),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png',
-            MIDCOM_TOOLBAR_OPTIONS => array
-            (
+            MIDCOM_TOOLBAR_OPTIONS => array(
                 'data-dialog' => 'dialog',
                 'data-dialog-cancel-label' => midcom::get()->i18n->get_l10n('midcom')->get('cancel')
             )
@@ -101,8 +98,8 @@ 
 
     private function prepare_url($url)
     {
-        if (   substr($url, 0, 1) != '/'
-            && ! preg_match('|^https?://|', $url))
+        if (substr($url, 0, 1) != '/'
+            && !preg_match('|^https?://|', $url))
         {
             $url = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) . $url;
         }

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

lib/midcom.php

Spacing +5 added lines, -6 removed lines

@@ -38,8 +38,7 @@ 
     /**
      * Mapping of service names to classes implementing the service
      */
-    private static $_service_classes = array
-    (
+    private static $_service_classes = array(
         'auth' => 'midcom_services_auth',
         'componentloader' => 'midcom_helper__componentloader',
         'cache' => 'midcom_services_cache',
@@ -67,12 +66,12 @@ 
         ///////////////////////////////////
         // Try to be smart about the paths:
         // Define default constants
-        if (! defined('MIDCOM_ROOT'))
+        if (!defined('MIDCOM_ROOT'))
         {
             define('MIDCOM_ROOT', __DIR__);
         }
 
-        if (! defined('MIDCOM_STATIC_ROOT'))
+        if (!defined('MIDCOM_STATIC_ROOT'))
         {
             $pos = strrpos(MIDCOM_ROOT, '/');
             if ($pos === false)
@@ -82,14 +81,14 @@ 
             }
             define('MIDCOM_STATIC_ROOT', substr(MIDCOM_ROOT, 0, $pos) . '/static');
         }
-        if (! defined('MIDCOM_STATIC_URL'))
+        if (!defined('MIDCOM_STATIC_URL'))
         {
             define('MIDCOM_STATIC_URL', '/midcom-static');
         }
 
         if (!defined('OPENPSA2_THEME_ROOT'))
         {
-            define ('OPENPSA2_THEME_ROOT', MIDCOM_ROOT . '/../var/themes/');
+            define('OPENPSA2_THEME_ROOT', MIDCOM_ROOT . '/../var/themes/');
         }
 
         // Instantiate the MidCOM main class

lib/no/bergfald/rcs/handler.php

Spacing +13 added lines, -21 removed lines

@@ -96,8 +96,7 @@ 
     private function _prepare_toolbars($revision = '', $diff_view = false)
     {
         $this->_view_toolbar->add_item(
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => midcom::get()->permalinks->create_permalink($this->_guid),
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('back to %s'), $this->_resolve_object_title()),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_up.png',
@@ -116,7 +115,7 @@ 
         $show_previous = false;
         if ($diff_view)
         {
-            if (   $before != ''
+            if ($before != ''
                 && $before2 != '')
             {
                 // When browsing diffs we want to display buttons to previous instead of current
@@ -137,16 +136,14 @@ 
         $buttons = array();
         if ($show_previous)
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/rcs/diff/{$this->_guid}/{$first}/{$second}/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('view %s differences with previous (%s)'), $second, $first),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_left.png',
             );
         }
 
-        $buttons[] = array
-        (
+        $buttons[] = array(
             MIDCOM_TOOLBAR_URL => "__ais/rcs/preview/{$this->_guid}/{$revision}/",
             MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('view this revision (%s)'), $revision),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/search.png',
@@ -155,16 +152,14 @@ 
         // Display restore and next buttons only if we're not in latest revision
         if ($after != '')
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/rcs/restore/{$this->_guid}/{$revision}/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('restore this revision (%s)'), $revision),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/editpaste.png',
                 MIDCOM_TOOLBAR_ENABLED => $this->_object->can_do('midgard:update'),
             );
 
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/rcs/diff/{$this->_guid}/{$revision}/{$after}/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n->get('view %s differences with next (%s)'), $revision, $after),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_right.png',
@@ -222,7 +217,7 @@ 
         $this->_guid = $args[0];
         $this->_load_object();
 
-        if (   !$this->_backend->version_exists($args[1])
+        if (!$this->_backend->version_exists($args[1])
             || !$this->_backend->version_exists($args[2]))
         {
             throw new midcom_error_notfound("One of the revisions {$args[1]} or {$args[2]} does not exist.");
@@ -238,7 +233,7 @@ 
         $this->_request_data['earlier_revision'] = $this->_backend->get_prev_version($args[1]);
         $this->_request_data['previous_revision'] = $args[1];
         $this->_request_data['latest_revision'] = $args[2];
-        $this->_request_data['next_revision']  = $this->_backend->get_next_version($args[2]);
+        $this->_request_data['next_revision'] = $this->_backend->get_next_version($args[2]);
 
         $this->_request_data['guid'] = $args[0];
 
@@ -246,13 +241,11 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['view_title']);
 
         $this->_prepare_breadcrumb();
-        $this->add_breadcrumb
-        (
+        $this->add_breadcrumb(
             "__ais/rcs/preview/{$this->_guid}/{$data['latest_revision']}/",
             sprintf($this->_l10n->get('version %s'), $data['latest_revision'])
         );
-        $this->add_breadcrumb
-        (
+        $this->add_breadcrumb(
             "__ais/rcs/diff/{$this->_guid}/{$data['previous_revision']}/{$data['latest_revision']}/",
             sprintf($this->_l10n->get('changes from version %s'), $data['previous_revision'])
         );
@@ -309,8 +302,7 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['view_title']);
 
         $this->_prepare_breadcrumb();
-        $this->add_breadcrumb
-        (
+        $this->add_breadcrumb(
             "__ais/rcs/preview/{$this->_guid}/{$revision}/",
             sprintf($this->_l10n->get('version %s'), $revision)
         );
@@ -318,7 +310,7 @@ 
         // Set the version numbers
         $data['previous_revision'] = $this->_backend->get_prev_version($args[1]);
         $data['latest_revision'] = $args[1];
-        $data['next_revision']  = $this->_backend->get_next_version($args[1]);
+        $data['next_revision'] = $this->_backend->get_next_version($args[1]);
         $data['guid'] = $args[0];
     }
 
@@ -347,7 +339,7 @@ 
 
         $this->_prepare_toolbars($args[1]);
 
-        if (   $this->_backend->version_exists($args[1])
+        if ($this->_backend->version_exists($args[1])
             && $this->_backend->restore_to_revision($args[1]))
         {
             midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];