Skip to content

Commit 4513bc0

Browse files
helmohelmo
committed
Merge remote-tracking branch 'origin/develop' into patch-client-info-tab
2 parents bd9153a + f0ace5f commit 4513bc0

File tree

3,571 files changed

+47224
-22849
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,571 files changed

+47224
-22849
lines changed

‎.git-scripts/syntax.sh‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#!/bin/bash
2+
3+
IFS=$'\n'
4+
EX=0
5+
ERRS="" ;
6+
WARNS="" ;
7+
ERRCNT=0 ;
8+
WARNCNT=0 ;
9+
10+
OUTCNT=0 ;
11+
FILECNT=0 ;
12+
DONECNT=0 ;
13+
14+
CMD="find . -type f \( -name \"*.php\" -o -name \"*.lng\" \) -print" ;
15+
16+
if [[ "$1" == "commit" ]] ; then
17+
CMD="git diff-tree --no-commit-id --name-only -r ${CI_COMMIT_SHA} | grep -E '\.(php|lng)$'" ;
18+
fi
19+
20+
FILECNT=$(eval "${CMD} | wc -l") ;
21+
22+
for F in $(eval "$CMD") ; do
23+
if [[ ! -e "${F}" || ! -f "${F}" ]] ; then
24+
continue ;
25+
fi
26+
R=$(php -d error_reporting=E_ALL -d display_errors=On -l "$F" 2>/dev/null) ;
27+
RET=$? ;
28+
R=$(echo "${R}" | sed "/^$/d")
29+
if [ $RET -gt 0 ] ; then
30+
EX=1 ;
31+
echo -n "E" ;
32+
ERRS="${ERRS}${F}:"$'\n'"${R}"$'\n\n' ;
33+
ERRCNT=$((ERRCNT + 1)) ;
34+
else
35+
if [[ "$R" == "Deprecated: "* ]] ; then
36+
echo -n "W" ;
37+
WARNS="${WARNS}${F}:"$'\n'"${R}"$'\n\n' ;
38+
WARNCNT=$((WARNCNT + 1)) ;
39+
else
40+
echo -n "." ;
41+
fi
42+
fi
43+
OUTCNT=$((OUTCNT + 1)) ;
44+
DONECNT=$((DONECNT + 1)) ;
45+
if [ $OUTCNT -ge 40 ] ; then
46+
OUTCNT=0 ;
47+
echo "[${DONECNT}/${FILECNT}]" ;
48+
fi
49+
done
50+
51+
echo ""
52+
echo "--------------------------";
53+
echo "${DONECNT} Files done"
54+
echo "${ERRCNT} Errors"
55+
if [ $ERRCNT -gt 0 ] ; then
56+
echo "${ERRS}"
57+
echo ""
58+
fi
59+
60+
echo "${WARNCNT} Warnings"
61+
if [ $WARNCNT -gt 0 ] ; then
62+
echo ""
63+
echo "${WARNS}"
64+
echo ""
65+
fi
66+
67+
exit $EX

‎.gitignore‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1-
.DS_Store
1+
.idea
22
/nbproject/private/
33
.phplint-cache
4+
*.swp
5+
6+
# macOS-specific things to exclude
7+
8+
# General
9+
.DS_Store
10+
.AppleDouble
11+
.LSOverride
12+
13+
# Icon must end with two \r
14+
Icon
15+
16+
17+
Icon?
18+
19+
# Thumbnails
20+
._*
21+
22+
# Files that might appear in the root of a volume
23+
.DocumentRevisions-V100
24+
.fseventsd
25+
.Spotlight-V100
26+
.TemporaryItems
27+
.Trashes
28+
.VolumeIcon.icns
29+
.com.apple.timemachine.donotpresent
30+
31+
# Directories potentially created on remote AFP share
32+
.AppleDB
33+
.AppleDesktop
34+
Network Trash Folder
35+
Temporary Items
36+
.apdisk
37+
38+
# Configuration for the Nova editor
39+
.nova

‎.gitlab-ci.yml‎

