flack / openpsa

lib/org/openpsa/mypage/style/weekreview-day-item-task-status.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 $target_person_label = midcom::get()->i18n->get_string('system', 'org.openpsa.projects');
 
 $fallback_creator = midcom_db_person::get_cached(1);
-if (    $task_status->metadata->creator
+if ($task_status->metadata->creator
      && $task_status->metadata->creator != $fallback_creator->guid)
 {
     $status_changer = org_openpsa_widgets_contact::get($task_status->metadata->creator);
@@ -38,7 +38,7 @@ 
     }
     echo $task_label;
 }
-catch (midcom_error $e){}
+catch (midcom_error $e) {}
         ?>
     </td>
     <td class="multivalue">

Braces +1 added lines, -2 removed lines

@@ -37,8 +37,7 @@
         $task_label = "<a href=\"{$data['projects_url']}task/{$task->guid}/\">{$task_label}</a>";
     }
     echo $task_label;
-}
-catch (midcom_error $e){}
+} catch (midcom_error $e){}
         ?>
     </td>
     <td class="multivalue">

lib/org/openpsa/mypage/workingon.php

Spacing +1 added lines, -2 removed lines

@@ -125,8 +125,7 @@
         }
 
         // Mark the new task work session as started
-        $workingon = array
-        (
+        $workingon = array(
             'task' => $task_guid,
             'description' => $description,
             'invoiceable' => $invoiceable,

Braces +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
         {
             midcom::get()->auth->require_valid_user();
             $this->person = midcom::get()->auth->user->get_storage();
-        }
-        else
+        } else
         {
             // TODO: Check that this is really a person object
             $this->person = $person;

lib/org/openpsa/mypage/handler/today.php

Spacing +6 added lines, -11 removed lines

@@ -15,22 +15,18 @@ 
 {
     private function _populate_toolbar()
     {
-        $buttons = array
-        (
-            array
-            (
+        $buttons = array(
+            array(
                 MIDCOM_TOOLBAR_URL => 'weekreview/' . $this->_request_data['this_day'] . '/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('week review'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/properties.png',
             ),
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => 'day/' . $this->_request_data['prev_day'] . '/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('previous'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/back.png',
             ),
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => 'day/' . $this->_request_data['next_day'] . '/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('next'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/next.png',
@@ -77,10 +73,9 @@ 
         org_openpsa_widgets_calendar::add_head_elements();
 
         //set the start-constraints for journal-entries
-        $time_span = 7 * 24 * 60 * 60 ; //7 days
+        $time_span = 7 * 24 * 60 * 60; //7 days
 
-        $this->_request_data['journal_constraints'] = array
-        (
+        $this->_request_data['journal_constraints'] = array(
             //just show entries of current_user
             array(
                 'property' => 'metadata.creator',

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
         if ($handler_id == 'today')
         {
             $data['requested_time'] = new DateTime;
-        }
-        else
+        } else
         {
             // TODO: Check format as YYYY-MM-DD via regexp
             $data['requested_time'] = new DateTime($args[0]);

lib/org/openpsa/mypage/handler/workingon.php

Indentation +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
                         $customer = $customer_id;
                     }
                     catch (midcom_error $e){}
-               }
+                }
             }
             $customer_cache[$array['task']] = $customer;
             if (!isset($this->_request_data['customers'][$customer]))

Spacing +4 added lines, -6 removed lines

@@ -30,8 +30,7 @@ 
         $task_conf = midcom_helper_datamanager2_widget_autocomplete::get_widget_config('task');
         $task_conf['id_field'] = 'guid';
 
-        $task_conf['constraints'][] = array
-        (
+        $task_conf['constraints'][] = array(
             'field' => 'status',
             'op'    => '<',
             'value' => org_openpsa_projects_task_status_dba::COMPLETED,
@@ -65,8 +64,7 @@ 
         $hours = $hours_mc->list_keys();
 
         $this->_request_data['customers'] = array();
-        $this->_request_data['hours'] = array
-        (
+        $this->_request_data['hours'] = array(
             'invoiceable' => array(),
             'uninvoiceable' => array(),
             'total_invoiceable' => 0,
@@ -106,7 +104,7 @@ 
                         $customer_label = $customer->official;
                         $customer = $customer_id;
                     }
-                    catch (midcom_error $e){}
+                    catch (midcom_error $e) {}
                }
             }
             $customer_cache[$array['task']] = $customer;
@@ -173,7 +171,7 @@ 
         $workingon = new org_openpsa_mypage_workingon();
         if (!$workingon->set($_POST['task']))
         {
-            midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.mypage'),  'Failed to set "working on" parameter to "' . $_POST['task'] . '", reason ' . midcom_connection::get_error_string(), 'error');
+            midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.mypage'), 'Failed to set "working on" parameter to "' . $_POST['task'] . '", reason ' . midcom_connection::get_error_string(), 'error');
         }
 
         return new midcom_response_relocate($relocate . "workingon/");

Braces +2 added lines, -4 removed lines

@@ -105,8 +105,7 @@ 
                         $customer = new org_openpsa_contacts_group_dba($customer_id);
                         $customer_label = $customer->official;
                         $customer = $customer_id;
-                    }
-                    catch (midcom_error $e){}
+                    } catch (midcom_error $e){}
                }
             }
             $customer_cache[$array['task']] = $customer;
@@ -127,8 +126,7 @@ 
         if (!isset($this->_request_data['hours'][$category][$customer]))
         {
             $this->_request_data['hours'][$category][$customer] = $array['hours'];
-        }
-        else
+        } else
         {
             $this->_request_data['hours'][$category][$customer] += $array['hours'];
         }

lib/org/openpsa/documents/elFinderVolumeOpenpsa.php

Indentation +86 added lines, -86 removed lines

@@ -21,73 +21,73 @@ 
         register_shutdown_function(function(){midcom::get()->finish();});
     }
 
