Commit 6984cf7ae6f549a33db87e4f73909153602689cc
1 parent
7ccbde2b
(#2962) refactored and tidied; using System attributes for variable names and labels
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2673 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
14 additions
and
76 deletions
presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
| @@ -27,77 +27,32 @@ | @@ -27,77 +27,32 @@ | ||
| 27 | // gets the delete stuff | 27 | // gets the delete stuff |
| 28 | function getPage() { | 28 | function getPage() { |
| 29 | global $default; | 29 | global $default; |
| 30 | - $oSystem = new System; | ||
| 31 | - | ||
| 32 | - global $default; | ||
| 33 | - | ||
| 34 | - $aRowNames = array ("LDAP Server: ", | ||
| 35 | - "LDAP Root DN: ", | ||
| 36 | - "LDAP Server Type (iPlanet OR ActiveDirectory): ", | ||
| 37 | - "Email Server:", | ||
| 38 | - "Administrator Email Address: ", | ||
| 39 | - "Administrator Name: ", | ||
| 40 | - "Default Email Address: ", | ||
| 41 | - "Default Email Name: ", | ||
| 42 | - "Document Root: ", | ||
| 43 | - "Language Directory: ", | ||
| 44 | - "User Interface Directory: ", | ||
| 45 | - "Root URL: ", | ||
| 46 | - "Graphics URL: ", | ||
| 47 | - "User Interface URL: ", | ||
| 48 | - "Default Language: ", | ||
| 49 | - "Session Timeout: "); | ||
| 50 | - | ||
| 51 | - $aNames = array("fldapServer", | ||
| 52 | - "fldapRootDn", | ||
| 53 | - "fldapServerType", | ||
| 54 | - "femailServer", | ||
| 55 | - "femailAdmin", | ||
| 56 | - "femailAdminName", | ||
| 57 | - "femailFrom", | ||
| 58 | - "femailFromName", | ||
| 59 | - "fdocumentRoot", | ||
| 60 | - "flanguageDirectory", | ||
| 61 | - "fuiDirectory", | ||
| 62 | - "frootUrl", | ||
| 63 | - "fgraphicsUrl", | ||
| 64 | - "fuiUrl", | ||
| 65 | - "fdefaultLanguage", | ||
| 66 | - "fsessionTimeout"); | ||
| 67 | - | ||
| 68 | - $aValue = $aNames; | ||
| 69 | - // todo | ||
| 70 | - | ||
| 71 | - // create a for loop that'll print out the names and input field with the value in | ||
| 72 | - // use the system table to get the value into the text field, by passing it the name | ||
| 73 | - // then loop a database entry to add everything... | ||
| 74 | - // and then when submit...run a set thingy.. | 30 | + $oSystem = $default->system; |
| 75 | 31 | ||
| 76 | $sToRender .= renderHeading("System Settings"); | 32 | $sToRender .= renderHeading("System Settings"); |
| 77 | $sToRender .= "<table>\n"; | 33 | $sToRender .= "<table>\n"; |
| 78 | - $sToRender .= "<tr><b>Current System Settings: </b></tr>\n"; | ||
| 79 | $sToRender .= "<tr>\n"; | 34 | $sToRender .= "<tr>\n"; |
| 80 | $sToRender .= "<tr>\n"; | 35 | $sToRender .= "<tr>\n"; |
| 81 | $sToRender .= "</tr>\n"; | 36 | $sToRender .= "</tr>\n"; |
| 82 | - for($i = 0; $i < count($aNames); $i++) { | ||
| 83 | - if ($oSystem->initialised()) { | ||
| 84 | - $sToRender .= "<td>". ($i+1) .".</td><td>" .$aRowNames[$i] ." </td><td><input size = \"40\" type=\"text\" name=\"". $aNames[$i] ."\" value =\"". $oSystem->get(substr($aNames[$i],1)) ."\"></td>\n"; | ||
| 85 | - } else { | ||
| 86 | - $sSetting = substr($aNames[$i],1); | ||
| 87 | - $sToRender .= "<td>". ($i+1) .".</td><td>" .$aRowNames[$i] ." </td><td><input size = \"40\" type=\"text\" name=\"". $aNames[$i] ."\" value =\"". $default->$sSetting ."\"></td>\n"; | 37 | + for($i = 0; $i < count($oSystem->aSettings); $i++) { |
| 38 | + if ($oSystem->initialised()) { | ||
| 39 | + $sValue = $oSystem->get($oSystem->aSettings[$i]); | ||
| 40 | + } else { | ||
| 41 | + $tmp = $oSystem->aSettings[$i]; | ||
| 42 | + $sValue = $default->$tmp; | ||
| 43 | + } | ||
| 44 | + if (is_array($sValue)) { | ||
| 45 | + $sValue = implode(";", $sValue); | ||
| 88 | } | 46 | } |
| 89 | - $sToRender .= "</tr>\n"; | ||
| 90 | - | 47 | + $sToRender .= "<tr><td>". ($i+1) .".</td><td>" . $oSystem->aLabels[$i] ." </td><td><input size=\"40\" type=\"text\" name=\"" . $oSystem->aSettings[$i] . "\" value =\"$sValue\"></td></tr>\n"; |
| 91 | } | 48 | } |
| 92 | - //$oSystem->generateRequiredFieldValidation($aNames,$aRowNames); | 49 | + |
| 93 | // do some validation | 50 | // do some validation |
| 94 | $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n"; | 51 | $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n"; |
| 95 | $sToRender .= "function validateForm(theForm) {\n"; | 52 | $sToRender .= "function validateForm(theForm) {\n"; |
| 96 | - | ||
| 97 | - for ($i = 0; $i < count($aNames); $i++) { | ||
| 98 | - $sToRender .= "\tif (!(validRequired(document.MainForm." .$aNames[$i] . ", '" . $aRowNames[$i] . "'))) {\n"; | 53 | + for ($i = 0; $i < count($oSystem->aSettings); $i++) { |
| 54 | + $sToRender .= "\tif (!(validRequired(document.MainForm." . $oSystem->aSettings[$i] . ", '" . $oSystem->aLabels[$i] . "'))) {\n"; | ||
| 99 | $sToRender .= "\t\treturn false;\n\t}\n"; | 55 | $sToRender .= "\t\treturn false;\n\t}\n"; |
| 100 | - | ||
| 101 | } | 56 | } |
| 102 | $sToRender .= "return true;\n}\n"; | 57 | $sToRender .= "return true;\n}\n"; |
| 103 | $sToRender .= "//-->\n</script>\n\n"; | 58 | $sToRender .= "//-->\n</script>\n\n"; |
| @@ -110,21 +65,4 @@ function getPage() { | @@ -110,21 +65,4 @@ function getPage() { | ||
| 110 | 65 | ||
| 111 | return $sToRender; | 66 | return $sToRender; |
| 112 | } | 67 | } |
| 113 | - | ||
| 114 | -// if edition is successful print otu success page | ||
| 115 | -function getPageSuccess() { | ||
| 116 | - global $default; | ||
| 117 | - | ||
| 118 | - $sToRender .= renderHeading("System Settings"); | ||
| 119 | - $sToRender .= "<table>\n"; | ||
| 120 | - $sToRender .= "<tr><td><b>Success!</b></td></tr>\n"; | ||
| 121 | - $sToRender .= "<tr><td>The Settings were successfully modified</td></tr>\n"; | ||
| 122 | - $sToRender .= "<tr></tr>\n"; | ||
| 123 | - $sToRender .= "<tr></tr>\n"; | ||
| 124 | - $sToRender .= "<tr>\n"; | ||
| 125 | - $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=systemAdministration\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n"; | ||
| 126 | - $sToRender .= "</tr>\n"; | ||
| 127 | - $sToRender .= "</table>\n"; | ||
| 128 | - return $sToRender; | ||
| 129 | -} | ||
| 130 | ?> | 68 | ?> |
| 131 | \ No newline at end of file | 69 | \ No newline at end of file |