flack / openpsa

lib/midcom/services/rcs/backend/rcs.php

Spacing +19 added lines, -21 removed lines

@@ -91,7 +91,7 @@ 
      *      3 on missing object->guid
      *      nonzero on error in one of the commands.
      */
-    public function rcs_update ($object, $message)
+    public function rcs_update($object, $message)
     {
         if (empty($object->guid))
         {
@@ -100,7 +100,7 @@ 
         }
 
         $filename = $this->_generate_rcs_filename($object->guid);
-        $rcsfilename =  "{$filename},v";
+        $rcsfilename = "{$filename},v";
 
         if (!file_exists($rcsfilename))
         {
@@ -118,7 +118,7 @@ 
         $command = 'ci -q -m' . escapeshellarg($message) . " {$filename}";
         $status = $this->exec($command);
 
-        chmod ($rcsfilename, 0770);
+        chmod($rcsfilename, 0770);
 
         return $status;
     }
@@ -138,11 +138,11 @@ 
         $filepath = $this->_generate_rcs_filename($this->_guid);
 
         // , must become . to work. Therefore this:
-        str_replace(',', '.', $revision );
+        str_replace(',', '.', $revision);
         // this seems to cause problems:
         //settype ($revision, "float");
 
-        $command = 'co -q -f -r' . escapeshellarg(trim($revision)) .  " {$filepath} 2>/dev/null";
+        $command = 'co -q -f -r' . escapeshellarg(trim($revision)) . " {$filepath} 2>/dev/null";
         $this->exec($command);
 
         $data = $this->rcs_readfile($this->_guid);
@@ -178,7 +178,7 @@ 
     {
         $versions = $this->list_history_numeric();
 
-        if (   !in_array($version, $versions)
+        if (!in_array($version, $versions)
             || $version === end($versions))
         {
             return '';
@@ -186,7 +186,7 @@ 
 
         $mode = end($versions);
 
-        while( $mode
+        while ($mode
             && $mode !== $version)
         {
             $mode = prev($versions);
@@ -221,7 +221,7 @@ 
     {
         $versions = $this->list_history_numeric();
 
-        if (   !in_array($version, $versions)
+        if (!in_array($version, $versions)
             || $version === current($versions))
         {
             return '';
@@ -229,7 +229,7 @@ 
 
         $mode = current($versions);
 
-        while (   $mode
+        while ($mode
                && $mode !== $version)
         {
             $mode = next($versions);
@@ -282,8 +282,7 @@ 
     private function rcs_parse_history_entry($entry)
     {
         // Create the empty history array
-        $history = array
-        (
+        $history = array(
             'revision' => null,
             'date'     => null,
             'lines'    => null,
@@ -326,7 +325,7 @@ 
             {
                 $history['user'] = $message_array[0];
             }
-            $history['ip']   = $message_array[1];
+            $history['ip'] = $message_array[1];
             $history['message'] = $message_array[2];
         }
         return $history;
@@ -360,7 +359,7 @@ 
 
                 $i += 3;
 
-                while (   $i < $total
+                while ($i < $total
                        && substr($lines[$i], 0, 4) != '----'
                        && substr($lines[$i], 0, 5) != '=====')
                 {
@@ -399,9 +398,9 @@ 
     /**
      * Writes $data to file $guid, does not return anything.
      */
-    private function rcs_writefile ($guid, $data)
+    private function rcs_writefile($guid, $data)
     {
-        if (   !is_writable($this->_config->get_rcs_root())
+        if (!is_writable($this->_config->get_rcs_root())
             || empty($guid))
         {
             return false;
@@ -416,7 +415,7 @@ 
      * @param string guid
      * @return string xml representation of guid
      */
-    private function rcs_readfile ($guid)
+    private function rcs_readfile($guid)
     {
         if (!empty($guid))
         {
@@ -475,7 +474,7 @@ 
 
         if (file_exists($filename))
         {
-            chmod ($filename, 0770);
+            chmod($filename, 0770);
         }
         return $status;
     }
@@ -535,16 +534,15 @@ 
                 continue;
             }
 
-            $return[$attribute] = array
-            (
+            $return[$attribute] = array(
                 'old' => $oldest_value,
                 'new' => $newest[$attribute]
             );
 
             if ($oldest_value != $newest[$attribute])
             {
-                $lines1 = explode ("\n", $oldest_value);
-                $lines2 = explode ("\n", $newest[$attribute]);
+                $lines1 = explode("\n", $oldest_value);
+                $lines2 = explode("\n", $newest[$attribute]);
 
                 $options = array();
                 $diff = new Diff($lines1, $lines2, $options);

lib/org/openpsa/invoices/invoice.php

Spacing +6 added lines, -7 removed lines

@@ -16,8 +16,7 @@ 
     public $__midcom_class_name__ = __CLASS__;
     public $__mgdschema_class_name__ = 'org_openpsa_invoice';
 
-    public $autodelete_dependents = array
-    (
+    public $autodelete_dependents = array(
         'org_openpsa_invoices_invoice_item_dba' => 'invoice'
     );
 
@@ -146,7 +145,7 @@ 
 
     public function _on_deleting()
     {
-        if (! midcom::get()->auth->request_sudo('org.openpsa.invoices'))
+        if (!midcom::get()->auth->request_sudo('org.openpsa.invoices'))
         {
             debug_add('Failed to get SUDO privileges, skipping invoice hour deletion silently.', MIDCOM_LOG_ERROR);
             return false;
@@ -175,7 +174,7 @@ 
                 $task = new org_openpsa_projects_task_dba($id);
                 $task->update_cache();
             }
-            catch (midcom_error $e){}
+            catch (midcom_error $e) {}
         }
 
         $qb = self::new_query_builder();
@@ -304,11 +303,11 @@ 
             {
                 try
                 {
-                    $deliverable = new org_openpsa_sales_salesproject_deliverable_dba((int)$mc_task_agreement->get_subkey($key, 'agreement'));
+                    $deliverable = new org_openpsa_sales_salesproject_deliverable_dba((int) $mc_task_agreement->get_subkey($key, 'agreement'));
                     $invoice_item->pricePerUnit = $deliverable->pricePerUnit;
                     $invoice_item->deliverable = $deliverable->id;
                     //calculate price
-                    if (   $deliverable->invoiceByActualUnits
+                    if ($deliverable->invoiceByActualUnits
                         || $deliverable->plannedUnits == 0)
                     {
                         $invoice_item->units = $hours;
@@ -397,7 +396,7 @@ 
     public function get_billing_data()
     {
             // check if we got the billing data cached already
-        if (   !$this->_billing_data
+        if (!$this->_billing_data
             // check if there is a customer set with invoice_data
             && !($this->_billing_data = $this->_get_billing_data('org_openpsa_contacts_group_dba', $this->customer))
             // check if the customerContact is set and has invoice_data