Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Helmo
ISPConfig 3
Commits
7374887b
Commit
7374887b
authored
17 years ago
by
pedro_morgan
Browse files
Options
Downloads
Patches
Plain Diff
* Idea of constants for digestion
* Small tweaks and a warning TODO
parent
d00272c6
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
interface/lib/app.inc.php
+3
-1
3 additions, 1 deletion
interface/lib/app.inc.php
interface/lib/config.inc.php
+27
-3
27 additions, 3 deletions
interface/lib/config.inc.php
with
30 additions
and
4 deletions
interface/lib/app.inc.php
+
3
−
1
View file @
7374887b
...
@@ -124,7 +124,7 @@ class app {
...
@@ -124,7 +124,7 @@ class app {
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<tr>
<td class="error"><b>Error:</b><br>'
.
$msg
;
<td class="error"><b>Error:</b><br>'
.
$msg
;
if
(
$next_link
!=
""
)
$msg
.
=
'<a href="'
.
$next_link
.
'">Next</a><br>'
;
if
(
$next_link
!=
''
)
$msg
.
=
'<a href="'
.
$next_link
.
'">Next</a><br>'
;
$msg
.
=
'</td>
$msg
.
=
'</td>
</tr>
</tr>
</table>
</table>
...
@@ -165,6 +165,8 @@ class app {
...
@@ -165,6 +165,8 @@ class app {
}
}
$this
->
tpl
->
setVar
(
'app_title'
,
$this
->
_conf
[
'app_title'
]);
$this
->
tpl
->
setVar
(
'app_title'
,
$this
->
_conf
[
'app_title'
]);
$this
->
tpl
->
setVar
(
'delete_confirmation'
,
$this
->
lng
(
'delete_confirmation'
));
$this
->
tpl
->
setVar
(
'delete_confirmation'
,
$this
->
lng
(
'delete_confirmation'
));
//TODO: Silence this notice
//print_r($_SESSION);
$this
->
tpl
->
setVar
(
'app_module'
,
$_SESSION
[
's'
][
'module'
][
'name'
]);
$this
->
tpl
->
setVar
(
'app_module'
,
$_SESSION
[
's'
][
'module'
][
'name'
]);
if
(
isset
(
$_SESSION
[
's'
][
'user'
])
&&
$_SESSION
[
's'
][
'user'
][
'typ'
]
==
'admin'
)
{
if
(
isset
(
$_SESSION
[
's'
][
'user'
])
&&
$_SESSION
[
's'
][
'user'
][
'typ'
]
==
'admin'
)
{
$this
->
tpl
->
setVar
(
'is_admin'
,
1
);
$this
->
tpl
->
setVar
(
'is_admin'
,
1
);
...
...
This diff is collapsed.
Click to expand it.
interface/lib/config.inc.php
+
27
−
3
View file @
7374887b
...
@@ -40,7 +40,9 @@ $conf['app_version'] = '3.0.0';
...
@@ -40,7 +40,9 @@ $conf['app_version'] = '3.0.0';
$conf
[
'modules_available'
]
=
'admin,mail,sites,monitor,client,dns'
;
$conf
[
'modules_available'
]
=
'admin,mail,sites,monitor,client,dns'
;
//** Future Code - pedro - rfc
//********************************************************************************
//** Future Code idea - pedro - rfc
//** >>>>
/* Database connection
/* Database connection
The only time paramaters are needed is to connect, otherwise the variables
The only time paramaters are needed is to connect, otherwise the variables
are not required "around" the application. ie Connected and done.
are not required "around" the application. ie Connected and done.
...
@@ -82,8 +84,30 @@ if(file_exists(dirname(__FILE__).'/db_local.php')){
...
@@ -82,8 +84,30 @@ if(file_exists(dirname(__FILE__).'/db_local.php')){
$conf
[
'db_database'
]
=
'ispconfig3'
;
$conf
[
'db_database'
]
=
'ispconfig3'
;
}
}
/* Dynamic constants are another technique as well as key files as constants.
The base root directory is the interface/ directory which is the top level for php
From this eveything else is be defined underneath as constants
The constants are directory paths with no trailing /
This should do away with the $conf['rootpath'] etc
The $conf['fs_div'] is unnecessary if only / is used, will work on windoze also
*/
//** The main ROOT is the parent directory to this file, ie interface
define
(
'ISPC_ROOT'
,
realpath
(
'../'
));
define
(
'ISPC_CLASS_PATH'
,
ISPC_ROOT
.
'/lib/classes'
);
define
(
'ISPC_TEMP_PATH'
,
ISPC_ROOT
.
'/temp'
);
define
(
'ISPC_CACHE_PATH'
,
ISPC_ROOT
.
'/cache'
);
//<< End pedro rfc block
//** Database Settings
/* See above
$conf['db_type'] = 'mysql';
$conf['db_host'] = 'localhost';
$conf['db_user'] = 'root';
$conf['db_password'] = '';
$conf['db_database'] = 'ispconfig3';
*/
//** Path Settings (Do not change!)
$conf
[
'rootpath'
]
=
substr
(
dirname
(
__FILE__
),
0
,
-
4
);
$conf
[
'rootpath'
]
=
substr
(
dirname
(
__FILE__
),
0
,
-
4
);
$conf
[
'fs_div'
]
=
'/'
;
// File system divider, \\ on windows and / on linux and unix
$conf
[
'fs_div'
]
=
'/'
;
// File system divider, \\ on windows and / on linux and unix
$conf
[
'classpath'
]
=
$conf
[
'rootpath'
]
.
$conf
[
'fs_div'
]
.
'lib'
.
$conf
[
'fs_div'
]
.
'classes'
;
$conf
[
'classpath'
]
=
$conf
[
'rootpath'
]
.
$conf
[
'fs_div'
]
.
'lib'
.
$conf
[
'fs_div'
]
.
'classes'
;
...
@@ -96,7 +120,7 @@ define('SERVER_ROOT', $conf['rootpath']);
...
@@ -96,7 +120,7 @@ define('SERVER_ROOT', $conf['rootpath']);
define
(
'INCLUDE_ROOT'
,
SERVER_ROOT
.
DIR_TRENNER
.
'lib'
);
define
(
'INCLUDE_ROOT'
,
SERVER_ROOT
.
DIR_TRENNER
.
'lib'
);
define
(
'CLASSES_ROOT'
,
INCLUDE_ROOT
.
DIR_TRENNER
.
'classes'
);
define
(
'CLASSES_ROOT'
,
INCLUDE_ROOT
.
DIR_TRENNER
.
'classes'
);
/* pedro notes ? this stuff is REALLY not necessay */
/* pedro notes ? this stuff is REALLY not necessay
, can leak everywhere
*/
define
(
'DB_TYPE'
,
$conf
[
'db_type'
]);
define
(
'DB_TYPE'
,
$conf
[
'db_type'
]);
define
(
'DB_HOST'
,
$conf
[
'db_host'
]);
define
(
'DB_HOST'
,
$conf
[
'db_host'
]);
define
(
'DB_DATABASE'
,
$conf
[
'db_database'
]);
define
(
'DB_DATABASE'
,
$conf
[
'db_database'
]);
...
...
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