intraface / intraface.dk

src/Intraface/Main.php

Spacing +3 added lines, -3 removed lines

@@ -160,7 +160,7 @@ 
     function includeFile($file)
     {
         // @todo constant should be removed
-        $file = PATH_INCLUDE_MODULE . $this->module_name . '/' . $file;
+        $file = PATH_INCLUDE_MODULE.$this->module_name.'/'.$file;
         if (!file_exists($file)) {
             return false;
         }
@@ -219,7 +219,7 @@ 
         // @todo global should be removed
         global $_setting; // globalized other places also
 
-        include(dirname(__FILE__). '/modules/' .$this->module_name.'/'.$file);
+        include(dirname(__FILE__).'/modules/'.$this->module_name.'/'.$file);
     }
 
     /**
@@ -229,7 +229,7 @@ 
      */
     public function getPath()
     {
-        return PATH_WWW . 'restricted/module/' . $this->module_name . '/';
+        return PATH_WWW.'restricted/module/'.$this->module_name.'/';
     }
 
     /**

src/Intraface/Pdf.php

Spacing +12 added lines, -12 removed lines

@@ -104,7 +104,7 @@ 
         if (is_int($value)) {
             $this->value['x'] = $this->get('margin_left') + $value;
         } elseif (is_string($value) && substr($value, 0, 1) == "+") {
-            $this->value['x'] +=  intval(substr($value, 1));
+            $this->value['x'] += intval(substr($value, 1));
         } elseif (is_string($value) && substr($value, 0, 1) == "-") {
             $this->value['x'] -= intval(substr($value, 1));
         } else {
@@ -150,11 +150,11 @@ 
 
         $height = $this->get('header_height');
         ;
-        $width = $size[0] * ($height/$size[1]);
+        $width = $size[0]*($height/$size[1]);
 
         if ($width > $this->get('content_width')) {
             $width = $this->get('content_width');
-            $height = $size[1] * ($width/$size[0]);
+            $height = $size[1]*($width/$size[0]);
         }
         parent::addJpegFromFile($headerImg, $this->get('right_margin_position') - $width, $this->page_height - $this->get('header_margin_top') - $height, $width, $height); // , ($this->value["page_width"] - $this->value["margin_left"])/10
         parent::closeObject();
@@ -177,15 +177,15 @@ 
     public function roundRectangle($x, $y, $width, $height, $round)
     {
         parent::setLineStyle(1);
-        parent::line($x, $y+$round, $x, $y+$height-$round);
-        parent::line($x+$round, $y+$height, $x+$width-$round, $y+$height);
-        parent::line($x+$width, $y+$height-$round, $x+$width, $y+$round-1);
-        parent::line($x+$width-$round, $y, $x+$round, $y);
-
-        parent::partEllipse($x+$round, $y+$round, 180, 270, $round);
-        parent::partEllipse($x+$round, $y+$height-$round, 90, 180, $round);
-        parent::partEllipse($x+$width-$round, $y+$height-$round, 0, 90, $round);
-        parent::partEllipse($x+$width-$round, $y+$round, 270, 360, $round);
+        parent::line($x, $y + $round, $x, $y + $height - $round);
+        parent::line($x + $round, $y + $height, $x + $width - $round, $y + $height);
+        parent::line($x + $width, $y + $height - $round, $x + $width, $y + $round - 1);
+        parent::line($x + $width - $round, $y, $x + $round, $y);
+
+        parent::partEllipse($x + $round, $y + $round, 180, 270, $round);
+        parent::partEllipse($x + $round, $y + $height - $round, 90, 180, $round);
+        parent::partEllipse($x + $width - $round, $y + $height - $round, 0, 90, $round);
+        parent::partEllipse($x + $width - $round, $y + $round, 270, 360, $round);
     }
 
    /**

install/Install.php

Spacing +15 added lines, -15 removed lines

@@ -26,13 +26,13 @@ 
 
     function dropDatabase()
     {
-        $result = $this->db->query("SHOW TABLES FROM " . DB_NAME);
+        $result = $this->db->query("SHOW TABLES FROM ".DB_NAME);
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }
 
         while ($line = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
-            $drop = $this->db->exec('DROP TABLE ' . $line['tables_in_' . DB_NAME]);
+            $drop = $this->db->exec('DROP TABLE '.$line['tables_in_'.DB_NAME]);
             if (PEAR::IsError($drop)) {
                 throw new Exception($drop->getUserInfo());
             }
@@ -42,7 +42,7 @@ 
 
     function createDatabaseSchema()
     {
-        $sql_structure = file_get_contents(dirname(__FILE__) . '/database-structure.sql');
+        $sql_structure = file_get_contents(dirname(__FILE__).'/database-structure.sql');
         $sql_arr = Intraface_Install::splitSql($sql_structure);
 
         foreach ($sql_arr as $sql) {
@@ -53,7 +53,7 @@ 
             }
         }
 
-        $sql_structure = file_get_contents(dirname(__FILE__) . '/database-update.sql');
+        $sql_structure = file_get_contents(dirname(__FILE__).'/database-update.sql');
         $sql_arr = Intraface_Install::splitSql($sql_structure);
 
         foreach ($sql_arr as $sql) {
@@ -68,12 +68,12 @@ 
 
     function emptyDatabase()
     {
-        $result = $this->db->query("SHOW TABLES FROM " . DB_NAME);
+        $result = $this->db->query("SHOW TABLES FROM ".DB_NAME);
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }
         while ($line = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
-            $truncate = $this->db->exec('TRUNCATE TABLE ' . $line['Tables_in_'.DB_NAME]);
+            $truncate = $this->db->exec('TRUNCATE TABLE '.$line['Tables_in_'.DB_NAME]);
             if (PEAR::IsError($truncate)) {
                 throw new Exception($truncate->getUserInfo());
             }
@@ -84,7 +84,7 @@ 
 
     function createStartingValues()
     {
-        $sql_values = file_get_contents(dirname(__FILE__) . '/database-values.sql');
+        $sql_values = file_get_contents(dirname(__FILE__).'/database-values.sql');
         $sql_arr = Intraface_Install::splitSql($sql_values);
 
         foreach ($sql_arr as $sql) {
@@ -128,15 +128,15 @@ 
 
     function deleteUploadDirectory($f)
     {
-        if ( is_dir( $f ) ){
-            foreach ( scandir( $f ) as $item ){
-                if ( !strcmp( $item, '.' ) || !strcmp( $item, '..' ) )
+        if (is_dir($f)) {
+            foreach (scandir($f) as $item) {
+                if (!strcmp($item, '.') || !strcmp($item, '..'))
                     continue;
-                $this->deleteUploadDirectory( $f . "/" . $item );
+                $this->deleteUploadDirectory($f."/".$item);
             }
-            rmdir( $f );
-        } else{
-            @unlink( $f );
+            rmdir($f);
+        } else {
+            @unlink($f);
         }
     }
 
@@ -215,7 +215,7 @@ 
             $object_method[0] = str_replace('/', '', $object_method[0]);
             $object_method[0] = str_replace('\\', '', $object_method[0]);
 
-            require_once dirname(__FILE__) . '/Helper/'.$object_method[0].'.php';
+            require_once dirname(__FILE__).'/Helper/'.$object_method[0].'.php';
             $object_name = 'Install_Helper_'.$object_method[0];
             $object = new $object_name($kernel, $this->db);
             $object->$object_method[1]();

tests/xmlrpcservers/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__) . '/../unit/config.test.php';
+require_once dirname(__FILE__).'/../unit/config.test.php';
 
 require_once 'konstrukt/konstrukt.inc.php';
 

tests/unit/Shop/ShopBasketTest.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     function createProductWithVariations()
     {
-        require_once dirname(__FILE__) .'/../../../install/Helper/Product.php';
+        require_once dirname(__FILE__).'/../../../install/Helper/Product.php';
         $helper = new Install_Helper_Product($this->kernel, MDB2::singleton(DB_DSN));
         $helper->createWithVariations();
     }

tests/unit/Filemanager/ImageRandomizerTest.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 require_once 'Intraface/modules/filemanager/FileManager.php';
 require_once 'Intraface/modules/filemanager/ImageRandomizer.php';
 require_once 'Intraface/shared/keyword/Keyword.php';
-require_once dirname(__FILE__) . '/../Filehandler/file_functions.php';
+require_once dirname(__FILE__).'/../Filehandler/file_functions.php';
 
 class ImageRandomizerTest extends PHPUnit_Framework_TestCase
 {
@@ -34,7 +34,7 @@ 
     {
         for ($i = 1; $i < 11; $i++) {
             $filemanager = new Intraface_modules_filemanager_FileManager($this->createKernel());
-            copy(dirname(__FILE__) . '/'.$this->file_name, PATH_UPLOAD.$this->file_name);
+            copy(dirname(__FILE__).'/'.$this->file_name, PATH_UPLOAD.$this->file_name);
             $filemanager->save(PATH_UPLOAD.$this->file_name, 'file'.$i.'.jpg');
             $appender = $filemanager->getKeywordAppender();
 

tests/unit/Email/EmailTest.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     function testALotOfSaveEmails()
     {
         $number = 200;
-        for ($i = 0; $i<$number; $i++) {
+        for ($i = 0; $i < $number; $i++) {
             $belong_to_id = rand(1, 100000);
             $type_id = rand(1, 5);
             $contact_id = rand(1, 100000);

tests/unit/Contact/ContactStubs.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
     function useShared($shared)
     {
-        switch($shared) {
+        switch ($shared) {
             case 'email':
                 require_once 'Intraface/shared/email/Email.php';
                 break;

tests/unit/Contact/ContactReminderTest.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
     function testPostPhoneUntil()
     {
         $reminder = new ContactReminder($this->getContact());
-        $this->assertTrue($reminder->postponeUntil(date('Y-') . date('m') + 1 . date('-d')));
+        $this->assertTrue($reminder->postponeUntil(date('Y-').date('m') + 1.date('-d')));
     }
 }