Merge remote-tracking branch 'main/stable-3.1' into dns_import

Author: Marius Burkard

.git-scripts/syntax.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+IFS=$'\n'
+EX=0
+ERRS="" ;
+WARNS="" ;
+ERRCNT=0 ;
+WARNCNT=0 ;
+
+CMD="find . -type f \( -name \"*.php\" -o -name \"*.lng\" \) -print" ;
+
+if [[ "$1" == "commit" ]] ; then
+	CMD="git diff-tree --no-commit-id --name-only -r ${CI_COMMIT_SHA} | grep -E '\.(php|lng)$'" ;
+fi
+
+for F in $(eval "$CMD") ; do
+	if [[ ! -e "${F}" && -f "${F}" ]] ; then
+		continue ;
+	fi
+	echo -n "${F} ... " ;
+	R=$(php -d error_reporting=E_ALL -d display_errors=On -l "$F" 2>/dev/null) ;
+	RET=$? ;
+	R=$(echo "${R}" | sed "/^$/d")
+	if [ $RET -gt 0 ] ; then
+		EX=1 ;
+		echo "[ERROR]" ;
+		ERRS="${ERRS}${F}:"$'\n'"${R}"$'\n\n' ;
+		ERRCNT=$((ERRCNT + 1)) ;
+	else
+		if [[ "$R" == "Deprecated: "* ]] ; then
+			echo "[WARN]" ;
+			WARNS="${WARNS}${F}:"$'\n'"${R}"$'\n\n' ;
+			WARNCNT=$((WARNCNT + 1)) ;
+		else 
+			echo "[OK]" ;
+		fi
+	fi
+done
+
+echo ""
+echo "--------------------------";
+echo ""
+echo "${ERRCNT} Errors"
+if [ $ERRCNT -gt 0 ] ; then
+	echo "${ERRS}"
+	echo ""
+fi
+
+echo "${WARNCNT} Warnings"
+if [ $WARNCNT -gt 0 ] ; then
+	echo ""
+	echo "${WARNS}"
+	echo ""
+fi
+
+exit $EX

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 # Defines stages which are to be executed
 stages:
   - syntax
+  - syntax_diff
 
 #
 ### Stage syntax
@@ -13,10 +14,38 @@ syntax:lint:
   only:
     - schedules
     - web
+    - merge_requests
 
   script:
-    - composer require overtrue/phplint
     - echo "Syntax checking PHP files"
-    - echo "For more information http://www.icosaedro.it/phplint/"
-    - vendor/bin/phplint
+    - bash ./.git-scripts/syntax.sh
+
+
+syntax_diff:lint:
+  stage: syntax
+  image: edbizarro/gitlab-ci-pipeline-php:7.2
+  allow_failure: false
+  only:
+    - web
+    - pushes
+    - branches
+
+  script:
+    - echo "Syntax checking PHP files"
+    - bash ./.git-scripts/syntax.sh commit
+
+#syntax:lint:
+#  stage: syntax
+#  image: edbizarro/gitlab-ci-pipeline-php:7.2
+#  allow_failure: false
+#  only:
+#    - schedules
+#    - web
+#    - merge_requests
+#
+#  script:
+#    - composer require overtrue/phplint
+#    - echo "Syntax checking PHP files"
+#    - echo "For more information http://www.icosaedro.it/phplint/"
+#    - vendor/bin/phplint
 

.phplint.yml

@@ -1,5 +1,5 @@
 path: ./
-jobs: 10
+jobs: 5
 cache: .phplint-cache
 extensions:
   - php

install/sql/README.txt

@@ -9,18 +9,24 @@ then follow these steps:
 1) Add the field or table in the ispconfig3.sql file. This file contains the
    complete database dump which is used when ISPConfig gets installed.
 
-2) Create a new file in the "incremental" subfolder wich contains the alter 
-   table, or if it is a complete new table then the add table, statement(s) in 
-   MySQL syntax which is/are required to modify the current ispconfig database 
-   during update. The naming scheme of the sql patch update files is 
-   upd_0001.sql, upd_0002.sql, upd_0003.sql etc. Ensure that the number that 
-   you choose for the new file is a +1 increment of the number of the last
-   existing file and that the number is formatted with 4 digits.
+2) Edit the file "incremental/upd_dev_collection.sql" which contains the SQL
+   statements (alter table, add table, update, etc.) in MySQL syntax which
+   are required to modify the current ispconfig database during update.
+
+   The upd_dev_collection.sql file contains all db schema modifications
+   for changes made since the last ISPConfig release.  If SQL statements
+   are already present in the file when you make your additions, add yours
+   to the end of the file, and do not remove any existing statements.
+
+   When a new ISPConfig update is released, the contents of
+   upd_dev_collections.sql will move to an sql patch file, using the naming
+   scheme upd_0001.sql, upd_0002.sql, upd_0003.sql etc.
 
-   A patch file may contain one or more alter table statements. Every patch file
-   gets executed once in the database, so do not modify older (already released) 
+   A patch file may contain one or more SQL modification statements. Every patch
+   file gets executed once in the database, so do not modify older (already released)
    patch files, they will not get executed again if the update was already run 
-   once on a system.
+   once on a system, and will result in missing updates on any system where they
+   have not run yet.
 
    After a patch has been executed, the dbversion field in the server table gets
    increeased to the version number of the last installed patch.

install/sql/incremental/upd_dev_collection.sql

@@ -13,3 +13,10 @@ ALTER TABLE `web_domain` ADD  `backup_password` VARCHAR( 255 ) NOT NULL DEFAULT
 ALTER TABLE `web_backup` ADD  `backup_format` VARCHAR( 64 ) NOT NULL DEFAULT '' AFTER `backup_mode`;
 ALTER TABLE `web_backup` ADD  `backup_password` VARCHAR( 255 ) NOT NULL DEFAULT '' AFTER `filesize`;
 -- end of backup encryption
+
+-- rename Comodo to "Sectigo / Comodo CA"
+UPDATE `dns_ssl_ca` SET `ca_name` = 'Sectigo / Comodo CA' WHERE `ca_issue` = 'comodoca.com';
+
+-- default php-fpm to ondemand mode
+ALTER TABLE `web_domain` ALTER pm SET DEFAULT 'ondemand';
+

install/sql/ispconfig3.sql

@@ -2046,7 +2046,7 @@ CREATE TABLE `web_domain` (
   `nginx_directives` mediumtext,
   `php_fpm_use_socket` ENUM('n','y') NOT NULL DEFAULT 'y',
   `php_fpm_chroot` enum('n','y') NOT NULL DEFAULT 'n',
-  `pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'dynamic',
+  `pm` enum('static','dynamic','ondemand') NOT NULL DEFAULT 'ondemand',
   `pm_max_children` int(11) NOT NULL DEFAULT '10',
   `pm_start_servers` int(11) NOT NULL DEFAULT '2',
   `pm_min_spare_servers` int(11) NOT NULL DEFAULT '1',

interface/web/admin/form/remote_user.tform.php

@@ -45,7 +45,7 @@
 	}
 }
 
-$form["title"]    = "Remote user";
+$form["title"]    = "remote_user_txt";
 $form["description"]  = "";
 $form["name"]    = "remote_user";
 $form["action"]   = "remote_user_edit.php";
@@ -63,7 +63,7 @@
 $form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
 
 $form["tabs"]['remote_user'] = array (
-	'title'  => "Remote User",
+	'title'  => "remote_user_txt",
 	'width'  => 100,
 	'template'  => "templates/remote_user_edit.htm",
 	'fields'  => array (

interface/web/admin/form/server_config.tform.php

@@ -33,7 +33,7 @@
 
  */
 
-$form["title"] = "Server Config";
+$form["title"] = "server_config";
 $form["description"] = "";
 $form["name"] = "server_config";
 $form["action"] = "server_config_edit.php";
@@ -2028,4 +2028,4 @@
 	$form['tabs']['mail']['fields']['content_filter']['default'] = 'amavisd';
 	unset($form['tabs']['mail']['fields']['content_filter']['value']['rspamd']);
 	unset($form['tabs']['mail']['fields']['rspamd_password']);
-}*/
+}*/

interface/web/admin/form/users.tform.php

@@ -60,7 +60,7 @@
 
 */
 
-$form['title']   = 'Users';
+$form['title']   = 'users_txt';
 //$form['description']  = 'Form to edit systemusers.';
 $form['name']   = 'users';
 $form['action']  = 'users_edit.php';
@@ -129,7 +129,7 @@
 }
 
 $form['tabs']['users'] = array (
-	'title'  => 'Users',
+	'title'  => 'users_txt',
 	'width'  => 80,
 	'template'  => 'templates/users_user_edit.htm',
 	'fields'  => array (

interface/web/admin/lib/lang/ar_remote_user.lng

@@ -1,4 +1,5 @@
 <?php
+$wb['remote_user_txt'] = 'Remote User';
 $wb['username_txt'] = 'Username';
 $wb['password_txt'] = 'Password';
 $wb['function_txt'] = 'Functions';