-	/**
-	 * Save uploaded file.
-	 * On success return array with new file stat and with removed file hash (if existed file was replaced)
+    /**
+     * Save uploaded file.
+     * On success return array with new file stat and with removed file hash (if existed file was replaced)
      *
      * Copied from parent and slightly modified to support attachment versioning
-	 *
-	 * @param  Resource $fp      file pointer
-	 * @param  string   $dst     destination folder hash
-	 * @param  string   $src     file name
-	 * @param  string   $tmpname file tmp name - required to detect mime type
-	 * @return array|false
-	 * @author Dmitry (dio) Levashov
-	 **/
-	public function upload($fp, $dst, $name, $tmpname, $hashes = array()) {
-		if ($this->commandDisabled('upload')) {
-			return $this->setError(elFinder::ERROR_PERM_DENIED);
-		}
-
-		if (($dir = $this->dir($dst)) == false) {
-			return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#'.$dst);
-		}
-
-		if (!$dir['write']) {
-			return $this->setError(elFinder::ERROR_PERM_DENIED);
-		}
-
-		if (!$this->nameAccepted($name)) {
-			return $this->setError(elFinder::ERROR_INVALID_NAME);
-		}
-
-		$mime = $this->mimetype($this->mimeDetect == 'internal' ? $name : $tmpname, $name);
-		$mimeByName = '';
-		if ($this->mimeDetect !== 'internal') {
-			$mimeByName = elFinderVolumeDriver::mimetypeInternalDetect($name);
-			if ($mime == 'unknown') {
-				$mime = $mimeByName;
-			}
-		}
-
-		if (!$this->allowPutMime($mime) || ($mimeByName && $mimeByName !== 'unknown' && !$this->allowPutMime($mimeByName))) {
-			return $this->setError(elFinder::ERROR_UPLOAD_FILE_MIME);
-		}
-
-		$tmpsize = sprintf('%u', filesize($tmpname));
-		if ($this->uploadMaxSize > 0 && $tmpsize > $this->uploadMaxSize) {
-			return $this->setError(elFinder::ERROR_UPLOAD_FILE_SIZE);
-		}
-
-		$dstpath = $this->decode($dst);
-		if (isset($hashes[$name])) {
-			$test = $this->decode($hashes[$name]);
-		} else {
-			$test = $this->joinPathCE($dstpath, $name);
-		}
-
-		$file = $this->stat($test);
-		$this->clearcache();
-
-		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) {
-				if (!$file['write']) {
-					return $this->setError(elFinder::ERROR_PERM_DENIED);
-				} elseif ($file['mime'] == 'directory') {
-					return $this->setError(elFinder::ERROR_NOT_REPLACE, $name);
-				}
+     *
+     * @param  Resource $fp      file pointer
+     * @param  string   $dst     destination folder hash
+     * @param  string   $src     file name
+     * @param  string   $tmpname file tmp name - required to detect mime type
+     * @return array|false
+     * @author Dmitry (dio) Levashov
+     **/
+    public function upload($fp, $dst, $name, $tmpname, $hashes = array()) {
+        if ($this->commandDisabled('upload')) {
+            return $this->setError(elFinder::ERROR_PERM_DENIED);
+        }
+
+        if (($dir = $this->dir($dst)) == false) {
+            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#'.$dst);
+        }
+
+        if (!$dir['write']) {
+            return $this->setError(elFinder::ERROR_PERM_DENIED);
+        }
+
+        if (!$this->nameAccepted($name)) {
+            return $this->setError(elFinder::ERROR_INVALID_NAME);
+        }
+
+        $mime = $this->mimetype($this->mimeDetect == 'internal' ? $name : $tmpname, $name);
+        $mimeByName = '';
+        if ($this->mimeDetect !== 'internal') {
+            $mimeByName = elFinderVolumeDriver::mimetypeInternalDetect($name);
+            if ($mime == 'unknown') {
+                $mime = $mimeByName;
+            }
+        }
+
+        if (!$this->allowPutMime($mime) || ($mimeByName && $mimeByName !== 'unknown' && !$this->allowPutMime($mimeByName))) {
+            return $this->setError(elFinder::ERROR_UPLOAD_FILE_MIME);
+        }
+
+        $tmpsize = sprintf('%u', filesize($tmpname));
+        if ($this->uploadMaxSize > 0 && $tmpsize > $this->uploadMaxSize) {
+            return $this->setError(elFinder::ERROR_UPLOAD_FILE_SIZE);
+        }
+
+        $dstpath = $this->decode($dst);
+        if (isset($hashes[$name])) {
+            $test = $this->decode($hashes[$name]);
+        } else {
+            $test = $this->joinPathCE($dstpath, $name);
+        }
+
+        $file = $this->stat($test);
+        $this->clearcache();
+
+        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) {
+                if (!$file['write']) {
+                    return $this->setError(elFinder::ERROR_PERM_DENIED);
+                } elseif ($file['mime'] == 'directory') {
+                    return $this->setError(elFinder::ERROR_NOT_REPLACE, $name);
+                }
                 $document = new org_openpsa_documents_document_dba($test);
                 $document->backup_version();
                 $attachments = org_openpsa_helpers::get_dm2_attachments($document, 'document');
@@ -108,28 +108,28 @@ 
 
                 return $this->stat($document->guid);
 
-			} else {
-				$name = $this->uniqueName($dstpath, $name, '-', false);
-			}
-		}
+            } else {
+                $name = $this->uniqueName($dstpath, $name, '-', false);
+            }
+        }
 
