 |
 |
 |
 |
|
|
Date: 01/22/01
- Next message: uw: "[phplib-dev] cvs commit"
- Previous message: Max A. Derkachev: "Re: [phplib-dev] [Fwd: [PHP-PEAR] Merging PHPLIB into PEAR]"
- Next in thread: uw: "[phplib-dev] cvs commit"
- Maybe reply: uw: "[phplib-dev] cvs commit"
- Maybe reply: uw: "[phplib-dev] cvs commit"
- Maybe reply: ssilk: "[phplib-dev] cvs commit"
- Maybe reply: ssilk: "[phplib-dev] cvs commit"
- Maybe reply: max: "[phplib-dev] cvs commit"
- Maybe reply: max: "[phplib-dev] cvs commit"
- Maybe reply: max: "[phplib-dev] cvs commit"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
From: uw
Date: Mon Jan 22 22:26:00 2001
Modified files:
php-lib/php/form/form_loader.inc
Log message:
Replaced require_once() with include_once(). include_once()
is conditional which is intended for the loader.
Index: php-lib/php/form/form_loader.inc
diff -u php-lib/php/form/form_loader.inc:1.5 php-lib/php/form/form_loader.inc:1.6
--- php-lib/php/form/form_loader.inc:1.5 Sat Jan 6 02:03:04 2001
+++ php-lib/php/form/form_loader.inc Mon Jan 22 22:25:58 2001
@@ -8,7 +8,7 @@
* <email protected> formloader
* <email protected> form
* <email protected> public
-* <email protected> $Id: form_loader.inc,v 1.5 2001/01/06 01:03:04 uw Exp $
+* <email protected> $Id: form_loader.inc,v 1.6 2001/01/22 21:25:58 uw Exp $
* <email protected> Ulf Wendel <ulf.wendel <email protected>>
*/
@@ -21,12 +21,12 @@
*/
function form_loader($task = "") {
- require_once(FORM_INCLUDE_DIR . "form_error.inc");
+ include_once(FORM_INCLUDE_DIR . "form_error.inc");
$files = array(
- "form" => array("form_commonobject", "form"),
- "bridge" => array("template_bridge"),
- "assistant" => array("assistant")
+ "form" => array("form_commonobject", "form"),
+ "flow_layout" => array("form_commonobject", "form", "form_flow_layout", "form_flow_layout_node"),
+ "assistant" => array("assistant")
);
$task = strtolower($task);
@@ -35,13 +35,13 @@
// greedy guys get them all
foreach ($files as $task => $required)
foreach ($required as $k => $file)
- require_once(FORM_INCLUE_DIR . $file . ".inc");
+ include_once(FORM_INCLUE_DIR . $file . ".inc");
} else {
// the good guys get christmas presents
foreach ($files[$task] as $k => $file)
- require_once(FORM_INCLUDE_DIR . $file . ".inc");
+ include_once(FORM_INCLUDE_DIR . $file . ".inc");
}
@@ -56,8 +56,8 @@
*/
function form_elements_loader($task = "") {
- require_once(FORM_INCLUDE_DIR . "form_commonobject.inc");
- require_once(FORM_INCLUDE_DIR . "form_element.inc");
+ include_once(FORM_INCLUDE_DIR . "form_commonobject.inc");
+ include_once(FORM_INCLUDE_DIR . "form_element.inc");
$files = array(
"checkbox" => array("form_element_checkobject", "form_element_checkbox"),
@@ -71,8 +71,8 @@
"file" => array("form_element_buttonobject", "form_element_file"),
"fileupload" => array("form_element_buttonobject", "form_element_file", "form_element_fileupload"),
- "image" => array("form_element_buttonobject", "form_element_image"),
"submit" => array("form_element_buttonobject", "form_element_submit"),
+ "image" => array("form_element_buttonobject", "form_element_submit", "form_element_image"),
"reset" => array("form_element_buttonobject", "form_element_submit", "form_element_reset"),
"hidden" => array("form_element_hidden"),
@@ -81,7 +81,17 @@
"password" => array("form_element_textobject", "form_element_text", "form_element_password"),
"textarea" => array("form_element_textobject", "form_element_textarea"),
- "tree" => array("form_element_tree")
+ "textedit" => array("form_element_textedit"),
+
+ "tree" => array("form_element_tree"),
+
+ // custom elements start here
+ "custom_date" => array("form_element_date", "form_element_custom_date"),
+ "custom_email" => array("form_element_textobject", "form_element_text", "form_element_custom_email"),
+ "custom_name" => array("form_element_textobject", "form_element_text", "form_element_custom_name"),
+ "custom_radio" => array("form_element_checkobject", "form_element_radio", "form_element_custom_radio"),
+ "custom_textedit" => array("form_element_textedit", "form_element_custom_textedit"),
+ "custom_submit" => array("form_element_buttonobject", "form_element_submit", "form_element_custom_submit")
);
$task = strtolower($task);
@@ -90,13 +100,13 @@
// ok, take them all... it's your fault.
foreach ($files as $task => $required)
foreach ($required as $k => $file)
- require_once(FORM_INCLUDE_DIR . $file . ".inc");
+ include_once(FORM_INCLUDE_DIR . $file . ".inc");
} else {
// intelligent user, heh?
foreach ($files[$task] as $k => $file)
- require_once(FORM_INCLUDE_DIR . $file . ".inc");
+ include_once(FORM_INCLUDE_DIR . $file . ".inc");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: phplib-dev-unsubscribe <email protected>
For additional commands, e-mail: phplib-dev-help <email protected>
- Next message: uw: "[phplib-dev] cvs commit"
- Previous message: Max A. Derkachev: "Re: [phplib-dev] [Fwd: [PHP-PEAR] Merging PHPLIB into PEAR]"
- Next in thread: uw: "[phplib-dev] cvs commit"
- Maybe reply: uw: "[phplib-dev] cvs commit"
- Maybe reply: uw: "[phplib-dev] cvs commit"
- Maybe reply: ssilk: "[phplib-dev] cvs commit"
- Maybe reply: ssilk: "[phplib-dev] cvs commit"
- Maybe reply: max: "[phplib-dev] cvs commit"
- Maybe reply: max: "[phplib-dev] cvs commit"
- Maybe reply: max: "[phplib-dev] cvs commit"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]