xampp1/2 [skip ci]

.gitignore

@@ -26,3 +26,7 @@
 !.empty
 !.htaccess
 tasmoadmin/data/devices_all.csv
+
+/portable/xampp
+/portable/xampp.zip
+!/portable/xampp.zip.*

.travis.yml

@@ -24,22 +24,26 @@ before_script:
     - if [ ! -z "$TRAVIS_TAG" ]; then export BUILD_VERSION=$TRAVIS_TAG; else export BUILD_VERSION=$TRAVIS_BRANCH; fi
 
 script:
+
+    # Build Docker images
+    - ./.docker/docker.sh build
+    # Test Docker images
+    - ./.docker/docker.sh test
+
+
     # Pack TasmoAdmin src to tar.gz
     - tar -zcf ./_releases/tasmoadmin_${BUILD_VERSION}.tar.gz tasmoadmin
     - zip -q -r ./_releases/tasmoadmin_${BUILD_VERSION}.zip tasmoadmin
     # Pack TasmoAdmin XAMPP portable
-    - cat portable/xampp.zip.part-* > portable/xampp.zip
+    - cat portable/xampp.zip.* > portable/xampp.zip
     - unzip -q portable/xampp.zip -d ./tmp/
     - cp -R tasmoadmin ./tmp/xampp/htdocs/
