UrlApprovals allow https: URLs if the http: URL for the same domain is approved (cont.)

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4537 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 3 insertions, 4 deletions

diff --git a/scripts/urlapprove.php b/scripts/urlapprove.php
index 2d345ec2..b4817942 100644
--- a/scripts/urlapprove.php
+++ b/scripts/urlapprove.php
@@ -64,6 +64,7 @@ function LinkHTTP($pagename,$imap,$path,$alt,$txt,$fmt=NULL) {
   $url = str_replace('$1',$p,$IMap[$imap]);
   if (!isset($UnapprovedLink)) $UnapprovedLink = array();
   foreach((array)$WhiteUrlPatterns as $pat) {
+    $pat = preg_replace('!^http\\:!', 'https?:', $pat);
     if (preg_match("!^$pat(/|$)!i",$url))
       return LinkIMap($pagename,$imap,$path,$alt,$txt,$fmt);
   }
@@ -82,10 +83,8 @@ function ReadApprovedUrls($pagename) {
     StopWatch("ReadApprovedUrls $pn begin");
     $apage = ReadPage($pn, READPAGE_CURRENT);
     preg_match_all("/$ApproveUrlPattern/",strval(@$apage['text']),$match);
-    foreach($match[0] as $a) {
-      $qa = preg_quote($a,'!');
-      $WhiteUrlPatterns[] = preg_replace('!^http\\:!', 'https?:', $qa);
-    }
+    foreach($match[0] as $a) 
+      $WhiteUrlPatterns[] = preg_quote($a,'!');
     StopWatch("ReadApprovedUrls $pn end");
   }
 }