Changeset 1070 for trunk/lib

Timestamp:

08/31/08 11:25:39 (4 months ago)

Author:

laurentj

Message:

jforms plugins: added a check on the existence of the control when calling ctrl_* plugin

Files:

• trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties (modified) (1 diff)
• trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties (modified) (1 diff)
• trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_control.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_label.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.ctrl_value.php (modified) (1 diff)
• trunk/lib/jelix/tpl/jTpl.class.php (modified) (4 diffs)

trunk/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

@@ -21 +21 @@
-bad.root.tag=(820) the root element %1$s is incorrect, it should have the name "form" (fichier %2$s)
-
+unknow.control=(830) The control "%1$s" doesn't exist in the form "%2$s" (template %3$s)
+
-js.err.invalid= "%s" field is invalid
-js.err.required= "%s" field is required

trunk/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

@@ -21 +21 @@
-bad.root.tag=(820) the root element %1$s is incorrect, it should have the name "form" (fichier %2$s)
-
+unknow.control=(830) The control "%1$s" doesn't exist in the form "%2$s" (template %3$s)
+
-js.err.invalid= "%s" field is invalid
-js.err.required= "%s" field is required

trunk/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

@@ -21 +21 @@
-bad.root.tag=(820) la balise racine %1$s est incorrecte, elle devrait avoir pour nom "form" (fichier %2$s)
-
+unknow.control=(830) Le contrôle "%1$s" n'existe pas dans le formulaire "%2$s" (template "%3$s")
+
-js.err.invalid=La saisie de "%s" est invalide
-js.err.required=La saisie de "%s" est obligatoire

trunk/lib/jelix/plugins/tpl/html/function.ctrl_control.php

@@ -28 +28 @@
-    else {
-        $ctrls = $tpl->_privateVars['__form']->getControls();
+        if (!isset($ctrls[$ctrlname])) {
+            throw new jException('jelix~formserr.unknow.control',
+                array($ctrlname, $tpl->_privateVars['__form']->getSelector(),$tpl->_templateName));
+        }
-        $ctrl = $ctrls[$ctrlname];
-    }

trunk/lib/jelix/plugins/tpl/html/function.ctrl_label.php

@@ -25 +25 @@
-    }else{
-        $ctrls = $tpl->_privateVars['__form']->getControls();
+        if (!isset($ctrls[$ctrlname])) {
+            throw new jException('jelix~formserr.unknow.control',
+                array($ctrlname, $tpl->_privateVars['__form']->getSelector(),$tpl->_templateName));
+        }
-        $ctrl=$ctrls[$ctrlname];
-    }

trunk/lib/jelix/plugins/tpl/html/function.ctrl_value.php

@@ -29 +29 @@
-        $tpl->_privateVars['__displayed_ctrl'][$ctrlname] = true;
-        $ctrlname = $tpl->_privateVars['__ctrlref'];
-else
+ else 
-        $ctrls = $tpl->_privateVars['__form']->getControls();
+        if (!isset($ctrls[$ctrlname])) {
+            throw new jException('jelix~formserr.unknow.control',
+                array($ctrlname, $tpl->_privateVars['__form']->getSelector(),$tpl->_templateName));
+        }
-        $ctrl = $ctrls[$ctrlname];
-    }

trunk/lib/jelix/tpl/jTpl.class.php

@@ -208 +208 @@
-
-    /**
+     * contains the name of the template file
+     * It have a public access only for plugins. So you musn't use directly this property
+     * except from tpl plugins.
+     * @var string
+     * @since 1.1
+     */
+    public $_templateName;
+
+    /**
-     * include the compiled template file and call one of the generated function
-     * @param string $tpl template selector
@@ -220 +229 @@
-        $sel->userFunctions = $this->userFunctions;
-        jIncluder::inc($sel);
+        $this->_templateName = $sel->toString();
-        $fct = $fctname.md5($sel->module.'_'.$sel->resource.'_'.$sel->outputType.($trusted?'_t':''));
-#else
-        $tpl = JTPL_TEMPLATES_PATH . $tpl;
-filen
-filen
+this->_templateN
+this->_templateN
-
-        $mustCompile = $GLOBALS['jTplConfig']['compilation_force']['force'] || !file_exists($cachefile);
@@ -260 +270 @@
-#ifnot JTPL_STANDALONE
-            $sel = new jSelectorTpl($tpl, $outputtype, $trusted);
+            $sel->userModifiers = $this->userModifiers;
+            $sel->userFunctions = $this->userFunctions;
-            jIncluder::inc($sel);
-            $md = md5($sel->module.'_'.$sel->resource.'_'.$sel->outputType.($trusted?'_t':''));
+            $this->_templateName = $sel->toString();
-#else
-            $tpl = JTPL_TEMPLATES_PATH . $tpl;
-filen
-filen
+this->_templateN
+this->_templateN
-
-            $mustCompile = $GLOBALS['jTplConfig']['compilation_force']['force'] || !file_exists($cachefile);
@@ -277 +290 @@
-                include_once(JTPL_PATH . 'jTplCompiler.class.php');
-                $compiler = new jTplCompiler();
+                $compiler->setUserPlugins( $this->userModifiers, $this->userFunctions);
-                $compiler->compile($tpl,$outputtype,$trusted);
-            }