Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
timesheet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
web2project
timesheet
Commits
585f1ef1
Commit
585f1ef1
authored
Dec 09, 2007
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix reading in options file.
parent
7df9728f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
config.php
config.php
+1
-1
configure.php
configure.php
+3
-5
No files found.
config.php
View file @
585f1ef1
<?php
//Do not edit this file by hand, it will be overwritten by the configuration utility.
<?php
//Do not edit this file by hand, it will be overwritten by the configuration utility.
$TIMESHEET_CONFIG
[
'
items_per_page'
]
=
'4
'
;
$TIMESHEET_CONFIG
[
'
approval_by'
]
=
'2
'
;
?>
?>
configure.php
View file @
585f1ef1
...
@@ -63,7 +63,7 @@ while ( $row = $q->fetchRow()) {
...
@@ -63,7 +63,7 @@ while ( $row = $q->fetchRow()) {
*/
*/
$config_options
=
array
(
$config_options
=
array
(
"heading1"
=>
$AppUI
->
_
(
'Timesheet rights'
),
"heading1"
=>
$AppUI
->
_
(
'Timesheet rights'
),
"
items_per_page
"
=>
array
(
"
approval_by
"
=>
array
(
"description"
=>
$AppUI
->
_
(
'Approval by'
),
"description"
=>
$AppUI
->
_
(
'Approval by'
),
"value"
=>
''
,
"value"
=>
''
,
'type'
=>
'select'
,
'type'
=>
'select'
,
...
@@ -74,7 +74,6 @@ $config_options = array(
...
@@ -74,7 +74,6 @@ $config_options = array(
//if this is a submitted page, overwrite the config file.
//if this is a submitted page, overwrite the config file.
if
(
dPgetParam
(
$_POST
,
"Save"
,
''
)
!=
''
)
if
(
dPgetParam
(
$_POST
,
"Save"
,
''
)
!=
''
)
{
{
if
(
is_writable
(
$CONFIG_FILE
))
{
if
(
is_writable
(
$CONFIG_FILE
))
{
if
(
!
$handle
=
fopen
(
$CONFIG_FILE
,
'w'
))
{
if
(
!
$handle
=
fopen
(
$CONFIG_FILE
,
'w'
))
{
$AppUI
->
setMsg
(
$CONFIG_FILE
.
" "
.
$AppUI
->
_
(
'cannot be opened'
),
UI_MSG_ERROR
);
$AppUI
->
setMsg
(
$CONFIG_FILE
.
" "
.
$AppUI
->
_
(
'cannot be opened'
),
UI_MSG_ERROR
);
...
@@ -120,14 +119,13 @@ if(dPgetParam( $_POST, "Save", '' )!='')
...
@@ -120,14 +119,13 @@ if(dPgetParam( $_POST, "Save", '' )!='')
$AppUI
->
redirect
(
"m=system&a=viewmods"
);
$AppUI
->
redirect
(
"m=system&a=viewmods"
);
}
}
//$
HELPDESK
_CONFIG = array();
//$
TIMESHEET
_CONFIG = array();
require_once
(
$CONFIG_FILE
);
require_once
(
$CONFIG_FILE
);
//Read the current config values from the config file and update the array.
//Read the current config values from the config file and update the array.
foreach
(
$config_options
as
$key
=>
$value
){
foreach
(
$config_options
as
$key
=>
$value
){
if
(
isset
(
$TIMESHEET_CONFIG
[
$key
])){
if
(
isset
(
$TIMESHEET_CONFIG
[
$key
])){
$config_options
[
$key
][
'value'
]
=
$TIMESHEET_CONFIG
[
$key
];
$config_options
[
$key
][
'value'
]
=
$HELPDESK_CONFIG
[
$key
];
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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