[PHPLIB-DEV] cvs commit From: uw (phplib-dev <email protected>)
Date: 04/17/00

From: uw
Date: Mon Apr 17 12:46:42 2000
Modified files:
      php-lib/php/form/assistant.inc
      php-lib/php/form/form.inc
      php-lib/php/form/form_elements.inc
      php-lib/php/form/template_bridge.inc

Log message:
- renamed classes

Index: php-lib/php/form/assistant.inc
diff -u php-lib/php/form/assistant.inc:1.1 php-lib/php/form/assistant.inc:1.2
--- php-lib/php/form/assistant.inc:1.1 Thu Apr 13 15:04:19 2000
+++ php-lib/php/form/assistant.inc Mon Apr 17 12:46:10 2000
@@ -102,7 +102,7 @@
         *  <email protected> setTemplateFiles()
         */
         var $template_files = array(
- "main" => "assistant_main.html"
+ "main" => "assistant_main.tpl"
                                                                                                                         #"tabs" => "assistant_tabs.html"
                                                                                                 );
         
@@ -819,6 +819,10 @@
                 }
                 if (!isset($pagedata["name"]) || ""==$pagedata["name"]) {
                         $this->setError(3, "assistant -> addPage(), you must specify a name for you page");
+ return false;
+ }
+ if (""==(string)$pagedata["object"]) {
+ $this->setError(40, "assistant -> addPage(), you must specify a template object for this page");
                         return false;
                 }
                 
Index: php-lib/php/form/form.inc
diff -u php-lib/php/form/form.inc:1.1 php-lib/php/form/form.inc:1.2
--- php-lib/php/form/form.inc:1.1 Thu Apr 13 15:04:19 2000
+++ php-lib/php/form/form.inc Mon Apr 17 12:46:10 2000
@@ -2,20 +2,20 @@
 /**
 * "Main" class
 */
