diff --git a/includes/core.php b/includes/core.php
index ce5a4eb..460122c 100644
--- a/includes/core.php
+++ b/includes/core.php
@@ -33,36 +33,7 @@ ini_set('upload_tmp_dir',$upload_tmp_dir);
 
 require_once('logging.php');
 require_once('functions.php');
-
-// Define session max duration
-if (!isset($session_max_duration))
-	$session_max_duration = (12*60*60); // Default to 12h
-ini_set('session.gc_maxlifetime', $session_max_duration);
-ini_set('session.cookie_lifetime', $session_max_duration);
-
-// Start session
-session_start();
-
-// Init session key
-if (!isset($_SESSION['session_key'])) {
-	$_SESSION['session_key']=uniqid();
-}
-
-// Handle session timeout
-if ($session_timeout) {
-	if (!isset($_SESSION['session_last_access'])) {
-		logging('DEBUG', 'Set initial session last access');
-		$_SESSION['session_last_access'] = time();
-	}
-	elseif ($_SESSION['session_last_access'] > (time() - $session_timeout)) {
-		logging('DEBUG', 'Session timeout not expired, update session last access (Previous value : '.$_SESSION['session_last_access'].')');
-		$_SESSION['session_last_access'] = time();
-	}
-	else {
-		logging('INFO', 'Session destroyed due to inactivity');
-		session_destroy();
-	}
-}
+require_once('session.php');
 
 // Nomenclatures
 $status_list = array (
diff --git a/includes/session.php b/includes/session.php
new file mode 100644
index 0000000..48a92b5
--- /dev/null
+++ b/includes/session.php
@@ -0,0 +1,33 @@
+<?php
+if (php_sapi_name() == "cli")
+  return true;
+
+// Define session max duration
+if (!isset($session_max_duration))
+	$session_max_duration = (12*60*60); // Default to 12h
+ini_set('session.gc_maxlifetime', $session_max_duration);
+ini_set('session.cookie_lifetime', $session_max_duration);
+
+// Start session
+session_start();
+
+// Init session key
+if (!isset($_SESSION['session_key'])) {
+	$_SESSION['session_key']=uniqid();
+}
+
+// Handle session timeout
+if ($session_timeout) {
+	if (!isset($_SESSION['session_last_access'])) {
+		logging('DEBUG', 'Set initial session last access');
+		$_SESSION['session_last_access'] = time();
+	}
+	elseif ($_SESSION['session_last_access'] > (time() - $session_timeout)) {
+		logging('DEBUG', 'Session timeout not expired, update session last access (Previous value : '.$_SESSION['session_last_access'].')');
+		$_SESSION['session_last_access'] = time();
+	}
+	else {
+		logging('INFO', 'Session destroyed due to inactivity');
+		session_destroy();
+	}
+}
diff --git a/includes/smarty.php b/includes/smarty.php
index 9f52d9f..30d0ad6 100644
--- a/includes/smarty.php
+++ b/includes/smarty.php
@@ -1,5 +1,8 @@
 <?php
 
+if (php_sapi_name() == "cli")
+  return true;
+
 require_once($smarty_path);
 $smarty = new Smarty();
 
diff --git a/includes/url-public.php b/includes/url-public.php
index bcc16ba..fa6c6f7 100644
--- a/includes/url-public.php
+++ b/includes/url-public.php
@@ -1,5 +1,8 @@
 <?php
 
+if (php_sapi_name() == "cli")
+  return true;
+
 function handle_homepage($url_info) {
   display_template("homepage.tpl", "Hello world !");
 }