flack / openpsa

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

Spacing +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'midcom_db_group'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $this->_view_toolbar->add_item($workflow->get_button("group/create/", array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button("group/create/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create group'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
             )));

lib/org/openpsa/user/handler/lostpassword.php

Spacing +3 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
      */
     private function _reset_password()
     {
-        if (! midcom::get()->auth->request_sudo($this->_component))
+        if (!midcom::get()->auth->request_sudo($this->_component))
         {
             throw new midcom_error('Failed to request sudo privileges.');
         }
@@ -164,13 +164,12 @@ 
     private function _send_reset_mail($person, $password)
     {
         $from = $this->_config->get('lostpassword_reset_mail_sender');
-        if (! $from)
+        if (!$from)
         {
             $from = $person->email;
         }
 
-        $parameters = array
-        (
+        $parameters = array(
             'PERSON' => $person,
             'PASSWORD' => $password,
         );

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

lib/org/openpsa/user/handler/list.php

Spacing +2 added lines, -4 removed lines

@@ -67,8 +67,7 @@ 
         $workflow = $this->get_workflow('datamanager2');
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'midcom_db_person'))
         {
-            $this->_view_toolbar->add_item($workflow->get_button("create/", array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button("create/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_person-new.png',
             )));
@@ -76,8 +75,7 @@ 
 
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'midcom_db_group'))
         {
-            $this->_view_toolbar->add_item($workflow->get_button("group/create/", array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button("group/create/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create group'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
             )));

Braces +3 added lines, -6 removed lines

@@ -144,8 +144,7 @@ 
                 if ($field == 'username')
                 {
                     midcom_core_account::add_username_constraint($qb, 'LIKE', $value . '%');
-                }
-                else
+                } else
                 {
                     $qb->add_constraint($field, 'LIKE', $value . '%');
                 }
@@ -157,8 +156,7 @@ 
             if ($field == 'username')
             {
                 midcom_core_account::add_username_order($qb, $direction);
-            }
-            else
+            } else
             {
                 $qb->add_order($field, $direction);
             }
@@ -203,8 +201,7 @@ 
             {
                 $group = org_openpsa_contacts_group_dba::get_cached($gid);
                 $entry['groups'][] = '<a href="' . $prefix . 'group/' . $group->guid . '/">' . $group->get_label() . '</a>';
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }

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

Spacing +5 added lines, -8 removed lines

@@ -43,15 +43,14 @@ 
         $this->add_breadcrumb('', $this->_person->get_label());
 
         $auth = midcom::get()->auth;