-		$stat = array(
-			'mime'   => $mime,
-			'width'  => 0,
-			'height' => 0,
-			'size'   => $tmpsize);
+        $stat = array(
+            'mime'   => $mime,
+            'width'  => 0,
+            'height' => 0,
+            'size'   => $tmpsize);
 
-		if (strpos($mime, 'image') === 0 && ($s = getimagesize($tmpname))) {
-			$stat['width'] = $s[0];
-			$stat['height'] = $s[1];
-		}
+        if (strpos($mime, 'image') === 0 && ($s = getimagesize($tmpname))) {
+            $stat['width'] = $s[0];
+            $stat['height'] = $s[1];
+        }
 
-		if (($path = $this->saveCE($fp, $dstpath, $name, $stat)) == false) {
-			return false;
-		}
+        if (($path = $this->saveCE($fp, $dstpath, $name, $stat)) == false) {
+            return false;
+        }
 
-		return $this->stat($path);
-	}
+        return $this->stat($path);
+    }
 
     /**
      * Return parent directory path
@@ -264,11 +264,11 @@ 
         {
             $object = midcom::get()->dbfactory->get_object_by_guid($path);
         }
-		catch (midcom_error $e)
+        catch (midcom_error $e)
         {
             $e->log();
-			return '';
-		}
+            return '';
+        }
 
         $output = array();
         if ($object instanceof org_openpsa_documents_document_dba)

Spacing +8 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(){midcom::get()->finish();});
+        register_shutdown_function(function() {midcom::get()->finish(); });
     }
 
 	/**
@@ -40,7 +40,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']) {
@@ -81,7 +81,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);
@@ -280,7 +280,7 @@ 
             $output[] = $object->extra;
         }
         $parent = $object->get_parent();
-        while (   $parent
+        while ($parent
                && $parent->component == 'org.openpsa.documents')
         {
             $output[] = $parent->extra;
@@ -354,8 +354,7 @@ 
         }
         $object = midcom::get()->dbfactory->get_object_by_guid($path);
 
-        $data = array
-        (
+        $data = array(
             'ts' => $object->metadata->revised,
             'read' => true,
             'write' => $object->can_do('midgard:update'),
@@ -465,7 +464,7 @@ 
      * @param  string $mode open mode
      * @return resource|false
      */
