Merge remote-tracking branch 'ispconfig3.official/master'

Author: Marius Burkard

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
-/nbproject/private/
+/nbproject/private/
+.phplint-cache

.gitlab-ci.yml

@@ -0,0 +1,21 @@
+# Defines stages which are to be executed
+stages:
+  - syntax
+
+#
+### Stage syntax
+#
+
+syntax:lint:
+  stage: syntax
+  image: bobey/docker-gitlab-ci-runner-php7
+  allow_failure: false
+  only:
+    - schedules
+    - web
+
+  script:
+    - composer require overtrue/phplint
+    - echo "Syntax checking PHP files"
+    - echo "For more information http://www.icosaedro.it/phplint/"
+    - vendor/bin/phplint

.phplint.yml

@@ -0,0 +1,9 @@
+path: ./
+jobs: 10
+cache: .phplint-cache
+extensions:
+  - php
+  - lng
+exclude:
+  - vendor
+

README.md

@@ -1,5 +1,9 @@
 # ISPConfig - Hosting Control Panel
 
+Nightly (master): [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master)   
+Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.1/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.1)
+
+
 - Manage multiple servers from one control panel
 - Web server management (Apache2 and nginx)
 - Mail server management (with virtual mail users)

helper_scripts/ubuntu-amavisd-new-2.11.patch

@@ -0,0 +1,18 @@
+--- amavisd-new.orig	2017-11-16 11:51:19.000000000 +0100
++++ amavisd-new	2018-05-25 16:53:45.623398108 +0200
+@@ -22829,6 +22829,7 @@
+         }
+         # load policy banks from the 'client_ipaddr_policy' lookup
+         Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl;
++        $msginfo->originating(c('originating'));
+ 
+         $msginfo->client_addr($cl_ip);      # ADDR
+         $msginfo->client_port($cl_port);    # PORT
+@@ -34361,6 +34362,7 @@
+     $sig_ind++;
+   }
+   Amavis::load_policy_bank($_,$msginfo) for @bank_names;
++  $msginfo->originating(c('originating'));
+   $msginfo->dkim_signatures_valid(\@signatures_valid)  if @signatures_valid;
+ # if (ll(5) && $sig_ind > 0) {
+ #   # show which header fields are covered by which signature

helper_scripts/utils.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+#  this is a bash script library to be called by other scripts, 
+#  but not to be run directly
+
 # Copyright (c) 2009, Scott Barr <gsbarr@gmail.com>
 # All rights reserved.
 #

install/apps/xmpp_libs/auth_prosody/authenticate_isp.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+IFS=":"
+AUTH_OK=1
+AUTH_FAILED=0
+LOGFILE="/var/log/prosody/auth.log"
+USELOG=true
+
+while read ACTION USER HOST PASS ; do
+
+    [ $USELOG == true ] && { echo "Date: $(date) Action: $ACTION User: $USER Host: $HOST" >> $LOGFILE; }
+
+    case $ACTION in
+        "auth")
+            if [ `/usr/bin/php /usr/local/lib/prosody/auth/db_auth.php $USER $HOST $PASS 2>/dev/null` == 1 ] ; then
+                echo $AUTH_OK
+                [ $USELOG == true ] && { echo "AUTH OK" >> $LOGFILE; }
+            else
+                echo $AUTH_FAILED
+                [ $USELOG == true ] && { echo "AUTH FAILED" >> $LOGFILE; }
+            fi
+        ;;
+        "isuser")
+             if [ `/usr/bin/php /usr/local/lib/prosody/auth/db_isuser.php $USER $HOST 2>/dev/null` == 1 ] ; then
+                echo $AUTH_OK
+                [ $USELOG == true ] && { echo "ISUSER OK" >> $LOGFILE; }
+            else
+                echo $AUTH_FAILED
+                [ $USELOG == true ] && { echo "ISUSER FAILED" >> $LOGFILE; }
+            fi
+        ;;
+        *)
+            echo $AUTH_FAILED
+            [ $USELOG == true ] && { echo "UNKNOWN ACTION GIVEN: $ACTION" >> $LOGFILE; }
+        ;;
+    esac
+
+done