Lines changed: 86 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,104 @@
11
# Defines stages which are to be executed
22
stages:
33
- syntax
4+
- syntax_diff
5+
- test
6+
- build
47

58
#
69
### Stage syntax
710
#
811

912
syntax:lint:
1013
stage: syntax
11-
image: bobey/docker-gitlab-ci-runner-php7
14+
image: edbizarro/gitlab-ci-pipeline-php:7.2
1215
allow_failure: false
1316
only:
1417
- schedules
1518
- web
19+
- merge_requests
20+
- /^\d+\.\d+\.\d+(p\d+)?$/
1621

1722
script:
18-
- composer require overtrue/phplint
1923
- echo "Syntax checking PHP files"
20-
- echo "For more information http://www.icosaedro.it/phplint/"
21-
- vendor/bin/phplint
24+
- bash ./.git-scripts/syntax.sh
2225

26+
27+
syntax_diff:lint:
28+
stage: syntax
29+
image: edbizarro/gitlab-ci-pipeline-php:7.2
30+
allow_failure: false
31+
only:
32+
- web
33+
- pushes
34+
- branches
35+
36+
except:
37+
- schedules
38+
- web
39+
- merge_requests
40+
- /^\d+\.\d+\.\d+(p\d+)?$/
41+
42+
script:
43+
- echo "Syntax checking PHP files"
44+
- bash ./.git-scripts/syntax.sh commit
45+
46+
#syntax:lint:
47+
# stage: syntax
48+
# image: edbizarro/gitlab-ci-pipeline-php:7.2
49+
# allow_failure: false
50+
# only:
51+
# - schedules
52+
# - web
53+
# - merge_requests
54+
#
55+
# script:
56+
# - composer require overtrue/phplint
57+
# - echo "Syntax checking PHP files"
58+
# - echo "For more information http://www.icosaedro.it/phplint/"
59+
# - vendor/bin/phplint
60+
61+
62+
#test:install:
63+
# stage: test
64+
# image: jerob/docker-ispconfig
65+
# only:
66+
# - schedules
67+
# - web
68+
# - /^\d+\.\d+\.\d+$/
69+
#
70+
# script:
71+
# - $CI_PROJECT_DIR/helper_scripts/test_install_docker.sh
72+
# - apt-get update
73+
# - apt-get --yes install curl
74+
# - curl --insecure https://127.0.0.1:8080/login/
75+
# - ps xaf
76+
#
77+
# needs: ["syntax:lint"]
78+
79+
build:package:
80+
stage: build
81+
image: edbizarro/gitlab-ci-pipeline-php:7.2
82+
only:
83+
refs:
84+
- /^\d+\.\d+\.\d+(p\d+)?$/
85+
- web
86+
87+
script:
88+
- echo "Building release."
89+
- if [[ "$VER" == "" ]] ; then VER="$CI_COMMIT_TAG" ; fi
90+
- if [[ "$VER" == "" ]] ; then VER="3.2dev"$(date +%s) ; fi
91+
- if [[ "$VER" != "" ]] ; then echo "Replacing 3.2dev by $VER" ; sed -i -r 's/3\.2dev/'${VER}'/g' install/tpl/config.inc.php.master install/sql/ispconfig3.sql ; fi
92+
- RET=0
93+
- tar -cpzf ISPConfig-${VER}.tar.gz --exclude "ISPConfig-${VER}.tar.gz" --exclude ".git*" --exclude ".phplint.yml" --transform 's,^\./,ispconfig3_install/,' --mode='0775' ./* || RET=$?
94+
- if [[ $RET > 1 ]] ; then exit $RET ; fi
95+
- echo "Listing tar contents for verification"
96+
- tar -tvf ISPConfig-${VER}.tar.gz
97+
- echo "Uploading file to download server"
98+
- curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/
99+
- if [[ "$VER" =~ ^[0-9]+\.[0-9]+\.[0-9]+(p[0-9]+)?$ ]] ; then echo "Stable release ${VER}" ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ISPConfig-${VER}.tar.gz ftp://${DEPLOY_FTP_SERVER}/web/ISPConfig-3-stable.tar.gz ; echo -n "${VER}" > ispconfig3_version.txt ; curl -u "${DEPLOY_FTP_USER}:${DEPLOY_FTP_PASSWORD}" -T ispconfig3_version.txt ftp://${DEPLOY_FTP_SERVER}/web/ ; else echo "Dev release ${VER}" ; fi
100+
- rm ISPConfig-${VER}.tar.gz
101+
- echo "Download url is https://download.ispconfig.org/ISPConfig-${VER}.tar.gz"
102+
103+
needs: ["syntax:lint"]
104+
allow_failure: false

‎.gitlab/issue_templates/Bug.md‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,45 @@
1-
## short description
2-
What is happening and what is wrong with that?
1+
<!-- Before creating a bug report, please:
2+
- Read the contribution guidelines: https://git.ispconfig.org/ispconfig/ispconfig3/-/blob/develop/CONTRIBUTING.md
3+
- Do not ask support questions here. If you are unsure if your problem is a bug, post a thread on the forum: https://www.howtoforge.com/community/#ispconfig-3.23
4+
- Make sure to remove any content from the description that you did not add. For example, if there are no related log entries, remove the whole "Related log entries" part.
5+
-->
36

4-
## correct behaviour
5-
What should happen instead?
7+
## Summary
8+
<!-- What is happening and what is wrong with that? -->
69

7-
## environment
8-
Server OS: (debian/ubuntu/centos/...)
9-
Server OS version: (wheezy/trusty/centos6/...)
10-
ISPConfig version: (3.0.5.4/3.1.5/3.1dev/...)
11-
_you can use `grep 'ISPC_APP_VERSION' /usr/local/ispconfig/server/lib/config.inc.php` to get it from the command line_
10+
## Steps to reproduce
11+
1. [First step]
12+
2. [Second step]
13+
3. [and so on...]
1214

13-
If it might be related to the problem
14-
```
15-
insert the output of `nginx -v` or `apachectl -v` here
16-
```
15+
## Correct behaviour
16+
<!-- What should happen instead? -->
17+
18+
## Environment
19+
Server OS + version: (Debian 10/Ubuntu 20.04/CentOS 8/...) \
20+
ISPConfig version: (3.1.15p3/3.2.3/3.2dev/...)
21+
<!-- _you can use `grep 'ISPC_APP_VERSION' /usr/local/ispconfig/server/lib/config.inc.php` to get it from the command line_ -->
22+
Software version of the related software:
23+
<!-- You can use 'nginx -v' or 'apachectl -v' to find the webserver version. Use 'php -v' to find the PHP version.> Put this in code blocks, like so: -->
1724
```
18-
insert the output of `php -v` here
25+
Output of the command
1926
```
2027

21-
## proposed fix
28+
## Proposed fix
2229
optional, of course.
23-
if you want to post code snippets, please use
30+
if you want to post code snippets, please use
2431
```
2532
your code
2633
```
27-
or attach a code file. Best is to create a merge request of course.
34+
or attach a code file. Best is to create a merge request of course.
2835

29-
## references
30-
if you know of related bugs or feature requests, please reference them by using `#<bugnumber>`, e. g. #123
31-
if you have done a merge request already, please reference it by using `!<mergenumber>`, e. g. !12
36+
## References
37+
if you know of related bugs or feature requests, please reference them by using `#<issuenumber>`, e. g. #6105
38+
if you have done a merge request already, please reference it by using `!<mergenumber>`, e. g. !1444
3239
if you know of a forum post on howtoforge.com that deals with this topic, just add the link to the forum topic here
3340

34-
## screenshots
41+
## Screenshots
3542
optional, of course.
3643
Add screenshots of the problem by clicking "Attach a file" on the bottom right.
3744

38-
## log entries
39-
```
40-
apache / nginx error.log lines (if related)
41-
```
45+
## Related log entries

‎.phplint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
path: ./
2-
jobs: 10
2+
jobs: 5
33
cache: .phplint-cache
44
extensions:
55
- php

0 commit comments

Comments
 (0)