diff --git a/.gitignore b/.gitignore index 4c49bd78..8c3dc162 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .env +/vendor/ + diff --git a/.htaccess b/.htaccess index b73f49b4..2b5271b3 100644 --- a/.htaccess +++ b/.htaccess @@ -1,4 +1,4 @@ -php_flag display_errors Off +php_flag display_errors On # php_value error_reporting -1 RedirectMatch 403 ^/\.well-known Options -Indexes diff --git a/header01.php b/header01.php index 3ca27b9e..53bdce98 100644 --- a/header01.php +++ b/header01.php @@ -8,6 +8,8 @@ $is_logged_in = isset($_SESSION['user_id']); if (isset($_SESSION['user_id'])) { $is_member = getUserMemberStatus($_SESSION['user_id']); $user_id = $_SESSION['user_id']; +} else { + $is_member = false; } $role = getUserRole(); logVisitor(); diff --git a/login.php b/login.php index aa8de937..314e731e 100644 --- a/login.php +++ b/login.php @@ -5,7 +5,7 @@ require_once 'google-client/vendor/autoload.php'; $client = new Google_Client(); $client->setClientId('948441222188-8qhboq2urr8o9n35mc70s5h2nhd52v0m.apps.googleusercontent.com'); $client->setClientSecret('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'); -$client->setRedirectUri('https://4wdcsa.co.za/validate_login.php'); +$client->setRedirectUri($_ENV['HOST'] . '/validate_login.php'); $client->addScope("email"); $client->addScope("profile"); diff --git a/testenv.php b/testenv.php new file mode 100644 index 00000000..38ab7976 --- /dev/null +++ b/testenv.php @@ -0,0 +1,7 @@ +load(); + +echo "HOST: " . $_ENV['HOST']; diff --git a/vendor/autoload.php b/vendor/autoload.php index 38b73c59..baf8ef2d 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -14,12 +14,9 @@ if (PHP_VERSION_ID < 50600) { echo $err; } } - trigger_error( - $err, - E_USER_ERROR - ); + throw new RuntimeException($err); } require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8::getLoader(); +return ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc::getLoader(); diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index 51e734a7..2052022f 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -26,12 +26,23 @@ use Composer\Semver\VersionParser; */ class InstalledVersions { + /** + * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to + * @internal + */ + private static $selfDir = null; + /** * @var mixed[]|null * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null */ private static $installed; + /** + * @var bool + */ + private static $installedIsLocalDir; + /** * @var bool|null */ @@ -309,6 +320,24 @@ class InstalledVersions { self::$installed = $data; self::$installedByVendor = array(); + + // when using reload, we disable the duplicate protection to ensure that self::$installed data is + // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, + // so we have to assume it does not, and that may result in duplicate data being returned when listing + // all installed packages for example + self::$installedIsLocalDir = false; + } + + /** + * @return string + */ + private static function getSelfDir() + { + if (self::$selfDir === null) { + self::$selfDir = strtr(__DIR__, '\\', '/'); + } + + return self::$selfDir; } /** @@ -322,19 +351,27 @@ class InstalledVersions } $installed = array(); + $copiedLocalDir = false; if (self::$canGetVendors) { + $selfDir = self::getSelfDir(); foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + $vendorDir = strtr($vendorDir, '\\', '/'); if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ $required = require $vendorDir.'/composer/installed.php'; - $installed[] = self::$installedByVendor[$vendorDir] = $required; - if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { - self::$installed = $installed[count($installed) - 1]; + self::$installedByVendor[$vendorDir] = $required; + $installed[] = $required; + if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { + self::$installed = $required; + self::$installedIsLocalDir = true; } } + if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { + $copiedLocalDir = true; + } } } @@ -350,7 +387,7 @@ class InstalledVersions } } - if (self::$installed !== array()) { + if (self::$installed !== array() && !$copiedLocalDir) { $installed[] = self::$installed; } diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index cc7b80e9..44bd25ea 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8 +class ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc { private static $loader; @@ -24,16 +24,16 @@ class ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8 require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit8f8443657afa9e4122281017b10fc4c8', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit4f947e5b57034e67caa05c4fc1c4b2dc', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::getInitializer($loader)); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$files; $requireFile = \Closure::bind(static function ($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 60372443..a8ef0cc3 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit8f8443657afa9e4122281017b10fc4c8 +class ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc { public static $files = array ( '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', @@ -111,10 +111,10 @@ class ComposerStaticInit8f8443657afa9e4122281017b10fc4c8 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$prefixesPsr0; - $loader->classMap = ComposerStaticInit8f8443657afa9e4122281017b10fc4c8::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$prefixesPsr0; + $loader->classMap = ComposerStaticInit4f947e5b57034e67caa05c4fc1c4b2dc::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 94ce81fa..d662fed4 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -24,7 +24,7 @@ }, "time": "2024-07-20T21:45:45+00:00", "type": "library", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-4": { "GrahamCampbell\\ResultType\\": "src/" @@ -495,7 +495,7 @@ "dev-master": "1.9-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-4": { "PhpOption\\": "src/PhpOption/" @@ -858,7 +858,7 @@ "name": "symfony/polyfill" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "files": [ "bootstrap.php" @@ -941,7 +941,7 @@ "name": "symfony/polyfill" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "files": [ "bootstrap.php" @@ -1018,7 +1018,7 @@ "name": "symfony/polyfill" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "files": [ "bootstrap.php" @@ -1118,7 +1118,7 @@ "dev-master": "5.6-dev" } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-4": { "Dotenv\\": "src/" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 050bbcd2..0c36964c 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => '__root__', - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => 'ac357402cabe33ab46fd8f677e956e1d2aa8409a', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,9 +11,9 @@ ), 'versions' => array( '__root__' => array( - 'pretty_version' => 'dev-main', - 'version' => 'dev-main', - 'reference' => 'ac357402cabe33ab46fd8f677e956e1d2aa8409a', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/firebase/php-jwt b/vendor/firebase/php-jwt deleted file mode 160000 index fa8a06e9..00000000 --- a/vendor/firebase/php-jwt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fa8a06e96526eb7c0eeaa47e4f39be59d21f16e1 diff --git a/vendor/google/apiclient b/vendor/google/apiclient deleted file mode 160000 index cd4d6167..00000000 --- a/vendor/google/apiclient +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cd4d61678bc26267f3e5371735ae3f579709ea30 diff --git a/vendor/google/apiclient-services b/vendor/google/apiclient-services deleted file mode 160000 index ceb2e432..00000000 --- a/vendor/google/apiclient-services +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ceb2e432e4326c6775d24f62d554395a1a9ad3dd diff --git a/vendor/psr/cache b/vendor/psr/cache deleted file mode 160000 index d11b50ad..00000000 --- a/vendor/psr/cache +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d11b50ad223250cf17b86e38383413f5a6764bf8 diff --git a/vendor/psr/log b/vendor/psr/log deleted file mode 160000 index d49695b9..00000000 --- a/vendor/psr/log +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d49695b909c3b7628b6289db5479a1c204601f11