WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added scope to parseHtml() and fixed loading of old values

This commit is contained in:
Roland Gruber 2005-03-29 16:10:30 +00:00
parent 2f3ba8f89c
commit 66b0edbdb6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lam/lib/modules.inc
View File

@ -535,9 +535,10 @@ function doUploadPostActions($scope, $data, $ids, $failed) {
* @param boolean $restricted If true then no buttons will be displayed * @param boolean $restricted If true then no buttons will be displayed
* @param integer $tabindex Start value of tabulator index for input fields * @param integer $tabindex Start value of tabulator index for input fields
* @param integer $tabindexLink Start value of tabulator index for links * @param integer $tabindexLink Start value of tabulator index for links
* @param string $scope Account type
* @return array List of input field names and their type (name => type) * @return array List of input field names and their type (name => type)
*/ */
function parseHtml($module, $input, $values, $restricted, &$tabindex, &$tabindexLink) { function parseHtml($module, $input, $values, $restricted, &$tabindex, &$tabindexLink, $scope) {
$ret = array(); $ret = array();
if (is_array($input)) { if (is_array($input)) {
echo "<table>\n"; echo "<table>\n";
@ -569,14 +570,14 @@ function parseHtml($module, $input, $values, $restricted, &$tabindex, &$tabindex
// checkbox // checkbox
if ($type == "checkbox") { if ($type == "checkbox") {
if (isset($values[$input[$i][$j]['name']])) { if (isset($values[$input[$i][$j]['name']])) {
if ($values[$input[$i][$j]['name']] == "true") $output .= ' checked'; if ($values[$input[$i][$j]['name']][0] == "true") $output .= ' checked';
} }
elseif ($input[$i][$j]['checked']) $output .= ' checked'; elseif ($input[$i][$j]['checked']) $output .= ' checked';
} }
// other input element // other input element
else { else {
if (isset($values[$input[$i][$j]['name']])) { if (isset($values[$input[$i][$j]['name']])) {
$output .= ' value="' . $values[$input[$i][$j]['name']] . '"'; $output .= ' value="' . $values[$input[$i][$j]['name']][0] . '"';
} }
elseif ($input[$i][$j]['value']!='') $output .= ' value="' . $input[$i][$j]['value'] . '"'; elseif ($input[$i][$j]['value']!='') $output .= ' value="' . $input[$i][$j]['value'] . '"';
} }
@ -594,7 +595,7 @@ function parseHtml($module, $input, $values, $restricted, &$tabindex, &$tabindex
case 'fieldset': case 'fieldset':
echo "<fieldset>\n"; echo "<fieldset>\n";
if ($input[$i][$j]['legend']!='') echo "<legend>" . $input[$i][$j]['legend'] . "</legend>\n"; if ($input[$i][$j]['legend']!='') echo "<legend>" . $input[$i][$j]['legend'] . "</legend>\n";
parseHtml($module, $input[$i][$j]['value'], $values, $restricted, $tabindex, $tabindexLink); parseHtml($module, $input[$i][$j]['value'], $values, $restricted, $tabindex, $tabindexLink, $scope);
echo "</fieldset>\n"; echo "</fieldset>\n";
break; break;
// selection // selection
@ -641,11 +642,11 @@ function parseHtml($module, $input, $values, $restricted, &$tabindex, &$tabindex
break; break;
// sub table // sub table
case 'table': case 'table':
parseHtml($module, $input[$i][$j]['value'], $values, $restricted, $tabindex, $tabindexLink); parseHtml($module, $input[$i][$j]['value'], $values, $restricted, $tabindex, $tabindexLink, $scope);
break; break;
// help link // help link
case 'help': case 'help':
echo "<a href=../help.php?module=$module&amp;HelpNumber=". $input[$i][$j]['value'] . "&amp;scope=" . $this->type . " target=\"help\" tabindex=$tabindexLink>" . _('Help') . "</a>\n"; echo "<a href=../help.php?module=$module&amp;HelpNumber=". $input[$i][$j]['value'] . "&amp;scope=" . $scope . " target=\"help\" tabindex=$tabindexLink>" . _('Help') . "</a>\n";
$tabindexLink++; $tabindexLink++;
break; break;
// status message // status message
@ -917,7 +918,7 @@ class accountContainer {
else $return = call_user_func(array($this->module[$this->order[$this->current_page]], 'display_html_'.$this->subpage), $post); else $return = call_user_func(array($this->module[$this->order[$this->current_page]], 'display_html_'.$this->subpage), $post);
$y = 5000; $y = 5000;
$z = 10000; $z = 10000;
parseHtml($this->order[$this->current_page], $return, array(), false, $y, $z); parseHtml($this->order[$this->current_page], $return, array(), false, $y, $z, $this->type);
// Display rest of html-page // Display rest of html-page
echo "</fieldset>\n"; echo "</fieldset>\n";
echo "</td></tr></table>\n"; echo "</td></tr></table>\n";