From 8a38d3ce9fde3484f8a5205f6d70459a4cb120d9 Mon Sep 17 00:00:00 2001
From: Junior <junior@jaj.com>
Date: Tue, 22 Aug 2023 14:45:18 -0400
Subject: [PATCH] Only start the session and create session variables when not
running in CLI
---
header.php | 62 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/header.php b/header.php
index f990546..2c9ae79 100644
--- a/header.php
+++ b/header.php
@@ -9,41 +9,43 @@ require 'functions.php';
// be named "require_login() and take no parameters
require 'authfunctions.php';
-// Start the session
-session_name(SESSIONCOMICS);
-session_start();
+if ( php_sapi_name() != "cli" ) {
+ // Start the session
+ session_name(SESSIONCOMICS);
+ session_start();
-// This session variable is TRUE when successfully logged in
-// If set to true, and using default authentication, no login will be required
-if ( !isset($_SESSION['validated']) ) {
- $_SESSION['validated'] = false;
-}
+ // This session variable is TRUE when successfully logged in
+ // If set to true, and using default authentication, no login will be required
+ if ( !isset($_SESSION['validated']) ) {
+ $_SESSION['validated'] = false;
+ }
-// This session variable is set to the current browsing folder.
-// It is relative to the COMICSDIR constant defined in variables.php
-if ( !isset($_SESSION['compath']) ) {
- $_SESSION['compath'] = '/';
-}
-if ( $_SESSION['compath'] == "" ) $_SESSION['compath'] = "/";
+ // This session variable is set to the current browsing folder.
+ // It is relative to the COMICSDIR constant defined in variables.php
+ if ( !isset($_SESSION['compath']) ) {
+ $_SESSION['compath'] = '/';
+ }
+ if ( $_SESSION['compath'] == "" ) $_SESSION['compath'] = "/";
-// This session variable is set to the current comic in Base64
-if ( !isset($_SESSION['comfile']) ) {
- $_SESSION['comfile'] = "";
-}
+ // This session variable is set to the current comic in Base64
+ if ( !isset($_SESSION['comfile']) ) {
+ $_SESSION['comfile'] = "";
+ }
-// Initialize the hash session variable used for SSO
-// Set the hash to the passed in value if it exists
-if ( !isset($_SESSION['hash']) ) {
- $_SESSION['hash'] = "";
-}
-if ( isset($_REQUEST['hash']) ) {
- $_SESSION['hash'] = $_REQUEST['hash'];
-}
+ // Initialize the hash session variable used for SSO
+ // Set the hash to the passed in value if it exists
+ if ( !isset($_SESSION['hash']) ) {
+ $_SESSION['hash'] = "";
+ }
+ if ( isset($_REQUEST['hash']) ) {
+ $_SESSION['hash'] = $_REQUEST['hash'];
+ }
-// Sorting for folders.
-// Valid values (from constants): SORTBYNAME, SORTBYDATE
-if ( !isset($_SESSION['sortorder']) ) {
- $_SESSION['sortorder'] = SORTBYDATE;
+ // Sorting for folders.
+ // Valid values (from constants): SORTBYNAME, SORTBYDATE
+ if ( !isset($_SESSION['sortorder']) ) {
+ $_SESSION['sortorder'] = SORTBYDATE;
+ }
}
// Make our PDO database connection which will be used in all scripts