flack / openpsa

lib/midgard/admin/asgard/navigation.php

Spacing +18 added lines, -18 removed lines

@@ -45,7 +45,7 @@ 
 
         $this->_object = $object;
         $this->get_object_path();
-        $this->_request_data =& $request_data;
+        $this->_request_data = & $request_data;
 
         $this->root_types = midcom_helper_reflector_tree::get_root_classes();
 
@@ -65,7 +65,7 @@ 
             {
                 foreach ($this->root_types as $root_type)
                 {
-                    if (    is_a($object, $root_type)
+                    if (is_a($object, $root_type)
                         || midcom_helper_reflector::is_same_class($root_type, $object->__midcom_class_name__))
                     {
                         $this->expanded_root_types[] = $root_type;
@@ -112,7 +112,7 @@ 
 
     protected function _is_collapsed($type, $total)
     {
-        return (   $total > $this->_config->get('max_navigation_entries')
+        return ($total > $this->_config->get('max_navigation_entries')
                 && empty($_GET['show_all_' . $type]));
     }
 
@@ -130,7 +130,7 @@ 
         {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked()))
             {
                 continue;
@@ -186,7 +186,7 @@ 
     {
         $qb = $ref->_root_objects_qb(false);
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked()))
         {
             return;
@@ -227,7 +227,7 @@ 
         $ref = midcom_helper_reflector::get($type);
         if (!empty($this->_object_path[$level]))
         {
-            if (   $this->_object_path[$level]->__mgdschema_class_name__ == $type
+            if ($this->_object_path[$level]->__mgdschema_class_name__ == $type
                 && !array_key_exists($this->_object_path[$level]->guid, $this->shown_objects))
             {
                 $label = htmlspecialchars($ref->get_object_label($this->_object_path[$level]));
@@ -264,7 +264,7 @@ 
         }
 
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-        if (   $selected
+        if ($selected
             || $autoexpand)
         {
             $this->_list_child_elements($object, $level + 1);
@@ -287,12 +287,12 @@ 
                 continue;
             }
 
-            if (   method_exists($class, 'navigation')
+            if (method_exists($class, 'navigation')
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}"))
             {
                 $this->_request_data['expanded'] = true;
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
-                call_user_func(array($class,'navigation'));
+                call_user_func(array($class, 'navigation'));
             }
             else
             {
@@ -327,14 +327,14 @@ 
         {
             $css_class .= ' selected';
         }
-        if (   is_object($this->_object)
-            && (   $object->guid == $this->_object->guid
-                || (   is_a($this->_object, 'midcom_db_parameter')
+        if (is_object($this->_object)
+            && ($object->guid == $this->_object->guid
+                || (is_a($this->_object, 'midcom_db_parameter')
                     && $object->guid == $this->_object->parentguid)))
         {
             $css_class .= ' current';
         }
-        if ( !$object->can_do('midgard:update'))
+        if (!$object->can_do('midgard:update'))
         {
             $css_class .= ' readonly';
         }
@@ -351,7 +351,7 @@ 
         $types = array();
 
         // Get the types that might have special display conditions
-        if (   $this->_config->get('midgard_types')
+        if ($this->_config->get('midgard_types')
             && preg_match_all('/\|([a-z0-9\.\-_]+)/', $this->_config->get('midgard_types'), $regs))
         {
             $types = $regs[1];
@@ -360,7 +360,7 @@ 
         // Override with user selected
         // @TODO: Should this just include to the configuration selection, although it would break the consistency
         // of other similar preference sets, which simply override the global settings?
-        if (   midgard_admin_asgard_plugin::get_preference('midgard_types')
+        if (midgard_admin_asgard_plugin::get_preference('midgard_types')
             && preg_match_all('/\|([a-z0-9\.\-_]+)/', midgard_admin_asgard_plugin::get_preference('midgard_types'), $regs))
         {
             $types = $regs[1];
@@ -400,7 +400,7 @@ 
         foreach ($types as $root_type)
         {
             // If the regular expression has been set, check which types should be shown
-            if (   $regexp !== '//'
+            if ($regexp !== '//'
                 && (boolean) preg_match($regexp, $root_type) == $exclude)
             {
                 continue;
@@ -437,7 +437,7 @@ 
          * click if nothing is expanded
          */
         $types_shown = false;
-        if (    sizeof($expanded_types) > 0
+        if (sizeof($expanded_types) > 0
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown')
         {
             $this->_draw_select_navigation();
@@ -479,7 +479,7 @@ 
             echo "    <li class=\"mgdschema-type\">";
 
             $dbaclass = midcom::get()->dbclassloader->get_midcom_class_name_for_mgdschema_object($type);
-            if (   $dbaclass
+            if ($dbaclass
                 && class_exists($dbaclass))
             {
                 $object = new $dbaclass;

lib/midcom/helper/_styleloader.php

Spacing +20 added lines, -20 removed lines

@@ -162,7 +162,7 @@ 
                         break;
                     }
 
-                    if (   midcom::get()->config->get('styleengine_relative_paths')
+                    if (midcom::get()->config->get('styleengine_relative_paths')
                         && $style->up == midcom_connection::get('style'))
                     {
                         // Relative path, stop before going to main Midgard style
@@ -170,7 +170,7 @@ 
                     }
                 }
             }
-            catch (midcom_error $e){}
+            catch (midcom_error $e) {}
 
             $path_parts = array_reverse($path_parts);
 
@@ -195,7 +195,7 @@ 
     {
         static $cached = array();
 
-        if (   midcom::get()->config->get('styleengine_relative_paths')
+        if (midcom::get()->config->get('styleengine_relative_paths')
             && $rootstyle == 0)
         {
             // Relative paths in use, start seeking from under the style used for the Midgard host
@@ -348,7 +348,7 @@ 
             $element = $matches[2];
         }
 
-        if (   isset($stylepath)
+        if (isset($stylepath)
             && $styleid = $this->get_style_id_from_path($stylepath))
         {
             array_unshift($this->_scope, $styleid);
@@ -396,10 +396,10 @@ 
      */
     public function render($preparsed, $path, array $data = array())
     {
-        if (   empty($data)
+        if (empty($data)
             && midcom_core_context::get()->has_custom_key('request_data'))
         {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
         }
 
         if (eval('?>' . $preparsed) === false)
@@ -436,7 +436,7 @@ 
         try
         {
             $root_topic = $context->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
-            if (   $root_topic->style
+            if ($root_topic->style
                 && $db_style = $this->get_style_id_from_path($root_topic->style))
             {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
@@ -479,7 +479,7 @@ 
             {
                 return $this->_styles[$src];
             }
-            if (   $this->_scope[0] != ''
+            if ($this->_scope[0] != ''
                 && $result = $this->_get_element_in_styletree($this->_scope[0], $_element))
             {
                 $this->_styles[$src] = $result;
@@ -499,7 +499,7 @@ 
         {
             return $this->_snippets[$src];
         }
-        if (   midcom::get()->config->get('theme')
+        if (midcom::get()->config->get('theme')
             && $content = midcom_helper_misc::get_element_content($_element))
         {
             $this->_snippets[$src] = $content;
@@ -509,7 +509,7 @@ 
         $current_context = midcom_core_context::get()->id;
         foreach ($this->_styledirs[$current_context] as $path)
         {
-            $filename = $path .  "/{$_element}.php";
+            $filename = $path . "/{$_element}.php";
             if (file_exists($filename))
             {
                 $this->_snippets[$filename] = file_get_contents($filename);
@@ -576,12 +576,12 @@ 
         else
         {
             $style = $topic->style;
-            if (   !$topic->style
+            if (!$topic->style
                 && !empty($GLOBALS['midcom_style_inherited']))
             {
                 $style = $GLOBALS['midcom_style_inherited'];
             }
-            if (   is_string($style)
+            if (is_string($style)
                 && strpos($style, 'theme:') === 0)
             {
                 $theme_dir = OPENPSA2_THEME_ROOT . midcom::get()->config->get('theme') . '/style';
@@ -612,7 +612,7 @@ 
     {
         // get component's snippetdir (for default styles)
         $loader = midcom::get()->componentloader;
-        if (   !$topic
+        if (!$topic
             || !$topic->guid)
         {
             return null;
@@ -632,7 +632,7 @@ 
      * @param dirname path of style directory within midcom.
      * @throws midcom exception if directory does not exist.
      */
-    function append_styledir ($dirname)
+    function append_styledir($dirname)
     {
         if (!file_exists($dirname))
         {
@@ -648,7 +648,7 @@ 
      * @return boolean true if directory appended
      * @throws midcom_error if directory does not exist.
      */
-    function prepend_styledir ($dirname)
+    function prepend_styledir($dirname)
     {
         if (!file_exists($dirname))
         {
@@ -664,7 +664,7 @@ 
      * @param string componentname
      * @throws midcom exception if directory does not exist.
      */
-    function append_component_styledir ($component)
+    function append_component_styledir($component)
     {
         $loader = midcom::get()->componentloader;
         $path = $loader->path_to_snippetpath($component) . "/style";
@@ -749,7 +749,7 @@ 
      *
      * @param string component style
      */
-    private function _merge_styledirs ($component_style)
+    private function _merge_styledirs($component_style)
     {
         $current_context = midcom_core_context::get()->id;
         /* first the prepend styles */
@@ -757,7 +757,7 @@ 
         /* then the contextstyle */
         $this->_styledirs[$current_context][count($this->_styledirs[$current_context])] = $component_style;
 
-        $this->_styledirs[$current_context] =  array_merge($this->_styledirs[$current_context], $this->_styledirs_append[$current_context]);
+        $this->_styledirs[$current_context] = array_merge($this->_styledirs[$current_context], $this->_styledirs_append[$current_context]);
     }
 
     /**
@@ -789,7 +789,7 @@ 
             $this->_styledirs_append[$context] = array();
         }
 
-        if (   $this->_topic
+        if ($this->_topic
             && $_st = $this->_get_component_style($this->_topic))
         {
             array_unshift($this->_scope, $_st);
@@ -810,7 +810,7 @@ 
      */
     public function leave_context()
     {
-        if (   $this->_topic
+        if ($this->_topic
             && $this->_get_component_style($this->_topic))
         {
             array_shift($this->_scope);