Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Fix bugfix project issue #925. #22

Merged
merged 1 commit into from over 2 years ago

2 participants

Ángel Guzmán Maeso Danny Terweij
Ángel Guzmán Maeso Fix bugfix project issue #925. No assume that checkForScript() return…
… some value. Only invoke for checking previously
b0c6fc7
Danny Terweij dterweij merged commit bb1811b into from
Danny Terweij dterweij closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Mar 03, 2012
Ángel Guzmán Maeso Fix bugfix project issue #925. No assume that checkForScript() return…
… some value. Only invoke for checking previously
b0c6fc7
This page is out of date. Refresh to see the latest.

Showing 1 changed file with 10 additions and 6 deletions. Show diff stats Hide diff stats

  1. +10 6 hypervm/httpdocs/htmllib/htmllib.php
16 hypervm/httpdocs/htmllib/htmllib.php
@@ -6697,7 +6697,8 @@ function print_multiselect($form, $variable, $rowuniqueid, $rowclass, $rowcount)
6697 6697 global $gbl, $sgbl, $login, $ghtml;
6698 6698
6699 6699 $_t_name = $this->getcgikey($variable->name);
6700   - $m_value = $this->checkForScript($this->$_t_name);
  6700 + $this->checkForScript($this->$_t_name);
  6701 + $m_value = $this->$_t_name;
6701 6702 $ts_name = "ts_$variable->name";
6702 6703 $ts_name2 = "ts_{$variable->name}2";
6703 6704 $size = $variable->count;
@@ -6989,13 +6990,15 @@ function print_modify($form, $variable, $rowuniqueid, $rowclass, $rowcount)
6989 6990
6990 6991
6991 6992 if ($variable->value != "") {
6992   - $m_value = $this->checkForScript($variable->value);
  6993 + $this->checkForScript($variable->value);
  6994 + $m_value = $variable->value;
6993 6995 } else {
6994 6996 if (trim($variable->texttype) != "password") {
6995 6997 $m_value = null;
6996 6998 $index = trim($variable->name);
6997 6999 if (isset($prevvar[$index])) {
6998   - $m_value = $this->checkForScript($prevvar[$index]);
  7000 + $this->checkForScript($prevvar[$index]);
  7001 + $m_value = $prevvar[$index];
6999 7002 }
7000 7003 }
7001 7004 }
@@ -7207,7 +7210,8 @@ function print_variable($block, $variable, $count)
7207 7210 case "checkbox":
7208 7211 $m_value = null;
7209 7212 if (isset($prevvar[trim($variable->name)])) {
7210   - $m_value = $this->checkForScript($prevvar[trim($variable->name)]);
  7213 + $this->checkForScript($prevvar[trim($variable->name)]);
  7214 + $m_value = $prevvar[trim($variable->name)];
7211 7215 }
7212 7216 $checkedvalue = trim($variable->checked);
7213 7217 $checkv = null;
@@ -7224,10 +7228,10 @@ function print_variable($block, $variable, $count)
7224 7228
7225 7229
7226 7230 case "select":
7227   - $m_value = "";
7228 7231 $m_value = null;
7229 7232 if (isset($prevvar[trim($variable->name)])) {
7230   - $m_value = $this->checkForScript($prevvar[trim($variable->name)]);
  7233 + $this->checkForScript($prevvar[trim($variable->name)]);
  7234 + $m_value = $prevvar[trim($variable->name)];
7231 7235 }
7232 7236 print("$variable_description <br> ");
7233 7237 $v = $variable->name;

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.