flack / openpsa

lib/org/openpsa/documents/elFinderVolumeOpenpsa.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
         // elfinder tmp detection doesn't work on OS X
         $this->tmpPath = midcom::get()->config->get('midcom_tempdir');
         // elfinder calls exit(), so we need to make sure we write caches
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             midcom::get()->finish();
         });
     }
@@ -43,7 +43,7 @@ 
         }
 
         if (($dir = $this->dir($dst)) == false) {
-            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#'.$dst);
+            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#' . $dst);
         }
 
         if (!$dir['write']) {
@@ -84,7 +84,7 @@ 
 
         if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem
             // check POST data `overwrite` for 3rd party uploader
-            $overwrite = isset($_POST['overwrite'])? (bool)$_POST['overwrite'] : $this->options['uploadOverwrite'];
+            $overwrite = isset($_POST['overwrite']) ? (bool) $_POST['overwrite'] : $this->options['uploadOverwrite'];
             if ($overwrite) {
                 if (!$file['write']) {
                     return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -249,7 +249,7 @@ 
         $output = array($object->get_label());
 
         $parent = $object->get_parent();
-        while (   $parent
+        while ($parent
                && $parent->component == 'org.openpsa.documents') {
             $output[] = $parent->extra;
             $parent = $parent->get_parent();
@@ -346,12 +346,12 @@ 
             $data['mime'] = 'directory';
         }
 
-        if (   $owner
+        if ($owner
             && $group = midcom::get()->auth->get_assignee($owner)) {
             $data['group'] = $group->name;
         }
 
-        if (   $this->root !== $path
+        if ($this->root !== $path
             && $parent = $object->get_parent()) {
             $data['phash'] = $this->encode($parent->guid);
         }
@@ -410,7 +410,7 @@ 
      * @param  string $mode open mode
      * @return resource|false
      */
-    protected function _fopen($path, $mode="rb")
+    protected function _fopen($path, $mode = "rb")
     {
         $document = org_openpsa_documents_document_dba::get_cached($path);
         $attachments = org_openpsa_helpers::get_dm2_attachments($document, 'document');
@@ -428,7 +428,7 @@ 
      * @param  string    $path  file path
      * @return bool
      */
-    protected function _fclose($fp, $path='')
+    protected function _fclose($fp, $path = '')
     {
         fclose($fp);
         return true;
@@ -614,7 +614,7 @@ 
     {
         $filename = midcom_db_attachment::safe_filename($name, true);
         $att = $doc->create_attachment($filename, $name, $mimetype);
-        if (   !$att
+        if (!$att
             || !$att->copy_from_handle($fp)) {
             return false;
         }

lib/org/openpsa/documents/document.php

Spacing +4 added lines, -4 removed lines

@@ -74,7 +74,7 @@ 
             return;
         }
         $parent = $this->get_parent();
-        if (   $parent
+        if ($parent
             && $parent->component == 'org.openpsa.documents') {
             midcom::get()->auth->request_sudo('org.openpsa.documents');
 
@@ -171,7 +171,7 @@ 
          * if nothing matched so far and the subtype is alphanumeric, uppercase it on the theory
          * that it's probably a file extension
          */
-        if (   $parts[1] == $subtype
+        if ($parts[1] == $subtype
             && preg_match('/^[a-z0-9]+$/', $subtype)) {
             $subtype = strtoupper($subtype);
         }
@@ -186,7 +186,7 @@ 
         $properties = $this->get_properties();
         // Copy current properties
         foreach ($properties as $key) {
-            if (   $key != 'guid'
+            if ($key != 'guid'
                 && $key != 'id'
                 && $key != 'metadata') {
                 $backup->$key = $this->{$key};
@@ -218,7 +218,7 @@ 
             $backup_attachment = $backup->create_attachment($original_attachment->name, $original_attachment->title, $original_attachment->mimetype);
 
             $original_handle = $original_attachment->open('r');
-            if (   !$backup_attachment
+            if (!$backup_attachment
                 || !$original_handle) {
                 // Failed to copy the attachment, abort
                 return $backup->delete();

lib/org/openpsa/directmarketing/importer.php

Spacing +4 added lines, -4 removed lines

@@ -128,7 +128,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
                 $qb = org_openpsa_contacts_person_dba::new_query_builder();
@@ -174,7 +174,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']++;
                 return;
@@ -214,7 +214,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
                 $qb->add_constraint($this->_schemadbs['organization']['default']->fields['company_id']['storage']['location'], '=', $subscriber['organization']['company_id']);
@@ -222,7 +222,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
                     $qb->add_constraint($this->_schemadbs['organization']['default']->fields['city']['storage']['location'], '=', $subscriber['organization']['city']);

lib/org/openpsa/directmarketing/sender/backend/email.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
         //Check for bounce detector usage
         if (!empty($config['bounce_detector_address'])) {
             //Force bouncer as backend if default specified
-            if (   empty($config['mail_send_backend'])
+            if (empty($config['mail_send_backend'])
                 || $config['mail_send_backend'] == 'try_default') {
                 $config['mail_send_backend'] = 'bouncer';
             }
@@ -89,7 +89,7 @@ 
 
         //Set some List-xxx headers to avoid auto-replies and in general to be a good netizen
         $mail->headers['List-Id'] = "<{$this->_message->guid}@{$_SERVER['SERVER_NAME']}>";
-        $mail->headers['List-Unsubscribe'] =  '<' . $member->get_unsubscribe_url() . '>';
+        $mail->headers['List-Unsubscribe'] = '<' . $member->get_unsubscribe_url() . '>';
 
         debug_add('mail->from: ' . $mail->from . ', mail->to: ' . $mail->to . ', mail->subject: ' . $mail->subject);
         switch ($this->_message->orgOpenpsaObtype) {
@@ -141,7 +141,7 @@ 
 
             // If you don't want to add the image as an attachment to the field, add show_attachment customdata-definition to
             // schema and set it to false
-            if (   isset($typedata->storage->_schema->fields[$field]['customdata']['show_attachment'])
+            if (isset($typedata->storage->_schema->fields[$field]['customdata']['show_attachment'])
                 && $typedata->storage->_schema->fields[$field]['customdata']['show_attachment'] === false) {
                 continue;
             }
@@ -183,7 +183,7 @@ 
         $address = addslashes($address);
         return preg_replace_callback(
                 '/href="(http:\/\/.*?)"/i',
-                function ($match) use ($address) {
+                function($match) use ($address) {
                     return 'href="' . str_replace("URL", rawurlencode($match[1]), $address) . '"';
                 },
                 $html);

lib/org/openpsa/directmarketing/viewer.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     private function _populate_node_toolbar()
     {
-        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');
             $this->_node_toolbar->add_item($workflow->get_button('config/', array(

lib/org/openpsa/directmarketing/handler/message/send.php

Spacing +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
     private function _get_sender(array &$data)
     {
         $data['message_array'] = $this->_datamanager->get_content_raw();
-        $data['message_array']['dm_types'] =& $this->_datamanager->types;
+        $data['message_array']['dm_types'] = & $this->_datamanager->types;
         if (!array_key_exists('content', $data['message_array'])) {
             throw new midcom_error('"content" not defined in schema');
         }

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

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,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->_message);
         if (!$this->_controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for message {$this->_message->id}.");
@@ -112,7 +112,7 @@ 
 
         $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_message_copy'));
         $this->_controller = midcom_helper_datamanager2_controller::create('nullstorage');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->initialize();
 
         midcom::get()->head->set_pagetitle($this->_l10n->get('copy message'));

lib/org/openpsa/directmarketing/campaign/ruleresolver.php

Spacing +4 added lines, -4 removed lines

@@ -103,7 +103,7 @@ 
     {
         $eval_ret = @eval('$rules = ' . $ruleset . ';');
 
-        if (   $eval_ret === false
+        if ($eval_ret === false
             || !is_array($rules)) {
             throw new midcom_error('given ruleset could not be parsed');
         }
@@ -318,7 +318,7 @@ 
      */
     private function add_misc_rule(array $rule, $class, $person_property)
     {
-        $persons = array( 0 => -1);
+        $persons = array(0 => -1);
         $match = $rule['match'];
         $constraint_match = "IN";
         if ($rule['match'] == '<>') {
@@ -408,13 +408,13 @@ 
         $helper = new helper;
 
         foreach ($helper->get_object_vars($object) as $property => $value) {
-            if (   preg_match('/^_/', $property)
+            if (preg_match('/^_/', $property)
                 || in_array($property, $skip_properties)
                 || property_exists($object, $property)) {
                 // Skip private or otherwise invalid properties
                 continue;
             }
-            if (   is_object($value)
+            if (is_object($value)
                 && !is_a($value, 'midgard_datetime')) {
                 while (list($property2, $value2) = each($value)) {
                     $prop_merged = "{$property}.{$property2}";

lib/org/openpsa/expenses/handler/hours/admin.php

Spacing +3 added lines, -3 removed lines

@@ -54,10 +54,10 @@ 
         $defaults['date'] = time();
 
         $controller = midcom_helper_datamanager2_controller::create('create');
-        $controller->schemadb =& $this->_schemadb;
+        $controller->schemadb = & $this->_schemadb;
         $controller->schemaname = $this->_schema;
         $controller->defaults = $defaults;
-        $controller->callback_object =& $this;
+        $controller->callback_object = & $this;
         if (!$controller->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
         }
@@ -129,7 +129,7 @@ 
 
         $this->_load_schemadb();
         $data['controller'] = midcom_helper_datamanager2_controller::create('simple');
-        $data['controller']->schemadb =& $this->_schemadb;
+        $data['controller']->schemadb = & $this->_schemadb;
         $data['controller']->set_storage($this->_hour_report);
         if (!$data['controller']->initialize()) {
             throw new midcom_error("Failed to initialize a DM2 controller instance for hour_report {$this->_hour_report->id}.");