Peter M. Groen / knowledgetree

Commit a6e962d495369a5c40c8081bd2bf46eec7c9bb31

Authored by Michael Joseph
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
Inline Side-by-side
Showing 1 changed file with 3 additions and 12 deletions
config/environment.php
  View file @a6e962d
@@ -55,13 +55,7 @@ $default->system = new System(); @@ -55,13 +55,7 @@ $default->system = new System();
55 $default->organisationID = 1; 55 $default->organisationID = 1;
56 56
57 if ($default->system->initialised()) { 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 for ($i=0; $i<count($aSettings); $i++) { 60 for ($i=0; $i<count($aSettings); $i++) {
67 $default->$aSettings[$i] = $default->system->get($aSettings[$i]); 61 $default->$aSettings[$i] = $default->system->get($aSettings[$i]);
@@ -85,7 +79,6 @@ if ($default-&gt;system-&gt;initialised()) { @@ -85,7 +79,6 @@ if ($default-&gt;system-&gt;initialised()) {
85 79
86 // directories 80 // directories
87 $default->documentRoot = $default->fileSystemRoot . "/Documents"; 81 $default->documentRoot = $default->fileSystemRoot . "/Documents";
88 - $default->languageDirectory = $default->fileSystemRoot . "/locale";  
89 $default->uiDirectory = $default->fileSystemRoot . "/presentation/lookAndFeel/knowledgeTree"; 82 $default->uiDirectory = $default->fileSystemRoot . "/presentation/lookAndFeel/knowledgeTree";
90 83
91 // urls 84 // urls
@@ -93,11 +86,9 @@ if ($default-&gt;system-&gt;initialised()) { @@ -93,11 +86,9 @@ if ($default-&gt;system-&gt;initialised()) {
93 $default->graphicsUrl = $default->rootUrl . "/graphics"; 86 $default->graphicsUrl = $default->rootUrl . "/graphics";
94 $default->uiUrl = $default->rootUrl . "/presentation/lookAndFeel/knowledgeTree"; 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 // session timeout (in seconds) 89 // session timeout (in seconds)
101 $default->sessionTimeout = 1200; 90 $default->sessionTimeout = 1200;
  91 + // add javascript content pane scrolling arrows
  92 + $default->contentPaneScrolling = true;
102 } 93 }
103 ?> 94 ?>
104 \ No newline at end of file 95 \ No newline at end of file