[phpwiki-checkins] CVS: phpwiki/lib Theme.php,1.72,1.73 loadsave.php,1.92,1.93

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15389

Modified Files:
	Theme.php loadsave.php 
Log Message:
also copy css and images with XHTML Dump

Index: Theme.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Theme.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -2 -b -p -d -r1.72 -r1.73
--- Theme.php	26 Feb 2004 02:25:53 -0000	1.72
+++ Theme.php	26 Feb 2004 03:22:05 -0000	1.73
@@ -162,5 +162,5 @@ function Button ($action, $label = false
 class Theme {
     var $HTML_DUMP_SUFFIX = '';
-    var $DUMP_MODE;
+    var $DUMP_MODE, $dumped_images, $dumped_css; 
 
     function Theme ($theme_name = 'default') {
@@ -487,5 +487,5 @@ class Theme {
         }
         
-        if ($this->DUMP_MODE) {
+        if ($this->DUMP_MODE) { // HTML, PDF or XML
             $link = HTML::u( empty($linktext) ? $wikiword : $linktext);
             $link->addTooltip(sprintf(_("Empty link to: %s"), $wikiword));
@@ -580,6 +580,11 @@ class Theme {
         $path = $this->_findData("images/$image", 'missing okay');
         if (!$path) // search explicit images/ or button/ links also
-            return $this->_findData("$image", 'missing okay');
-       	else 
+            $path = $this->_findData("$image", 'missing okay');
+
+        if ($this->DUMP_MODE) {
+            if (empty($this->dumped_images)) $this->dumped_images = array();
+            $path = "images/". basename($path);
+            if (!in_array($path,$this->dumped_images)) $this->dumped_images[] = $path;
+        }
             return $path;	
     }
@@ -876,4 +881,9 @@ class Theme {
         if ($media) 
             $link->setAttr('media', $media);
+        if ($this->DUMP_MODE) {
+            if (empty($this->dumped_css)) $this->dumped_css = array();
+            if (!in_array($css_file,$this->dumped_css)) $this->dumped_css[] = $css_file;
+            $link->setAttr('href', basename($link->getAttr('href')));
+        }
         
         return $link;
@@ -1083,4 +1093,7 @@ class SubmitImageButton extends SubmitBu
 
 // $Log$
+// Revision 1.73  2004/02/26 03:22:05  rurban
+// also copy css and images with XHTML Dump
+//
 // Revision 1.72  2004/02/26 02:25:53  rurban
 // fix empty and #-anchored links in XHTML Dumps

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -2 -b -p -d -r1.92 -r1.93
--- loadsave.php	26 Feb 2004 02:25:54 -0000	1.92
+++ loadsave.php	26 Feb 2004 03:22:05 -0000	1.93
@@ -294,6 +294,34 @@ function DumpHtmlToDir (&$request)
     }
 
-    //CopyImageFiles() will go here;
-    $Theme->$HTML_DUMP_SUFFIX = '';
+    if (is_array($Theme->dumped_images)) {
+        @mkdir("$directory/images");
+        foreach ($Theme->dumped_images as $img_file) {
+            if (($from = $Theme->_findFile($img_file)) and basename($from)) {
+                $target = "$directory/images/".basename($img_file);
+                if (copy($Theme->_path . $from, $target)) {
+                    $msg = HTML(HTML::br(), HTML($from), HTML::small(fmt("... copied to %s", $target)));
+                    PrintXML($msg);
+                }
+            } else {
+                $msg = HTML(HTML::br(), HTML($from), HTML::small(fmt("... not found", $target)));
+                PrintXML($msg);
+            }
+        }
+    }
+    if (is_array($Theme->dumped_css)) {
+      foreach ($Theme->dumped_css as $css_file) {
+          if (($from = $Theme->_findFile(basename($css_file))) and basename($from)) {
+              $target = "$directory/" . basename($css_file);
+              if (copy($Theme->_path . $from, $target)) {
+                  $msg = HTML(HTML::br(), HTML($from), HTML::small(fmt("... copied to %s", $target)));
+                  PrintXML($msg);
+              }
+          } else {
+              $msg = HTML(HTML::br(), HTML($from), HTML::small(fmt("... not found", $target)));
+              PrintXML($msg);
+          }
+      }
+    }
+    $Theme->HTML_DUMP_SUFFIX = '';
     $Theme->DUMP_MODE = false;
 
@@ -850,4 +878,7 @@ function LoadPostFile (&$request)
 /**
  $Log$
+ Revision 1.93  2004/02/26 03:22:05  rurban
+ also copy css and images with XHTML Dump
+
  Revision 1.92  2004/02/26 02:25:54  rurban
  fix empty and #-anchored links in XHTML Dumps