flack / openpsa

lib/net/nemein/rss/handler/admin.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     {
         $data['schemadb'] = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_feed'));
         $data['controller'] = midcom_helper_datamanager2_controller::create('simple');
-        $data['controller']->schemadb =& $data['schemadb'];
+        $data['controller']->schemadb = & $data['schemadb'];
         $data['controller']->set_storage($data['feed']);
         if (!$data['controller']->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for feed {$data['feed']->id}.");
@@ -84,7 +84,7 @@ 
         }
 
         // OPML subscription list import support
-        if (   array_key_exists('net_nemein_rss_manage_opml', $_FILES)
+        if (array_key_exists('net_nemein_rss_manage_opml', $_FILES)
             && is_uploaded_file($_FILES['net_nemein_rss_manage_opml']['tmp_name'])) {
             $opml_file = $_FILES['net_nemein_rss_manage_opml']['tmp_name'];
 

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 {