flack / openpsa

lib/org/openpsa/documents/handler/directory/edit.php

Spacing +3 added lines, -4 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->_request_data['directory'], $this->_schema);
-        if (! $this->_controller->initialize())
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 controller instance for task {$this->_directory->id}.");
         }
@@ -71,8 +71,7 @@ 
         $this->_load_edit_controller();
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('edit %s'), $this->_l10n->get('directory')));
 
-        $workflow = new midcom\workflow\datamanager2(array
-        (
+        $workflow = new midcom\workflow\datamanager2(array(
             'controller' => $this->_controller,
             'save_callback' => array($this, 'save_callback')
         ));

lib/org/openpsa/documents/handler/directory/navigation.php

Spacing +2 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
                 {
                     $tree_array[$root_topic->id] = array('topic' => $root_topic);
                 }
-                $tree_array[$root_topic->id][$topic->id] = array
-                (
+                $tree_array[$root_topic->id][$topic->id] = array(
                     "topic" => $topic
                 );
                 $this->_tree_array_build($topic_array, $topic, $tree_array[$root_topic->id]);
@@ -98,8 +97,7 @@ 
      */
     public function _show_navigation($handler_id, array &$data)
     {
-        $tree_array = array
-        (
+        $tree_array = array(
             $this->_request_data['root_topic']->id => $this->_request_data['root_topic']
         );
         $this->_tree_array_build($this->_request_data['topic_array'], $this->_request_data['root_topic'], $tree_array);

lib/org/openpsa/documents/handler/directory/create.php

Spacing +6 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
         $generator = midcom::get()->serviceloader->load('midcom_core_service_urlgenerator');
         $topic->name = $generator->from_string($_POST['extra']);
 
-        if (! $topic->create())
+        if (!$topic->create())
         {
             debug_print_r('We operated on this object:', $topic);
             throw new midcom_error("Failed to create a new topic, cannot continue. Error: " . midcom_connection::get_error_string());
@@ -65,10 +65,10 @@ 
     {
         $this->_schemadb = midcom_helper_datamanager2_schema::load_database($this->_config->get('schemadb_directory'));
         $this->_controller = midcom_helper_datamanager2_controller::create('create');
-        $this->_controller->schemadb =& $this->_schemadb;
+        $this->_controller->schemadb = & $this->_schemadb;
         $this->_controller->schemaname = $this->_schema;
-        $this->_controller->callback_object =& $this;
-        if (! $this->_controller->initialize())
+        $this->_controller->callback_object = & $this;
+        if (!$this->_controller->initialize())
         {
             throw new midcom_error("Failed to initialize a DM2 create controller.");
         }
@@ -87,8 +87,7 @@ 
 
         midcom::get()->head->set_pagetitle($this->_l10n->get('new directory'));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $this->_controller,
             'save_callback' => array($this, 'save_callback')
         ));
@@ -100,6 +99,6 @@ 
         $indexer = new org_openpsa_documents_midcom_indexer($this->_topic);
         $indexer->index($controller->datamanager);
 
-        return $this->_request_data["directory"]->name. "/";
+        return $this->_request_data["directory"]->name . "/";
     }
 }

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

Spacing +11 added lines, -19 removed lines

@@ -30,9 +30,9 @@ 
         org_openpsa_widgets_contact::add_head_elements();
 
         $head = midcom::get()->head;
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/ui/draggable.min.js');
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/ui/droppable.min.js');
-        $head->add_jsfile(MIDCOM_JQUERY_UI_URL. '/ui/selectable.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/ui/draggable.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/ui/droppable.min.js');
+        $head->add_jsfile(MIDCOM_JQUERY_UI_URL . '/ui/selectable.min.js');
         $head->add_jsfile(MIDCOM_STATIC_URL . $prefix . 'js/elfinder.min.js');
 
         $lang = midcom::get()->i18n->get_current_language();
@@ -64,26 +64,22 @@ 
         $buttons = array();
         if ($this->_request_data['directory']->can_do('midgard:create'))
         {
-            $buttons[] = $workflow->get_button("document/create/", array
-            (
+            $buttons[] = $workflow->get_button("document/create/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('new document'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/new-text.png',
             ));
-            $buttons[] = $workflow->get_button("create/", array
-            (
+            $buttons[] = $workflow->get_button("create/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('new directory'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/new-dir.png',
             ));
         }
         if ($this->_request_data['directory']->can_do('midgard:update'))
         {
-            $buttons[] = $workflow->get_button("edit/", array
-            (
+            $buttons[] = $workflow->get_button("edit/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('edit directory'),
                 MIDCOM_TOOLBAR_ACCESSKEY => 'e',
             ));
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__ais/folder/move/{$this->_request_data['directory']->guid}/",
                 MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('move', 'midcom.admin.folder'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/save-as.png',
@@ -92,8 +88,7 @@ 
         if ($this->_request_data['directory']->can_do('midgard:delete'))
         {
             $workflow = $this->get_workflow('delete', array('object' => $this->_request_data['directory'], 'recursive' => true));
-            $buttons[] = $workflow->get_button("__ais/folder/delete/", array
-            (
+            $buttons[] = $workflow->get_button("__ais/folder/delete/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('delete directory'),
                 MIDCOM_TOOLBAR_ACCESSKEY => 'd',
             ));
@@ -119,12 +114,9 @@ 
      */
     public function _handler_connector($handler_id, array $args, array &$data)
     {
-        $options = array
-        (
-            'roots' => array
-            (
-                array
-                (
+        $options = array(
+            'roots' => array(
+                array(
                     'driver' => 'Openpsa',
                     'path' => $this->_topic->guid
                 )

lib/org/openpsa/widgets/grid/provider.php

Spacing +4 added lines, -5 removed lines

@@ -250,7 +250,7 @@ 
 
     private function _convert_to_localdata()
     {
-        return "var " . $this->_grid->get_identifier() . '_entries = ' .  json_encode($this->get_rows()) . ";\n";
+        return "var " . $this->_grid->get_identifier() . '_entries = ' . json_encode($this->get_rows()) . ";\n";
     }
 
     private function _render_json()
@@ -261,8 +261,7 @@ 
             $this->_total_rows = count($rows);
         }
 
-        $response = array
-        (
+        $response = array(
             'total' => ceil($this->_total_rows / $this->_results_per_page),
             'page' => ($this->_offset / $this->_results_per_page) + 1,
             'records' => $this->_total_rows,
@@ -289,7 +288,7 @@ 
             $this->_sort_field = $query['sidx'];
             $this->_sort_direction = strtoupper($query['sord']);
         }
-        if (   !empty($query['_search'])
+        if (!empty($query['_search'])
             && $query['_search'] === 'true')
         {
             foreach ($query as $field => $value)
@@ -318,7 +317,7 @@ 
 
         $this->_total_rows = $qb->count();
 
-        if (   $this->_datatype == 'json'
+        if ($this->_datatype == 'json'
             && !empty($this->_results_per_page))
         {
             $this->_query->set_limit($this->_results_per_page);

Braces +4 added lines, -8 removed lines

@@ -96,12 +96,10 @@ 
         if (is_a($source, 'org_openpsa_widgets_grid_provider_client'))
         {
             $this->_client = $source;
-        }
-        else if (is_array($source))
+        } else if (is_array($source))
         {
             $this->set_rows($source);
-        }
-        else
+        } else
         {
             throw new midcom_error('Unknown source type');
         }
@@ -332,12 +330,10 @@ 
         if ($qb instanceof midcom_core_querybuilder)
         {
             $items = $qb->execute();
-        }
-        else if ($qb instanceof midcom_core_collector)
+        } else if ($qb instanceof midcom_core_collector)
         {
             $items = $qb->get_objects();
-        }
-        else
+        } else
         {
             throw new midcom_error('Unsupported query class ' . get_class($qb));
         }

lib/org/openpsa/widgets/grid/main.php

Spacing +4 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
         {
             $lang = $language;
         }
-        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-'. $lang . '.min.js');
+        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-' . $lang . '.min.js');
 
         $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'jquery.jqgrid.min.js');
 
@@ -162,7 +162,7 @@ 
     public function set_option($key, $value, $autoquote_string = true)
     {
         $this->_raw_options[$key] = $value;
-        if (   $autoquote_string
+        if ($autoquote_string
             && is_string($value))
         {
             $value = '"' . str_replace('"', '\\"', $value) . '"';
@@ -206,8 +206,7 @@ 
         {
             throw new midcom_error('Invalid column name ' . $name);
         }
-        $this->_columns[$name] = array
-        (
+        $this->_columns[$name] = array(
             'label' => $label,
             'options' => $options,
             'separate_index' => $separate_index
@@ -229,7 +228,7 @@ 
      */
     public function remove_column($name)
     {
-        if (   empty($name)
+        if (empty($name)
             || !array_key_exists($name, $this->_columns))
         {
             throw new midcom_error('Invalid column name ' . $name);

Braces +6 added lines, -12 removed lines

@@ -166,16 +166,13 @@ 
             && is_string($value))
         {
             $value = '"' . str_replace('"', '\\"', $value) . '"';
-        }
-        else if ($value === true)
+        } else if ($value === true)
         {
             $value = 'true';
-        }
-        else if ($value === false)
+        } else if ($value === false)
         {
             $value = 'false';
-        }
-        else if (is_array($value))
+        } else if (is_array($value))
         {
             $value = json_encode($value);
         }
@@ -253,8 +250,7 @@ 
         if (null == $value)
         {
             $this->_footer_data = $data;
-        }
-        else
+        } else
         {
             $this->_footer_data[$data] = $value;
         }
@@ -282,8 +278,7 @@ 
             if (null !== $this->_provider)
             {
                 $this->_provider->set_rows($entries);
-            }
-            else
+            } else
             {
                 $this->_provider = new org_openpsa_widgets_grid_provider($entries, $this->get_option('datatype'));
                 $this->_provider->set_grid($this);
@@ -358,8 +353,7 @@ 
             if ($column['separate_index'])
             {
                 $string .= 'index: "index_' . $name . '"';
-            }
-            else
+            } else
             {
                 $string .= 'index: "' . $name . '"';
             }

lib/org/openpsa/widgets/contact.php

Indentation +1 added lines, -1 removed lines

@@ -415,7 +415,7 @@
             $group_label = $group->get_label();
             if ($link_contacts)
             {
-                 $group_label = "<a href=\"" . self::$_contacts_url . "group/{$group->guid}/\">" . $group_label . '</a>';
+                    $group_label = "<a href=\"" . self::$_contacts_url . "group/{$group->guid}/\">" . $group_label . '</a>';
             }
 
             echo "<span class=\"organization-name\">{$group_label}</span>";

Spacing +16 added lines, -17 removed lines

@@ -24,8 +24,7 @@ 
     /**
      * Contact information of the person being displayed
      */
-    var $contact_details = array
-    (
+    var $contact_details = array(
         'guid' => '',
         'id' => '',
         'firstname' => '',
@@ -145,7 +144,7 @@ 
      */
     function read_object($person)
     {
-        if (   !is_object($person)
+        if (!is_object($person)
             || !midcom::get()->dbfactory->is_a($person, 'midcom_db_person'))
         {
             // Given $person is not one
@@ -159,7 +158,7 @@ 
         {
             $this->contact_details['lastname'] = $this->_l10n->get('no person');
         }
-        else if (   $person->firstname == ''
+        else if ($person->firstname == ''
                  && $person->lastname == '')
         {
             $this->contact_details['lastname'] = "Person #{$person->id}";
@@ -195,13 +194,13 @@ 
             $this->contact_details['homepage'] = $person->homepage;
         }
 
-        if (   $this->_config->get('jabber_enable_presence')
+        if ($this->_config->get('jabber_enable_presence')
             && $person->parameter('org.openpsa.jabber', 'jid'))
         {
             $this->contact_details['jid'] = $person->parameter('org.openpsa.jabber', 'jid');
         }
 
-        if (   $this->_config->get('skype_enable_presence')
+        if ($this->_config->get('skype_enable_presence')
             && $person->parameter('org.openpsa.skype', 'name'))
         {
             $this->contact_details['skype'] = $person->parameter('org.openpsa.skype', 'name');
@@ -220,7 +219,7 @@ 
         {
             $url = $this->link;
         }
-        else if (   $this->link_contacts
+        else if ($this->link_contacts
                  && !empty($this->contact_details['guid']))
         {
             if (!self::$_contacts_url)
@@ -289,11 +288,11 @@ 
 
         // Show picture
         // TODO: Implement photo also in local way
-        if (   $this->_config->get('gravatar_enable')
+        if ($this->_config->get('gravatar_enable')
             && !empty($this->contact_details['email']))
         {
             $size = $this->_config->get('gravatar_size');
-            $gravatar_url = "http://www.gravatar.com/avatar.php?gravatar_id=" . md5($this->contact_details['email']) . "&size=".$size;
+            $gravatar_url = "http://www.gravatar.com/avatar.php?gravatar_id=" . md5($this->contact_details['email']) . "&size=" . $size;
             echo "<img src=\"{$gravatar_url}\" class=\"photo\" style=\"float: right; margin-left: 4px;\" />\n";
         }
 
@@ -382,7 +381,7 @@ 
 
     private function _show_groups()
     {
-        if (   !$this->show_groups
+        if (!$this->show_groups
             || empty($this->contact_details['id']))
         {
             return;
@@ -451,13 +450,13 @@ 
 
             if (sizeof($cards_to_show) == 0)
             {
-                if (   $property != 'street'
+                if ($property != 'street'
                     && $customer->$property)
                 {
                     $inherited_cards_only = false;
                     $cards_to_show[] = $cardname;
                 }
-                else if (   !$default_shown
+                else if (!$default_shown
                          && $customer->street)
                 {
                     $default_shown = true;
@@ -466,9 +465,9 @@ 
             }
             else
             {
-                if (    $customer->$property
-                    || (   $customer->street
-                        && (   !$inherited_cards_only
+                if ($customer->$property
+                    || ($customer->street
+                        && (!$inherited_cards_only
                             && !$default_shown)))
                 {
                     $inherited_cards_only = false;
@@ -494,8 +493,8 @@ 
         foreach ($cards_to_show as $cardname)
         {
             echo '<div class="vcard">';
-            if (   $multiple_addresses
-                || (   $cardname != 'visiting'
+            if ($multiple_addresses
+                || ($cardname != 'visiting'
                     && !$inherited_cards_only))
             {
                 echo '<div style="text-align:center"><em>' . midcom::get()->i18n->get_string($cardname . ' address', 'org.openpsa.contacts') . "</em></div>\n";

Braces +11 added lines, -22 removed lines

@@ -120,13 +120,11 @@ 
             if (class_exists('org_openpsa_contacts_person_dba'))
             {
                 $person = org_openpsa_contacts_person_dba::get_cached($src);
-            }
-            else
+            } else
             {
                 $person = new midcom_db_person($src);
             }
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $widget = new self();
             $cache[$src] = $widget;
@@ -158,13 +156,11 @@ 
         if ($person->guid == "")
         {
             $this->contact_details['lastname'] = $this->_l10n->get('no person');
-        }
-        else if (   $person->firstname == ''
+        } else if (   $person->firstname == ''
                  && $person->lastname == '')
         {
             $this->contact_details['lastname'] = "Person #{$person->id}";
-        }
-        else
+        } else
         {
             $this->contact_details['firstname'] = $person->firstname;
             $this->contact_details['lastname'] = $person->lastname;
@@ -219,15 +215,13 @@ 
         if ($this->link)
         {
             $url = $this->link;
-        }
-        else if (   $this->link_contacts
+        } else if (   $this->link_contacts
                  && !empty($this->contact_details['guid']))
         {
             if (!self::$_contacts_url)
             {
                 $this->link_contacts = false;
-            }
-            else
+            } else
             {
                 $url = self::$_contacts_url . 'person/' . $this->contact_details['guid'] . '/';
             }
@@ -372,8 +366,7 @@ 
             if ($dialurl)
             {
                 echo "<li class=\"tel $type\"><a title=\"Dial {$this->contact_details[$field]}\" href=\"#\" onclick=\"javascript:window.open('$dialurl{$this->contact_details[$field]}','dialwin','width=300,height=200')\">{$this->contact_details[$field]}</a></li>\n";
-            }
-            else
+            } else
             {
                 echo "<li class=\"tel $type\">{$this->contact_details[$field]}</li>\n";
             }
@@ -398,8 +391,7 @@ 
             try
             {
                 $group = org_openpsa_contacts_group_dba::get_cached($data['gid']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 continue;
@@ -456,15 +448,13 @@ 
                 {
                     $inherited_cards_only = false;
                     $cards_to_show[] = $cardname;
-                }
-                else if (   !$default_shown
+                } else if (   !$default_shown
                          && $customer->street)
                 {
                     $default_shown = true;
                     $cards_to_show[] = $cardname;
                 }
-            }
-            else
+            } else
             {
                 if (    $customer->$property
                     || (   $customer->street
@@ -531,8 +521,7 @@ 
             {
                 echo "<p>{$customer->$property_street}<br />\n";
                 echo "{$customer->$property_postcode} {$customer->$property_city}</p>\n";
-            }
-            else if ($customer->street)
+            } else if ($customer->street)
             {
                 echo "<p>{$customer->street}<br />\n";
                 echo "{$customer->postcode} {$customer->city}</p>\n";

lib/org/openpsa/widgets/ui.php

Indentation +4 added lines, -4 removed lines

@@ -112,13 +112,13 @@
             //pass the urls & titles for the tabs
             $tabdata[] = array
             (
-               'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/html/',
-               'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'),
+                'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/html/',
+                'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'),
             );
             $tabdata[] = array
             (
-               'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/',
-               'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'),
+                'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/',
+                'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'),
             );
         }
 

Spacing +6 added lines, -9 removed lines

@@ -40,12 +40,11 @@ 
             $config = array_merge($defaults, $config);
 
             $node_url = $siteconfig->get_node_full_url($component);
-            if (   $node_url
-                && (   !$user_id
+            if ($node_url
+                && (!$user_id
                     || midcom::get()->auth->acl->can_do_byguid('midgard:read', $siteconfig->get_node_guid($component), 'midcom_db_topic', $user_id)))
             {
-                $providers[] = array
-                (
+                $providers[] = array(
                     'placeholder' => midcom::get()->i18n->get_string('search title', $component),
                     'url' => $node_url . $config['route'],
                     'identifier' => $component,
@@ -110,13 +109,11 @@ 
         if (null !== $guid)
         {
             //pass the urls & titles for the tabs
-            $tabdata[] = array
-            (
+            $tabdata[] = array(
                'url' => '__mfa/org.openpsa.relatedto/journalentry/' . $guid . '/html/',
                'title' => midcom::get()->i18n->get_string('journal entries', 'org.openpsa.relatedto'),
             );
-            $tabdata[] = array
-            (
+            $tabdata[] = array(
                'url' => '__mfa/org.openpsa.relatedto/render/' . $guid . '/both/',
                'title' => midcom::get()->i18n->get_string('related objects', 'org.openpsa.relatedto'),
             );
@@ -126,7 +123,7 @@ 
         echo "\n<ul>\n";
         foreach ($tabdata as $key => $tab)
         {
-            echo "<li><a id='key_" . $key ."' class='tabs_link' href='" . $prefix . $tab['url'] . "' ><span> " . $tab['title'] . "</span></a></li>";
+            echo "<li><a id='key_" . $key . "' class='tabs_link' href='" . $prefix . $tab['url'] . "' ><span> " . $tab['title'] . "</span></a></li>";
         }
         echo "\n</ul>\n";
         echo "</div>\n";

lib/org/openpsa/helpers/list.php

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
                     $cache[$array_name][$key] = $label;
 
                     //TODO: get the vgroup object based on the key or something, this check fails always.
-                    if (   $show_members
+                    if ($show_members
                         && is_object($vgroup))
                     {
                         $vgroup_members = $vgroup->list_members();

Braces +2 added lines, -4 removed lines

@@ -72,8 +72,7 @@ 
         try
         {
             $company = new org_openpsa_contacts_group_dba($company_id);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             return;
         }
@@ -145,8 +144,7 @@ 
                     if (is_object($vgroup))
                     {
                         $label = $vgroup->name;
-                    }
-                    else
+                    } else
                     {
                         $label = $vgroup;
                     }