flack / openpsa

lib/midcom/helper/datamanager2/storage/midgard.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
             default:
                 $fieldname = $this->_schema->fields[$name]['storage']['location'];
                 $helper = new helper;
-                if (   !$helper->property_exists($this->object, $fieldname)
+                if (!$helper->property_exists($this->object, $fieldname)
                     && !$helper->property_exists($this->object->__object, $fieldname)) {
                     throw new midcom_error("Missing {$fieldname} field in object: " . get_class($this->object));
                 }
@@ -112,8 +112,8 @@ 
 
             case 'metadata':
                 $helper = new helper;
-                if (   !isset($this->object->metadata)
-                    || (   !$helper->property_exists($this->object->metadata, $name)
+                if (!isset($this->object->metadata)
+                    || (!$helper->property_exists($this->object->metadata, $name)
                         && !$helper->property_exists($this->object->__object->metadata, $name))) {
                     throw new midcom_error("Missing {$name} metadata field in object: " . get_class($this->object));
                 }

lib/midcom/helper/datamanager2/widget/jsdate.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
      */
     public function _on_configuring()
     {
-        if (   is_a($this->_type, 'midcom_helper_datamanager2_type_date')
+        if (is_a($this->_type, 'midcom_helper_datamanager2_type_date')
             && $this->_type->storage_type == 'UNIXTIME') {
             $this->minyear = 1970;
             $this->maxyear = 2030;
@@ -395,7 +395,7 @@ 
         }
 
         // Both date and time found, convert the input to hopefully full-fletched ISO datetime
-        if (   $date
+        if ($date
             && $time) {
             $input = "{$date} {$time}";
         }

lib/midcom/helper/datamanager2/widget/downloads.php

Spacing +9 added lines, -9 removed lines

@@ -110,7 +110,7 @@ 
         $this->_require_type_class('midcom_helper_datamanager2_type_blobs');
 
         // Reflect the type config setting for maximum count
-        if (   isset($this->_type->max_count)
+        if (isset($this->_type->max_count)
             && !$this->max_count) {
             $this->max_count = $this->_type->max_count;
         }
@@ -137,7 +137,7 @@ 
             ");
         }
         // controls if required apc-settings for the progressbar are set
-        if (   ini_get("apc.rfc1867") == 1
+        if (ini_get("apc.rfc1867") == 1
             && ini_get("apc.enabled") == 1) {
             $this->show_progressbar = true;
             $this->progress_id = uniqid("");
@@ -206,7 +206,7 @@ 
     private function _add_new_upload_row($frozen)
     {
         // Show only a configured amount of new image rows
-        if (   $this->max_count
+        if ($this->max_count
             && count($this->_type->attachments_info) >= $this->max_count) {
             return;
         }
@@ -287,7 +287,7 @@ 
         if ($this->_type->sortable) {
             $sortable  = "            <td class=\"midcom_helper_datamanager2_helper_sortable\">\n";
             $sortable .= "               <input type=\"text\" class=\"downloads_sortable\" name=\"midcom_helper_datamanager2_sortable[{$this->name}][{$identifier}]\" value=\"{$this->_sort_index}\" />\n";
-            $sortable .="             </td>\n";
+            $sortable .= "             </td>\n";
 
             $this->_sort_index++;
         }
@@ -368,8 +368,8 @@ 
     public function add_elements_to_form($attributes)
     {
         $frozen = false;
-        if (   $this->_type->storage->object
-            && (   !$this->_type->storage->object->can_do('midgard:attachments')
+        if ($this->_type->storage->object
+            && (!$this->_type->storage->object->can_do('midgard:attachments')
                 || !$this->_type->storage->object->can_do('midgard:update')
                 || !$this->_type->storage->object->can_do('midgard:parameters'))) {
             $frozen = true;
@@ -476,7 +476,7 @@ 
             if (!$this->_type->delete_attachment($identifier)) {
                 debug_add("Failed to delete the attachment {$identifier} on the field '{$this->name}'. Ignoring silently.", MIDCOM_LOG_WARN);
             }
-        } elseif (   array_key_exists("e_exist_{$identifier}_file", $this->_elements)
+        } elseif (array_key_exists("e_exist_{$identifier}_file", $this->_elements)
                  && $this->_elements["e_exist_{$identifier}_file"]->isUploadedFile()) {
             $file = $this->_elements["e_exist_{$identifier}_file"]->getValue();
             $title = $values["e_exist_{$identifier}_title"];
@@ -490,7 +490,7 @@ 
             if (!$this->_type->update_attachment($identifier, $file['name'], $title, $file['type'], $file['tmp_name'])) {
                 debug_add("Failed to update the attachment {$identifier} on the field '{$this->name}'. Ignoring silently.", MIDCOM_LOG_WARN);
             }
-        } elseif (   array_key_exists("e_exist_{$identifier}_title", $values)
+        } elseif (array_key_exists("e_exist_{$identifier}_title", $values)
                  && $values["e_exist_{$identifier}_title"] != $this->_type->attachments_info[$identifier]['description']) {
             $this->_type->update_attachment_title($identifier, $values["e_exist_{$identifier}_title"]);
         }
@@ -547,7 +547,7 @@ 
     public function sync_type_with_widget($results)
     {
         // NOTE: Updating titles etc is done already on _on_submit
-        if (   $this->_type->sortable
+        if ($this->_type->sortable
             && isset($_REQUEST['midcom_helper_datamanager2_sortable'])
             && isset($_REQUEST['midcom_helper_datamanager2_sortable'][$this->name])) {
             $this->_type->_sorted_list = $_REQUEST['midcom_helper_datamanager2_sortable'][$this->name];

lib/midcom/helper/datamanager2/widget/tinymce.php

Spacing +1 added lines, -1 removed lines

@@ -352,7 +352,7 @@
         $original_element = $this->_form->getElement($this->name);
 
         foreach ($this->_form->_elements as $key => $element) {
-            if (   isset($element->_attributes['name'])
+            if (isset($element->_attributes['name'])
                 && $element->_attributes['name'] == $this->name
                 && isset($this->_form->_elements[$key + 1]->_attributes['name'])) {
                 $name_after = $this->_form->_elements[$key + 1]->_attributes['name'];

lib/midcom/helper/datamanager2/widget/select.php

Spacing +2 added lines, -2 removed lines

@@ -127,8 +127,8 @@
      */
     public function get_default()
     {
-        if (   empty($this->_type->selection)
-            && (    !$this->_type->allow_other
+        if (empty($this->_type->selection)
+            && (!$this->_type->allow_other
                  || empty($this->_type->others))) {
             return null;
         }

lib/midcom/helper/datamanager2/widget/image.php

Spacing +9 added lines, -9 removed lines

@@ -68,8 +68,8 @@ 
 
         $this->_form->addGroup($elements, $this->name, $this->_translate($this->_field['title']), ' ', false);
 
-        if (   $this->_type->storage->object
-            && (   !$this->_type->storage->object->can_do('midgard:attachments')
+        if ($this->_type->storage->object
+            && (!$this->_type->storage->object->can_do('midgard:attachments')
                 || !$this->_type->storage->object->can_do('midgard:update')
                 || !$this->_type->storage->object->can_do('midgard:parameters'))) {
             $this->freeze();
@@ -200,7 +200,7 @@ 
         $static_html .= $this->_l10n->get('type image: available sizes') . ":\n" .
                 "<ul class='midcom_helper_datamanager2_widget_image_sizelist'>";
         foreach ($this->_type->attachments_info as $info) {
-            if (   $info['size_x']
+            if ($info['size_x']
                 && $info['size_y']) {
                 $size = "{$info['size_x']}x{$info['size_y']}";
             } else {
@@ -269,9 +269,9 @@ 
             $y = $main_info['size_y'];
 
             // Downscale Preview image to max 75px, protect against broken images:
-            if (   $x != 0
+            if ($x != 0
                 && $y != 0) {
-                $aspect = $x/$y;
+                $aspect = $x / $y;
                 if ($x > 75) {
                     $x = 75;
                     $y = round($x / $aspect);
@@ -315,9 +315,9 @@ 
                 $y = $this->_type->attachments_info['main']['size_y'];
 
                 // Downscale Preview image to max 75px, protect against broken images:
-                if (   $x != 0
+                if ($x != 0
                     && $y != 0) {
-                    $aspect = $x/$y;
+                    $aspect = $x / $y;
                     if ($x > 75) {
                         $x = 75;
                         $y = round($x / $aspect);
@@ -456,10 +456,10 @@ 
         $static_html .= "    <span class='field_text'>" . $this->_l10n->get('type image: actions') . ":</span>\n";
         $static_html .= "    <ul class='midcom_helper_datamanager2_widget_image_actions' id='{$this->_namespace}{$this->name}_image_actions'>\n";
         $static_html .= "        <li title='" . $this->_l10n->get('rotate left') . "'>\n";
-        $static_html .= "            <input type='image' name='{$this->name}_rotate[left]' src='".MIDCOM_STATIC_URL."/stock-icons/16x16/rotate_ccw.png' />\n";
+        $static_html .= "            <input type='image' name='{$this->name}_rotate[left]' src='" . MIDCOM_STATIC_URL . "/stock-icons/16x16/rotate_ccw.png' />\n";
         $static_html .= "         </li>\n";
         $static_html .= "         <li title='" . $this->_l10n->get('rotate right') . "'>\n";
-        $static_html .= "             <input type='image' name='{$this->name}_rotate[right]' src='".MIDCOM_STATIC_URL."/stock-icons/16x16/rotate_cw.png' />\n";
+        $static_html .= "             <input type='image' name='{$this->name}_rotate[right]' src='" . MIDCOM_STATIC_URL . "/stock-icons/16x16/rotate_cw.png' />\n";
         $static_html .= "         </li>\n";
         $static_html .= "    </ul>\n";
         $static_html .= "</div>\n";

lib/midcom/helper/datamanager2/widget/images.php

Spacing +11 added lines, -11 removed lines

@@ -101,7 +101,7 @@ 
         $this->_require_type_class('midcom_helper_datamanager2_type_images');
 
         // Reflect the type config setting for maximum count
-        if (   isset($this->_type->max_count)
+        if (isset($this->_type->max_count)
             && !$this->max_count) {
             $this->max_count = $this->_type->max_count;
         }
@@ -191,7 +191,7 @@ 
     private function _add_new_upload_row_old($frozen)
     {
         // Show only a configured amount of new image rows
-        if (   $this->max_count
+        if ($this->max_count
             && count($this->_type->images) >= $this->max_count) {
             return;
         }
@@ -253,7 +253,7 @@ 
     private function _add_new_upload_row($frozen)
     {
         // Show only a configured amount of new image rows
-        if (   $this->max_count
+        if ($this->max_count
             && count($this->_type->images) >= $this->max_count) {
             return;
         }
@@ -305,7 +305,7 @@ 
         }
         if (empty($info['object']->guid)) {
             //Panic, broken identifier
-            debug_add("Identifier '{$identifier}' does not have a valid object behind it",  MIDCOM_LOG_ERROR);
+            debug_add("Identifier '{$identifier}' does not have a valid object behind it", MIDCOM_LOG_ERROR);
             return;
         }
 
@@ -370,9 +370,9 @@ 
             $y = $info['size_y'];
 
             // Downscale Preview image to max 75px, protect against broken images:
-            if (   $x != 0
+            if ($x != 0
                 && $y != 0) {
-                $aspect = $x/$y;
+                $aspect = $x / $y;
                 if ($x > 75) {
                     $x = 75;
                     $y = round($x / $aspect);
@@ -443,8 +443,8 @@ 
     public function add_elements_to_form($attributes)
     {
         $frozen = false;
-        if (   $this->_type->storage->object
-            && (   !$this->_type->storage->object->can_do('midgard:attachments')
+        if ($this->_type->storage->object
+            && (!$this->_type->storage->object->can_do('midgard:attachments')
                 || !$this->_type->storage->object->can_do('midgard:update')
                 || !$this->_type->storage->object->can_do('midgard:parameters'))) {
             $frozen = true;
@@ -500,7 +500,7 @@ 
 
         $file = $this->_elements['e_new_file']->getValue();
 
-        if ( preg_match('/\.(zip|tar(\.gz|\.bz2)?|tgz)$/', strtolower($file['name']), $extension_matches)) {
+        if (preg_match('/\.(zip|tar(\.gz|\.bz2)?|tgz)$/', strtolower($file['name']), $extension_matches)) {
             if (!$this->_type->_batch_handler($extension_matches[1], $file)) {
                 debug_add("Failed to add attachments from compressed files to the field '{$this->name}'. Ignoring silently.", MIDCOM_LOG_WARN);
             }
@@ -551,7 +551,7 @@ 
             }
         }
         // Image to be updated
-        elseif (   array_key_exists("e_exist_{$identifier}_file", $this->_elements)
+        elseif (array_key_exists("e_exist_{$identifier}_file", $this->_elements)
                   && $this->_elements["e_exist_{$identifier}_file"]->isUploadedFile()) {
             $file = $this->_elements["e_exist_{$identifier}_file"]->getValue();
             $title = $values["e_exist_{$identifier}_title"];
@@ -618,7 +618,7 @@ 
     public function sync_type_with_widget($results)
     {
         $values = $results[$this->name];
-        if (   $this->_type->sortable
+        if ($this->_type->sortable
             && isset($_REQUEST['midcom_helper_datamanager2_sortable'])
             && isset($_REQUEST['midcom_helper_datamanager2_sortable'][$this->name])) {
             /**

lib/midcom/helper/datamanager2/widget/autocomplete.php

Spacing +3 added lines, -3 removed lines

@@ -364,7 +364,7 @@ 
     private function _get_form_selection($data)
     {
         $selection = array();
-        if (   !isset($data[$this->name])
+        if (!isset($data[$this->name])
             || !is_array($data[$this->name])
             || !array_key_exists("selection", $data[$this->name])) {
             return $selection;
@@ -374,7 +374,7 @@ 
 
         if (is_array($real_results)) {
             foreach ($real_results as $value) {
-                if (   $value != "0"
+                if ($value != "0"
                     || $value != 0) {
                     $selection[] = $value;
                 }
@@ -414,7 +414,7 @@ 
     public function is_frozen()
     {
         foreach ($this->_widget_elements as $element) {
-            if (   method_exists($element, 'isFrozen')
+            if (method_exists($element, 'isFrozen')
                 && !$element->isFrozen()) {
                 return false;
             }

Braces +2 added lines, -1 removed lines

@@ -455,7 +455,8 @@
             }
             try {
                 $object = new $this->class($key);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

lib/midcom/helper/datamanager2/widget/photo.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         $static_html .= $this->_l10n->get('type image: available sizes') . ":\n
                 <ul class='midcom_helper_datamanager2_widget_image_sizelist'>";
         foreach ($this->_type->attachments_info as $info) {
-            if (   $info['size_x']
+            if ($info['size_x']
                 && $info['size_y']) {
                 $size = "{$info['size_x']}x{$info['size_y']}";
             } else {