flack / openpsa

lib/org/openpsa/documents/handler/search.php

Braces +2 added lines, -1 removed lines

@@ -89,7 +89,8 @@
                     // ->source will always contain the document GUID
                     $data['document'] = new org_openpsa_documents_document_dba($document->source);
                     $this->_datamanagers['document']->autoset_storage($data['document']);
-                } catch (Exception $e) {
+                }
+                catch (Exception $e) {
                     $e->log();
                     continue;
                 }

lib/org/openpsa/documents/handler/document/view.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
             $entry['mimetype'] = org_openpsa_documents_document_dba::get_file_type($att->mimetype);
         }
 
-        $title = '<a class="tab_escape" href="' .$prefix . 'document/' . $document->guid .'/"><img src="' . $icon . '"';
+        $title = '<a class="tab_escape" href="' . $prefix . 'document/' . $document->guid . '/"><img src="' . $icon . '"';
         $title .= 'alt="' . $alt . '" style="border: 0px; height: 16px; vertical-align: middle" /> ' . $document->title . '</a>';
 
         $entry['title'] = $title;

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;
         }

Braces +10 added lines, -5 removed lines

@@ -82,7 +82,8 @@ 
         $file = $this->stat($test);
         $this->clearcache();
 
-        if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem
+        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'];
             if ($overwrite) {
@@ -135,11 +136,13 @@ 
     {
         try {
             return org_openpsa_documents_document_dba::get_cached($path);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             try {
                 return org_openpsa_documents_directory::get_cached($path);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -275,7 +278,8 @@ 
         $object = midcom::get()->dbfactory->get_object_by_guid($path);
         try {
             $parentdir = org_openpsa_documents_directory::get_cached($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -571,7 +575,8 @@ 
         try {
             $doc = new org_openpsa_documents_document_dba($path);
             return $doc->delete();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             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']);

Braces +2 added lines, -1 removed lines

@@ -300,7 +300,8 @@
                     $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
                 $this->_clean_new_objects();

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/handler/campaign/rules.php

Braces +2 added lines, -1 removed lines

@@ -107,7 +107,8 @@
         if (!empty($_POST['midcom_helper_datamanager2_save'])) {
             try {
                 $rules = $this->_load_rules();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error');
                 return;
             }