-        if (   $this->_person->id == midcom_connection::get_user()
+        if ($this->_person->id == midcom_connection::get_user()
             || $auth->can_user_do('org.openpsa.user:manage', null, 'org_openpsa_user_interface'))
         {
             $buttons = array();
             $workflow = $this->get_workflow('datamanager2');
             if ($this->_person->can_do('midgard:update'))
             {
-                $buttons[] = $workflow->get_button("edit/{$this->_person->guid}/", array
-                (
+                $buttons[] = $workflow->get_button("edit/{$this->_person->guid}/", array(
                     MIDCOM_TOOLBAR_ACCESSKEY => 'e',
                 ));
             }
@@ -60,11 +59,10 @@ 
                 $delete_workflow = $this->get_workflow('delete', array('object' => $this->_person));
                 $buttons[] = $delete_workflow->get_button("delete/{$this->_person->guid}/");
             }
-            if (   midcom_connection::is_user($this->_person)
+            if (midcom_connection::is_user($this->_person)
                 && $this->_person->can_do('midgard:privileges'))
             {
-                $buttons[] = $workflow->get_button("privileges/{$this->_person->guid}/", array
-                (
+                $buttons[] = $workflow->get_button("privileges/{$this->_person->guid}/", array(
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get("permissions"),
                     MIDCOM_TOOLBAR_ICON => 'midgard.admin.asgard/permissions-16.png',
                 ));
@@ -72,8 +70,7 @@ 
 
             if ($this->_person->can_do('midgard:update'))
             {
-                $buttons[] = $workflow->get_button("person/notifications/{$this->_person->guid}/", array
-                (
+                $buttons[] = $workflow->get_button("person/notifications/{$this->_person->guid}/", array(
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get("notification settings"),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock-discussion.png',
                 ));

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

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
         $accounthelper = new org_openpsa_user_accounthelper($this->_person);
 
         // Update account
-        if (   !$accounthelper->set_account($formmanager->get_value("username"), $password)
+        if (!$accounthelper->set_account($formmanager->get_value("username"), $password)
             && midcom_connection::get_error() != MGD_ERR_OK)
         {
             // Failure, give a message

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

Spacing +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('edit %s'), $this->_person->get_label()));
 
         $data['controller'] = $this->get_controller('simple', $this->_person);
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));

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

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
                     'title' => 'account_fieldset',
                     'css_group' => 'area meta',
                 );
-            }
-            else if ($current == $last)
+            } else if ($current == $last)
             {
                 $field['end_fieldset'] = '';
             }

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/accounthelper.php

Indentation +1 added lines, -1 removed lines

@@ -467,7 +467,7 @@
 
         if (!midcom_services_at_interface::register($release_time, 'org.openpsa.user', 'reopen_account', $args))
         {
-             throw new midcom_error("Failed to register interface for re_open the user account, last Midgard error was: " . midcom_connection::get_error_string());
+                throw new midcom_error("Failed to register interface for re_open the user account, last Midgard error was: " . midcom_connection::get_error_string());
         }
         $this->_person->set_parameter("org_openpsa_user_blocked_account", "account_password", $account->get_password());
         $account->set_password('', false);

Spacing +10 added lines, -12 removed lines

@@ -116,8 +116,7 @@ 
             $mail->body = $this->_config->get('welcome_mail_body');
 
             // Make replacements to body
-            $mail->parameters = array
-            (
+            $mail->parameters = array(
                 "USERNAME" => $username,
                 "PASSWORD" => $password,
                 "SITE_URL" => midcom::get()->config->get('midcom_site_url')
@@ -163,7 +162,7 @@ 
             $new_password_encrypted = midcom_connection::prepare_password($new_password);
 
             //check if the new encrypted password was already used
-            if (    $this->check_password_reuse($new_password_encrypted)
+            if ($this->check_password_reuse($new_password_encrypted)
                  && $this->check_password_strength($new_password))
             {
                 $this->_save_old_password();
@@ -218,7 +217,7 @@ 
         while ($length--)
         {
             $offset = 1;
-            if (   $length == 1
+            if ($length == 1
                 || $password == '')
             {
                 //make sure password doesn't begin or end in punctuation character
@@ -240,7 +239,7 @@ 
         do
         {
             $password = self::generate_password($length);
-        } while(!$this->check_password_strength($password));
+        } while (!$this->check_password_strength($password));
         return $password;
     }
 
@@ -380,7 +379,7 @@ 
             $repeated = true;
             for ($j = 0; $j < $plen && ($j + $i + $plen) < strlen($password); $j++)
             {
-                if (   (substr($password, $j + $i, 1) == substr($password, $j + $i + $plen, 1))
+                if ((substr($password, $j + $i, 1) == substr($password, $j + $i + $plen, 1))
                     && $repeated)
                 {
                     $repeated = true;
@@ -446,8 +445,7 @@ 
             return false;
         }
         $release_time = time() + ($timeframe_minutes * 60);
-        $args = array
-        (
+        $args = array(
             'guid' => $this->_person->guid,
             'parameter_name' => 'org_openpsa_user_blocked_account',
             'password' => 'account_password',
@@ -539,7 +537,7 @@ 
 
     public static function get_person_by_formdata($data)
     {
-        if (   empty($data['username'])
+        if (empty($data['username'])
             || empty($data['password']))
         {
             return false;
@@ -576,7 +574,7 @@ 
         $max_attempts = midcom_baseclasses_components_configuration::get($component, 'config')->get('max_password_attempts');
         $timeframe = midcom_baseclasses_components_configuration::get($component, 'config')->get('password_block_timeframe_min');
 
-        if (   $max_attempts == 0
+        if ($max_attempts == 0
             || $timeframe == 0)
         {
             return $stat;
@@ -603,8 +601,8 @@ 
          * If the maximum number of attemps is reached and the oldest attempt
          * on the stack is within our defined timeframe, we block the account
          */
-        if (   sizeof($attempts) >= $max_attempts
-            && $attempts[$max_attempts-1] >= (time() - ($timeframe * 60)))
+        if (sizeof($attempts) >= $max_attempts
+            && $attempts[$max_attempts - 1] >= (time() - ($timeframe * 60)))
         {
             $this->disable_account();
             $stat = false;

Braces +6 added lines, -12 removed lines

@@ -84,8 +84,7 @@ 
         {
             $generated_password = true;
             $password = $this->generate_safe_password($this->_config->get("min_password_length"));
-        }
-        else
+        } else
         {
             $generated_password = false;
         }
@@ -129,8 +128,7 @@ 
                 $this->delete_account();
                 return false;
             }
-        }
-        else if ($generated_password)
+        } else if ($generated_password)
         {
             /*
              * no welcome mail was sent:
@@ -168,8 +166,7 @@ 
             {
                 $this->_save_old_password();
                 $account->set_password($new_password);
-            }
-            else
+            } else
             {
                 $this->errstr = "password strength too low";
                 return false;
@@ -311,8 +308,7 @@ 
             {
                 $old_passwords_array = array_slice($old_passwords_array, 0, $max);
             }
-        }
-        else
+        } else
         {
             $old_passwords_array = array();
         }
@@ -384,8 +380,7 @@ 
                     && $repeated)
                 {
                     $repeated = true;
-                }
-                else
+                } else
                 {
                     $repeated = false;
                 }
@@ -398,8 +393,7 @@ 
             {
                 $i += $plen - 1;
                 $repeated = false;
-            }
-            else
+            } else
             {
                 $result .= substr($password, $i, 1);
             }

lib/org/openpsa/projects/project.php

Spacing +12 added lines, -23 removed lines

@@ -14,8 +14,7 @@ 
     public $__midcom_class_name__ = __CLASS__;
     public $__mgdschema_class_name__ = 'org_openpsa_project';
 
-    public $autodelete_dependents = array
-    (
+    public $autodelete_dependents = array(
         'org_openpsa_contacts_role_dba' => 'objectGuid'
     );
 
@@ -31,46 +30,38 @@ 
      *
      * @var array
      */
-    private $_status_map = array
-    (
-        'rejected' => array
-        (
+    private $_status_map = array(
+        'rejected' => array(
             'ongoing' => org_openpsa_projects_task_status_dba::REOPENED, // If there's an ongoing task, the project seems to have resumed
             'not_started' => org_openpsa_projects_task_status_dba::PROPOSED, // There are pending tasks, so maybe the project is back to start
             'rejected' => null, // Sanity check
             'on_hold' => org_openpsa_projects_task_status_dba::ONHOLD, //Blocker task
             'closed' => org_openpsa_projects_task_status_dba::COMPLETED //Work seems to have been finished
         ),
-        'not_started' => array
-        (
+        'not_started' => array(
             'ongoing' => org_openpsa_projects_task_status_dba::STARTED, //Work seems to have been started
             'on_hold' => org_openpsa_projects_task_status_dba::ONHOLD, // Or is on hold
             'not_started' => null,
             'closed' => org_openpsa_projects_task_status_dba::COMPLETED // Or is even finished already
         ),
-        'ongoing' => array
-        (
+        'ongoing' => array(
             'ongoing' => null, //Only do something if there are no ongoing tasks
             'on_hold' => org_openpsa_projects_task_status_dba::ONHOLD, //Blocker task
-            'not_started' => array
-            (
+            'not_started' => array(
                 'closed' => org_openpsa_projects_task_status_dba::ONHOLD, //Project is in limbo: Some tasks are finished, others didn't begin yet
                 'not_started' => org_openpsa_projects_task_status_dba::PROPOSED //Back to start: Someone withdrew acceptance
             ),
             'closed' => org_openpsa_projects_task_status_dba::ONHOLD //Work seems to have been finished
         ),
-        'closed' => array
-        (
+        'closed' => array(
             'not_started' => org_openpsa_projects_task_status_dba::REOPENED, //Something new came up, reopen
             'ongoing' => org_openpsa_projects_task_status_dba::REOPENED, //Something new came up, reopen
             'closed' => null, //Sanity check
             'on_hold' => org_openpsa_projects_task_status_dba::ONHOLD
         ),
-        'on_hold' => array
-        (
+        'on_hold' => array(
             'on_hold' => null, //only if no task is on hold we have to look for something else
-            'not_started' => array
-            (
+            'not_started' => array(
                 'closed' => null,
                 'not_started' => org_openpsa_projects_task_status_dba::PROPOSED // If nothing is closed, ongoing or on hold, let's try not_started
             ),
@@ -177,8 +168,7 @@ 
      */
     function get_task_count()
     {
-        $numbers = array
-        (
+        $numbers = array(
             'not_started' => 0,
             'ongoing' => 0,
             'on_hold' => 0,
@@ -202,8 +192,7 @@ 
      */
     function get_task_hours()
     {
-        $numbers = array
-        (
+        $numbers = array(
             'plannedHours' => 0,
             'reportedHours' => 0
         );
@@ -266,7 +255,7 @@ 
             $new_status = $this->_find_status($this->_status_map[$this->status_type], $status_types);
         }
 
-        if (   !is_null($new_status)
+        if (!is_null($new_status)
             && $this->status != $new_status)
         {
             $this->status = $new_status;

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
             if (array_key_exists($this->_schema, $schemadb))
             {
                 $schema_name = $this->_schema;
-            }
-            else
+            } else
             {
                 $schema_name = key($schemadb);
             }
@@ -110,8 +109,7 @@ 
             {
                 $this->_rows[] = array($row);
             }
-        }
-        else
+        } else
         {
             $this->_rows = $rows;
         }