Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
5ff1ed65
Commit
5ff1ed65
authored
11 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
install: Fix incomplete settings on install
parent
2cba82e5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/i18n/en_US/config.yaml
+1
-6
1 addition, 6 deletions
include/i18n/en_US/config.yaml
setup/inc/class.installer.php
+12
-14
12 additions, 14 deletions
setup/inc/class.installer.php
with
13 additions
and
20 deletions
include/i18n/en_US/config.yaml
+
1
−
6
View file @
5ff1ed65
...
...
@@ -8,7 +8,7 @@ core:
date_format
:
'
m/d/Y'
datetime_format
:
'
m/d/Y
g:i
a'
daydatetime_format
:
'
D,
M
j
Y
g:ia'
default_timezone_id
:
0
default_timezone_id
:
8
default_priority_id
:
2
enable_daylight_saving
:
0
...
...
@@ -31,12 +31,7 @@ core:
max_user_file_uploads
:
1
max_staff_file_uploads
:
1
autolock_minutes
:
3
alert_email_id
:
0
default_email_id
:
0
default_dept_id
:
0
default_sla_id
:
0
default_priority_id
:
2
default_template_id
:
1
default_smtp_id
:
0
use_email_priority
:
0
enable_kb
:
0
...
...
This diff is collapsed.
Click to expand it.
setup/inc/class.installer.php
+
12
−
14
View file @
5ff1ed65
...
...
@@ -199,20 +199,18 @@ class Installer extends SetupWizard {
//Create config settings---default settings!
//XXX: rename ostversion helpdesk_* ??
// XXX: Some of this can go to the core install file
$defaults
=
array
(
'isonline'
=>
'0'
,
'default_email_id'
=>
$support_email_id
,
'alert_email_id'
=>
$alert_email_id
,
'default_dept_id'
=>
$dept_id_1
,
'default_sla_id'
=>
$sla_id_1
,
'default_timezone_id'
=>
$default_timezone
,
'default_template_id'
=>
$template_id_1
,
'admin_email'
=>
db_input
(
$vars
[
'admin_email'
]),
'schema_signature'
=>
db_input
(
$signature
),
'helpdesk_url'
=>
db_input
(
URL
),
'helpdesk_title'
=>
db_input
(
$vars
[
'name'
]));
foreach
(
$defaults
as
$key
=>
$value
)
{
$sql
=
'UPDATE '
.
PREFIX
.
'config SET updated=NOW(), value='
.
$value
.
' WHERE namespace="core" AND `key`='
.
db_input
(
$key
);
if
(
!
db_query
(
$sql
,
false
))
$this
->
errors
[
'err'
]
=
'Unable to create config settings (#7)'
;
}
$defaults
=
array
(
'default_email_id'
=>
$support_email_id
,
'alert_email_id'
=>
$alert_email_id
,
'default_dept_id'
=>
$dept_id_1
,
'default_sla_id'
=>
$sla_id_1
,
'default_template_id'
=>
$template_id_1
,
'admin_email'
=>
$vars
[
'admin_email'
],
'schema_signature'
=>
$signature
,
'helpdesk_url'
=>
URL
,
'helpdesk_title'
=>
$vars
[
'name'
]);
$config
=
new
Config
(
'core'
);
if
(
!
$config
->
updateAll
(
$defaults
))
$this
->
errors
[
'err'
]
=
'Unable to create config settings (#7)'
;
// Set company name
require_once
(
INCLUDE_DIR
.
'class.company.php'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment