Merge branch 'e107inc:master' into rica-carv-news_user-update

.github/workflows/test-acceptance.yml

@@ -1,7 +1,9 @@
 name: Acceptance Tests
+
 on:
   push:
   pull_request:
+
 jobs:
   test-acceptance:
     strategy:
@@ -11,30 +13,27 @@ jobs:
           - image: docker.io/jrei/systemd-ubuntu:20.04
           - image: docker.io/jrei/systemd-ubuntu:22.04
     runs-on: ubuntu-latest
+
     steps:
-      - name: Replace Docker with Podman Rootless
-        run: |
-          sudo apt-get -o Dpkg::Options::="--force-overwrite" install -y podman
-          echo -e "export XDG_RUNTIME_DIR=/tmp/${RUNNER_TEMP}" >> $GITHUB_ENV
-          echo -e "export XDG_DATA_HOME=/tmp/${RUNNER_TEMP}" >> $GITHUB_ENV
-          echo -e "export CONTAINERS_STORAGE_CONF=/tmp/${RUNNER_TEMP}/storage.conf" >> $GITHUB_ENV
+      - name: Replace Docker with Podman
+        run: sudo apt-get -o Dpkg::Options::="--force-overwrite" install -y podman-docker
+
       - uses: actions/setup-go@v3
         with:
           go-version: "^1.19"
+
       - uses: actions/checkout@v3
+
       - name: Compile SaltStack bootstrap wrapper
         run: CGO_ENABLED=0 go build -ldflags "-s -w" -o ./salt-bootstrap salt-bootstrap.go
         working-directory: ./e107_tests/lib/ci/salt/
+
       - name: Launch test container
-        run: |
-          docker run -d --rm --name target -v .:/app/ ${{ matrix.operating_system.image }} tail -f /dev/null
-          sleep 5
-          if ! docker ps | grep -q target; then
-            docker logs target
-            exit 1
-          fi
+        run: docker run -d -it --rm --name target -v .:/app/ ${{ matrix.operating_system.image }}
+
       - name: Install SaltStack
         run: docker exec target /app/e107_tests/lib/ci/salt/salt-bootstrap onedir
+
       - name: Apply Salt state
         run: |
           ln -v -s master minion
@@ -48,14 +47,18 @@ jobs:
             salt-call -c ./ --id=e107-dev --local state.apply e107-dev
           "
         working-directory: ./e107_tests/lib/ci/salt/
+
       - name: Install test dependencies
         run: |
           docker exec -w /app/e107_tests/ -e COMPOSER_ALLOW_SUPERUSER=1 target \
           composer update --prefer-dist --no-progress
+
       - name: Download Git submodule dependencies
         run: git submodule update --init --recursive --remote
+
       - name: Install the CI test configuration file
         run: |
           ln -v -s -f ./lib/ci/config.acceptance.ci.yml ./e107_tests/config.yml
+
       - name: Run acceptance tests
         run: docker exec -w /app/e107_tests/ target php ./vendor/bin/codecept run acceptance --steps

.github/workflows/test-unit.yml

@@ -163,8 +163,17 @@ jobs:
           --input ./e107_tests/tests/_output/coverage/codeclimate.json
       continue-on-error: true
 
+    - name: Set artifact name
+      id: set_artifact_name
+      run: |
+        TIMESTAMP=$(date +%Y%m%d%H%M%S)
+        INTERPRETER_IMAGE=$(echo "${{ matrix.interpreter.image }}" | sed 's/[:/]/_/g')
+        DB_IMAGE=$(echo "${{ matrix.db.image }}" | sed 's/[:/]/_/g')
+        ARTIFACT_NAME="tests_output_${{ github.run_id }}_${INTERPRETER_IMAGE}_${DB_IMAGE}_${TIMESTAMP}"
+        echo "ARTIFACT_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
+
     - name: Upload test output
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
-        name: tests_output
+        name: ${{ env.ARTIFACT_NAME }}
         path: ./e107_tests/tests/_output/

README.md

