flack / openpsa

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

Spacing +22 added lines, -24 removed lines

@@ -95,15 +95,13 @@ 
         {
             $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
-                (
+                $this->_schemadb['comment']->append_field(
                     'captcha',
-                    array
-                    (
+                    array(
                         'title' => $this->_l10n_midcom->get('captcha field title'),
                         'storage' => null,
                         'type' => 'captcha',
@@ -113,7 +111,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;
@@ -135,12 +133,12 @@ 
         }
 
         $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())
+        if (!$this->_post_controller->initialize())
         {
             throw new midcom_error('Failed to initialize a DM2 create controller.');
         }
@@ -149,7 +147,7 @@ 
     /**
      * DM2 creation callback, binds the new object directly to the _objectguid.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_new_comment = new net_nehmer_comments_comment();
         $this->_new_comment->objectguid = $this->_objectguid;
@@ -178,13 +176,13 @@ 
            $this->_new_comment->_send_notification = true;
         }
 
-        if (! $this->_new_comment->create())
+        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
@@ -216,7 +214,7 @@ 
      */
     public function _handler_comments($handler_id, array $args, array &$data)
     {
-        if (! mgd_is_guid($args[0]))
+        if (!mgd_is_guid($args[0]))
         {
             throw new midcom_error("The GUID '{$args[0]}' is invalid. Cannot continue.");
         }
@@ -249,7 +247,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();
@@ -264,7 +262,7 @@ 
         $this->_process_admintoolbar();
         // This might exit.
 
-        if (   $handler_id == 'view-comments-custom'
+        if ($handler_id == 'view-comments-custom'
             && count($args) > 1)
         {
             midcom::get()->skip_page_style = true;
@@ -274,7 +272,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;
@@ -313,7 +311,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');
@@ -329,7 +327,7 @@ 
                 // Fall-through intentional
 
             case 'cancel':
-                if (! midcom::get()->auth->user)
+                if (!midcom::get()->auth->user)
                 {
                     midcom::get()->auth->drop_sudo();
                 }
@@ -346,7 +344,7 @@ 
      */
     private function _get_last_modified()
     {
-        if (! $this->_comments)
+        if (!$this->_comments)
         {
             return 0;
         }
@@ -398,8 +396,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');
@@ -412,7 +410,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');

lib/midcom/config/test.php

Spacing +13 added lines, -15 removed lines

@@ -14,11 +14,10 @@ 
 class midcom_config_test
 {
     const OK = 0;
-    const WARNING =  1;
+    const WARNING = 1;
     const ERROR = 2;
 
-    private $messages = array
-    (
+    private $messages = array(
         'midcom' => array(),
         'php' => array(),
         'external' => array()
@@ -42,8 +41,7 @@ 
 
     private function add($testname, $result_code, $recommendations = ' ')
     {
-        $this->messages[$this->section][$testname] = array
-        (
+        $this->messages[$this->section][$testname] = array(
             'result' => $result_code,
             'message' => $recommendations
         );
@@ -53,12 +51,12 @@ 
     private function check_midcom()
     {
         $this->section = 'midcom';
-        if (   extension_loaded('midgard')
+        if (extension_loaded('midgard')
             && version_compare(mgd_version(), '8.09.9', '<'))
         {
             $this->add('Midgard Version', self::ERROR, 'Midgard 8.09.9 or greater is required for OpenPSA.');
         }
-        else if (   extension_loaded('midgard2')
+        else if (extension_loaded('midgard2')
                  && version_compare(mgd_version(), '10.05.5', '<'))
         {
             $this->add('Midgard Version', self::ERROR, 'Midgard2 10.05.5 or greater is required for OpenPSA.');
@@ -70,11 +68,11 @@ 
 
         // Validate the Cache Base Directory.
         $cachedir = midcom::get()->config->get('cache_base_directory');
-        if  (! is_dir($cachedir))
+        if (!is_dir($cachedir))
         {
             $this->add('MidCOM cache base directory', self::ERROR, "The configured MidCOM cache base directory ({$cachedir}) does not exist or is not a directory. You have to create it as a directory writable by the Apache user.");
         }
-        else if (! is_writable($cachedir))
+        else if (!is_writable($cachedir))
         {
             $this->add('MidCOM cache base directory', self::ERROR, "The configured MidCOM cache base directory ({$cachedir}) is not writable by the Apache user. You have to create it as a directory writable by the Apache user.");
         }
@@ -152,7 +150,7 @@ 
             $this->add('Setting: post_max_size', self::WARNING, 'post_max_size should be larger than upload_max_filesize, as both limits apply during uploads.');
         }
 
-        if (! $this->ini_get_boolean('magic_quotes_gpc'))
+        if (!$this->ini_get_boolean('magic_quotes_gpc'))
         {
             $this->add('Setting: magic_quotes_gpc', self::OK);
         }
@@ -160,7 +158,7 @@ 
         {
             $this->add('Setting: magic_quotes_gpc', self::ERROR, 'Magic Quotes must be turned off, Midgard/MidCOM does this explicitly where required.');
         }
-        if (! $this->ini_get_boolean('magic_quotes_runtime'))
+        if (!$this->ini_get_boolean('magic_quotes_runtime'))
         {
             $this->add('Setting: magic_quotes_runtime', self::OK);
         }
@@ -186,7 +184,7 @@ 
             $this->add("Bytecode cache", self::WARNING, "A PHP bytecode cache is recommended for efficient MidCOM operation");
         }
 
-        if (! class_exists('Memcache'))
+        if (!class_exists('Memcache'))
         {
             $this->add('Memcache', self::WARNING, 'The PHP Memcache module is recommended for efficient MidCOM operation.');
         }
@@ -247,7 +245,7 @@ 
         $this->section = 'external';
         // ImageMagick
         $cmd = midcom::get()->config->get('utility_imagemagick_base') . "identify -version";
-        exec ($cmd, $output, $result);
+        exec($cmd, $output, $result);
         if ($result !== 0 && $result !== 1)
         {
             $this->add('ImageMagick', self::ERROR, 'The existence ImageMagick toolkit could not be verified, it is required for all kinds of image processing in MidCOM.');
@@ -274,7 +272,7 @@ 
         }
     }
 
-    private function check_for_utility ($testname, $fail_code, $fail_recommendations, $ok_notice = '&nbsp;')
+    private function check_for_utility($testname, $fail_code, $fail_recommendations, $ok_notice = '&nbsp;')
     {
         $executable = midcom::get()->config->get("utility_{$testname}");
         if (is_null($executable))
@@ -287,7 +285,7 @@ 
         }
         else
         {
-            exec ("which {$executable}", $output, $exitcode);
+            exec("which {$executable}", $output, $exitcode);
             if ($exitcode == 0)
             {
                 $this->add($testname, self::OK, $ok_notice);

lib/midcom/helper/nav/main.php

Spacing +9 added lines, -12 removed lines

@@ -193,7 +193,7 @@ 
      * @return int             The ID of the Node for which we have a match, or false on failure.
      * @see midcom_helper_nav_backend::get_leaf_uplink()
      */
-    function get_leaf_uplink ($leaf_id)
+    function get_leaf_uplink($leaf_id)
     {
         return $this->_backend->get_leaf_uplink($leaf_id);
     }
@@ -225,7 +225,7 @@ 
         {
             return true;
         }
-        if (   $uplink == false
+        if ($uplink == false
             || $uplink == -1)
         {
             return false;
@@ -370,9 +370,9 @@ 
         // this is the rest of the lot, we need to traverse everything, unfortunately.
         // First, we traverse a list of nodes to be checked on by one, avoiding a recursive
         // function call.
-        $unprocessed_node_ids = Array ($this->get_root_node());
+        $unprocessed_node_ids = Array($this->get_root_node());
 
-        while (count ($unprocessed_node_ids) > 0)
+        while (count($unprocessed_node_ids) > 0)
         {
             $node_id = array_shift($unprocessed_node_ids);
 
@@ -485,7 +485,7 @@ 
             }
             else
             {
-                if (   !empty($data['napobject'][MIDCOM_NAV_GUID])
+                if (!empty($data['napobject'][MIDCOM_NAV_GUID])
                     && in_array($data['napobject'][MIDCOM_NAV_GUID], $skip_guids))
                 {
                     continue;
@@ -587,8 +587,7 @@ 
         foreach ($this->get_node_path($curr_node) as $node_id)
         {
             $node = $this->get_node($node_id);
-            $result[$node[MIDCOM_NAV_ID]] = Array
-            (
+            $result[$node[MIDCOM_NAV_ID]] = Array(
                 MIDCOM_NAV_URL => $node[MIDCOM_NAV_ABSOLUTEURL],
                 MIDCOM_NAV_NAME => $node[MIDCOM_NAV_NAME],
                 MIDCOM_NAV_TYPE => 'node',
@@ -603,8 +602,7 @@ 
             // Ignore Index Article Leaves
             if ($leaf[MIDCOM_NAV_URL] != '')
             {
-                $result[$leaf[MIDCOM_NAV_ID]] = Array
-                (
+                $result[$leaf[MIDCOM_NAV_ID]] = Array(
                     MIDCOM_NAV_URL => $leaf[MIDCOM_NAV_ABSOLUTEURL],
                     MIDCOM_NAV_NAME => $leaf[MIDCOM_NAV_NAME],
                     MIDCOM_NAV_TYPE => 'leaf',
@@ -624,14 +622,13 @@ 
                     $id = "custom-{$key}";
 
                     $url = "{$prefix}{$entry[MIDCOM_NAV_URL]}";
-                    if (   substr($entry[MIDCOM_NAV_URL], 0, 1) == '/'
+                    if (substr($entry[MIDCOM_NAV_URL], 0, 1) == '/'
                         || preg_match('|^https?://|', $entry[MIDCOM_NAV_URL]))
                     {
                         $url = $entry[MIDCOM_NAV_URL];
                     }
 
-                    $result[$id] = Array
-                    (
+                    $result[$id] = Array(
                         MIDCOM_NAV_URL => $url,
                         MIDCOM_NAV_NAME => $entry[MIDCOM_NAV_NAME],
                         MIDCOM_NAV_TYPE => 'custom',

Braces +6 added lines, -12 removed lines

@@ -266,12 +266,10 @@ 
         if ($navorder == MIDCOM_NAVORDER_ARTICLESFIRST)
         {
             $navorder = 'articlesfirst';
-        }
-        else if ($navorder == MIDCOM_NAVORDER_SCORE)
+        } else if ($navorder == MIDCOM_NAVORDER_SCORE)
         {
             $navorder = 'score';
-        }
-        else
+        } else
         {
             $navorder = 'topicsfirst';
         }
@@ -313,8 +311,7 @@ 
         try
         {
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             debug_add("Could not load GUID {$guid}, trying to continue anyway. Last error was: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }
@@ -482,8 +479,7 @@ 
                 {
                     $entry = "<span class=\"{$current_class}\">{$entry}</span>";
                 }
-            }
-            else
+            } else
             {
                 if (   !empty($data['napobject'][MIDCOM_NAV_GUID])
                     && in_array($data['napobject'][MIDCOM_NAV_GUID], $skip_guids))
@@ -566,8 +562,7 @@ 
         {
             $curr_leaf = $this->get_current_leaf();
             $curr_node = $this->get_current_node();
-        }
-        else
+        } else
         {
             $curr_leaf = $this->get_leaf($id);
             $curr_node = -1;
@@ -578,8 +573,7 @@ 
                 {
                     $curr_node = $node[MIDCOM_NAV_ID];
                 }
-            }
-            else
+            } else
             {
                 $curr_node = $this->get_node($curr_leaf[MIDCOM_NAV_NODEID]);
             }

lib/midcom/admin/user/handler/group/create.php

Spacing +3 added lines, -3 removed lines

@@ -36,14 +36,14 @@
      *
      * Assumes Admin Privileges.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         // Create a new group
         $this->_group = new midcom_db_group();
-        if (! $this->_group->create())
+        if (!$this->_group->create())
         {
             debug_print_r('We operated on this object:', $this->_group);
-            throw new midcom_error('Failed to create a new group. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new group. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_group;

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

Spacing +17 added lines, -23 removed lines

@@ -66,7 +66,7 @@ 
         {
             case 'edit':
                 $this->_controller = midcom_helper_datamanager2_controller::create('simple');
-                $this->_controller->schemadb =& $this->_schemadb;
+                $this->_controller->schemadb = & $this->_schemadb;
                 $this->_controller->set_storage($this->_topic);
                 break;
 
@@ -79,9 +79,9 @@ 
                     }
                 }
                 $this->_controller = midcom_helper_datamanager2_controller::create('create');
-                $this->_controller->schemadb =& $this->_schemadb;
+                $this->_controller->schemadb = & $this->_schemadb;
                 $this->_controller->schemaname = 'default';
-                $this->_controller->callback_object =& $this;
+                $this->_controller->callback_object = & $this;
 
                 // Suggest to create the same type of a folder as the parent is
                 $component_suggestion = $this->_topic->component;
@@ -92,8 +92,7 @@ 
                     $component_suggestion = $this->_config->get('default_component');
                 }
 
-                $this->_controller->defaults = array
-                (
+                $this->_controller->defaults = array(
                     'component' => $component_suggestion,
                 );
                 break;
@@ -108,16 +107,16 @@ 
                 $this->_schemadb = midcom_helper_datamanager2_schema::load_database($schemadb);
 
                 $this->_controller = midcom_helper_datamanager2_controller::create('create');
-                $this->_controller->schemadb =& $this->_schemadb;
+                $this->_controller->schemadb = & $this->_schemadb;
                 $this->_controller->schemaname = 'link';
-                $this->_controller->callback_object =& $this;
+                $this->_controller->callback_object = & $this;
                 break;
 
             default:
                 throw new midcom_error('Unable to process the request, unknown handler id');
         }
 
-        if (! $this->_controller->initialize())
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for article {$this->_event->id}.");
         }
@@ -126,15 +125,15 @@ 
     /**
      * DM2 creation callback, binds to the current content topic.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_new_topic = new midcom_db_topic();
         $this->_new_topic->up = $this->_topic->id;
 
-        if (! $this->_new_topic->create())
+        if (!$this->_new_topic->create())
         {
             debug_print_r('We operated on this object:', $this->_new_topic);
-            throw new midcom_error('Failed to create a new topic, cannot continue. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new topic, cannot continue. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_new_topic;
@@ -186,8 +185,7 @@ 
 
         midcom::get()->head->set_pagetitle($title);
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->_controller,
             'save_callback' => array($this, 'save_callback')
         ));
@@ -206,7 +204,7 @@ 
 
     private function _update_topic($prefix, $old_name)
     {
-        if (   !empty($this->_topic->symlink)
+        if (!empty($this->_topic->symlink)
             && !empty($this->_topic->component))
         {
             $this->_topic->symlink = null;
@@ -225,7 +223,7 @@ 
 
             midcom::get()->uimessages->add($this->_l10n->get('midcom.admin.folder'), $this->_l10n->get('new style created'));
 
-            if (! $this->_topic->update())
+            if (!$this->_topic->update())
             {
                 midcom::get()->uimessages->add($this->_l10n->get('midcom.admin.folder'), sprintf($this->_l10n->get('could not save folder: %s'), midcom_connection::get_error_string()));
                 return false;
@@ -274,8 +272,7 @@ 
                         $e->getMessage(), MIDCOM_LOG_ERROR);
 
                     $this->_new_topic->purge();
-                    throw new midcom_error
-                    (
+                    throw new midcom_error(
                         "Refusing to create this symlink because its target folder was not found: " .
                         $e->getMessage()
                     );
@@ -285,8 +282,7 @@ 
             if ($this->_new_topic->up == $topic->up)
             {
                 $this->_new_topic->purge();
-                throw new midcom_error
-                (
+                throw new midcom_error(
                     "Refusing to create this symlink because it is located in the same
                     folder as its target"
                 );
@@ -294,8 +290,7 @@ 
             if ($this->_new_topic->up == $topic->id)
             {
                 $this->_new_topic->purge();
-                throw new midcom_error
-                (
+                throw new midcom_error(
                     "Refusing to create this symlink because its parent folder is the same
                     folder as its target."
                 );
@@ -304,8 +299,7 @@ 
             if (!midcom_admin_folder_management::is_child_listing_finite($topic))
             {
                 $this->_new_topic->purge();
-                throw new midcom_error
-                (
+                throw new midcom_error(
                     "Refusing to create this symlink because it would have created an
                     infinite loop situation."
                 );

lib/org/openpsa/user/handler/person/create.php

Spacing +5 added lines, -7 removed lines

@@ -41,8 +41,7 @@ 
         {
             if ($current++ == 0)
             {
-                $field['start_fieldset'] = array
-                (
+                $field['start_fieldset'] = array(
                     'title' => 'account_fieldset',
                     'css_group' => 'area meta',
                 );
@@ -87,8 +86,7 @@ 
         midcom::get()->head->set_pagetitle($this->_l10n->get('create person'));
 
         $data['controller'] = $this->get_controller('create');
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));
@@ -107,14 +105,14 @@ 
     /**
      * DM2 creation callback.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         // Create a new person
         $this->_person = new midcom_db_person;
-        if (! $this->_person->create())
+        if (!$this->_person->create())
         {
             debug_print_r('We operated on this object:', $this->_person);
-            throw new midcom_error('Failed to create a new person. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new person. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_person;

lib/org/openpsa/user/handler/group/create.php

Spacing +4 added lines, -5 removed lines

@@ -41,8 +41,7 @@ 
         midcom::get()->auth->require_user_do('org.openpsa.user:manage', null, 'org_openpsa_user_interface');
         midcom::get()->head->set_pagetitle($this->_l10n->get('create group'));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->get_controller('create'),
             'save_callback' => array($this, 'save_callback')
         ));
@@ -58,14 +57,14 @@ 
     /**
      * DM2 creation callback.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         // Create a new group
         $this->_group = new midcom_db_group();
-        if (! $this->_group->create())
+        if (!$this->_group->create())
         {
             debug_print_r('We operated on this object:', $this->_group);
-            throw new midcom_error('Failed to create a new group. Last Midgard error was: '. midcom_connection::get_error_string());
+            throw new midcom_error('Failed to create a new group. Last Midgard error was: ' . midcom_connection::get_error_string());
         }
 
         return $this->_group;