Changeset 1196

Timestamp:

12/02/08 16:05:45 (1 month ago)

Author:

julieni

Message:

backports of a bunch of patches from the trunk

Files:

• branches/1.0.x/lib/jelix/core-modules/jelix/templates/atom10.tpl (modified) (1 diff)
• branches/1.0.x/lib/jelix/core-modules/jelix/templates/rss20.tpl (modified) (1 diff)
• branches/1.0.x/lib/jelix/core/jCoordinator.class.php (modified) (2 diffs)
• branches/1.0.x/lib/jelix/core/jSelector.class.php (modified) (2 diffs)
• branches/1.0.x/lib/jelix/CREDITS (modified) (2 diffs)
• branches/1.0.x/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (6 diffs)

branches/1.0.x/lib/jelix/core-modules/jelix/templates/atom10.tpl

@@ -86 +86 @@
-  </entry>
-  {/foreach}
-
+

branches/1.0.x/lib/jelix/core-modules/jelix/templates/rss20.tpl

@@ -58 +58 @@
-
- </channel>
-
+

branches/1.0.x/lib/jelix/core/jCoordinator.class.php

@@ -23 +23 @@
-class jCoordinator {
-
-
-
-
-
+ 
+ 
+ 
+ 
-    public $plugins=array();
-
@@ -280 +280 @@
-     * instancy a response object corresponding to the default response type
-     * of the current resquest
+     * @param boolean $originalResponse TRUE to get the original, non overloaded response
-     * @return mixed  error string or false
-     */
-
-
+
+
+
+
+
-
-        $type= $this->request->defaultResponseType;
-
-gJConfig->responses[$type])){
+responses[$type]))
-            return jLocale::get('jelix~errors.default.response.type.unknow',array($this->moduleName.'~'.$this->actionName,$type));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

branches/1.0.x/lib/jelix/core/jSelector.class.php

@@ -15 +15 @@
-* @contributor Thibault PIRONT < nuKs >
-* @contributor Julien Issler
+* @contributor Baptiste Toinot
-* @copyright   2005-2007 Laurent Jouanneau, 2007 Loic Mathaud, 2007 Rahal
-* @copyright   2007 Thibault PIRONT
-* @copyright   2008 Julien Issler
+* @copyright   2008 Baptiste Toinot
-* @link        http://www.jelix.org
-* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
@@ -520 +522 @@
-            }
-            // else check for the original locale file
-/
+
-            if (is_readable ($path)){
-                $this->_where = 'modules/';

branches/1.0.x/lib/jelix/CREDITS

@@ -86 +86 @@
- - jDao: autoremove of empty groups in jDaoConditions (#724)
- - jForms: server side check for <input type="url"> doesn't work (#743)
+ - jForms: some controls are selected by default if their values are "0" (#757)
+ - jCoordinator: exception loop when response's constructor fails (#749)
-
-Bastien Jaillot (aka bastnic)
@@ -153 +155 @@
- - fixed bugs in jDao (#576, #643)
-
+Baptiste Toinot (aka Surfoo)
+ - double / in path for locale selector
+ 
-Christian Tritten
- - improvements on pagelinks plugin (#340)

branches/1.0.x/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -205 +205 @@
-
-            if(is_array($value)){
+                $value = array_map(create_function('$v', 'return (string) $v;'),$value);
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo $span,$attrs,$i,'" value="',htmlspecialchars($v),'"';
-$v,$val
+(string) $v,$value,tr
-                        echo ' checked="checked"';
-                    echo $readonly,$class,$this->_endt,'<label for="',$id,$i,'">',htmlspecialchars($label),'</label></span>';
@@ -213 +214 @@
-                }
-            }else{
+                $value = (string) $value;
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-                    echo $span,$attrs,$i,'" value="',htmlspecialchars($v),'"';
-$v 
+(string) $v =
-                        echo ' checked="checked"';
-                    echo $readonly,$class,$this->_endt,'<label for="',$id,$i,'">',htmlspecialchars($label),'</label></span>';
@@ -232 +234 @@
-                    $value='';
-            }
+            $value = (string) $value;
-            $span ='<span class="jforms-radio jforms-ctl-'.$ctrl->ref.'"><input type="radio"';
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-$v
+(string) $v=
-                echo '<label for="',$this->_name,'_',$ctrl->ref,'_',$i,'">',htmlspecialchars($label),'</label></span>';
-                $i++;
@@ -248 +251 @@
-                    $value='';
-            }
+            $value = (string) $value;
-            if (!$ctrl->required) {
-
+=
-            }
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-$v
+(string) $v=
-            }
-            echo '</select>';
@@ -265 +269 @@
-
-                if(is_array($value)){
+                    $value = array_map(create_function('$v', 'return (string) $v;'),$value);
-                    foreach($ctrl->datasource->getDatas() as $v=>$label){
-$v,$val
+(string) $v,$value,tr
-                    }
-                }else{
+                    $value = (string) $value;
-                    foreach($ctrl->datasource->getDatas() as $v=>$label){
-$v
+(string) $v=
-                    }
-                }
@@ -283 +289 @@
-                        $value ='';
-                }
-
+
-                echo '<select',$id,$hint,$class,' size="',$ctrl->size,'">';
-                foreach($ctrl->datasource->getDatas() as $v=>$label){
-$v
+(string) $v=
-                }
-                echo '</select>';