@@ -1,6 +1,6 @@
 [![e107 Content Management System](https://e107.org/e107_images/logoHD.png)](https://e107.org)
 =================
-[![Supported PHP Versions](https://img.shields.io/badge/PHP-7.4,%208.0,%208.1,%208.2-blue)](https://github.com/e107inc/e107/)
+[![Supported PHP Versions](https://img.shields.io/badge/PHP-7.4,%208.0,%208.1,%208.2,%208.3-blue)](https://github.com/e107inc/e107/)
 [![GitHub release](https://img.shields.io/github/v/release/e107inc/e107?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfjDBwRCAhY3Q3XAAAAGXRFWHRDb21tZW50AENyZWF0ZWQgd2l0aCBHSU1QV4EOFwAAA8hJREFUWMOtlltMVFcUhhcDGC+YalXSpI1Kqtg0jMVLTS9p0tcahkTb+GRi65MvfRWN+tL60kuqsU+mxtLYpIQOIBYhNJZYQY2RFrVoNWICioYWOpFhBqQw8/kwnH32Ppe5Mftp5uy1/3+t/19n7SOS5eIFDtNHhAh3OUaFFHaxkX709Q/bCwlfxRDONcXOwmXvhgeYZEch4IM+8ADP5l0FVTwyIPvoIVmwKlziHKJEhI+IG17sKJQ4dWqn1kGxM7/sH3rDi4gQYnJeQhFk0B9+ropY3lVQlS57H6Gyr8JlbZ1vZCgPu/2tzaKKzEIRdIhzIGNCtTnY7cp+f1aShhLxrN7u7Kz1rmI4s92ZreV9vqaDVo6w0V3F9Xgsnd2ugewQh5do0XanOU6JGTESOh8b87M7k7WUc801Sc9QbEb11jZORbyEcmXvEIe1XPcc1s2UmZGXa8PxUd3u7SJCGX+mhV/HPbV3m085wBP1v91N0RT/V79YVwufZIC/q/Z6KBcRoVq7IzpYYp64GDIovhQaNfjPHfCvavDdrPTsuPMsNU9d2hWeVh11Q7isQqO8nCb7FcZepfaV0e6s4vf+H629/4QuzZQtBvzfXtmr/QqDQvPi5tKuR03WzrBwQpPoakplR/Ye8CIi3Wu4rQk1R0HgwpkGG/FX4W3D5KuUu+BfVFm/wYfs4k2KUv9b12pVdLBEJFn6W/1POt5uEeG4QXGRzdxxZ882OpkGIMEl3k09barQqmhjVeP37TpWE6UiQjGn1KNZOrnvtpYaJow0YtR4VNGZaBu2Y1pYbJUe4DuAqUTvOS28W4Of9Piu86LoSDYr+IV6TxRxkjB1mjg9Spwadb2P8RVfMKKq2K0o7HOdyYP0adkbjXnTM3tr1j9OtTEbVAPP8rGi+EudbWU5pd4XzojL2pAGX6294RZFUqPo9xsfzrH9iwZviTPMZscQsShmLIoLq+kBznqIox3cwj7127b2CZtckTZFwqIYWMRe52RKc5Wr7B8S9Iyw3+QEe3L9dNym+n6IrSzwiapUbTHNe7kRtCn4Kk7Sa80oLaLk5waaWc+NuchjuRFsZRAYIhj/FoArJgWB0R/CAA1UcgtoYVmuIlXTxWvs08agfeGUUG91NEd5hW/Sdk4akhVE3cOcAPXa01nWSL6LMk4b8+cPPuAdwsazc/Y4z4eiSJu0XsscaXlRzE1aH/jFMv/lS3F23tnbQj07NU6UKBEiTDDOU6ZaWCSFWwT+PzoQf8Ad7jHA4Ez0dEHhU2vm9dhBGmgc+4y3sj/1HPOcQpNXqqPqAAAAAElFTkSuQmCC)](https://github.com/e107inc/e107/releases)
 [![GitHub Workflow "Unit Tests" Status](https://img.shields.io/github/actions/workflow/status/e107inc/e107/test-unit.yml?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAOCAQAAABnEe8CAAAAAnNCSVQICFXsRgQAAAAJcEhZcwAAA3cAAAN3Aa+SYCgAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAABG0lEQVQoFW3By0pUARgA4H8O05AQZWjkImjprr0LL7guJ3VcidAmkFZBi0AHDyNCtu4FeoF6hbQLw5CiKIX2BLWa0+jshj6P13Tq++KUfjWbDrTtWnUvrnAzjpmU2Vc14aGXdhwaizP6VNyKCFM6qirWNR2qe2ROT+Qk5qWKEeGO36peaxiWKBnx3u3IGVL3NE5Ztqei4breuOCut34ajnO2LfpoJMIDqWKEoucy2+7HX1rKMknkvPHZjF28cyMu01KWSSKn1y/8UVOIq2ypWjcaJzzRNhP/UrNn2lc9kVMwqKQU3fTLLHnlu3GJgiGfPFOIbh7rSE1b09T0xawXPrgW3ZQ1/ZAqm7Dgm5bZ+B99UhtaDmxZMRBdjgBnPOGTaoNcdgAAAABJRU5ErkJggg==)](https://github.com/e107inc/e107/actions)
 [![Code coverage](https://img.shields.io/codeclimate/coverage/e107inc/e107?logo=code-climate)](https://codeclimate.com/github/e107inc/e107/test_coverage)
@@ -122,7 +122,6 @@ Having trouble getting e107 up and running? Something not working the way you th
 
 ## License
 
-e107 is released under the terms and conditions of the GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-This changed. 
+e107 is released under the terms and conditions of the GNU [General Public License](http://www.gnu.org/licenses/gpl.txt)
 
   [1]: https://e107.org

class2.php

@@ -470,54 +470,24 @@
 	}
     elseif(deftrue('e_DOMAIN'))
 	{
-		// Find domain and port from user and from pref
-		list($urlbase,$urlport) = explode(':',$_SERVER['HTTP_HOST'].':');
-		if(!$urlport)
-		{
-			$urlport = (int) $_SERVER['SERVER_PORT'];
-		}
-		if(!$urlport)
-		{
-			$urlport = 80;
-		}
-		$aPrefURL = explode('/',$pref['siteurl'],4);
-		if (count($aPrefURL) > 2) // we can do this -- there's at least http[s]://dom.ain/whatever
-		{
-			$PrefRoot = $aPrefURL[2];
-			list($PrefSiteBase,$PrefSitePort) = explode(':',$PrefRoot.':');
-			if (!$PrefSitePort)
-			{
-				$PrefSitePort = ( $aPrefURL[0] === 'https:' ) ? 443 : 80;	// no port so set port based on 'scheme'
-			}
+		$location = e107::getRedirect()->host($_SERVER, $pref['siteurl'], ADMINDIR);
 
-			// Redirect only if
-			// -- ports do not match (http <==> https)
-			// -- base domain does not match (case-insensitive)
-			// -- NOT admin area
-			if (($urlport !== $PrefSitePort || stripos($PrefSiteBase, $urlbase) === false) && strpos(e_REQUEST_SELF, ADMINDIR) === false)
-			{
-				$aeSELF = explode('/', e_REQUEST_SELF, 4);
-				$aeSELF[0] = $aPrefURL[0];	// Swap in correct type of query (http, https)
-				$aeSELF[1] = '';						// Defensive code: ensure http:// not http:/<garbage>/
-				$aeSELF[2] = $aPrefURL[2];  // Swap in correct domain and possibly port
-				$location = implode('/',$aeSELF).($_SERVER['QUERY_STRING'] ? '?'.$_SERVER['QUERY_STRING'] : '');
-				$location = filter_var($location, FILTER_SANITIZE_URL);
-			//
-		//	header("Location: {$location}", true, 301); // send 301 header, not 302
+		if($location)
+		{
 			if(defined('e_DEBUG') && e_DEBUG === true)
 			{
-				echo "DEBUG INFO: site-redirect preference enabled.<br />Redirecting to: <a hre='".$location."'>".$location. '</a>';
-                echo '<br />e_DOMAIN: ' .e_DOMAIN;
-				echo '<br />e_SUBDOMAIN: ' .e_SUBDOMAIN;
+				echo "DEBUG INFO: site-redirect preference enabled.<br />Redirecting to: <a href='" . $location . "'>" . $location . "</a>";
+				echo '<br />e_DOMAIN: ' . e_DOMAIN;
+				echo '<br />e_SUBDOMAIN: ' . e_SUBDOMAIN;
 			}
 			else
 			{
-				e107::getRedirect()->go($location,true,301);
+				e107::getRedirect()->go($location, true, 301); // Issue 301 redirect
 			}
 
-				exit();
-			}
+			exit();
 		}
+
 	}
 }