Peter M. Groen / knowledgetree

Commit 1c5993985adad73f752838eb34907c3a1a86b051

Authored by Michael Joseph
1 parent 3cf08371

moved authentication class setting from dmsDefaults.php to environment.php; move… 

…d serverName and sslEnabled outside db config; removed uMask system setting


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1680 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 11 additions and 21 deletions
config/dmsDefaults.php
  View file @1c59939
... ... @@ -114,12 +114,6 @@ $default->owl_words_lookup_table = "words_lookup";
114 114 //stores help text
115 115 $default->owl_help_table = "help";
116 116  
117   -
118   -// Change this to reflect the authentication method you are using
119   -$default->authenticationClass = "DBAuthenticator";
120   -
121   -require_once("$default->fileSystemRoot/lib/authentication/$default->authenticationClass.inc");
122   -
123 117 // logo file that must reside inside lang/graphics directory
124 118 $default->logo = "kt.jpg";
125 119  
... ...
config/environment.php
  View file @1c59939
... ... @@ -11,6 +11,13 @@
11 11  
12 12 // install path
13 13 $default->fileSystemRoot = "/usr/local/www/owl/dms";
  14 +// server settings
  15 +$default->serverName = "change.to.your.hostname";
  16 +// whether ssl is enabled or not
  17 +$default->sslEnabled = true;
  18 +// Change this to reflect the authentication method you are using
  19 +$default->authenticationClass = "DBAuthenticator";
  20 +require_once("$default->fileSystemRoot/lib/authentication/$default->authenticationClass.inc");
14 21  
15 22 // Database info
16 23 $default->dbUser = "dms";
... ... @@ -34,20 +41,14 @@ $default->system = new System();
34 41 if ($default->system->initialised()) {
35 42 $aSettings = array("ldapServer", "ldapRootDn", "emailServer", "emailFrom", "emailFromName",
36 43 "emailAdmin", "emailAdminName",
37   - "serverName", "documentRoot", "languageDirectory",
38   - "uiDirectory", "uMask", "rootUrl", "graphicsUrl", "uiUrl", "useFS", "defaultLanguage",
39   - "sessionTimeout", "sslEnabled");
  44 + "documentRoot", "languageDirectory",
  45 + "uiDirectory", "rootUrl", "graphicsUrl", "uiUrl", "useFS", "defaultLanguage",
  46 + "sessionTimeout");
40 47  
41 48 for ($i=0; $i<count($aSettings); $i++) {
42   - if ($aSettings[$i] == "uMask") {
43   - $default->$aSettings[$i] = $default->system->getInt($aSettings[$i]);
44   - } else {
45   - $default->$aSettings[$i] = $default->system->get($aSettings[$i]);
46   - }
  49 + $default->$aSettings[$i] = $default->system->get($aSettings[$i]);
47 50 }
48 51 } else {
49   - // TODO: redirect to system setup form
50   -
51 52 // ldap settings
52 53 $default->ldapServer = "192.168.1.9";
53 54 $default->ldapRootDn = "o=Medical Research Council";
... ... @@ -59,13 +60,10 @@ if ($default-&gt;system-&gt;initialised()) {
59 60 $default->emailAdmin = "dmsHelp@jamwarehouse.com";
60 61 $default->emailAdminName = "DMS Administrator";
61 62  
62   - $default->serverName = "ktdev.jamwarehouse.com";
63   -
64 63 // directories
65 64 $default->documentRoot = "/usr/local/www/owl/dms/Documents";
66 65 $default->languageDirectory = $default->fileSystemRoot . "/locale";
67 66 $default->uiDirectory = $default->fileSystemRoot . "/presentation/lookAndFeel/knowledgeTree";
68   - $default->uMask = "0755";
69 67  
70 68 // urls
71 69 $default->rootUrl = "/dms";
... ... @@ -78,7 +76,5 @@ if ($default-&gt;system-&gt;initialised()) {
78 76 $default->defaultLanguage = "NewEnglish";
79 77 // session timeout (in seconds)
80 78 $default->sessionTimeout = 1200;
81   - // whether ssl is enabled or not
82   - $default->sslEnabled = true;
83 79 }
84 80 ?>
... ...