Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
b9ce1a88
Commit
b9ce1a88
authored
Mar 20, 2012
by
xaver
Browse files
PHP 5.4 fixes for Notice Errors
parent
4a32aada
Changes
4
Hide whitespace changes
Inline
Side-by-side
interface/lib/classes/listform_actions.inc.php
View file @
b9ce1a88
...
...
@@ -267,6 +267,8 @@ class listform_actions {
$limits
=
array
(
'5'
=>
'5'
,
'15'
=>
'15'
,
'25'
=>
'25'
,
'50'
=>
'50'
,
'100'
=>
'100'
,
'999999999'
=>
'all'
);
//* create options and set selected, if default -> 15 is selected
$options
=
''
;
foreach
(
$limits
as
$key
=>
$val
){
$options
.
=
'<option value="'
.
$key
.
'" '
.
(
isset
(
$_SESSION
[
'search'
][
'limit'
])
&&
$_SESSION
[
'search'
][
'limit'
]
==
$key
?
'selected="selected"'
:
''
)
.
(
!
isset
(
$_SESSION
[
'search'
][
'limit'
])
&&
$key
==
'15'
?
'selected="selected"'
:
''
)
.
'>'
.
$val
.
'</option>'
;
}
...
...
interface/web/client/client_edit.php
View file @
b9ce1a88
...
...
@@ -142,7 +142,7 @@ class page_action extends tform_actions {
$username
=
$app
->
db
->
quote
(
$this
->
dataRecord
[
"username"
]);
$password
=
$app
->
db
->
quote
(
$this
->
dataRecord
[
"password"
]);
$modules
=
$conf
[
'interface_modules_enabled'
];
if
(
$this
->
dataRecord
[
"limit_client"
]
>
0
)
$modules
.
=
',client'
;
if
(
isset
(
$this
->
dataRecord
[
"limit_client"
])
&&
$this
->
dataRecord
[
"limit_client"
]
>
0
)
$modules
.
=
',client'
;
$startmodule
=
(
stristr
(
$modules
,
'dashboard'
))
?
'dashboard'
:
'client'
;
$usertheme
=
$app
->
db
->
quote
(
$this
->
dataRecord
[
"usertheme"
]);
$type
=
'user'
;
...
...
@@ -194,9 +194,8 @@ class page_action extends tform_actions {
*/
function
onAfterUpdate
()
{
global
$app
;
// username changed
if
(
$conf
[
'demo_mode'
]
!=
true
&&
isset
(
$this
->
dataRecord
[
'username'
])
&&
$this
->
dataRecord
[
'username'
]
!=
''
&&
$this
->
oldDataRecord
[
'username'
]
!=
$this
->
dataRecord
[
'username'
])
{
if
(
isset
(
$conf
[
'demo_mode'
])
&&
$conf
[
'demo_mode'
]
!=
true
&&
isset
(
$this
->
dataRecord
[
'username'
])
&&
$this
->
dataRecord
[
'username'
]
!=
''
&&
$this
->
oldDataRecord
[
'username'
]
!=
$this
->
dataRecord
[
'username'
])
{
$username
=
$app
->
db
->
quote
(
$this
->
dataRecord
[
"username"
]);
$client_id
=
$this
->
id
;
$sql
=
"UPDATE sys_user SET username = '
$username
' WHERE client_id =
$client_id
"
;
...
...
@@ -208,7 +207,7 @@ class page_action extends tform_actions {
}
// password changed
if
(
$conf
[
'demo_mode'
]
!=
true
&&
isset
(
$this
->
dataRecord
[
"password"
])
&&
$this
->
dataRecord
[
"password"
]
!=
''
)
{
if
(
isset
(
$conf
[
'demo_mode'
])
&&
$conf
[
'demo_mode'
]
!=
true
&&
isset
(
$this
->
dataRecord
[
"password"
])
&&
$this
->
dataRecord
[
"password"
]
!=
''
)
{
$password
=
$app
->
db
->
quote
(
$this
->
dataRecord
[
"password"
]);
$salt
=
"$1$"
;
$base64_alphabet
=
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
;
...
...
@@ -223,7 +222,7 @@ class page_action extends tform_actions {
}
// language changed
if
(
$conf
[
'demo_mode'
]
!=
true
&&
isset
(
$this
->
dataRecord
[
'language'
])
&&
$this
->
dataRecord
[
'language'
]
!=
''
&&
$this
->
oldDataRecord
[
'language'
]
!=
$this
->
dataRecord
[
'language'
])
{
if
(
isset
(
$conf
[
'demo_mode'
])
&&
$conf
[
'demo_mode'
]
!=
true
&&
isset
(
$this
->
dataRecord
[
'language'
])
&&
$this
->
dataRecord
[
'language'
]
!=
''
&&
$this
->
oldDataRecord
[
'language'
]
!=
$this
->
dataRecord
[
'language'
])
{
$language
=
$app
->
db
->
quote
(
$this
->
dataRecord
[
"language"
]);
$client_id
=
$this
->
id
;
$sql
=
"UPDATE sys_user SET language = '
$language
' WHERE client_id =
$client_id
"
;
...
...
interface/web/client/form/client.tform.php
View file @
b9ce1a88
...
...
@@ -220,7 +220,7 @@ $form["tabs"]['address'] = array (
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'SELECT'
,
'default'
=>
$conf
[
"country"
],
'default'
=>
(
isset
(
$conf
[
"country"
]
)
?
$conf
[
"country"
]
:
''
)
,
'datasource'
=>
array
(
'type'
=>
'SQL'
,
'querystring'
=>
'SELECT iso,printable_name FROM country ORDER BY printable_name'
,
'keyfield'
=>
'iso'
,
...
...
interface/web/client/form/reseller.tform.php
View file @
b9ce1a88
...
...
@@ -220,7 +220,7 @@ $form["tabs"]['address'] = array (
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'SELECT'
,
'default'
=>
$conf
[
"country"
],
'default'
=>
(
isset
(
$conf
[
"country"
]
)
?
$conf
[
"country"
]
:
''
)
,
'datasource'
=>
array
(
'type'
=>
'SQL'
,
'querystring'
=>
'SELECT iso,printable_name FROM country ORDER BY printable_name'
,
'keyfield'
=>
'iso'
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment