- Override privacy status on bookmark file import, if specified (i.e. Delicious)

[scuttle] / header.inc.php

diff --git a/header.inc.php b/header.inc.php
index de56c846196626b5bac800fd2a512689f1740a6c..1002aab5c2f640d274a51a93fc695df332d0ada8 100644 (file)
--- a/header.inc.php
+++ b/header.inc.php
@@ -2,20 +2,18 @@
 ini_set('display_errors', '1');
 ini_set('mysql.trace_mode', '0');
 
 ini_set('display_errors', '1');
 ini_set('mysql.trace_mode', '0');
 

-error_reporting(E_ALL ^ E_NOTICE);
-
-define('DEBUG', true);
+error_reporting(E_ALL & ~E_WARNING & ~E_NOTICE);

 session_start();
 
 session_start();
 

-require_once(dirname(__FILE__) .'/services/servicefactory.php');
-require_once(dirname(__FILE__) .'/config.inc.php');
-require_once(dirname(__FILE__) .'/functions.inc.php');
+require_once dirname(__FILE__) .'/services/servicefactory.php';
+require_once dirname(__FILE__) .'/config.inc.php';
+require_once dirname(__FILE__) .'/functions.inc.php';

 
 // Determine the base URL
 if (!isset($root)) {
     $pieces = explode('/', $_SERVER['SCRIPT_NAME']);
 
 // Determine the base URL
 if (!isset($root)) {
     $pieces = explode('/', $_SERVER['SCRIPT_NAME']);

-    $root = '/';
-    foreach($pieces as $piece) {
+    $root   = '/';
+    foreach ($pieces as $piece) {

         if ($piece != '' && !strstr($piece, '.php')) {
             $root .= $piece .'/';
         }
         if ($piece != '' && !strstr($piece, '.php')) {
             $root .= $piece .'/';
         }


@@ -24,12 +22,13 @@ if (!isset($root)) {
         $root .= '/';
     }
     $path = $root;
         $root .= '/';
     }
     $path = $root;

-    $root = 'http://'. $_SERVER['HTTP_HOST'] . $root;
+
+    $protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
+    $root     = $protocol .'://'. $_SERVER['HTTP_HOST'] . $root;

 }
 
 }
 

-// Error codes
-define('GENERAL_MESSAGE', 200);
-define('GENERAL_ERROR', 202);
+define('GENERAL_MESSAGE',  200);
+define('GENERAL_ERROR',    202);

 define('CRITICAL_MESSAGE', 203);
 define('CRITICAL_MESSAGE', 203);

-define('CRITICAL_ERROR', 204);
-?>
\ No newline at end of file
+define('CRITICAL_ERROR',   204);
+define('DEBUG',            TRUE);