Commit a6e962d495369a5c40c8081bd2bf46eec7c9bb31
1 parent
36a09bdf
(#2962) tidied up, using settings inside System object, added contentPaneScrolling setting
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2669 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
3 additions
and
12 deletions
config/environment.php
| ... | ... | @@ -55,13 +55,7 @@ $default->system = new System(); |
| 55 | 55 | $default->organisationID = 1; |
| 56 | 56 | |
| 57 | 57 | if ($default->system->initialised()) { |
| 58 | - $aSettings = array("ldapServer", "ldapRootDn", "ldapServerType", | |
| 59 | - "ldapDomain", "ldapSearchUser", "ldapSearchPassword", | |
| 60 | - "emailServer", "emailFrom", "emailFromName", | |
| 61 | - "emailAdmin", "emailAdminName", | |
| 62 | - "documentRoot", "languageDirectory", | |
| 63 | - "uiDirectory", "rootUrl", "graphicsUrl", "uiUrl", "useFS", "defaultLanguage", | |
| 64 | - "sessionTimeout"); | |
| 58 | + $aSettings = $default->system->aSettings; | |
| 65 | 59 | |
| 66 | 60 | for ($i=0; $i<count($aSettings); $i++) { |
| 67 | 61 | $default->$aSettings[$i] = $default->system->get($aSettings[$i]); |
| ... | ... | @@ -85,7 +79,6 @@ if ($default->system->initialised()) { |
| 85 | 79 | |
| 86 | 80 | // directories |
| 87 | 81 | $default->documentRoot = $default->fileSystemRoot . "/Documents"; |
| 88 | - $default->languageDirectory = $default->fileSystemRoot . "/locale"; | |
| 89 | 82 | $default->uiDirectory = $default->fileSystemRoot . "/presentation/lookAndFeel/knowledgeTree"; |
| 90 | 83 | |
| 91 | 84 | // urls |
| ... | ... | @@ -93,11 +86,9 @@ if ($default->system->initialised()) { |
| 93 | 86 | $default->graphicsUrl = $default->rootUrl . "/graphics"; |
| 94 | 87 | $default->uiUrl = $default->rootUrl . "/presentation/lookAndFeel/knowledgeTree"; |
| 95 | 88 | |
| 96 | - // app settings | |
| 97 | - // TODO: in browse- scan current folder and sync db | |
| 98 | - $default->useFS = true; | |
| 99 | - $default->defaultLanguage = "NewEnglish"; | |
| 100 | 89 | // session timeout (in seconds) |
| 101 | 90 | $default->sessionTimeout = 1200; |
| 91 | + // add javascript content pane scrolling arrows | |
| 92 | + $default->contentPaneScrolling = true; | |
| 102 | 93 | } |
| 103 | 94 | ?> |
| 104 | 95 | \ No newline at end of file | ... | ... |