Changeset 47

Timestamp:

04/22/2006 08:27:17 AM (4 years ago)

Author:

DotMG

Message:

#142, #148, #145
URL containing .mm, Secured Link method
Refixing #131

Location:

trunk

Files:

• formatters/wakka.php (modified) (2 diffs)
• wikka.php (modified) (3 diffs)

trunk/formatters/wakka.php

@@ -125 +125 @@
                 {
                         $url = $matches[1];
-                        if (preg_match("/^(.*)\.(gif|jpg|png)/si", $url)) {
-                                return "<img src=\"$url\" alt=\"image\" />".$matches[2];
-                        } else
+                        /* Inline images are disabled for security reason, use {{image action}} #142
+                        But if you still need this functionality, update this file like below
+                        if (preg_match("/\.(gif|jpg|png|svg)$/si", $url)) {
+                                return '<img src="'.$wakka->Link($url).'" alt="image" />'.$wakka->htmlspecialchars_ent($matches[2]);
+                        } else */
                         // Mind Mapping Mod
-                        if (preg_match("/^(.*)\.(mm)/si", $url)) {
+                        if (preg_match("/\.(mm)$/si", $url)) { #145
                                 return $wakka->Action("mindmap ".$url);
                         } else
@@ -191 +193 @@
                 {
                         /*
-                         * Note: this routine is rewritten such that (new) language formatters
-                         * will automatically be found, whether they are GeSHi language config files
-                         * or "internal" Wikka formatters.
-                         * Path to GeSHi language files and Wikka formatters MUST be defined in config.
-                         * For line numbering (GeSHi only) a starting line can be specified after the language
-                         * code, separated by a ; e.g., %%(php;27)....%%.
-                         * Specifying >= 1 turns on line numbering if this is enabled in the configuration.
-                         */
+                                * Note: this routine is rewritten such that (new) language formatters
+                                * will automatically be found, whether they are GeSHi language config files
+                                * or "internal" Wikka formatters.
+                                * Path to GeSHi language files and Wikka formatters MUST be defined in config.
+                                * For line numbering (GeSHi only) a starting line can be specified after the language
+                                * code, separated by a ; e.g., %%(php;27)....%%.
+                                * Specifying >= 1 turns on line numbering if this is enabled in the configuration.
+                                */
                         $code = $matches[1];
                         // if configuration path isn't set, make sure we'll get an invalid path so we

trunk/wikka.php

@@ -636 +636 @@
                 // escape text?
                 if ($escapeText) $text = $this->htmlspecialchars_ent($text);
+                $tag = $this->htmlspecialchars_ent($tag); #142 & #148
+                $method = $this->htmlspecialchars_ent($method);
+                $title = $this->htmlspecialchars_ent($title);
                 $url = '';
 
@@ -1156 +1159 @@
         exit;
 }
-#Fix lowercase mod_rewrite bug: Url rewritting lowercases the page name.
+
+// start session
+session_start();
+
+// fetch wakka location
+$wakka = $_REQUEST["wakka"];
+
+// remove leading slash
+$wakka = preg_replace("/^\//", "", $wakka);
+
+// split into page/method
+if (preg_match("#^(.+?)/(.*)$#", $wakka, $matches)) list(, $page, $method) = $matches;
+else if (preg_match("#^(.*)$#", $wakka, $matches)) list(, $page) = $matches;
+#Fix lowercase mod_rewrite bug: Url rewritting lowercases the page name. #135
 if (strtolower($page) == $page)
 {
@@ -1165 +1181 @@
  }
 }
-
-// start session
-session_start();
-
-// fetch wakka location
-$wakka = $_REQUEST["wakka"];
-
-// remove leading slash
-$wakka = preg_replace("/^\//", "", $wakka);
-
-// split into page/method
-if (preg_match("#^(.+?)/(.*)$#", $wakka, $matches)) list(, $page, $method) = $matches;
-else if (preg_match("#^(.*)$#", $wakka, $matches)) list(, $page) = $matches;
 
 // create wakka object