flack / openpsa

lib/org/openpsa/directmarketing/handler/campaign/create.php

Spacing +3 added lines, -4 removed lines

@@ -56,12 +56,12 @@ 
     /**
      * DM2 creation callback, binds to the current content topic.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_campaign = new org_openpsa_directmarketing_campaign_dba();
         $this->_campaign->node = $this->_topic->id;
 
-        if (! $this->_campaign->create())
+        if (!$this->_campaign->create())
         {
             debug_print_r('We operated on this object:', $this->_campaign);
             throw new midcom_error('Failed to create a new campaign. Last Midgard error was: ' . midcom_connection::get_error_string());
@@ -84,8 +84,7 @@ 
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($this->_schemadb[$this->_schema]->description)));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->get_controller('create'),
             'save_callback' => array($this, 'save_callback')
         ));

lib/org/openpsa/directmarketing/handler/campaign/admin.php

Spacing +2 added lines, -2 removed lines

@@ -51,9 +51,9 @@
     {
         $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->_campaign);
-        if (! $this->_controller->initialize())
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for campaign {$this->_campaign->id}.");
         }

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

Spacing +1 added lines, -2 removed lines

@@ -74,8 +74,7 @@
             $schemadb_campaign = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_campaign'));
             foreach (array_keys($schemadb_campaign) as $name)
             {
-                $this->_view_toolbar->add_item($workflow->get_button("campaign/create/{$name}/", array
-                (
+                $this->_view_toolbar->add_item($workflow->get_button("campaign/create/{$name}/", array(
                     MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($schemadb_campaign[$name]->description)),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people.png',
                 )));

lib/org/openpsa/directmarketing/handler/subscriber.php

Braces +5 added lines, -10 removed lines

@@ -36,8 +36,7 @@ 
             try
             {
                 $campaign = new org_openpsa_directmarketing_campaign_dba($_POST['add_to_campaign']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 // FIXME: More informative error message
                 $this->notify('Failed adding person %s to campaign %s', $_POST['add_to_campaign'], 'error');
@@ -54,8 +53,7 @@ 
             if ($member->create())
             {
                 $this->notify('added person %s to campaign %s', $campaign->title, 'info');
-            }
-            else
+            } else
             {
                 $this->notify('Failed adding person %s to campaign %s', $campaign->title, 'error');
             }
@@ -96,8 +94,7 @@ 
             {
                 $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign);
                 $campaign_membership_map[$membership->campaign] = $membership;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage());
             }
@@ -161,8 +158,7 @@ 
         if ($this->_request_data['unsubscribe_status'] == false)
         {
             midcom_show_style('show-unsubscribe-failed');
-        }
-        else
+        } else
         {
             midcom_show_style('show-unsubscribe-ok');
         }
@@ -243,8 +239,7 @@ 
         if ($data['unsubscribe_status'] == false)
         {
             midcom_show_style('show-unsubscribe-failed');
-        }
-        else
+        } else
         {
             midcom_show_style('show-unsubscribe-ok');
         }

lib/org/openpsa/directmarketing/handler/import.php

Spacing +6 added lines, -9 removed lines

@@ -34,10 +34,8 @@ 
         // Try to load the correct campaign
         $this->_request_data['campaign'] = $this->_master->load_campaign($args[0]);
 
-        $this->_view_toolbar->add_item
-        (
-            array
-            (
+        $this->_view_toolbar->add_item(
+            array(
                 MIDCOM_TOOLBAR_URL => "campaign/{$this->_request_data['campaign']->guid}/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get("back"),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_left.png',
@@ -163,7 +161,7 @@ 
         if (count($this->_request_data['contacts']) > 0)
         {
             $this->_request_data['import_status'] = $importer->import_subscribers($this->_request_data['contacts'], $this->_request_data['campaign']);
-            if (   $this->_request_data['import_status']['subscribed_new'] > 0
+            if ($this->_request_data['import_status']['subscribed_new'] > 0
                 || $this->_request_data['import_status']['already_subscribed'] > 0)
             {
                 $this->_import_success = true;
@@ -205,7 +203,7 @@ 
         // Update the breadcrumb line
         $this->_update_breadcrumb($handler_id, $args);
 
-        if (   array_key_exists('org_openpsa_directmarketing_import', $_POST)
+        if (array_key_exists('org_openpsa_directmarketing_import', $_POST)
             && is_uploaded_file($_FILES['org_openpsa_directmarketing_import_upload']['tmp_name']))
         {
             $importer = new org_openpsa_directmarketing_importer_vcards($this->_schemadbs);
@@ -266,7 +264,7 @@ 
                 $read_rows = 0;
                 $handle = fopen($_FILES['org_openpsa_directmarketing_import_upload']['tmp_name'], 'r');
                 $total_columns = 0;
-                while (   $read_rows < 2
+                while ($read_rows < 2
                        && $csv_line = fgetcsv($handle, 1000, $data['separator']))
                 {
                     if ($total_columns == 0)
@@ -341,8 +339,7 @@ 
         $this->_update_breadcrumb($handler_id, $args);
 
         $data['rows'] = array();
-        $config = array
-        (
+        $config = array(
             'fields' => $_POST['org_openpsa_directmarketing_import_csv_field'],
             'separator' => $_POST['org_openpsa_directmarketing_import_separator'],
         );

Braces +3 added lines, -6 removed lines

@@ -23,8 +23,7 @@ 
         if (is_string($value[0]))
         {
             $date = $value[0];
-        }
-        else
+        } else
         {
             $date = $value[0][$options . '_date'];
         }
@@ -88,8 +87,7 @@ 
             {
                 return false;
             }
-        }
-        else
+        } else
         {
             $minutes = '00';
         }
@@ -100,8 +98,7 @@ 
             {
                 return false;
             }
-        }
-        else
+        } else
         {
             $seconds = '00';
         }

lib/org/openpsa/directmarketing/importer.php

Spacing +5 added lines, -6 removed lines

@@ -137,7 +137,7 @@ 
                 }
             }
 
-            if (   !$person
+            if (!$person
                 && !empty($subscriber['person']['handphone']))
             {
                 // Perform a simple cell phone test. More complicated duplicate checking is best left to the o.o.contacts duplicate checker
@@ -190,7 +190,7 @@ 
             // User is or has been subscriber earlier, update status
             $member = $members[0];
 
-            if (   $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
+            if ($member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED
                 || $member->orgOpenpsaObtype == org_openpsa_directmarketing_campaign_member_dba::NORMAL)
             {
                 $this->_import_status['already_subscribed']++;
@@ -239,7 +239,7 @@ 
 
             $qb = org_openpsa_contacts_group_dba::new_query_builder();
 
-            if (   array_key_exists('company_id', $this->_schemadbs['organization']['default']->fields)
+            if (array_key_exists('company_id', $this->_schemadbs['organization']['default']->fields)
                 && !empty($subscriber['organization']['company_id']))
             {
                 // Imported data has a company id, we use that instead of name
@@ -250,7 +250,7 @@ 
                 // Seek by official name
                 $qb->add_constraint('official', '=', $subscriber['organization']['official']);
 
-                if (   array_key_exists('city', $this->_schemadbs['organization']['default']->fields)
+                if (array_key_exists('city', $this->_schemadbs['organization']['default']->fields)
                     && !empty($subscriber['organization']['city']))
                 {
                     // Imported data has a city, we use also that for matching
@@ -317,8 +317,7 @@ 
      */
     public function import_subscribers(array $subscribers, org_openpsa_directmarketing_campaign_dba $campaign)
     {
-        $this->_import_status = array
-        (
+        $this->_import_status = array(
             'already_subscribed' => 0,
             'subscribed_new' => 0,
             'failed_create' => 0,

Braces +5 added lines, -10 removed lines

@@ -205,13 +205,11 @@ 
             if (array_key_exists('person', $this->_new_objects))
             {
                 $this->_import_status['subscribed_new']++;
-            }
-            else
+            } else
             {
                 $this->_import_status['already_subscribed']++;
             }
-        }
-        else
+        } else
         {
             // Not a subscribed member yet, add
             $member = new org_openpsa_directmarketing_campaign_member_dba();
@@ -244,8 +242,7 @@ 
             {
                 // Imported data has a company id, we use that instead of name
                 $qb->add_constraint($this->_schemadbs['organization']['default']->fields['company_id']['storage']['location'], '=', $subscriber['organization']['company_id']);
-            }
-            else
+            } else
             {
                 // Seek by official name
                 $qb->add_constraint('official', '=', $subscriber['organization']['official']);
@@ -292,8 +289,7 @@ 
         {
             // Match found, use it
             $member = $members[0];
-        }
-        else
+        } else
         {
             // We didn't have person matching the email in DB. Create a new one.
             $member = new midcom_db_member();
@@ -340,8 +336,7 @@ 
                     $organization = $this->_import_subscribers_organization($subscriber);
                     $this->_import_subscribers_organization_member($subscriber, $person, $organization);
                 }
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 // Clean up possibly created data

