Skip to content

Commit 14c2067

Browse files
committed
Fixes #4390: Code validation changes added
1 parent 579de6e commit 14c2067

File tree

9 files changed

+627
-406
lines changed

9 files changed

+627
-406
lines changed

.codeclimate.yml

+118-14
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,134 @@
1-
---
2-
engines:
1+
version: "2"
2+
checks:
3+
argument-count:
4+
enabled: true
5+
config:
6+
threshold: 10
7+
complex-logic:
8+
enabled: false
9+
file-lines:
10+
config:
11+
threshold: 10000
12+
similar-code:
13+
enabled: false
14+
identical-code:
15+
enabled: false
16+
method-complexity:
17+
enabled: true
18+
config:
19+
threshold: 10000
20+
method-count:
21+
enabled: true
22+
config:
23+
threshold: 1000
24+
method-lines:
25+
config:
26+
threshold: 10000
27+
nested-control-flow:
28+
enabled: true
29+
config:
30+
threshold: 10000
31+
return-statements:
32+
enabled: true
33+
config:
34+
threshold: 100
35+
plugins:
336
csslint:
437
enabled: true
38+
checks:
39+
adjoining-classes:
40+
enabled: false
41+
box-model:
42+
enabled: false
43+
box-sizing:
44+
enabled: false
45+
compatible-vendor-prefixes:
46+
enabled: false
47+
display-property-grouping:
48+
enabled: false
49+
duplicate-background-images:
50+
enabled: false
51+
duplicate-properties:
52+
enabled: false
53+
empty-rules:
54+
enabled: false
55+
fallback-colors:
56+
enabled: false
57+
gradients:
58+
enabled: false
59+
known-properties:
60+
enabled: false
61+
important:
62+
enabled: false
63+
order-alphabetical:
64+
enabled: false
65+
outline-none:
66+
enabled: false
67+
overqualified-elements:
68+
enabled: false
69+
qualified-headings:
70+
enabled: false
71+
universal-selector:
72+
enabled: false
73+
unqualified-attributes:
74+
enabled: false
75+
regex-selectors:
76+
enabled: false
77+
star-property-hack:
78+
enabled: false
79+
text-indent:
80+
enabled: false
81+
underscore-property-hack:
82+
enabled: false
83+
zero-units:
84+
enabled: false
585
eslint:
686
enabled: true
787
fixme:
888
enabled: true
89+
checks:
90+
TODO:
91+
enabled: false
92+
XXX:
93+
enabled: false
994
phpmd:
10-
enabled: true
95+
enabled: false
1196
checks:
97+
CleanCode/BooleanArgumentFlag:
98+
enabled: false
99+
CleanCode/ElseExpression:
100+
enabled: false
101+
CleanCode/IfStatementAssignment:
102+
enabled: false
103+
CleanCode/MissingImport:
104+
enabled: false
105+
CleanCode/StaticAccess:
106+
enabled: false
107+
Controversial/CamelCaseMethodName:
108+
enabled: false
12109
Controversial/CamelCaseParameterName:
13110
enabled: false
111+
Controversial/CamelCasePropertyName:
112+
enabled: false
113+
Controversial/CamelCaseVariableName:
114+
enabled: false
115+
Controversial/Superglobals:
116+
enabled: false
117+
CyclomaticComplexity:
118+
enabled: false
119+
Design/LongMethod:
120+
enabled: false
121+
Design/NpathComplexity:
122+
enabled: false
14123
Naming/LongVariable:
15124
enabled: false
16125
Naming/ShortVariable:
17126
enabled: false
18127
order-alphabetical:
19128
enabled: false
20-
ratings:
21-
paths:
22-
- "**.css"
23-
- "**.js"
24-
- "**.php"
25-
exclude_paths:
26-
- api_explorer/*
27-
- build/*
28-
- client/css/converse.css
29-
- client/js/libs/*
30-
- server/php/libs/vendors/**/*
129+
exclude_patterns:
130+
- "api_explorer/*"
131+
- "build/*"
132+
- "client/css/converse.css"
133+
- "client/js/libs/*"
134+
- "server/php/libs/vendors/**/*"

client/css/bootstrap-datetimepicker.min.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
.datetimepicker table tr td.today:hover,
187187
.datetimepicker table tr td.today.disabled,
188188
.datetimepicker table tr td.today.disabled:hover {
189-
background-color: ##f47564;
189+
background-color: #f47564;
190190
/*background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
191191
background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
192192
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));

diagnose.php

+11-8
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,20 @@
9696
}
9797
}
9898
function _is_writable_recursive($dir) {
99-
if (!($folder = @opendir($dir))) {
100-
return false;
101-
}
102-
while ($file = readdir($folder)) {
103-
if ($file != '.' && $file != '..' && (!is_writable($dir . '/' . $file) || (is_dir($dir . '/' . $file) && !_is_writable_recursive($dir . '/' . $file)))) {
104-
closedir($folder);
99+
if (is_dir($dir)){
100+
$folder = opendir($dir);
101+
if (!($folder)) {
105102
return false;
106103
}
104+
while (($file = readdir($folder)) !== false) {
105+
if ($file != '.' && $file != '..' && (!is_writable($dir . '/' . $file) || (is_dir($dir . '/' . $file) && !_is_writable_recursive($dir . '/' . $file)))) {
106+
closedir($folder);
107+
return false;
108+
}
109+
}
110+
closedir($folder);
111+
return true;
107112
}
108-
closedir($folder);
109-
return true;
110113
}
111114
if (file_exists(APP_PATH . '/client/apps/r_ldap_login/app.json')) {
112115
$is_having_ldap_plugin = true;

0 commit comments

Comments
 (0)