intraface / intraface.dk

install/Helper/Accounting.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         require_once 'Intraface/modules/accounting/Year.php';
         $year = new Year($this->kernel);
-        $year->save(array('from_date' => date('Y') . '-01-01', 'to_date' => date('Y') . '-12-31', 'label' => 'test', 'locked' => 0, 'vat' => 1));
+        $year->save(array('from_date' => date('Y').'-01-01', 'to_date' => date('Y').'-12-31', 'label' => 'test', 'locked' => 0, 'vat' => 1));
         $year->createAccounts('standard');
         $year->setYear();
     }

install/Helper/Debtor.php

Spacing +9 added lines, -9 removed lines

@@ -12,11 +12,11 @@ 
 
     public function createInvoice()
     {
-        require_once dirname (__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -26,7 +26,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'Test invoice',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)));
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)));
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));
@@ -34,11 +34,11 @@ 
 
     public function createOrder()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -48,7 +48,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'Test invoice',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)));
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)));
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));
@@ -56,11 +56,11 @@ 
 
     public function createOrderFromShop()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -70,7 +70,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'From shop',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)), 'webshop', 1);
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)), 'webshop', 1);
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));

install/Helper/ModulePackage.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function loadPackages()
     {
 
-        $sql_structure = file_get_contents(dirname(__FILE__) . '/../database-module_package-values.sql');
+        $sql_structure = file_get_contents(dirname(__FILE__).'/../database-module_package-values.sql');
         $sql_arr = Intraface_Install::splitSql($sql_structure);
 
         foreach ($sql_arr as $sql) {

install/Helper/Product.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 $variation->load();
                 $detail = $variation->getDetail();
                 $detail->price_difference = 0; /* Can be reimplemented: ($a1 * $a2); */
-                $detail->weight_difference = -1*($a1 * $a2);
+                $detail->weight_difference = -1*($a1*$a2);
                 $detail->save();
 
             }

install/Helper/Email.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function create()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 

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]();

generate_package_xml.php

Indentation +25 added lines, -25 removed lines

@@ -57,10 +57,10 @@ 
         'packagefile'       => 'package.xml',

         'ignore'            => $ignore,

         'dir_roles'        => array(

-              'intraface.dk' => 'www'

+                'intraface.dk' => 'www'

         ),

         'exceptions' => array(

-              'intraface.dk/*.*' => 'www'

+                'intraface.dk/*.*' => 'www'

         ),

         'simpleoutput'      => true,

         'addhiddenfiles' => true

@@ -221,29 +221,29 @@ 
 $post_install_script = $pfm->initPostinstallScript('intraface.php');

 $post_install_script->addParamGroup('setup',

     array($post_install_script->getParam('db_user', 'User', 'string', 'root'),

-          $post_install_script->getParam('db_pass', 'Password', 'string', ''),

-          $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'),

-          $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'),

-          $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'),

-          $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'),

-          $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'),

-          $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'),

-          $post_install_script->getParam('path_include_path', 'Include path', 'string', ''),

-          $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'),

-          $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'),

-          $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true),

-          $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'),

-          $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL),

-          $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE),

-          $post_install_script->getParam('error_report_email', 'Error report email', 'string', 'support@intraface.dk'),

-          $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'),

-          $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'),

-          $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'),

-          $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''),

-          $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'),

-          $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''),

-          $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '')

-              ),

+            $post_install_script->getParam('db_pass', 'Password', 'string', ''),

+            $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'),

+            $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'),

+            $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'),

+            $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'),

+            $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'),

+            $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'),

+            $post_install_script->getParam('path_include_path', 'Include path', 'string', ''),

+            $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'),

+            $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'),

+            $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true),

+            $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'),

+            $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL),

+            $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE),

+            $post_install_script->getParam('error_report_email', 'Error report email', 'string', 'support@intraface.dk'),

+            $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'),

+            $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'),

+            $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'),

+            $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''),

+            $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'),

+            $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''),

+            $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '')

+                ),

     '');

 

 $pfm->addPostInstallTask($post_install_script, 'intraface.php');

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
 

 foreach ($web_files AS $file) {

     $src_file = substr($file, 4);

-    $formatted_file = substr($file, strlen($web_dir . '/'));

+    $formatted_file = substr($file, strlen($web_dir.'/'));

     if (in_array($src_file, $ignore)) continue;

     $pfm->addInstallAs($src_file, $formatted_file);

 }

src/Intraface/Weblogin.php

Indentation +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 

     function hasModuleAccess($modulename)

     {

-		return $this->intranet->hasModuleAccess($modulename);

+        return $this->intranet->hasModuleAccess($modulename);

     }

 

     function hasIntranetAccess($intranet_id)

src/Intraface/Intranet.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 

     public function getAddress()

     {

-    	return ($this->address = Intraface_Address::factory('intranet', $this->id));

+        return ($this->address = Intraface_Address::factory('intranet', $this->id));

     }

 

     /**

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      */

     function hasModuleAccess($module)

     {

-        $filename = PATH_INCLUDE_MODULE . $module . '/Main' . ucfirst($module) . '.php';

+        $filename = PATH_INCLUDE_MODULE.$module.'/Main'.ucfirst($module).'.php';

         if (file_exists($filename)) {

             require_once $filename;

             $module_class = 'Main'.ucfirst($module);