+    - cp -R portable/root_xampp/* ./tmp/xampp/
     - >
         pushd tmp &&
         zip -q -r ../_releases/tasmoadmin_${BUILD_VERSION}_xampp_portable.zip xampp &&
         popd
 
-    # Build Docker images
-    - ./.docker/docker.sh build
-    # Test Docker images
-    - ./.docker/docker.sh test
 
 deploy:
     # Deploy TasmoAdmin release to github

CHANGELOG.md

@@ -4,8 +4,9 @@
 ## Upcoming
 
 ### v1.6.0-beta4   
--**FIX**: avoid sending backlog commands twice cuz backlog does not give any response. [#210](https://github.com/reloxx13/TasmoAdmin/issues/210)
--**FIX**: Unwanted underscore added [#210](https://github.com/reloxx13/TasmoAdmin/issues/210)
+- **FIX**: avoid sending backlog commands twice cuz backlog does not give any response. [#210](https://github.com/reloxx13/TasmoAdmin/issues/210)
+- **FIX**: Unwanted underscore added [#210](https://github.com/reloxx13/TasmoAdmin/issues/210)
+- **FIX**: XAMPP Pack fixed and updated to XAMPP 7.2.9.0 (PHP7) [141](https://github.com/reloxx13/TasmoAdmin/issues/141), [209](https://github.com/reloxx13/TasmoAdmin/issues/209)
 
 ### v1.6.0-beta3
 -FIX: nginx config

portable/VERSION.txt

@@ -0,0 +1,7 @@
+xampp-portable-win32-7.2.9-0-VC15
+
+2018-09-05
+
+
+MOD:
+- moved xampp website from htdocs/* to a new htdocs/xampp folder, this allows nameservers

portable/root_xampp/apache/conf/extra/httpd-default.conf

@@ -0,0 +1,90 @@
+#
+# This configuration file reflects default settings for Apache HTTP Server.
+#
+# You may change these, but chances are that you may not need to.
+#
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+#
+# UseCanonicalName: Determines how Apache constructs self-referencing 
+# URLs and the SERVER_NAME and SERVER_PORT variables.
+# When set "Off", Apache will use the Hostname and Port supplied
+# by the client.  When set "On", Apache will use the value of the
+# ServerName directive.
+#
+UseCanonicalName Off
+
+#
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride 
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# ServerTokens
+# This directive configures what you return as the Server HTTP response
+# Header. The default is 'Full' which sends information about the OS-Type
+# and compiled in modules.
+# Set to one of:  Full | OS | Minor | Minimal | Major | Prod
+# where Full conveys the most information, and Prod the least.
+#
+ServerTokens Full
+
+#
+# Optionally add a line containing the server version and virtual host
+# name to server-generated pages (internal error documents, FTP directory 
+# listings, mod_status and mod_info output etc., but not CGI generated 
+# documents or custom error documents).
+# Set to "EMail" to also include a mailto: link to the ServerAdmin.
+# Set to one of:  On | Off | EMail
+#
+ServerSignature On
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+#
+# Set a timeout for how long the client may take to send the request header
+# and body.
+# The default for the headers is header=20-40,MinRate=500, which means wait
+# for the first byte of headers for 20 seconds. If some data arrives,
+# increase the timeout corresponding to a data rate of 500 bytes/s, but not
+# above 40 seconds.
+# The default for the request body is body=20,MinRate=500, which is the same
+# but has no upper limit for the timeout.
+# To disable, set to header=0 body=0
+#
+<IfModule reqtimeout_module>
+  RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
+</IfModule>

portable/root_xampp/apache/conf/extra/httpd-vhosts.conf

@@ -0,0 +1,56 @@
+# Virtual Hosts
+#
+# Required modules: mod_log_config
+
+# If you want to maintain multiple domains/hostnames on your
+# machine you can setup VirtualHost containers for them. Most configurations
+# use only name-based virtual hosts so the server doesn't need to worry about
+# IP addresses. This is indicated by the asterisks in the directives below.
+#
+# Please see the documentation at
+# <URL:http://httpd.apache.org/docs/2.4/vhosts/>
+# for further details before you try to setup virtual hosts.
+#
+# You may use the command line option '-S' to verify your virtual host
+# configuration.
+
+#
+# Use name-based virtual hosting.
+#
+##NameVirtualHost *:80
+#
+# VirtualHost example:
+# Almost any Apache directive may go into a VirtualHost container.
+# The first VirtualHost section is used for all requests that do not
+# match a ##ServerName or ##ServerAlias in any <VirtualHost> block.
+#
+##<VirtualHost *:80>
+    ##ServerAdmin webmaster@dummy-host.example.com
+    ##DocumentRoot "/xampp/htdocs/dummy-host.example.com"
+    ##ServerName dummy-host.example.com
+    ##ServerAlias www.dummy-host.example.com
+    ##ErrorLog "logs/dummy-host.example.com-error.log"
+    ##CustomLog "logs/dummy-host.example.com-access.log" common
+##</VirtualHost>
+
+##<VirtualHost *:80>
+    ##ServerAdmin webmaster@dummy-host2.example.com
+    ##DocumentRoot "/xampp/htdocs/dummy-host2.example.com"
+    ##ServerName dummy-host2.example.com
+    ##ErrorLog "logs/dummy-host2.example.com-error.log"
+    ##CustomLog "logs/dummy-host2.example.com-access.log" common
+##</VirtualHost>
+
+##Listen 80 #this happens in httpd.conf already
+NameVirtualHost *:80
+
+<VirtualHost *:80>
+   ServerAdmin webmaster@sonweb
+   DocumentRoot "/xampp/htdocs/tasmoadmin"
+   ServerName tasmoadmin
+   ServerAlias tasmoadmin
+   ErrorLog "logs/tasmoadmin-error.log"
+   CustomLog "logs/tasmoadmin-access.log" common
+</VirtualHost>
+
+

portable/root_xampp/apache/conf/extra/httpd-xampp.conf

@@ -0,0 +1,108 @@
+#
+# XAMPP settings
+#
+
+<IfModule env_module>
+    SetEnv MIBDIRS "/xampp/php/extras/mibs"
+    SetEnv MYSQL_HOME "\\xampp\\mysql\\bin"
+    SetEnv OPENSSL_CONF "/xampp/apache/bin/openssl.cnf"
+    SetEnv PHP_PEAR_SYSCONF_DIR "\\xampp\\php"
+    SetEnv PHPRC "\\xampp\\php"
+    SetEnv TMP "\\xampp\\tmp"
+</IfModule>
+
+#
+# PHP-Module setup
+#
+LoadFile "/xampp/php/php7ts.dll"
+LoadFile "/xampp/php/libpq.dll"
+LoadModule php7_module "/xampp/php/php7apache2_4.dll"
+
+<FilesMatch "\.php$">
+    SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch "\.phps$">
+    SetHandler application/x-httpd-php-source
+</FilesMatch>
+
+#
+# PHP-CGI setup
+#
+#<FilesMatch "\.php$">
+#    SetHandler application/x-httpd-php-cgi
+#</FilesMatch>
+#<IfModule actions_module>
+#    Action application/x-httpd-php-cgi "/php-cgi/php-cgi.exe"
+#</IfModule>
+
+
+<IfModule php7_module>
+    PHPINIDir "/xampp/php"
+</IfModule>
+
+<IfModule mime_module>
+    AddType text/html .php .phps
+</IfModule>
+
+ScriptAlias /php-cgi/ "/xampp/php/"
+<Directory "/xampp/php">
+    AllowOverride None
+    Options None
+    Require all denied
+    <Files "php-cgi.exe">
+          Require all granted
+    </Files>
+</Directory>
+
+<Directory "/xampp/cgi-bin">
+    <FilesMatch "\.php$">
+        SetHandler cgi-script
+    </FilesMatch>
+    <FilesMatch "\.phps$">
+        SetHandler None
+    </FilesMatch>
+</Directory>
+
+<Directory "/xampp/htdocs/xampp/xampp">
+    <IfModule php7_module>
+    	<Files "status.php">
+    		php_admin_flag safe_mode off
+    	</Files>
+    </IfModule>
+    AllowOverride AuthConfig
+</Directory>
+
+<IfModule alias_module>
+    Alias /licenses "/xampp/licenses/"
+    <Directory "/xampp/licenses">
+        Options +Indexes
+        <IfModule autoindex_color_module>
+            DirectoryIndexTextColor  "#000000"
+            DirectoryIndexBGColor "#f8e8a0"
+            DirectoryIndexLinkColor "#bb3902"
+            DirectoryIndexVLinkColor "#bb3902"
+            DirectoryIndexALinkColor "#bb3902"
+        </IfModule>
+        Require local
+        ErrorDocument 403 /error/XAMPP_FORBIDDEN.html.var
+   </Directory>
+
+    Alias /phpmyadmin "/xampp/phpMyAdmin/"
+    <Directory "/xampp/phpMyAdmin">
+        AllowOverride AuthConfig
+        Require local
+        ErrorDocument 403 /error/XAMPP_FORBIDDEN.html.var
+    </Directory>
+
+    Alias /webalizer "/xampp/webalizer/"
+    <Directory "/xampp/webalizer">
+        <IfModule php7_module>
+    		<Files "webalizer.php">
+    			php_admin_flag safe_mode off
+    		</Files>
+        </IfModule>
+        AllowOverride AuthConfig
+        Require local
+        ErrorDocument 403 /error/XAMPP_FORBIDDEN.html.var
+    </Directory>
+</IfModule>