-class new_form {
+class form {
         /**
         * Constructor
         *  <email protected> enum(weak|strong) $js_mode = "weak"
         *  <email protected> public
         *  <email protected> js_mode
         */
- function new_form($js_mode = "weak") {
+ function form($js_mode = "weak") {
         
                 if (""!=$js_mode && "strong"==$js_mode)
                         $this->js_mode = $js_mode;
                         
                 $this->Init();
- } // end func new_form
+ } // end func form
         
         /**
         * This function contains all addElement calls
@@ -148,7 +148,7 @@
         */
         function getSessionHash() {
                 if (0==count($this->elements)) {
- $this->setError(43, "new_form -> getSessionHash(), no elements in form");
+ $this->setError(43, "form -> getSessionHash(), no elements in form");
                         return array();
                 }
                 
@@ -184,13 +184,13 @@
                 if (!is_array($ellist))
                         $ellist = array($ellist);
                 if (!is_array($ellist) || 0==count($ellist)) {
- $this->setError(43, "new_form -> autoloadValues(), no elements in form");
+ $this->setError(43, "form -> autoloadValues(), no elements in form");
                         return false;
                 }
                 
                 $data = ("POST" == $this->method) ? $GLOBALS["HTTP_POST_VARS"] : $GLOBALS["HTTP_GET_VARS"];
                 if (!is_array($data) || 0==count($data)) {
- $this->setError(44, sprintf("new_form -> autoloadValues(), warning: no HTTP_%s_VARS", $this->method) );
+ $this->setError(44, sprintf("form -> autoloadValues(), warning: no HTTP_%s_VARS", $this->method) );
                         return true;
                 }
 
@@ -230,7 +230,7 @@
         */
         function setValues($values) {
                 if (!is_array($values) || 0==count($values)) {
- $this->setError(18, "new_ooh -> setValues() - illegal function call");
+ $this->setError(18, "form -> setValues() - illegal function call");
                         return false;
                 }
 
@@ -275,7 +275,7 @@
         function Validation($ellist, $status=false) {
                 
                 if (""==(string)$ellist) {
- $this->setError(29, "new_ooh_form -> Validation() - illegal function call");
+ $this->setError(29, "form -> Validation() - illegal function call");
                         return false;
                 }
                 
@@ -340,7 +340,7 @@
                         return false;
                 
                 if (!isset($this[$validator]) || "userfunction" != gettype($this[$validator]) ) {
- $this->setError(28, "new_ooh->setValidator() - validation function not defined!");
+ $this->setError(28, "form->setValidator() - validation function not defined!");
                         return false;
                 }
                 
@@ -504,7 +504,7 @@
         */
         function addElement($element_data) {
                 if (""==$element_data || (is_array($element_data) && 0==count($element_data)) || ""==$element_data["type"] ) {
- $this->setError(-1, "form->addElement - Illegal function call");
+ $this->setError(-1, "form -> addElement - Illegal function call");
                         return false;
                 }
                 $element_data["type"] = strtolower($element_data["type"]);
@@ -540,7 +540,7 @@
                 else
                         $of_objectname = $element_data["type"];
 
- $of_objectname = "new_form_elements_".$of_objectname;
+ $of_objectname = "form_elements_".$of_objectname;
                 $el = new $of_objectname( $element_data,
                                                                                                                         $this->js_name, $this->js_mode,
                                                                                                                         $this->cr_html, $this->cr_js,
@@ -693,17 +693,17 @@
         */
         function ElementExists($function, $name, $errno) {
                 if (""==$function || !is_array($errno)) {
- $this->setError(28, "new_ooh_form -> ElementExists() - illegal function call");
+ $this->setError(28, "form -> ElementExists() - illegal function call");
                         return false;
                 }
                 
                 if (""==$name) {
- $msg = sprintf("new_ooh_form -> %s() - no element specified", $function);
+ $msg = sprintf("form -> %s() - no element specified", $function);
                         $this->setError($errno[0], $msg);
                         return false;
                 }
                 if (!isset($this->elements[$name]) && !isset($this->radio_elements[$name])) {
- $msg = sprintf("new_ooh_form -> %s() - unknown element '%s'",
+ $msg = sprintf("form -> %s() - unknown element '%s'",
                                                                                                 $function,
                                                                                                 $name
                                                                                 );
@@ -784,7 +784,7 @@
                         return true;
                         
                 if (""==$message)
- $this->setError(24, "ooh_new->setValidationError(), no error message specified");
+ $this->setError(24, "form -> setValidationError(), no error message specified");
 
                 $this->validation_msg.= $message.$this->cr;
                 $this->validation_flags[$name] = $message;
@@ -884,11 +884,11 @@
         */
         function addJS($name, $code) {
                 if (""==$name || ""==$code) {
- $this->setError(9, "new_ooh_form -> addJS() - illegal function call");
+ $this->setError(9, "form -> addJS() - illegal function call");
                         return false;
                 }
                 if (!isset($this->elements[$name])) {
- $this->setError(10, "new_ooh_form -> addJS() - unknown element '$name'");
+ $this->setError(10, "form -> addJS() - unknown element '$name'");
                         return false;
                 }
                 
@@ -908,11 +908,11 @@
         */
         function setJS($name, $code) {
                 if (""==$name || ""==$code) {
- $this->setError(11, "new_ooh_form -> setJS() - illegal function call");
+ $this->setError(11, "form -> setJS() - illegal function call");
                         return false;
                 }
                 if (!isset($his->elements[$name])) {
- $this->setError(12, "new_ooh_form -> setJS() - unknown element '$name'");
+ $this->setError(12, "form -> setJS() - unknown element '$name'");
                         return false;
                 }
                 
@@ -932,7 +932,7 @@
         */
         function getJS($names="") {
                 if (""==$this->js_name) {
- $this->setError(24, "new_ooh_form -> getJS() - no javascript name specified");
+ $this->setError(24, "form -> getJS() - no javascript name specified");
                         return "";
                 }
         
@@ -941,7 +941,7 @@
                 if (!is_array($names))
                         $names = array($names);
                 if (0==count($names)) {
- $this->setError(13, "new_ooh_form -> getJS() - no element specified");
+ $this->setError(13, "form -> getJS() - no element specified");
                         return "";
                 }
                 
@@ -974,7 +974,7 @@
         */
         function setSize($size) {
                 if ((int)$size<1) {
- $this->setError(2, "new_form -> setSize, $size must be at least 1");
+ $this->setError(2, "form -> setSize, $size must be at least 1");
                         return false;
                 }
                 $this->defaultSize = (int)$size;
@@ -989,7 +989,7 @@
         */
         function setMaxlength($maxlength) {
                 if ((int)$maxlength<1) {
- $this->setError(3, "new_form -> setMaxlength, $maxlength must be at least 1");
+ $this->setError(3, "form -> setMaxlength, $maxlength must be at least 1");
                         return false;
                 }
                 $this->defaultMaxlength = (int)$maxlength;
@@ -1016,7 +1016,7 @@
         
         function getJSHead() {
                 if (""==$this->js_name) {
- $this->setError(10, "new_form -> JSHead() - no JavaScript name specified");
+ $this->setError(10, "form -> JSHead() - no JavaScript name specified");
                         return "";
                 }
                 
@@ -1133,7 +1133,7 @@
         */
         function setTree($ellist) {
                 if (!is_array($ellist)) {
- $this->setError(39, "new_ooh -> setTree() - illegal function call");
+ $this->setError(39, "form -> setTree() - illegal function call");
                         return false;
                 }
                 
@@ -1159,7 +1159,7 @@
         */
         function getOptions($ellist) {
                 if (""==(string)$ellist) {
- $this->setError(33, "ooh_new -> getOptions() - illegal function call");
+ $this->setError(33, "form -> getOptions() - illegal function call");
                         return array();
                 }
                 
@@ -1186,7 +1186,7 @@
         */
         function setOptions($ellist) {
                 if (!is_array($ellist)) {
- $this->setError(34, "ooh_new -> setOptions() - illegal function call");
+ $this->setError(34, "form -> setOptions() - illegal function call");
                         return false;
                 }
 
@@ -1321,5 +1321,5 @@
         } // end func introspection
         
         
-} // end class new_form
+} // end class form
 ?>
Index: php-lib/php/form/form_elements.inc
diff -u php-lib/php/form/form_elements.inc:1.1 php-lib/php/form/form_elements.inc:1.2
--- php-lib/php/form/form_elements.inc:1.1 Thu Apr 13 15:04:19 2000
+++ php-lib/php/form/form_elements.inc Mon Apr 17 12:46:10 2000
@@ -4,10 +4,10 @@
 *
 *
 */
-class new_form_elements {
- function new_form_elements ( $element_data, $js_name="", $js_mode="", $cr_html="", $cr_js="", $cr="", $showerror="", $haltonerror="" ) {
+class form_elements {
+ function form_elements ( $element_data, $js_name="", $js_mode="", $cr_html="", $cr_js="", $cr="", $showerror="", $haltonerror="" ) {
                 if (!is_array($element_data) || 0==count($element_data)) {
- $this->setError(-1, "new_form_elements->new_form_elements() - Illegal function call");
+ $this->setError(-1, "form_elements -> form_elements() - Illegal function call");
                         return;
                 }
 
@@ -52,9 +52,9 @@
                         $this->flag_haltonerror = $haltonerror;
                                         
                 $this->generateJS();
- } // end func new_form_elements
+ } // end func form_elements
         
- var $classname = "new_form_elements";
+ var $classname = "form_elements";
                 
         /**
         * Name to access this element in form
@@ -240,7 +240,7 @@
         */
         function setValidator($validator) {
                 if ("string" != gettype($validator)) {
- $this->setError(21, 'new_form_elements->setValidator(), illegal function call');
+ $this->setError(21, 'form_elements->setValidator(), illegal function call');
                         return false;
                 }
 
@@ -346,7 +346,7 @@
                         $events = array($events => $events);
                 
                 if (!is_array($events)) {
- $this->setError(21, "of_element->react() - illegal function call");
+ $this->setError(21, "form_elements -> react() - illegal function call");
                         return false;
                 }
                 
@@ -374,7 +374,7 @@
         */
         function setValue($value) {
                 if (is_array($value) || is_object($value)) {
- $this->setError(19, "of_element->setValue() - the value of this element must be skalar data");
+ $this->setError(19, "form_elements -> setValue() - the value of this element must be skalar data");
                         return false;
                 }
                 
@@ -391,7 +391,7 @@
         */
         function addJS($code) {
                 if (""==$code) {
- $this->setError(-1, "of_element->addJS() - Illegal function call");
+ $this->setError(-1, "form_elements -> addJS() - Illegal function call");
                         return false;
                 }
                 $this->js_code.="\n$code";
@@ -429,7 +429,7 @@
         function generateJS() {
                 
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element->generateJS() -
+ $this->setError(2, "form_elements->generateJS() -
                                                                                                         JavaScript validation code already set by user"
                                                                                         );
                         return false;
@@ -457,7 +457,7 @@
         */
         function writeJSCode($condition, $error) {
                 if (""==$error) {
- $this->setError(11, "of_element -> writeJSCode(), illegal function call");
+ $this->setError(11, "form_elements -> writeJSCode(), illegal function call");
                         return "";
                 }
                                                 
@@ -525,7 +525,7 @@
         */
         function doValidation($event) {
                 if (""==$event || !isset($this->val_events[$event])) {
- $this->setError(29, "ooh_element => doValidation() - illegal function call");
+ $this->setError(29, "form_elements -> doValidation() - illegal function call");
                         return false;
                 }
 
@@ -716,9 +716,9 @@
                 printf("<br>\n%s => %s<br>\n", $this->errno, $this->error);
         } // end func showError
         
-} // end class new_form_elements
+} // end class form_elements
 
-class new_form_elements_textarea extends new_form_elements {
+class form_elements_textarea extends form_elements {
         /**
         * name
         * value
@@ -827,7 +827,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_textarea -> generateJS() -
+ $this->setError(2, "form_elements_textarea -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -881,9 +881,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elements_textarea
+} // end class form_elements_textarea
 
-class new_form_elements_text extends new_form_elements {
+class form_elements_text extends form_elements {
         /**
         * name
         * value
@@ -995,7 +995,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_text -> generateJS() -
+ $this->setError(2, "form_elements_text -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -1035,9 +1035,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elements_text
+} // end class form_elements_text
 
-class new_form_elements_select extends new_form_elements {
+class form_elements_select extends form_elements {
         /**
         * name
         * value
@@ -1063,7 +1063,7 @@
                                         (!$this->multiple && is_array($value))
                                 ) {
                                 
- $this->setError(20, "ooh_element_select ->setValue, illegal value");
+ $this->setError(20, "form_elements_select ->setValue, illegal value");
                                 return false;
                 }
                 
@@ -1077,7 +1077,7 @@
                         return $this->getfrozen($value);
 
                 if (!is_array($this->options)) {
- $this->setError(13, "new_ooh_select -> get(), illegal function call");
+ $this->setError(13, "form_elements_select -> get(), illegal function call");
                         return "";
                 }
                 
@@ -1085,7 +1085,7 @@
                         $this->value = array($this->value);
 
                 if ($this->multiple && "]"!=substr($this->name, -1, 1)) {
- $this->setError(14, "new_ooh_select ->get(),
+ $this->setError(14, "form_elements_select ->get(),
                                                                                                                 make sure to use [] with the element name."
                                                                                         );
                         return "";
@@ -1230,7 +1230,7 @@
                         return array (true, "");
                         
                 if (""!=$this->intro && ""==$this->intro_e)
- $this->setError(14, "new_ooh_select -> validate(), missing intro_e");
+ $this->setError(14, "form_elements_select -> validate(), missing intro_e");
                 
                 if ($this->doValidation("intro")) {
                         if (is_array($this->intro)) {
@@ -1256,7 +1256,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_text -> generateJS() -
+ $this->setError(2, "form_elements_text -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -1278,9 +1278,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elements_select
+} // end class form_elements_select
 
-class new_form_elements_file extends new_form_elements {
+class form_elements_file extends form_elements {
         /**
         * name
         * value
@@ -1395,7 +1395,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_text -> generateJS() -
+ $this->setError(2, "form_elements_text -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -1443,9 +1443,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elements_file
+} // end class form_elements_file
 
-class new_form_elements_combo extends new_form_elements {
+class form_elements_combo extends form_elements {
 
 /**
         * name
@@ -1514,7 +1514,7 @@
                                         (!$this->multiple && is_array($value))
                                 ) {
                                 
- $this->setError(20, "ooh_element_combo ->setValue, illegal value");
+ $this->setError(20, "form_elements_combo ->setValue, illegal value");
                                 return false;
                 }
                 
@@ -1528,16 +1528,16 @@
                         return $this->getfrozen($value);
 
                 if (!is_array($this->options)) {
- $this->setError(13, "new_ooh_combo -> get(), illegal function call");
+ $this->setError(13, "form_elements_combo -> get(), illegal function call");
                         return "";
                 }
                 if (is_array($this->value) && !$this->multiple) {
- $this->setError(30, "new_ooh_combo -> get(), can't decide which value to use");
+ $this->setError(30, "form_elements_combo -> get(), can't decide which value to use");
                         return "";
                 }
 
                 if ($this->multiple && "]"!=substr($this->name, -1)) {
- $this->setError(14, "new_ooh_combo -> get(),
+ $this->setError(14, "form_elements_combo -> get(),
                                                                                                                 make sure to use [] with the element name."
                                                                                         );
                         return "";
@@ -1635,7 +1635,7 @@
         */
         function sortOptions() {
                 if (!is_array($this->options)) {
- $this->setError(31, "ooh_element_combo -> sortValues() - illegal function call");
+ $this->setError(31, "form_elements_combo -> sortValues() - illegal function call");
                         return;
                 }
                 if (""==$this->sort)
@@ -1704,7 +1704,7 @@
         
         function addOption($label, $value="") {
                 if (""==$label) {
- $this->setError(39, "of_combo -> addOption() - you must specify a label!");
+ $this->setError(39, "form_elements_combo -> addOption() - you must specify a label!");
                         return false;
                 }
                 if (""==$value)
@@ -1849,7 +1849,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_text -> generateJS() -
+ $this->setError(2, "form_elements_text -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -1890,9 +1890,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elementsCombo
+} // end class form_elementsCombo
 
-class new_form_elements_tree extends new_form_elements {
+class form_elements_tree extends form_elements {
         var $tree;
         var $delimiter = "/";
         
@@ -1917,7 +1917,7 @@
         function sortTree() {
                 
                 if (""==$this->delimiter) {
- $this->setError(36, "new_ooh_tree -> setTree() - no delimiter specified");
+ $this->setError(36, "form_elements_tree -> setTree() - no delimiter specified");
                         return;
                 }
                 
@@ -2040,7 +2040,7 @@
 
         function setTree($tree) {
                 if (!is_array($tree)) {
- $this->setError(37, "new_ooh_tree -> setTree(), illegal function call");
+ $this->setError(37, "form_elements_tree -> setTree(), illegal function call");
                         return false;
                 }
                 $this->tree = $tree;
@@ -2053,7 +2053,7 @@
                         return $this->getfrozen($value);
 
                 if (!is_array($this->tree)) {
- $this->setError(13, "new_ooh_tree -> get(), illegal function call");
+ $this->setError(13, "form_elements_tree -> get(), illegal function call");
                         return "";
                 }
         
@@ -2162,7 +2162,7 @@
                         return array (true, "");
                         
                 if (""!=$this->intro && ""==$this->intro_e)
- $this->setError(14, "new_ooh_tree -> validate(), missing intro_e");
+ $this->setError(14, "form_elements_tree -> validate(), missing intro_e");
                 
                 if ($this->doValidation("intro")) {
 
@@ -2183,7 +2183,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_text -> generateJS() -
+ $this->setError(2, "form_elements_text -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -2205,9 +2205,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elements_tree
+} // end class form_elements_tree
 
-class new_form_elements_checkbox extends new_form_elements {
+class form_elements_checkbox extends form_elements {
         
         var $checked = false;
         var $accesskey = "";
@@ -2258,9 +2258,9 @@
                 $this->js_code="";
         } // end func generateJS
         
-} // end class new_form_elements_checkbox
+} // end class form_elements_checkbox
 
-class new_form_elements_submit extends new_form_elements {
+class form_elements_submit extends form_elements {
         
         var $width = "";
         var $height= "";
@@ -2398,7 +2398,7 @@
         function generateJS() {
         
                 if ($this->flag_setjs) {
- $this->setError(2, "of_element_text -> generateJS() -
+ $this->setError(2, "form_elements_text -> generateJS() -
                                                                                                                                                                                 JavaScript validation code
                                                                                                                                                                                 already set by user");
                         return false;
@@ -2412,9 +2412,9 @@
                 return true;
         } // end func generateJS
         
-} // end class new_form_elements_submit
+} // end class form_elements_submit
 
-class new_form_elements_radio extends new_form_elements {
+class form_elements_radio extends form_elements {
         
         var $checked = false;
         
@@ -2429,7 +2429,7 @@
         
         function setValue($value) {
                 if (is_array($value) || is_object($value)) {
- $this->setError(19, "ooh_radio->setValue() - the value of this element must be skalar data");
+ $this->setError(19, "form_elements_radio -> setValue() - the value of this element must be skalar data");
                         return false;
                 }
                 
@@ -2482,5 +2482,5 @@
                 $this->js_code = "";
         } // end func generateJS
         
-} // end class new_form_elements_radio
+} // end class form_elements_radio
 ?>
Index: php-lib/php/form/template_bridge.inc
diff -u php-lib/php/form/template_bridge.inc:1.1 php-lib/php/form/template_bridge.inc:1.2
--- php-lib/php/form/template_bridge.inc:1.1 Thu Apr 13 15:04:20 2000
+++ php-lib/php/form/template_bridge.inc Mon Apr 17 12:46:10 2000
@@ -2,7 +2,7 @@
 /**
 * Joins OOH Forms and Template to build automatically complex one column forms
 */
-class newform_to_template {
+class template_bridge {
         /**
         * Constructor
         *  <email protected> string $template path to template file
@@ -11,7 +11,7 @@
         *  <email protected> public
         *  <email protected> template_files, tpl
         */
- function newform_to_template($form="", $template="", $template_files="") {
+ function template_bridge($form="", $template="", $template_files="") {
                 if (""==$template_files)
                         $template_files = $this->template_files;
                 if (!is_array($template_files))
@@ -28,7 +28,7 @@
                 $this->template_files = $template_files;
                                 
                 $this->Init();
- } // end func newform_to_template
+ } // end func template_bridge
 
         function Init() {
         } // end func Init()
@@ -156,7 +156,7 @@
         */
         function setTemplatePath($template) {
                 if (""==$template) {
- $this->setError(31, "newform -> setTemplatePath(), illegal function call");
+ $this->setError(31, "template_bridge -> setTemplatePath(), illegal function call");
                         return false;
                 }
                 $this->template = $template;
@@ -171,7 +171,7 @@
         */
         function setTemplateFiles($template_files) {
                 if (""==$template_files) {
- $this->setError(32, "newform -> setTemplateFiles(), illegal function call");
+ $this->setError(32, "template_bridge -> setTemplateFiles(), illegal function call");
                         return false;
                 }
                 if (!is_array($template_files))
@@ -189,7 +189,7 @@
         */
         function setForm($form) {
                 if (""==$form) {
- $this->setError(33, "newform -> setForm(), illegal function call");
+ $this->setError(33, "template_bridge -> setForm(), illegal function call");
                         return false;
                 }
                 
@@ -208,7 +208,7 @@
         */
         function getSessionHash() {
                 if (0==count($this->elements)) {
- $this->setError(30, "newform -> getSessionHash(), no elements in template");
+ $this->setError(30, "template_bridge -> getSessionHash(), no elements in template");
                         return array();
                 }
                 
@@ -230,7 +230,7 @@
         */
         function restoreSessionHash($session_hash) {
                 if (!is_array($session_hash) || 0==count($session_hash)) {
- $this->setError(31, "newform -> restoreSessionHash(), warning: no data provided");
+ $this->setError(31, "template_bridge -> restoreSessionHash(), warning: no data provided");
                         return false;
                 }
                 return $this->form->setValues($session_hash);
@@ -272,7 +272,7 @@
         */
         function newTemplate() {
                 if (""==$this->template) {
- $this->SetError(11, "newform_to_template -> newTemplate(), illegal function call");
+ $this->SetError(11, "template_bridge -> newTemplate(), illegal function call");
                         return false;
                 }
                 unset($this->tpl);
@@ -323,7 +323,7 @@
         */
         function setImagepath($path) {
                 if (""==$path) {
- $this->setError(12, "newform_to_template -> setImagepath(), illegal function call");
+ $this->setError(12, "template_bridge -> setImagepath(), illegal function call");
                         return false;
                 }
                 
@@ -343,7 +343,7 @@
         */
         function setImages($images) {
                 if (!is_array($images) || 0==count($images)) {
- $this->setError(10, "newform_to_template -> setImages(), illegal function call");
+ $this->setError(10, "template_bridge -> setImages(), illegal function call");
                         return false;
                 }
                 
@@ -377,7 +377,7 @@
         */
         function dropImages($images) {
                 if (!is_array($images) || 0==count($images)) {
- $this->setError(11, "newform_to_template -> dropImages(), illegal function call");
+ $this->setError(11, "template_bridge -> dropImages(), illegal function call");
                         return false;
                 }
                 
@@ -406,11 +406,11 @@
         */
         function addElement($element_data) {
                 if (!is_array($element_data)) {
- $this->setError(1, "newform_to_template -> addElement(), illegal function call");
+ $this->setError(1, "template_bridge -> addElement(), illegal function call");
                         return false;
                 }
                 if (isset($this->elements[$element_data["name"]]))
- $this->setError(2, "newform_to_template -> addElement(), override previously declared element");
+ $this->setError(2, "template_bridge -> addElement(), override previously declared element");