flack / openpsa

lib/net/nemein/rss/manage.php

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
     {
         try {
             $viewer->register_plugin_namespace('__feeds', array('rss' => array('class' => __CLASS__)));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
     }

lib/net/nehmer/blog/handler/admin.php

Spacing +3 added lines, -3 removed lines

@@ -60,8 +60,8 @@ 
      */
     private function _load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb'];
-        if (   $this->_config->get('simple_name_handling')
+        $this->_schemadb = & $this->_request_data['schemadb'];
+        if ($this->_config->get('simple_name_handling')
             && !midcom::get()->auth->admin) {
             foreach (array_keys($this->_schemadb) as $name) {
                 $this->_schemadb[$name]->fields['name']['readonly'] = true;
@@ -76,7 +76,7 @@ 
     {
         $this->_load_schemadb();
         $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->set_storage($this->_article);
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for article {$this->_article->id}.");

lib/net/nehmer/blog/handler/create.php

Spacing +3 added lines, -3 removed lines

@@ -61,8 +61,8 @@ 
      */
     public function load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb'];
-        if (   $this->_config->get('simple_name_handling')
+        $this->_schemadb = & $this->_request_data['schemadb'];
+        if ($this->_config->get('simple_name_handling')
             && !midcom::get()->auth->can_user_do('midcom:urlname')) {
             foreach (array_keys($this->_schemadb) as $name) {
                 $this->_schemadb[$name]->fields['name']['readonly'] = true;
@@ -86,7 +86,7 @@ 
 
         if (!$this->_article->create()) {
             debug_print_r('We operated on this object:', $this->_article);
-            throw new midcom_error('Failed to create a new article. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new article. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         // Callback possibility

lib/net/nehmer/static/navigation.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $qb->add_constraint('name', '<>', '');
 
         // Unless in Auto-Index mode or the index article is hidden, we skip the index article.
-        if (   !$this->_config->get('autoindex')
+        if (!$this->_config->get('autoindex')
             && !$this->_config->get('indexinnav')) {
             $qb->add_constraint('name', '<>', 'index');
         }

lib/net/nehmer/static/handler/admin.php

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
      */
     private function _load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb'];
-        if (   $this->_config->get('simple_name_handling')
+        $this->_schemadb = & $this->_request_data['schemadb'];
+        if ($this->_config->get('simple_name_handling')
             && !midcom::get()->auth->admin) {
             foreach (array_keys($this->_schemadb) as $name) {
                 $this->_schemadb[$name]->fields['name']['readonly'] = true;
@@ -71,7 +71,7 @@ 
     {
         $this->_load_schemadb();
         $controller = midcom_helper_datamanager2_controller::create('simple');
-        $controller->schemadb =& $this->_schemadb;
+        $controller->schemadb = & $this->_schemadb;
         $controller->set_storage($this->_article);
 
         if (!$controller->initialize()) {

lib/net/nehmer/static/handler/autoindex.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
                     $filename = "{$article->name}/{$data['filename']}";
                     $view[$filename] = $this->_get_attachment_data($filename, $data);
                 }
-            } elseif (   $datamanager->types[$name] instanceof midcom_helper_datamanager2_type_image
+            } elseif ($datamanager->types[$name] instanceof midcom_helper_datamanager2_type_image
                      && $datamanager->types[$name]->attachments_info) {
                 $data = $datamanager->types[$name]->attachments_info['main'];
                 $filename = "{$article->name}/{$data['filename']}";

lib/net/nehmer/comments/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     private function _populate_node_toolbar()
     {
         $buttons = array();
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $workflow = $this->get_workflow('datamanager2');
             $buttons[] = $workflow->get_button('config/', array(
@@ -34,7 +34,7 @@ 
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',
             ));
         }
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('net.nehmer.comments:moderation')) {
             $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => 'moderate/reported_abuse/',
@@ -80,7 +80,7 @@ 
     {
         $toolbar = new midcom_helper_toolbar();
         $buttons = array();
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             && $comment->status < net_nehmer_comments_comment::MODERATED) {
             if (!$comment->can_do('net.nehmer.comments:moderation')) {
                 // Regular users can only report abuse

lib/net/nehmer/comments/handler/view.php

Spacing +15 added lines, -15 removed lines

@@ -94,8 +94,8 @@ 
         if (!$this->_schemadb) {
             $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb'));
 
-            if (   $this->_config->get('use_captcha')
-                || (   !midcom::get()->auth->user
+            if ($this->_config->get('use_captcha')
+                || (!midcom::get()->auth->user
                     && $this->_config->get('use_captcha_if_anonymous'))) {
                 $this->_schemadb['comment']->append_field(
                     'captcha',
@@ -109,7 +109,7 @@ 
                 );
             }
 
-            if (   $this->_config->get('ratings_enable')
+            if ($this->_config->get('ratings_enable')
                 && array_key_exists('rating', $this->_schemadb['comment']->fields)) {
                 $this->_schemadb['comment']->fields['rating']['hidden'] = false;
             }
@@ -129,10 +129,10 @@ 
         }
 
         $this->_post_controller = midcom_helper_datamanager2_controller::create('create');
-        $this->_post_controller->schemadb =& $this->_schemadb;
+        $this->_post_controller->schemadb = & $this->_schemadb;
         $this->_post_controller->schema = 'comment';
         $this->_post_controller->defaults = $defaults;
-        $this->_post_controller->callback_object =& $this;
+        $this->_post_controller->callback_object = & $this;
 
         if (!$this->_post_controller->initialize()) {
             throw new midcom_error('Failed to initialize a DM2 create controller.');
@@ -166,10 +166,10 @@ 
 
         if (!$this->_new_comment->create()) {
             debug_print_r('We operated on this object:', $this->_new_comment);
-            throw new midcom_error('Failed to create a new comment, cannot continue. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new comment, cannot continue. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
-        if (   isset($_POST['subscribe'])
+        if (isset($_POST['subscribe'])
             && midcom::get()->auth->user) {
             // User wants to subscribe to receive notifications about this comments thread
 
@@ -230,7 +230,7 @@ 
             $this->_comments = $this->_comments->execute();
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             $this->_init_post_controller();
             $this->_process_post();
@@ -240,7 +240,7 @@ 
             $this->_init_display_datamanager();
         }
 
-        if (   $handler_id == 'view-comments-custom'
+        if ($handler_id == 'view-comments-custom'
             && count($args) > 1) {
             midcom::get()->skip_page_style = true;
             $this->custom_view = $args[1];
@@ -249,7 +249,7 @@ 
         $this->_prepare_request_data();
         midcom::get()->metadata->set_request_metadata($this->_get_last_modified(), $this->_objectguid);
 
-        if (   isset($_SERVER['HTTP_X_REQUESTED_WITH'])
+        if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])
             && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
             midcom::get()->skip_page_style = true;
         }
@@ -284,7 +284,7 @@ 
      */
     private function _process_post()
     {
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             && !midcom::get()->auth->request_sudo('net.nehmer.comments')) {
             throw new midcom_error('We were anonymous but could not acquire SUDO privileges, aborting');
         }
@@ -314,7 +314,7 @@ 
      */
     private function _get_last_modified()
     {
-        return array_reduce($this->_comments, function ($carry, net_nehmer_comments_comment $item) {
+        return array_reduce($this->_comments, function($carry, net_nehmer_comments_comment $item) {
             return max($item->metadata->revised, $carry);
         }, 0);
     }
@@ -346,8 +346,8 @@ 
                 $data['comment_toolbar'] = $this->_master->_populate_post_toolbar($comment);
                 midcom_show_style('comments-item');
 
-                if (   midcom::get()->auth->admin
-                    || (   midcom::get()->auth->user
+                if (midcom::get()->auth->admin
+                    || (midcom::get()->auth->user
                         && $comment->can_do('midgard:delete'))) {
                     midcom_show_style('comments-admintoolbar');
                 }
@@ -357,7 +357,7 @@ 
             midcom_show_style('comments-nonefound');
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             midcom_show_style('post-comment');
         } else {

lib/midgard/admin/asgard/navigation.php

Spacing +17 added lines, -17 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();
 
@@ -59,7 +59,7 @@ 
             // we go through the path bottom up and show the first root type we find
             foreach (array_reverse($this->_object_path) as $object) {
                 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;
                         break;
@@ -99,7 +99,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]));
     }
 
@@ -115,7 +115,7 @@ 
         foreach ($ref->get_child_classes() as $class) {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked())) {
                 continue;
             }
@@ -163,7 +163,7 @@ 
     {
         $qb = $ref->_root_objects_qb(false);
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked())) {
             return;
         }
@@ -198,7 +198,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]));
                 $this->_draw_element($this->_object_path[$level], $label, $level);
@@ -232,7 +232,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);
         }
@@ -252,7 +252,7 @@ 
                 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');
@@ -286,13 +286,13 @@ 
         if ($this->_is_selected($object)) {
             $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';
         }
     }
@@ -308,7 +308,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];
         }
@@ -316,7 +316,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];
         }
@@ -348,7 +348,7 @@ 
         $label_mapping = array();
         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;
             }
@@ -383,7 +383,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();
             $types_shown = true;
@@ -421,7 +421,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;
             } else {