intraface / intraface.dk

src/Intraface/modules/filemanager/ImageHandler.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
     /**

      * Constructor

      *

-     * @param object $file_handler

+     * @param FileHandler $file_handler

      *

      * @return void

      */

@@ -143,8 +143,8 @@ 
      *

      * @param float  $width  Width

      * @param float  $height Height

-     * @param float $offset_x offset x

-     * @param float $offset_y offset y

+     * @param integer $offset_x offset x

+     * @param integer $offset_y offset y

      *

      * @return string new file name

      */

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@
 <?php

- /**

-  * Image handler. Klarer h�ndtering af billeder.

-  *

-  * @package Intraface

-  * @author: Sune

-  * @version: 1.0

-  *

-  */

+    /**

+     * Image handler. Klarer h�ndtering af billeder.

+     *

+     * @package Intraface

+     * @author: Sune

+     * @version: 1.0

+     *

+     */

 

 class ImageHandler extends Intraface_Standard

 {

Spacing +5 added lines, -5 removed lines

@@ -54,7 +54,7 @@ 
         $this->image_library = IMAGE_LIBRARY;

 

         if ($this->file_handler->get('is_image') != 1) {

-            throw new Exception("Filtypen " . $file_handler->get('mime_type') . " er ikke et billede, og kan derfor ikke manipuleres i ImageHandler");

+            throw new Exception("Filtypen ".$file_handler->get('mime_type')." er ikke et billede, og kan derfor ikke manipuleres i ImageHandler");

         }

 

         $this->tempdir_path = $this->file_handler->getTemporaryDirectory();

@@ -80,7 +80,7 @@ 
 

         $image = Image_Transform::factory($this->image_library);

         if (PEAR::isError($image)) {

-            throw new Exception($image->getMessage() . $image->getUserInfo());

+            throw new Exception($image->getMessage().$image->getUserInfo());

         }

 

         if ($this->tmp_file_name != NULL && file_exists($this->tmp_file_name)) {

@@ -116,7 +116,7 @@ 
             }

 

             // die($image->new_x.':'.$image->new_y.':'.$width.':'.$height.': '.$offset_x.': '.$offset_y);

-            if ($image->crop($width, $height, $offset_x, $offset_y) !== true){

+            if ($image->crop($width, $height, $offset_x, $offset_y) !== true) {

                 throw new Exception("Der opstod en fejl under formatering (crop) af billedet i ImageHandler->resize");

             }

         } else {

@@ -152,7 +152,7 @@ 
     {

         $image = Image_Transform::factory($this->image_library);

         if (PEAR::isError($image)) {

-            throw new Exception($image->getMessage() . $image->getUserInfo());

+            throw new Exception($image->getMessage().$image->getUserInfo());

         }

 

         if ($this->tmp_file_name != NULL && file_exists($this->tmp_file_name)) {

@@ -170,7 +170,7 @@ 
         $result = $image->crop($width, $height, $offset_x, $offset_y);

 

         if (PEAR::isError($result)) {

-            throw new Exception("Der opstod en fejl under formatering (crop) af billedet i ImageHandler->crop: " . $result->getMessage());

+            throw new Exception("Der opstod en fejl under formatering (crop) af billedet i ImageHandler->crop: ".$result->getMessage());

         }

 

         $file_type = $this->file_handler->get('file_type');

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 

         if ($this->tmp_file_name != NULL && file_exists($this->tmp_file_name)) {

             $error = $image->load($this->tmp_file_name);

-        }

-        else {

+        } else {

             $error = $image->load($this->file_handler->get('file_path'));

         }

 

src/Intraface/modules/filemanager/ImageRandomizer.php

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     /**
      * return an file object with random image
      *
-     * @return object file_manager with random image loaded
+     * @return FileHandler file_manager with random image loaded
      */
     public function getRandomImage()
     {

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
     public function getRandomImage()
     {
         require_once 'Intraface/modules/filemanager/FileHandler.php';
-        $key = rand(0, count($this->file_list)-1);
+        $key = rand(0, count($this->file_list) - 1);
         $filehandler = new FileHandler($this->file_manager->getKernel(), $this->file_list[$key]);
         return $filehandler;
     }

src/Intraface/modules/filemanager/InstanceHandler.php

Doc Comments +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      * @param object  $file_handler File handler object

      * @param integer $id           Optional id

      *

-     * @return void

+     * @return string

      */

     function __construct($file_handler, $id = 0)

     {

@@ -65,11 +65,11 @@ 
     /**

      * Factory

      *

-     * @param object $file_handler File handler

-     * @param string $type         the instance type

+     * @param FileHandler $file_handler File handler

      * @param array  $param        one or more of crop_width, crop_height, crop_offset_x, crop_offset_y

+     * @param string $type_name
      *

-     * @return object

+     * @return InstanceHandler

      */

     function factory($file_handler, $type_name, $param = array())

     {

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
                 type_key = ".$type['type_key'].",

                 file_size = ".(int)$file_size.",

                 width = ".(int)$width.",

-                height = ".(int)$height.", " .

+                height = ".(int)$height.", ".

                 "crop_parameter = \"".safeToDb($crop_param_string)."\"");

 

             $id = $db->insertedId();

@@ -187,7 +187,7 @@ 
         //$this->value['predefined_size'] = $db->f('predefined_size');

         $this->value['server_file_name'] = $db->f('server_file_name');

         $this->value['file_size'] = $db->f('file_size');

-        $this->value['file_path'] = $this->instance_path . $db->f('server_file_name');

+        $this->value['file_path'] = $this->instance_path.$db->f('server_file_name');

 

         $this->value['last_modified'] = filemtime($this->get('file_path'));

         // $this->value['file_uri'] = FILE_VIEWER.'?id='.$this->get('id').'&type='.$this->get('type').'&name=/'.urlencode($this->file_handler->get('file_name'));

@@ -339,7 +339,7 @@ 
 

         $db = new DB_sql;

         $db->query("SELECT id FROM file_handler_instance WHERE intranet_id = ".$this->file_handler->kernel->intranet->get('id')." AND file_handler_id = ".$this->file_handler->get('id')." AND active = 1");

-        while($db->nextRecord()) {

+        while ($db->nextRecord()) {

             $instance = new InstanceHandler($this->file_handler, $db->f('id'));

             $instance->delete();

         }

src/Intraface/modules/filemanager/InstanceManager.php

Doc Comments +1 added lines, -2 removed lines

@@ -225,7 +225,6 @@ 
      * Checks whether a name is free to use
      * 
      * @param string $name 
-     * @param integer $id integer which should not be checked
      * @return boolean true or false
      */
     private function isNameFree($name, $type_key = 0) 
@@ -367,7 +366,7 @@ 
     /**
      * returns the resize types
      * 
-     * @return array resize types
+     * @return string[] resize types
      */
     public function getResizeTypes() {
         return array(0 => 'relative', 1 => 'strict'); 

Indentation +4 added lines, -4 removed lines

@@ -329,10 +329,10 @@
                 }
             }
             else {
-               $type[$i] = $custom_types[$c];
-               $type[$i]['resize_type'] = $resize_types[$type[$i]['resize_type_key']];
-               $type[$i]['origin'] = 'custom';
-               $c++; 
+                $type[$i] = $custom_types[$c];
+                $type[$i]['resize_type'] = $resize_types[$type[$i]['resize_type_key']];
+                $type[$i]['origin'] = 'custom';
+                $c++; 
             } 
             
             $i++;

Spacing +13 added lines, -13 removed lines

@@ -156,9 +156,9 @@ 
             return false;
         }
         
-        $sql = 'name = '.$this->db->quote($input['name'], 'text').', ' .
-                'max_width = '.$this->db->quote($input['max_width'], 'integer').', ' .
-                'max_height = '.$this->db->quote($input['max_height'], 'integer').', ' .
+        $sql = 'name = '.$this->db->quote($input['name'], 'text').', '.
+                'max_width = '.$this->db->quote($input['max_width'], 'integer').', '.
+                'max_height = '.$this->db->quote($input['max_height'], 'integer').', '.
                 'resize_type_key = '.$this->db->quote($resize_type_key);
         
         if ($this->type_key == 0 || $this->get('origin') == 'standard') {
@@ -169,9 +169,9 @@ 
                 $type_key = $this->type_key;
             }
             
-            $result = $this->db->exec('INSERT INTO file_handler_instance_type SET ' .
-                    'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', ' .
-                    'type_key = '.$this->db->quote($type_key, 'integer').', ' .
+            $result = $this->db->exec('INSERT INTO file_handler_instance_type SET '.
+                    'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', '.
+                    'type_key = '.$this->db->quote($type_key, 'integer').', '.
                     'active = 1, '.$sql);
             if (PEAR::isError($result)) {
                 throw new Exception('Error in exec: '.$result->getUserInfo());
@@ -185,8 +185,8 @@ 
             return $this->type_key;
         }
         else {
-            $result = $this->db->exec('UPDATE file_handler_instance_type SET '.$sql.' ' .
-                    'WHERE intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' ' .
+            $result = $this->db->exec('UPDATE file_handler_instance_type SET '.$sql.' '.
+                    'WHERE intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' '.
                             'AND type_key = '.$this->db->quote($this->type_key, 'integer'));
             if (PEAR::isError($result)) {
                 throw new Exception('Error in exec: '.$result->getUserInfo());
@@ -238,10 +238,10 @@ 
             }
         }
         
-        $result = $this->db->query('SELECT type_key FROM file_handler_instance_type WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
-                'name = '.$this->db->quote($name, 'text').' AND ' .
-                'type_key != '.$this->db->quote((int)$type_key, 'integer').' AND ' .
+        $result = $this->db->query('SELECT type_key FROM file_handler_instance_type WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
+                'name = '.$this->db->quote($name, 'text').' AND '.
+                'type_key != '.$this->db->quote((int)$type_key, 'integer').' AND '.
                 'active = 1');
         if (PEAR::isError($result)) {
             throw new Exception('Error in query: '.$result->getUserInfo());
@@ -264,7 +264,7 @@ 
     private function getNextFreeTypeKey() 
     {
         // We do not active = 1, then it is possible to recreate deleted items without messing everything up.
-        $result = $this->db->query('SELECT MAX(type_key) AS max_key FROM file_handler_instance_type WHERE ' .
+        $result = $this->db->query('SELECT MAX(type_key) AS max_key FROM file_handler_instance_type WHERE '.
                 'intranet_id = '.$this->db->quote($this->intranet_id, 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception('Error in query: '.$result->getUserInfo());

Braces +9 added lines, -18 removed lines

@@ -86,20 +86,17 @@ 
             $this->value['resize_type'] = $resize_types[$this->value['resize_type_key']];
             $this->value['origin'] = 'overwritten';
             return true;
-        }
-        elseif (isset($standard_type)) {
+        } elseif (isset($standard_type)) {
             $this->value = $standard_type;
             $this->value['origin'] = 'standard';
             return true;           
-        }
-        elseif (isset($custom_type)) {
+        } elseif (isset($custom_type)) {
             $this->value = $custom_type;
             $resize_types = $this->getResizeTypes();
             $this->value['resize_type'] = $resize_types[$this->value['resize_type_key']];
             $this->value['origin'] = 'custom';
             return true;
-        }
-        else {
+        } else {
             $this->type_key = 0;
             $this->value['type_key'] = 0;
             return false;
@@ -164,8 +161,7 @@ 
         if ($this->type_key == 0 || $this->get('origin') == 'standard') {
             if ($this->type_key == 0) {
                 $type_key = $this->getNextFreeTypeKey();
-            }
-            else {
+            } else {
                 $type_key = $this->type_key;
             }
             
@@ -183,8 +179,7 @@ 
             }
             $this->type_key = $type_key;
             return $this->type_key;
-        }
-        else {
+        } else {
             $result = $this->db->exec('UPDATE file_handler_instance_type SET '.$sql.' ' .
                     'WHERE intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' ' .
                             'AND type_key = '.$this->db->quote($this->type_key, 'integer'));
@@ -275,8 +270,7 @@ 
         
         if ($row['max_key'] >= InstanceManager::MIN_CUSTOM_TYPE_KEY_VALUE) {
             return $row['max_key'] + 1;
-        }
-        else {
+        } else {
             return InstanceManager::MIN_CUSTOM_TYPE_KEY_VALUE; 
         }  
     }
@@ -322,13 +316,11 @@ 
                     $type[$i]['resize_type'] = $resize_types[$type[$i]['resize_type_key']];
                     $type[$i]['origin'] = 'overwritten';
                     $c++;
-                }
-                else {
+                } else {
                     $type[$i] = $standard_types[$s];
                     $type[$i]['origin'] = 'standard';
                 }
-            }
-            else {
+            } else {
                $type[$i] = $custom_types[$c];
                $type[$i]['resize_type'] = $resize_types[$type[$i]['resize_type_key']];
                $type[$i]['origin'] = 'custom';
@@ -386,8 +378,7 @@ 
         if (!empty($key)) {
             if (isset($this->value[$key])) {
                 return($this->value[$key]);
-            }
-            else {
+            } else {
                 return '';
             }
         }

src/Intraface/modules/filemanager/TemporaryFile.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     /**
      * Constructor
      * 
-     * @param object $file_handler
+     * @param FileHandler $filehandler
      * @param string $file_name the name of the temporary file.
      */
     public function __construct($filehandler, $file_name = NULL)

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     /**
      * @var string $file_path
      */
-    private $file_path ;
+    private $file_path;
     
     /**
      * @var string $file_dir
@@ -114,7 +114,7 @@ 
         if (strlen($file_name) > 50) {
             $extension = strrchr($file_name, '.');
             if ($extension !== false && (strlen($extension) == 4 || strlen($extension) == 5)) {
-                $file_name = substr($file_name, 0, 50-strlen($extension)).$extension;
+                $file_name = substr($file_name, 0, 50 - strlen($extension)).$extension;
             }
             else {
                 $file_name = substr($file_name, 0, 50);

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
             $extension = strrchr($file_name, '.');
             if ($extension !== false && (strlen($extension) == 4 || strlen($extension) == 5)) {
                 $file_name = substr($file_name, 0, 50-strlen($extension)).$extension;
-            }
-            else {
+            } else {
                 $file_name = substr($file_name, 0, 50);
             }   
         }

src/Intraface/modules/filemanager/UploadHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      *       then the filehandler->save method should rather accept some kind of file object which this

      *       object could generate?

      *

-     * @param object $file_handler A filehandler

+     * @param FileHandler $file_handler A filehandler

      *

      * @return void

      */

Spacing +1 added lines, -1 removed lines

@@ -290,7 +290,7 @@
                     CONTINUE;

                 }

 

-                $ext = substr($file, strrpos($file, ".")+1);

+                $ext = substr($file, strrpos($file, ".") + 1);

 

                 if (strlen($ext) < 3 || strlen($ext) > 4) {

                     $this->file_handler->error->set("Filen \"".$file."\" har ikke en gyldig endelse, f.eks. .pdf");

src/Intraface/modules/intranetmaintenance/Controller/Intranet/Show.php

Doc Comments +3 added lines

@@ -207,6 +207,9 @@
     	$this->removeDir('/home/intraface/upload/' . $intranet_id . '/');

     }

 

+    /**
+     * @param string $path
+     */
     protected function removeDir($path)

     {

 		// Add trailing slash to $path if one is not there

Indentation +97 added lines, -97 removed lines

@@ -118,137 +118,137 @@
         $modul = $this->getKernel()->module("intranetmaintenance");

         $intranet = new IntranetMaintenance(intval($_POST["id"]));

 

-    	$value = $_POST;

-    	$address_value = $_POST;

-    	$address_value["name"] = $_POST["address_name"];

-

-    	if ($intranet->save($_POST) && $intranet->setMaintainedByUser($_POST['maintained_by_user_id'], $this->getKernel()->intranet->get('id'))) {

-    		if ($intranet->address->save($address_value)) {

-    			return new k_SeeOther($this->url(null));

-    		}

-    	}

-    	return $this->render();

+        $value = $_POST;

+        $address_value = $_POST;

+        $address_value["name"] = $_POST["address_name"];

+

+        if ($intranet->save($_POST) && $intranet->setMaintainedByUser($_POST['maintained_by_user_id'], $this->getKernel()->intranet->get('id'))) {

+            if ($intranet->address->save($address_value)) {

+                return new k_SeeOther($this->url(null));

+            }

+        }

+        return $this->render();

     }

 

     function DELETE()

     {

-    	$db = new DB_Sql;

-    	$db2 = new DB_Sql;

+        $db = new DB_Sql;

+        $db2 = new DB_Sql;

 

-    	$intranet_id = intval($_POST['intranet_id']);

+        $intranet_id = intval($_POST['intranet_id']);

 

-    	if (!array_key_exists($intranet_id, $allowed_delete)) {

-    		throw new Exception('Du kan kun slette bambus beta og bambus - sune og lars');

-    	}

+        if (!array_key_exists($intranet_id, $allowed_delete)) {

+            throw new Exception('Du kan kun slette bambus beta og bambus - sune og lars');

+        }

 

-    	$db->query("DELETE FROM accounting_account WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_post WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_vat_period WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_voucher WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_year WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_year_end WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_account WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_post WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_vat_period WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_voucher WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_year WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_year_end WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = " . $intranet_id);

 

-    	// her skulle vi slette noget address

+        // her skulle vi slette noget address

 

-    	$db->query("DELETE FROM contact WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM contact_person WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM contact_message WHERE intranet_id  = " . $intranet_id);

+        $db->query("DELETE FROM contact WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM contact_person WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM contact_message WHERE intranet_id  = " . $intranet_id);

 

-    	$db->query("DELETE FROM cms_element WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_page WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_parameter WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_section WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_site WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_template WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_template_section WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_element WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_page WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_parameter WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_section WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_site WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_template WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM cms_template_section WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM comment WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM comment WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM debtor WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM debtor_item WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM debtor WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM debtor_item WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM email WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM email_attachment WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM email WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM email_attachment WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM file_handler WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM file_handler_instance WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM filehandler_append_file WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM file_handler WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM file_handler_instance WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM filehandler_append_file WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM invoice_payment WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM invoice_reminder WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM invoice_payment WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM invoice_reminder WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM keyword WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM keyword_x_object WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM keyword WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM keyword_x_object WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM newsletter_archieve WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM newsletter_list WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM newsletter_archieve WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM newsletter_list WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM onlinepayment WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM onlinepayment WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM procurement WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM procurement_item WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM procurement WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM procurement_item WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM product WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM product_detail WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM product_related WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM product WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM product_detail WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM product_related WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM stock_adaptation WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM stock_regulation WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM stock_adaptation WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM stock_regulation WHERE intranet_id = " . $intranet_id);

 

-    	$db->query("DELETE FROM todo_list WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM todo_item WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM todo_contact WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM todo_list WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM todo_item WHERE intranet_id = " . $intranet_id);

+        $db->query("DELETE FROM todo_contact WHERE intranet_id = " . $intranet_id);

 

-    	$this->removeDir('/home/intraface/upload/' . $intranet_id . '/');

+        $this->removeDir('/home/intraface/upload/' . $intranet_id . '/');

     }

 

     protected function removeDir($path)

     {

-		// Add trailing slash to $path if one is not there

-		if (substr($path, -1, 1) != "/") {

-			$path .= "/";

-		}

-

-		$normal_files = glob($path . "*");

-		$hidden_files = glob($path . "\.?*");

-		$all_files = array_merge($normal_files, $hidden_files);

-

-		foreach ($all_files as $file) {

-			# Skip pseudo links to current and parent dirs (./ and ../).

-			if (preg_match("/(\.|\.\.)$/", $file)) {

-               continue;

-			}

-

-			if (is_file($file) === TRUE) {

-				// Remove each file in this Directory

-				unlink($file);

-				echo "Removed File: " . $file . "<br>";

-			}

-			else if (is_dir($file) === TRUE) {

-				// If this Directory contains a Subdirectory, run this Function on it

-				removeDir($file);

-			}

-		}

-		// Remove Directory once Files have been removed (If Exists)

-		if (is_dir($path) === TRUE) {

-			rmdir($path);

-			//echo "<br>Removed Directory: " . $path . "<br><br>";

-		}

-	}

+        // Add trailing slash to $path if one is not there

+        if (substr($path, -1, 1) != "/") {

+            $path .= "/";

+        }

+

+        $normal_files = glob($path . "*");

+        $hidden_files = glob($path . "\.?*");

+        $all_files = array_merge($normal_files, $hidden_files);

+

+        foreach ($all_files as $file) {

+            # Skip pseudo links to current and parent dirs (./ and ../).

+            if (preg_match("/(\.|\.\.)$/", $file)) {

+                continue;

+            }

+

+            if (is_file($file) === TRUE) {

+                // Remove each file in this Directory

+                unlink($file);

+                echo "Removed File: " . $file . "<br>";

+            }

+            else if (is_dir($file) === TRUE) {

+                // If this Directory contains a Subdirectory, run this Function on it

+                removeDir($file);

+            }

+        }

+        // Remove Directory once Files have been removed (If Exists)

+        if (is_dir($path) === TRUE) {

+            rmdir($path);

+            //echo "<br>Removed Directory: " . $path . "<br><br>";

+        }

+    }

 

     function getValues()

     {

         $intranet = new IntranetMaintenance($this->name());

         $value = $intranet->get();

         if (isset($intranet->address)) {

-        	$address_value = $intranet->address->get();

+            $address_value = $intranet->address->get();

         } else {

-        	$address_value = array();

+            $address_value = array();

         }

 

         return array_merge($value, $address_value);

Spacing +56 added lines, -56 removed lines

@@ -48,7 +48,7 @@ 
                 $contact_module = $this->getKernel()->useModule('contact');

 

                 $redirect = Intraface_Redirect::factory($kernel, 'go');

-                $url = $redirect->setDestination($contact_module->getPath()."select_contact", NET_SCHEME . NET_HOST . $this->url());

+                $url = $redirect->setDestination($contact_module->getPath()."select_contact", NET_SCHEME.NET_HOST.$this->url());

                 $redirect->askParameter('contact_id');

                 $redirect->setIdentifier('contact');

 

@@ -61,7 +61,7 @@ 
         // add existing user

         if ($this->query('add_user') == 1) {

             $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');

-            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('../../user'), NET_SCHEME . NET_HOST . $this->url(null));

+            $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('../../user'), NET_SCHEME.NET_HOST.$this->url(null));

             $redirect->askParameter('user_id');

             $redirect->setIdentifier('add_user');

             return new k_SeeOther($url);

@@ -77,7 +77,7 @@ 
                 $user = new UserMaintenance($redirect->getParameter('user_id'));

                 $user->setIntranetAccess($intranet->get('id'));

                 $user_id = $user->get('id');

-                return new k_SeeOther($this->url('../../user/' . $user->get('id'), array('intranet_id' => $this->name())));

+                return new k_SeeOther($this->url('../../user/'.$user->get('id'), array('intranet_id' => $this->name())));

             }

         }

 

@@ -92,7 +92,7 @@ 
         $gateway = new Intraface_ModuleGateway($this->mdb2);

         $modules = $gateway->getList();

 

-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/show');

+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/show');

         return $smarty->render($this, array('modules' => $modules));

     }

 

@@ -103,13 +103,13 @@ 
         $modul = $this->getKernel()->module("intranetmaintenance");

         $translation = $this->getKernel()->getTranslation('intranetmaintenance');

 

-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');

+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');

         return $smarty->render($this);

     }

 

     function renderHtmlDelete()

     {

-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/delete');

+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/delete');

         return $smarty->render($this);

     }

 

@@ -141,70 +141,70 @@ 
     		throw new Exception('Du kan kun slette bambus beta og bambus - sune og lars');

     	}

 

-    	$db->query("DELETE FROM accounting_account WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_post WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_vat_period WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_voucher WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_year WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_year_end WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM accounting_account WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_post WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_vat_period WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_voucher WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_year WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_year_end WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = ".$intranet_id);

 

     	// her skulle vi slette noget address

 

-    	$db->query("DELETE FROM contact WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM contact_person WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM contact_message WHERE intranet_id  = " . $intranet_id);

+    	$db->query("DELETE FROM contact WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM contact_person WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM contact_message WHERE intranet_id  = ".$intranet_id);

 

-    	$db->query("DELETE FROM cms_element WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_page WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_parameter WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_section WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_site WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_template WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM cms_template_section WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM cms_element WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM cms_page WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM cms_parameter WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM cms_section WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM cms_site WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM cms_template WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM cms_template_section WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM comment WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM comment WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM debtor WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM debtor_item WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM debtor WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM debtor_item WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM email WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM email_attachment WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM email WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM email_attachment WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM file_handler WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM file_handler_instance WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM filehandler_append_file WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM file_handler WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM file_handler_instance WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM filehandler_append_file WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM invoice_payment WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM invoice_reminder WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM invoice_payment WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM invoice_reminder WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM keyword WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM keyword_x_object WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM keyword WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM keyword_x_object WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM newsletter_archieve WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM newsletter_list WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM newsletter_archieve WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM newsletter_list WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM onlinepayment WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM onlinepayment WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM procurement WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM procurement_item WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM procurement WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM procurement_item WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM product WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM product_detail WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM product_related WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM product WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM product_detail WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM product_related WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM stock_adaptation WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM stock_regulation WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM stock_adaptation WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM stock_regulation WHERE intranet_id = ".$intranet_id);

 

-    	$db->query("DELETE FROM todo_list WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM todo_item WHERE intranet_id = " . $intranet_id);

-    	$db->query("DELETE FROM todo_contact WHERE intranet_id = " . $intranet_id);

+    	$db->query("DELETE FROM todo_list WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM todo_item WHERE intranet_id = ".$intranet_id);

+    	$db->query("DELETE FROM todo_contact WHERE intranet_id = ".$intranet_id);

 

-    	$this->removeDir('/home/intraface/upload/' . $intranet_id . '/');

+    	$this->removeDir('/home/intraface/upload/'.$intranet_id.'/');

     }

 

     protected function removeDir($path)

@@ -214,8 +214,8 @@ 
 			$path .= "/";

 		}

 

-		$normal_files = glob($path . "*");

-		$hidden_files = glob($path . "\.?*");

+		$normal_files = glob($path."*");

+		$hidden_files = glob($path."\.?*");

 		$all_files = array_merge($normal_files, $hidden_files);

 

 		foreach ($all_files as $file) {

@@ -227,7 +227,7 @@ 
 			if (is_file($file) === TRUE) {

 				// Remove each file in this Directory

 				unlink($file);

-				echo "Removed File: " . $file . "<br>";

+				echo "Removed File: ".$file."<br>";

 			}

 			else if (is_dir($file) === TRUE) {

 				// If this Directory contains a Subdirectory, run this Function on it

Braces +1 added lines, -2 removed lines

@@ -228,8 +228,7 @@
 				// Remove each file in this Directory

 				unlink($file);

 				echo "Removed File: " . $file . "<br>";

-			}

-			else if (is_dir($file) === TRUE) {

+			} else if (is_dir($file) === TRUE) {

 				// If this Directory contains a Subdirectory, run this Function on it

 				removeDir($file);

 			}

src/Intraface/modules/intranetmaintenance/IntranetMaintenance.php

Doc Comments +1 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
      * Removes the intranets access to a module
      *
      * @param mixed module_id either name or id on module
-     * @return boolean true on success
+     * @return null|boolean true on success
      */
     public function removeModuleAccess($module_id)
     {
@@ -323,7 +323,6 @@ 
     /**
      * returns the RandomKeyGenerator
      *
-     * @param integer $length the length of the generated key
      * @return object RandomKeyGenerator
      */
     private function getRandomKeyGenerator()

Indentation +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
             $this->id = $this->db->lastInsertID('intranet', 'id');
 
             if (PEAR::isError($this->id)) {
-                   throw new Exception("Error in IntranetMaintenance: ".$id->getMessage());
+                    throw new Exception("Error in IntranetMaintenance: ".$id->getMessage());
             }
             $this->load();
         } else {

Spacing +3 added lines, -3 removed lines

@@ -288,7 +288,7 @@ 
         $intranet = array();
         $db = $this->dbquery->getRecordset('DISTINCT(intranet.id), intranet.name');
         while ($db->nextRecord()) {
-            $intranet[$i]['id'] =   $db->f('id');
+            $intranet[$i]['id'] = $db->f('id');
             $intranet[$i]['name'] = $db->f('name');
             $i++;
         }
@@ -316,7 +316,7 @@ 
      */
     function setContact($contact_id)
     {
-        $this->db->query("UPDATE intranet SET contact_id = ".intval($contact_id)." WHERE id = " . intval($this->id));
+        $this->db->query("UPDATE intranet SET contact_id = ".intval($contact_id)." WHERE id = ".intval($this->id));
         return true;
     }
 
@@ -333,7 +333,7 @@ 
 
     private function identifierIsUnique($identifier)
     {
-        $result = $this->db->query("SELECT identifier FROM intranet WHERE identifier = ".$this->db->quote($identifier, 'text')." AND id <> " . intval($this->id));
+        $result = $this->db->query("SELECT identifier FROM intranet WHERE identifier = ".$this->db->quote($identifier, 'text')." AND id <> ".intval($this->id));
         if ($result->numRows() > 1) {
             return false;
         }

src/Intraface/modules/intranetmaintenance/UserMaintenance.php

Doc Comments +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
      * @param mixed sub_access_id either id or name of sub_access

      * @param integer intranet_id id of intranet to give access

      *

-     * @return void

+     * @return boolean

      */

     function setSubAccess($module_id, $sub_access_id, $intranet_id = 0)

     {