Changeset 1328

Timestamp:

03/06/06 09:08:37 (3 years ago)

Author:

mbonetti

Message:

Fix for #362. Well spotted, thanks.

Location:

trunk/rss

Files:

• admin/config.php (modified) (3 diffs)
• admin/ds.php (modified) (2 diffs)
• opml.php (modified) (1 diff)

trunk/rss/admin/config.php

@@ -222 +222 @@
         echo "<form style=\"display:inline\" id=\"cfg\" method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."\">\n";
         
-        config_edit_form($key,$value,$default,$type,$desc,$export);
+        $onclickaction = null;
+        config_edit_form($key,$value,$default,$type,$desc,$export,$onclickaction);
 
         echo "<p style=\"display:inline\">\n";
         echo (isset($preview)?"<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_PREVIEW_CHANGES ."\""
-      .(isset($onclickaction)?" onclick=\"$onclickaction\"":"") ." />\n":"");
+      .($onclickaction?" onclick=\"$onclickaction\"":"") ." />\n":"");
         echo "<input type=\"hidden\" name=\"".CST_ADMIN_METAACTION."\" value=\"LBL_ADMIN_SUBMIT_CHANGES\" />";
     
         echo "<input type=\"submit\" name=\"action\" value=\"". LBL_ADMIN_SUBMIT_CHANGES ."\""
-        .(isset($onclickaction)?" onclick=\"$onclickaction\"":"")
+        .($onclickaction?" onclick=\"$onclickaction\"":"")
         ." /><input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CONFIG ."\"/>\n</p></form>\n";
     
@@ -250 +251 @@
     case LBL_ADMIN_SUBMIT_CHANGES:
     case 'LBL_ADMIN_SUBMIT_CHANGES':
+                
         $key = sanitize($_POST['key'],RSS_SANITIZER_NO_SPACES|RSS_SANITIZER_SIMPLE_SQL);
         $type = sanitize($_POST['type'],RSS_SANITIZER_CHARACTERS);
         $value = sanitize($_POST['value'], RSS_SANITIZER_SIMPLE_SQL);
 
-                
                 // sanitizine routines for values
                 switch ($key) {
@@ -375 +376 @@
 }
 
-function config_edit_form($key,$value,$default,$type,$desc,$export) {
+function config_edit_form($key,$value,$default,$type,$desc,$export, & $onclickaction = null) {
     $value = real_strip_slashes($value);
 

trunk/rss/admin/ds.php

@@ -57 +57 @@
     }    
 
-        function populate1() {
+    function populate1() {
       var box1 = getForm().first;
       var box2 = getForm().second;
@@ -68 +68 @@
     
     function add1() {
-      var newtag = getForm().newtag.value.replace(/[^a-zA-Z]*/g,"");
+      var newtag = getForm().newtag.value.replace(/[^a-zA-Z0-9]*/g,"");
       if (newtag == '') return;
       getForm().newtag.value = '';

trunk/rss/opml.php

@@ -61 +61 @@
       or xml_error("couldnt set XML handlers");
     
-    xml_parse($xp, $opml, true) or xml_error("failed parsing xml");
+    xml_parse($xp, $opml, true) or xml_error("failed parsing xml at line ".xml_get_current_line_number().": " . xml_error_string());
     xml_parser_free($xp) or xml_error("failed freeing the parser");
     return $blogs;