lib/org/openpsa/directmarketing/midcom/interfaces.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     public function _on_watched_dba_delete($object)
     {
         $qb = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
-        if (   is_a($object, 'midcom_db_person')
+        if (is_a($object, 'midcom_db_person')
             || is_a($object, 'org_openpsa_contacts_person_dba'))
         {
             $qb->add_constraint('person', '=', $object->id);
@@ -49,7 +49,7 @@ 
      */
     function background_send_message($args, $handler)
     {
-        if (   !isset($args['url_base'])
+        if (!isset($args['url_base'])
             || !isset($args['batch']))
         {
             $handler->print_error('url_base or batch number not set, aborting');

Braces +4 added lines, -8 removed lines

@@ -21,12 +21,10 @@ 
             || is_a($object, 'org_openpsa_contacts_person_dba'))
         {
             $qb->add_constraint('person', '=', $object->id);
-        }
-        else if (is_a($object, 'org_openpsa_directmarketing_campaign_dba'))
+        } else if (is_a($object, 'org_openpsa_directmarketing_campaign_dba'))
         {
             $qb->add_constraint('campaign', '=', $object->id);
-        }
-        else
+        } else
         {
             return;
         }
@@ -65,8 +63,7 @@ 
         {
             midcom::get()->dynamic_load($batch_url);
             $ret = true;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $ret = $e->getMessage();
         }
@@ -95,8 +92,7 @@ 
         try
         {
             $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID");
             return false;

lib/org/openpsa/user/widget/password.php

Spacing +3 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
         $elements = array();
         $attributes = array_merge($attributes, array('class' => 'shorttext', 'id' => $this->name . '_input'));
 
-        $menu ='<label><input type="radio" name="org_openpsa_user_person_account_password_switch" value="0" checked="checked"/> ' . $this->_l10n->get("generate_password") . '
+        $menu = '<label><input type="radio" name="org_openpsa_user_person_account_password_switch" value="0" checked="checked"/> ' . $this->_l10n->get("generate_password") . '
             </label>
             <label>
                 <input type="radio" name="org_openpsa_user_person_account_password_switch" value="1"/> ' . $this->_l10n->get("own_password") . '
@@ -42,10 +42,8 @@ 
 
     public static function jsinit($name, midcom_services_i18n_l10n $l10n, midcom_helper_configuration $config, $userid_required)
     {
-        $conf = array
-        (
-            'strings' => array
-            (
+        $conf = array(
+            'strings' => array(
                 'shortPass' => $l10n->get("password too short"),
                 'badPass' => $l10n->get("password weak"),
                 'goodPass' => $l10n->get("password good"),

lib/org/openpsa/user/viewer.php

Spacing +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
             $password = $formmanager->_types['password']->value;
         }
 
-        $stat = $account_helper->create_account
-        (
+        $stat = $account_helper->create_account(
             $person->guid,
             $formmanager->_types["username"]->value,
             $person->email,