-    protected function _fopen($path, $mode="rb")
+    protected function _fopen($path, $mode = "rb")
     {
         $document = new org_openpsa_documents_document_dba($path);
         $attachments = org_openpsa_helpers::get_dm2_attachments($document, 'document');
@@ -484,7 +483,7 @@ 
      * @param  string    $path  file path
      * @return bool
      */
-    protected function _fclose($fp, $path='')
+    protected function _fclose($fp, $path = '')
     {
         fclose($fp);
         return true;
@@ -688,7 +687,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 +11 added lines, -22 removed lines

@@ -144,8 +144,7 @@ 
             $topic = new org_openpsa_documents_directory($path);
             $parent = $topic->get_parent();
             return $parent->guid;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
             try
@@ -153,8 +152,7 @@ 
                 $document = new org_openpsa_documents_document_dba($path);
                 $parent = $document->get_parent();
                 return $parent->guid;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 return '';
@@ -174,16 +172,14 @@ 
         {
             $topic = new org_openpsa_documents_directory($path);
             return $topic->extra;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
             try
             {
                 $document = new org_openpsa_documents_document_dba($path);
                 return $document->title;
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 return '';
@@ -263,8 +259,7 @@ 
         try
         {
             $object = midcom::get()->dbfactory->get_object_by_guid($path);
-        }
-		catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
 			return '';
@@ -274,8 +269,7 @@ 
         if ($object instanceof org_openpsa_documents_document_dba)
         {
             $output[] = $object->title;
-        }
-        else
+        } else
         {
             $output[] = $object->extra;
         }
@@ -308,8 +302,7 @@ 
         try
         {
             $parentdir = new org_openpsa_documents_directory($parent);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
             return false;
@@ -320,8 +313,7 @@ 
         if ($object instanceof org_openpsa_documents_document_dba)
         {
             $qb->add_constraint('id', '=', $object->topic);
-        }
-        else
+        } else
         {
             $qb->add_constraint('id', '=', $object->id);
         }
@@ -380,8 +372,7 @@ 
                     $data['size'] = $stat['size'];
                 }
             }
-        }
-        else
+        } else
         {
             $parentfield = 'up';
             $group = midcom::get()->auth->get_assignee($object->get_parameter('org.openpsa.core', 'orgOpenpsaOwnerWg'));
@@ -612,8 +603,7 @@ 
             {
                 return $source;
             }
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
             $dir = new org_openpsa_documents_directory($source);
@@ -640,8 +630,7 @@ 
         {
             $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/style/show-search-form-simple.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 $search_config = org_openpsa_widgets_ui::get_search_providers();
-if (   array_key_exists('org.openpsa.documents', $search_config)
+if (array_key_exists('org.openpsa.documents', $search_config)
     && midcom::get()->indexer->enabled())
 {
 $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX);

lib/org/openpsa/documents/style/show-directory-navigation.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <div class="area org_openpsa_helper_box">
-<h3><?php echo $data['l10n']->get('folders');?></h3>
+<h3><?php echo $data['l10n']->get('folders'); ?></h3>
 <?php
 midcom_show_style('show-search-form-simple');
 
 $nap = new midcom_helper_nav();
 $current_node = $nap->get_node($nap->get_current_node());
 $url = $current_node[MIDCOM_NAV_RELATIVEURL];
-midcom::get()->dynamic_load($url. "directory/navigation/");
+midcom::get()->dynamic_load($url . "directory/navigation/");
 ?>
 </div>
\ No newline at end of file

lib/org/openpsa/documents/style/show-navigation-item-begin.php

Spacing +2 added lines, -2 removed lines

@@ -1,3 +1,3 @@
 
-<li class="folder" id="key_<?php echo $data["id"];?>">
-  <a href="<?php echo $data["link_url"];?>"><?php echo $data["name"]; ?></a>
\ No newline at end of file
+<li class="folder" id="key_<?php echo $data["id"]; ?>">
+  <a href="<?php echo $data["link_url"]; ?>"><?php echo $data["name"]; ?></a>
\ No newline at end of file

lib/org/openpsa/documents/document.php

Spacing +7 added lines, -8 removed lines

@@ -18,8 +18,7 @@ 
     public $__midcom_class_name__ = __CLASS__;
     public $__mgdschema_class_name__ = 'org_openpsa_document';
 
-    public $autodelete_dependents = array
-    (
+    public $autodelete_dependents = array(
         'org_openpsa_documents_document_dba' => 'nextVersion'
     );
 
@@ -79,7 +78,7 @@ 
             return;
         }
         $parent = $this->get_parent();
-        if (   $parent
+        if ($parent
             && $parent->component == 'org.openpsa.documents')
         {
             midcom::get()->auth->request_sudo('org.openpsa.documents');
@@ -95,7 +94,7 @@ 
 
     public function get_class()
     {
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             || empty($this->guid))
         {
             return '';
@@ -103,7 +102,7 @@ 
         $person = midcom::get()->auth->user->get_storage();
         $lastvisited = $person->get_parameter('org.openpsa.documents_visited', $this->guid);
 
-        if (   $lastvisited
+        if ($lastvisited
             && $lastvisited > $this->metadata->revised)
         {
             return 'visited';
@@ -201,7 +200,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);
@@ -218,7 +217,7 @@ 
         // Copy current properties
         foreach ($properties as $key)
         {
-            if (   $key != 'guid'
+            if ($key != 'guid'
                 && $key != 'id'
                 && $key != 'metadata')
             {
@@ -263,7 +262,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

Braces +2 added lines, -4 removed lines

@@ -177,12 +177,10 @@
                 {
                     $type = str_replace('vnd.oasis.opendocument.', '', $subtype);
                     $subtype = 'OpenDocument';
-                }
-                else if (preg_match('/^vnd\.ms/', $subtype))
+                } else if (preg_match('/^vnd\.ms/', $subtype))
                 {
                     $subtype = ucfirst(str_replace('vnd.ms-', '', $subtype));
-                }
-                else if (preg_match('/^vnd\.openxmlformats/', $subtype))
+                } else if (preg_match('/^vnd\.openxmlformats/', $subtype))
                 {
                     $type = str_replace('vnd.openxmlformats-officedocument.', '', $subtype);
                     $type = str_replace('ml.', ' ', $type);