flack / openpsa

lib/midcom/helper/datamanager2/type/php.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
      */
     public function _on_validate()
     {
-        if (   is_array($this->value)
+        if (is_array($this->value)
             || is_object($this->value)) {
             $this->validation_error = $this->_l10n->get('type text: value may not be array or object');
             return false;

lib/midcom/helper/datamanager2/type/text.php

Spacing +9 added lines, -9 removed lines

@@ -146,7 +146,7 @@ 
             $this->purify_markdown_on_output = $this->_config->get('html_purify_markdown');
         }
 
-        if (   !empty($this->forbidden_patterns)
+        if (!empty($this->forbidden_patterns)
             && !empty($this->allowed_patterns)) {
             debug_add('Both allowed and forbidden patterns are set, allowed has precedence', MIDCOM_LOG_ERROR);
             $this->forbidden_patterns = null;
@@ -160,7 +160,7 @@ 
 
     function purify_string($content)
     {
-        if (   isset($this->purify_config['Cache']['SerializerPath'])
+        if (isset($this->purify_config['Cache']['SerializerPath'])
             && !file_exists($this->purify_config['Cache']['SerializerPath'])) {
             mkdir($this->purify_config['Cache']['SerializerPath']);
         }
@@ -184,16 +184,16 @@ 
 
         // Load custom element/attribute definitions
         $config_defs = $this->_config->get('html_purify_HTMLDefinition');
-        if (   is_array($config_defs)
+        if (is_array($config_defs)
             && !empty($config_defs)
             && $def = $purifier_config_object->maybeGetRawHTMLDefinition(true)) {
-            if (   !empty($config_defs['addAttribute'])
+            if (!empty($config_defs['addAttribute'])
                 && is_array($config_defs['addAttribute'])) {
                 foreach (array_filter($config_defs['addAttribute'], 'is_array') as $attrdef) {
                     call_user_func_array(array($def, 'addAttribute'), $attrdef);
                 }
             }
-            if (   !empty($config_defs['addElement'])
+            if (!empty($config_defs['addElement'])
                 && is_array($config_defs['addElement'])) {
                 foreach (array_filter($config_defs['addElement'], 'is_array') as $elemdef) {
                     call_user_func_array(array($def, 'addElement'), $elemdef);
@@ -247,7 +247,7 @@ 
      */
     public function _on_validate()
     {
-        if (   is_array($this->value)
+        if (is_array($this->value)
             || is_object($this->value)) {
             $this->validation_error = $this->_l10n->get('type text: value may not be array or object');
             return false;
@@ -259,7 +259,7 @@ 
             $this->purify_content();
         }
 
-        if (   $this->maxlength > 0
+        if ($this->maxlength > 0
             && strlen($this->value) > $this->maxlength) {
             $this->validation_error = sprintf($this->_l10n->get('type text: value is longer than %d characters'),
                 $this->maxlength);
@@ -283,7 +283,7 @@ 
 
     public function validate_allowed_patterns($fields)
     {
-        if (   !empty($this->allowed_patterns)
+        if (!empty($this->allowed_patterns)
             && is_array($this->allowed_patterns)) {
             foreach ($this->allowed_patterns as $condition) {
                 if (!isset($condition['explanation'])) {
@@ -365,7 +365,7 @@ 
                 return midcom_helper_formatter::format($this->value, 'F');
 
             case 'markdown':
-                if (   !$this->purify
+                if (!$this->purify
                     || !$this->purify_markdown_on_output) {
                     // Return the Markdown straight away
                     return MarkdownExtra::defaultTransform($this->value);

lib/midcom/helper/datamanager2/type/privilege.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     public function _on_initialize()
     {
-        if (   !$this->name
+        if (!$this->name
             || !$this->assignee) {
             throw new midcom_error("The field {$this->name} had no name or assignee specified with it, cannot start up.");
         }

lib/midcom/helper/datamanager2/type/images.php

Spacing +10 added lines, -10 removed lines

@@ -305,7 +305,7 @@ 
                 continue;
             }
             $images_identifier = $info[0];
-            if (   !empty($this->attachments_info[$blobs_identifier]['object'])
+            if (!empty($this->attachments_info[$blobs_identifier]['object'])
                 && is_object($this->attachments_info[$blobs_identifier]['object'])) {
                 $this->titles[$images_identifier] = $this->attachments_info[$blobs_identifier]['object']->title;
             }
@@ -363,7 +363,7 @@ 
                     }
                     if (empty($main['object']->guid)) {
                         //Panic, broken identifier
-                        debug_add("Identifier '{$identifier}' does not have a valid object behind it",  MIDCOM_LOG_ERROR);
+                        debug_add("Identifier '{$identifier}' does not have a valid object behind it", MIDCOM_LOG_ERROR);
                         continue;
                     }
 
@@ -465,7 +465,7 @@ 
             debug_print_r('$this->attachments_info', $this->attachments_info);
             return;
         }
-        $info =& $this->attachments_info[$identifier];
+        $info = & $this->attachments_info[$identifier];
         $this->_info_heuristics($info, $identifier);
         $attachment->set_parameter('midcom.helper.datamanager2.type.images', 'images_identifier', $info['images_identifier']);
         // This would be the name of the 'derived_images' key.
@@ -507,7 +507,7 @@ 
 
         $this->attachments_info[$identifier]['images_identifier'] = $images_identifier;
         $this->attachments_info[$identifier]['images_name'] = $images_name;
-        $this->images[$images_identifier][$images_name] =& $this->attachments_info[$identifier];
+        $this->images[$images_identifier][$images_name] = & $this->attachments_info[$identifier];
     }
 
     /**
@@ -533,16 +533,16 @@ 
     protected function _sort_images_callback($a, $b)
     {
         // safety against broken images
-        if (   !empty($a['main']['object'])
+        if (!empty($a['main']['object'])
             && !empty($b['main']['object'])) {
             $a_obj = $a['main']['object'];
             $b_obj = $b['main']['object'];
         } else {
             // Try to read the sort values from some other key
-            if (   is_array($a)
+            if (is_array($a)
                 && is_array($b)) {
                 foreach ($a as $key => $data) {
-                    if (   !empty($data['object'])
+                    if (!empty($data['object'])
                         && !empty($b[$key]['object'])) {
                         $a_obj = $data['object'];
                         $b_obj = $b[$key]['object'];
@@ -550,7 +550,7 @@ 
                     }
                 }
             }
-            if (   empty($a_obj)
+            if (empty($a_obj)
                 && empty($b_obj)) {
                 return 0;
             }
@@ -653,7 +653,7 @@ 
     private function _batch_handler_cleanup($tmp_dir, $new_name)
     {
         debug_add("called with: '{$tmp_dir}', '{$new_name}'");
-        if (   !empty($tmp_dir)
+        if (!empty($tmp_dir)
             && $tmp_dir !== '/'
             /* TODO: better tmp dir matching */
             && preg_match('|^/tmp/|', $tmp_dir)) {
@@ -661,7 +661,7 @@ 
             debug_add("executing '{$cmd}'");
             exec($cmd, $output, $ret);
         }
-        if (   empty($new_name)
+        if (empty($new_name)
             /* TODO: better tmp dir matching */
             || !preg_match('|^/tmp/|', $new_name)) {
             return;

lib/midcom/helper/configuration.php

Spacing +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
     private function _update_cache()
     {
         $this->_merged = $this->_global;
-        if (   !empty($this->_local)
+        if (!empty($this->_local)
             && is_array($this->_local)) {
             $this->_merged = array_merge($this->_merged, $this->_local);
         }
@@ -186,7 +186,7 @@ 
      */
     public function store(array $params, $reset = true)
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -246,7 +246,7 @@ 
      */
     public function get($key)
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -278,7 +278,7 @@ 
      */
     public function get_all()
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }
@@ -294,7 +294,7 @@ 
      */
     public function exists($key)
     {
-        if (   !$this->_object_stored
+        if (!$this->_object_stored
             && $this->_object) {
             $this->_store_from_object();
         }

lib/midcom/admin/folder/handler/approvals.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function _handler_approval($handler_id, array $args, array &$data)
     {
-        if (   !array_key_exists('guid', $_REQUEST)
+        if (!array_key_exists('guid', $_REQUEST)
             || !array_key_exists('return_to', $_REQUEST)) {
             throw new midcom_error('Cannot process approval request, request is incomplete.');
         }

lib/midcom/admin/help/help.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
         parent::__construct();
         $this->add_stylesheet(MIDCOM_STATIC_URL . '/midcom.admin.help/style-editor.css');
 
-        midcom::get()->head->add_jsfile(MIDCOM_STATIC_URL.'/midcom.admin.help/twisty.js');
+        midcom::get()->head->add_jsfile(MIDCOM_STATIC_URL . '/midcom.admin.help/twisty.js');
         if (defined('MGD_TYPE_NONE')) {
             $this->mgdtypes[MGD_TYPE_NONE] = 'none';
         }
@@ -48,7 +48,7 @@ 
 
     static function check_component($component)
     {
-        if (   !midcom::get()->componentloader->is_installed($component)
+        if (!midcom::get()->componentloader->is_installed($component)
             && $component != 'midcom') {
             throw new midcom_error("Failed to generate documentation path for component {$component} as it is not installed.");
         }
@@ -234,9 +234,9 @@ 
         $files = array();
         $pattern = $component_dir . '*.{' . midcom::get()->i18n->get_current_language() . ',' . midcom::get()->config->get('i18n_fallback_language') . '}.txt';
 
-        foreach (glob($pattern, GLOB_NOSORT|GLOB_BRACE) as $path) {
+        foreach (glob($pattern, GLOB_NOSORT | GLOB_BRACE) as $path) {
             $entry = basename($path);
-            if (    substr($entry, 0, 5) == 'index'
+            if (substr($entry, 0, 5) == 'index'
                  || substr($entry, 0, 7) == 'handler'
                  || substr($entry, 0, 9) == 'urlmethod') {
                 // Ignore dotfiles, handlers & index.lang.txt
@@ -261,7 +261,7 @@ 
 
         // TODO: We're using "private" members here, better expose them through a method
         $handler = midcom::get()->componentloader->get_interface_class($component);
-        $request =& $handler->_context_data[midcom_core_context::get()->id]['handler'];
+        $request = & $handler->_context_data[midcom_core_context::get()->id]['handler'];
         if (!isset($request->_request_switch)) {
             // No request switch available, skip loading it
             return $data;
@@ -316,7 +316,7 @@ 
             $exec_path = MIDCOM_ROOT . '/' . $component_path . '/exec';
         }
 
-        if (   !is_dir($exec_path)
+        if (!is_dir($exec_path)
             || !is_readable($exec_path)) {
             // Directory not accessible, skip loading it
             return $data;
@@ -427,7 +427,7 @@ 
     {
         $this->add_breadcrumb("__ais/help/", $this->_l10n->get('midcom.admin.help'));
 
-        if (   $handler_id == '____ais-help-help'
+        if ($handler_id == '____ais-help-help'
             || $handler_id == '____ais-help-component') {
             $this->add_breadcrumb(
                 "__ais/help/{$this->_request_data['component']}/",
@@ -436,7 +436,7 @@ 
         }
 
         if ($handler_id == '____ais-help-help') {
-            if (   $this->_request_data['help_id'] == 'handlers'
+            if ($this->_request_data['help_id'] == 'handlers'
                 || $this->_request_data['help_id'] == 'urlmethods'
                 || $this->_request_data['help_id'] == 'mgdschemas') {
                 $this->add_breadcrumb(

lib/midcom/db/topic.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     public function _on_loaded()
     {
         // if we are missing the component, use the nullcomponent.
-        if (   !$this->component
+        if (!$this->component
             || !array_key_exists($this->component, midcom::get()->componentloader->manifests)) {
             debug_add("Topic {$this->id} has no component assigned to it, using 'midcom.core.nullcomponent'.",
             MIDCOM_LOG_INFO);

lib/midcom/response/styled.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $this->context->set_key(MIDCOM_CONTEXT_PAGETITLE, $meta[MIDCOM_NAV_NAME]);
         }
 
-        if (   $this->context->id == 0
+        if ($this->context->id == 0
             && !midcom::get()->skip_page_style) {
             // Let metadata service add its meta tags
             midcom::get()->metadata->populate_meta_head();