flack / openpsa

lib/net/nemein/wiki/parser.php

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
                 $value = "<a href=\"{$prefix}__mfa/asgard_midcom.admin.user/group/edit/{$group->guid}/\">{$value}</a>";
             }
             $groups[] = $value;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $groups[] = "#{$member->gid}";
         }

lib/midcom/helper/metadata.php

Spacing +15 added lines, -15 removed lines

@@ -218,7 +218,7 @@ 
 
         $object_schema = self::find_schemaname($this->_schemadb, $this->__object);
         $this->_datamanager->set_schema($object_schema);
-        if (! $this->_datamanager->set_storage($this->__object))
+        if (!$this->_datamanager->set_storage($this->__object))
         {
             throw new midcom_error('Failed to initialize the metadata datamanager instance, see the Debug Log for details.');
         }
@@ -236,7 +236,7 @@ 
         // Check if we have metadata schema defined in the schemadb specific for the object's schema or component
         $object_schema = $object->get_parameter('midcom.helper.datamanager2', 'schema_name');
         $component_schema = str_replace('.', '_', midcom_core_context::get()->get_key(MIDCOM_CONTEXT_COMPONENT));
-        if (   $object_schema == ''
+        if ($object_schema == ''
             || !isset($schemadb[$object_schema]))
         {
             if (isset($schemadb[$component_schema]))
@@ -255,7 +255,7 @@ 
 
     function release_datamanager()
     {
-        if (! is_null($this->_datamanager))
+        if (!is_null($this->_datamanager))
         {
             $this->_datamanager = null;
         }
@@ -482,7 +482,7 @@ 
             case 'scheduleend':
             case 'exported':
             case 'imported':
-                if (   !extension_loaded('midgard')
+                if (!extension_loaded('midgard')
                     && isset($this->__metadata->$key))
                 {
                     //This is ugly, but seems the only possible way...
@@ -495,7 +495,7 @@ 
                         $value = (int) $this->__metadata->$key->format('U');
                     }
                 }
-                else if (   empty($this->__metadata->$key)
+                else if (empty($this->__metadata->$key)
                          || $this->__metadata->$key == '0000-00-00 00:00:00')
                 {
                     $value = 0;
@@ -594,12 +594,12 @@ 
         }
 
         $now = time();
-        if (   $this->get('schedulestart')
+        if ($this->get('schedulestart')
             && $this->get('schedulestart') > $now)
         {
             return false;
         }
-        if (   $this->get('scheduleend')
+        if ($this->get('scheduleend')
             && $this->get('scheduleend') < $now)
         {
             return false;
@@ -618,9 +618,9 @@ 
     function is_object_visible_onsite()
     {
         return
-        (   (   midcom::get()->config->get('show_hidden_objects')
+        ((midcom::get()->config->get('show_hidden_objects')
              || $this->is_visible())
-         && (   midcom::get()->config->get('show_unapproved_objects')
+         && (midcom::get()->config->get('show_unapproved_objects')
              || $this->is_approved())
         );
     }
@@ -714,7 +714,7 @@ 
         }
         else if (is_array($source))
         {
-            if (   !array_key_exists(MIDCOM_NAV_GUID, $source)
+            if (!array_key_exists(MIDCOM_NAV_GUID, $source)
                 || is_null($source[MIDCOM_NAV_GUID]))
             {
                 debug_print_r('We got an invalid input, cannot return metadata:', $source);
@@ -728,7 +728,7 @@ 
             $guid = $source;
         }
 
-        if (   is_null($object)
+        if (is_null($object)
             && mgd_is_guid($guid))
         {
             try
@@ -769,7 +769,7 @@ 
         }
 
         // Lock was created by the user, return "not locked"
-        if (   !empty(midcom::get()->auth->user->guid)
+        if (!empty(midcom::get()->auth->user->guid)
             && $this->get('locker') === midcom::get()->auth->user->guid)
         {
             return false;
@@ -794,7 +794,7 @@ 
             $timeout = midcom::get()->config->get('metadata_lock_timeout');
         }
 
-        if (   is_object($this->__object)
+        if (is_object($this->__object)
             && $this->__object->lock())
         {
             $this->_cache = array();
@@ -812,7 +812,7 @@ 
      */
     function can_unlock()
     {
-        return (   $this->__object->can_do('midcom:unlock')
+        return ($this->__object->can_do('midcom:unlock')
                 || midcom::get()->auth->can_user_do('midcom:unlock', null, 'midcom_services_auth', 'midcom'));
     }
 
@@ -823,7 +823,7 @@ 
      */
     public function unlock()
     {
-        if (   $this->can_unlock()
+        if ($this->can_unlock()
             && is_object($this->__object)
             && $this->__object->unlock())
         {

Braces +12 added lines, -24 removed lines

@@ -243,8 +243,7 @@ 
             {
                 // No specific metadata schema for object, fall back to component-specific metadata schema
                 $object_schema = $component_schema;
-            }
-            else
+            } else
             {
                 // No metadata schema for component, fall back to default
                 $object_schema = 'metadata';
@@ -379,8 +378,7 @@ 
                 if ($value == 0)
                 {
                     $value = '0000-00-00 00:00:00';
-                }
-                else
+                } else
                 {
                     $value = gmstrftime('%Y-%m-%d %T', $value);
                 }
@@ -389,8 +387,7 @@ 
                     if ($value == '0000-00-00 00:00:00')
                     {
                         $value = null;
-                    }
-                    else
+                    } else
                     {
                         $value = new midgard_datetime($value);
                     }
@@ -437,8 +434,7 @@ 
         if ($key)
         {
             unset ($this->_cache[$key]);
-        }
-        else
+        } else
         {
             $this->_cache = Array();
         }
@@ -489,18 +485,15 @@ 
                     if ((string) $this->__metadata->$key === "0001-01-01T00:00:00+00:00")
                     {
                         $value = 0;
-                    }
-                    else
+                    } else
                     {
                         $value = (int) $this->__metadata->$key->format('U');
                     }
-                }
-                else if (   empty($this->__metadata->$key)
+                } else if (   empty($this->__metadata->$key)
                          || $this->__metadata->$key == '0000-00-00 00:00:00')
                 {
                     $value = 0;
-                }
-                else
+                } else
                 {
                     $value = strtotime("{$this->__metadata->$key} UTC");
                 }
@@ -525,8 +518,7 @@ 
                         if (empty($guids))
                         {
                             $root_user_guid = 'f6b665f1984503790ed91f39b11b5392';
-                        }
-                        else
+                        } else
                         {
                             $root_user_guid = key($guids);
                         }
@@ -555,8 +547,7 @@ 
                 {
                     // Fall back to the parameter reader for non-core MidCOM metadata params
                     $value = $this->__object->get_parameter('midcom.helper.metadata', $key);
-                }
-                else
+                } else
                 {
                     $value = $dm->types[$key]->convert_to_csv();
                 }
@@ -711,8 +702,7 @@ 
         {
             $object = $source;
             $guid = $source->guid;
-        }
-        else if (is_array($source))
+        } else if (is_array($source))
         {
             if (   !array_key_exists(MIDCOM_NAV_GUID, $source)
                 || is_null($source[MIDCOM_NAV_GUID]))
@@ -722,8 +712,7 @@ 
             }
             $guid = $source[MIDCOM_NAV_GUID];
             $object = $source[MIDCOM_NAV_OBJECT];
-        }
-        else
+        } else
         {
             $guid = $source;
         }
@@ -734,8 +723,7 @@ 
             try
             {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 debug_add("Failed to create a metadata instance for the GUID {$guid}: " . $e->getMessage(), MIDCOM_LOG_WARN);
                 debug_print_r("Source was:", $source);

lib/midcom/helper/imagepopup/handler/upload.php

Spacing +8 added lines, -8 removed lines

@@ -26,10 +26,10 @@ 
         reset($_FILES);
         $temp = array_shift($_FILES);
 
-        if(is_uploaded_file($temp['tmp_name']))
+        if (is_uploaded_file($temp['tmp_name']))
         {
             // Verify file extension
-            if(!in_array(strtolower(pathinfo($temp['name'], PATHINFO_EXTENSION)), array("gif", "jpg", "png")))
+            if (!in_array(strtolower(pathinfo($temp['name'], PATHINFO_EXTENSION)), array("gif", "jpg", "png")))
             {
                 throw new midcom_error('Invalid extension.');
             }
@@ -93,15 +93,15 @@ 
         $query->add_constraint('parentguid', '=', $parentguid);
         $entry = $query->execute();
 
-        if(count($entry) == 0)
+        if (count($entry) == 0)
         {
             throw new midcom_error_notfound("There is no match in database " . midcom_connection::get_error_string());
         }
-        else if(count($entry) == 1)
+        else if (count($entry) == 1)
         {
             return $entry[0];
         }
-        else if(count($entry) > 1)
+        else if (count($entry) > 1)
         {
             throw new midcom_error('There is more than just one object' . midcom_connection::get_error_string());
         }
@@ -114,13 +114,13 @@ 
     private function write_the_file($tmp, midcom_db_attachment $target)
     {
         $source = fopen($tmp, 'r');
-        if(!$source)
+        if (!$source)
         {
             throw new midcom_error("Could not open file " . $tmp . " for reading.");
         }
         $stat = $target->copy_from_handle($source);
         fclose($source);
-        if(!$stat)
+        if (!$stat)
         {
             throw new midcom_error('Failed to copy from handle: ' . midcom_connection::get_error_string());
         }
@@ -139,7 +139,7 @@ 
         $attachment->title = $filename;
         $attachment->mimetype = $mimetype;
         $attachment->parentguid = $parentguid;
-        if(!$attachment->create())
+        if (!$attachment->create())
         {
             throw new midcom_error('Failed to create derived image: ' . midcom_connection::get_error_string());
         }

Braces +2 added lines, -4 removed lines

@@ -96,12 +96,10 @@
         if(count($entry) == 0)
         {
             throw new midcom_error_notfound("There is no match in database " . midcom_connection::get_error_string());
-        }
-        else if(count($entry) == 1)
+        } else if(count($entry) == 1)
         {
             return $entry[0];
-        }
-        else if(count($entry) > 1)
+        } else if(count($entry) > 1)
         {
             throw new midcom_error('There is more than just one object' . midcom_connection::get_error_string());
         }

lib/org/openpsa/calendar/midcom/interfaces.php

Braces +2 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
         {
             $relatedto_arr = $session->get('relatedto2get_array');
             $session->remove('relatedto2get_array');
-        }
-        else
+        } else
         {
             $relatedto_arr = org_openpsa_relatedto_plugin::get2relatedto();
         }
@@ -35,8 +34,7 @@ 
             if (!$rel->id)
             {
                 $rel->create();
-            }
-            else
+            } else
             {
                 //In theory we should not ever hit this, but better to be sure.
                 $rel->update();

lib/org/openpsa/products/midcom/interfaces.php

Braces +2 added lines, -4 removed lines

@@ -46,8 +46,7 @@ 
         {
             $local_filename = midcom_db_attachment::safe_filename($uploaded_file['name']);
             $local_file = $this->_get_file($local_filename, true);
-        }
-        else
+        } else
         {
             $local_file = $this->_file;
         }
@@ -89,8 +88,7 @@ 
             // We're creating a new file
             $local_filename = midcom_db_attachment::safe_filename($_POST['midgard_admin_asgard_filename']);
             $local_file = $this->_get_file($local_filename, true);
-        }
-        else
+        } else
         {
             $local_file = $this->_file;
         }

lib/fi/protie/navigation/main.php

Spacing +8 added lines, -8 removed lines

@@ -266,7 +266,7 @@ 
             return;
         }
 
-        if (   isset($this->_get_params[$name])
+        if (isset($this->_get_params[$name])
             && $this->_get_params[$name] == $value)
         {
             return;
@@ -436,8 +436,8 @@ 
 
         if ($child[MIDCOM_NAV_TYPE] === 'node')
         {
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
-                && (   !$this->_nap->get_current_leaf()
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
+                && (!$this->_nap->get_current_leaf()
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf())))
             {
                 $classes[] = $this->css_active;
@@ -502,7 +502,7 @@ 
         }
 
         // Add information about the object's status
-        if (   $this->object_status_to_class
+        if ($this->object_status_to_class
             && isset($item[MIDCOM_NAV_OBJECT])
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT]))
         {
@@ -524,13 +524,13 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}{$get_params}\"{$link_class}>{$item[MIDCOM_NAV_NAME]}</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
             && !$this->show_only_current
-            && (   $this->list_levels === 0
+            && ($this->list_levels === 0
                 || $this->_level < $this->list_levels))
         {
-            if (   $this->follow_all
-                || (   $this->follow_selected
+            if ($this->follow_all
+                || ($this->follow_selected
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true)))
             {
                 $this->_level++;