Should address issue of security preventions to allow features to work again

Author: mastacontrola

.githooks/pre-commit

@@ -5,14 +5,19 @@
 # exit with non-zero status after issuing an appropriate message if
 # it wants to stop the commit.
 #
-# To enable this hook, rename this file to "pre-commit" within .git\hooks
-# or run git config core.hooksPath .githooks
+# To enable this hook, rename this file to "pre-commit".
 #
 # Exit on error
-#set -e
+# set -e
 
 project_dir=$(git rev-parse --show-toplevel)
 
+psrfix() {
+    command -v php-cs-fixer >/dev/null || return
+    $(command -v php-cs-fixer) fix $project_dir/packages/web --rules=@PSR2
+    git add $project_dir/packages/web
+}
+
 updateLanguage() {
     command -v xgettext >/dev/null || return
     command -v msgcat >/dev/null || return
@@ -23,10 +28,10 @@ updateLanguage() {
         msgmerge --update --backup=none $PO_FILE $project_dir/packages/web/management/languages/messages.pot 2>/dev/null >/dev/null
         msgcat --sort-output -o $PO_FILE $PO_FILE
     done
-    git add "$project_dir/packages/web/management/languages"
 }
 
 updateLanguage
+#psrfix
 
 # Get the current branch name
 gitbranch=$(git branch --show-current)
@@ -44,7 +49,7 @@ branchon=$(echo ${gitbranch} | awk -F'-' '{print $1}')
 branchend=$(echo ${gitbranch} | awk -F'-' '{print $2}')
 
 # Define the path to the system file
-system_file="$(git rev-parse --show-toplevel)/packages/web/lib/fog/system.class.php"
+system_file="$project_dir/packages/web/lib/fog/system.class.php"
 
 current_version=$(grep "define('FOG_VERSION'" $system_file | sed "s/.*FOG_VERSION', '\([^']*\)');/\1/")
 
@@ -61,12 +66,12 @@ case $branchon in
         channel="Patches"
         ;;
     stable)
-        # For stable, don't increment version, use what is being pulled from dev-branch
+        # Describe the tag and append the commit count correctly
         tagversion=$(git describe --tags ${gitcom})
         baseversion=${tagversion%.*}   # Retain everything before the last segment
         lastrevision=${tagversion##*.} # Extracts the last segment
-        gitcount=$(git rev-list master..dev-branch --count) #get the gitcount from dev-branch instead
         trunkversion="${baseversion}.${gitcount}"
+        gitcount=$(git rev-list master..dev-branch --count) # Get the gitcount from dev-branch instead
         channel="Patches"
         ;;
     working)
@@ -78,7 +83,7 @@ case $branchon in
     rc)
         channel="Release Candidate"
         version_prefix="${branchend}.0-RC"
-        if [[ $current_version =~ $version_prefix-([0-9]+) ]]; then
+        if [[ $current_version =~ "${version_prefix}-([0-9]+)" ]]; then
             last_rc_version=${BASH_REMATCH[1]}
             next_rc_version=$((last_rc_version + 1))
         else

packages/web/commons/base.inc.php

@@ -1,15 +1,6 @@
 <?php
-/**
- * Base that commonizes the requirements of FOG.
- *
- * PHP version 5
- *
- * @category Base
- * @package  FOGProject
- * @author   Tom Elliott <[email protected]>
- * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
- * @link     https://fogproject.org
- */
+declare(strict_types=1);
+
 /**
  * Base that commonizes the requirements of FOG.
  *
@@ -19,30 +10,29 @@
  * @license  http://opensource.org/licenses/gpl-3.0 GPLv3
  * @link     https://fogproject.org
  */
-/**
- * Setup our more secure friendly header information.
- */
+
+if (!function_exists('str_contains')) {
+    function str_contains($haystack, $needle)
+    {
+        return $needle !== '' && strpos($haystack, $needle) !== false;
+    }
+}
+
+// Set security-related headers.
 header('X-Frame-Options: sameorigin');
 header('X-XSS-Protection: 1; mode=block');
 header('X-Content-Type-Options: nosniff');
 header('Strict-Transport-Security: max-age=31536000');
-header(
-    "Content-Security-Policy: default-src 'none';"
-    . "script-src 'self' 'unsafe-eval';"
-    . "connect-src 'self';"
-    . "img-src 'self' data:;"
-    . "style-src 'self' 'unsafe-inline';"
-    . "font-src 'self';"
-);
-/**
- * Our required files, text for language and init to initialize system.
- */
+header("Content-Security-Policy: default-src 'none'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; connect-src 'self' https://fogproject.org; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:;");
+
+// Include required initialization script.
 require 'init.php';
-/**
- * All output should be sanitized for faster browser experience.
- */
-ob_start(array('Initiator', 'sanitizeOutput'));
+
+// Output buffering with custom output sanitization for performance and security.
+ob_start(['Initiator', 'sanitizeOutput']);
 Initiator::sanitizeItems();
 Initiator::startInit();
+
+// Load global constants and functions.
 require BASEPATH . "commons/text.php";
 new LoadGlobals();