[Fusionforge-commits] r11152 - in trunk/src/plugins/wiki/www: . lib lib/plugin themes/fusionforge

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Oct 22 20:21:28 CEST 2010


Author: vargenau
Date: 2010-10-22 20:21:27 +0200 (Fri, 22 Oct 2010)
New Revision: 11152

Modified:
   trunk/src/plugins/wiki/www/g
   trunk/src/plugins/wiki/www/lib/PageList.php
   trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css
   trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css
Log:
Update from Phpwiki

Modified: trunk/src/plugins/wiki/www/g
===================================================================
--- trunk/src/plugins/wiki/www/g	2010-10-22 16:45:32 UTC (rev 11151)
+++ trunk/src/plugins/wiki/www/g	2010-10-22 18:21:27 UTC (rev 11152)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: g 7708 2010-09-22 18:19:06Z vargenau $
+<?php // -*-php-*- $Id: g 7719 2010-10-22 09:30:47Z vargenau $
 
 /*
  * Copyright (C) 2008-2010 Alcatel-Lucent
@@ -121,8 +121,8 @@
     // Dummy value
     define('ADMIN_PASSWD', 'xxx');
 
-    // Allow ".svg" as extension
-    define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg');
+    // Allow ".svg" and ".swf" as extensions
+    define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg|swf');
 
     // Allow <div> and <span> in wiki code
     define('ENABLE_MARKUP_DIVSPAN', true);

Modified: trunk/src/plugins/wiki/www/lib/PageList.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/PageList.php	2010-10-22 16:45:32 UTC (rev 11151)
+++ trunk/src/plugins/wiki/www/lib/PageList.php	2010-10-22 18:21:27 UTC (rev 11152)
@@ -195,7 +195,7 @@
             return $page_handle->get($this->_field);
         }
     }
-  
+
     function _getSortableValue ($page_handle, &$revision_handle) {
         $val = $this->_getValue($page_handle, $revision_handle);
         if ($this->_field == 'hits')
@@ -226,7 +226,7 @@
                         $this->_getValue($pagelist, $page_handle, $revision_handle),
                         HTML::raw('&nbsp;'));
     }
-  
+
     function _getValue (&$pagelist, $page_handle, &$revision_handle) {
         if (!$revision_handle or (!$revision_handle->_data['%content']
                                   or $revision_handle->_data['%content'] === true)) {
@@ -239,7 +239,7 @@
             unset($revision_handle->_data['%content']);
         return $size;
     }
-  
+
     function _getSortableValue ($page_handle, &$revision_handle) {
         if (!$revision_handle)
             $revision_handle = $page_handle->getCurrentRevision(true);
@@ -358,7 +358,7 @@
                                       '»'.$this->search.'«');
         }
     }
-  
+
     function _getValue ($page_handle, &$revision_handle) {
         if (!$revision_handle or (!$revision_handle->_data['%content']
                                   or $revision_handle->_data['%content'] === true)) {
@@ -452,7 +452,7 @@
         else
             return $author;
     }
-  
+
     function _getSortableValue ($page_handle, &$revision_handle) {
         return _PageList_Column::_getValue($page_handle, $revision_handle);
     }
@@ -714,11 +714,11 @@
                      'external' => null,
                      );
     }
-  
+
     function pagingArgs() {
         return array('sortby','limit','paging','count','dosort');
     }
-  
+
     function clearArg($arg_name) {
         if (isset($this->_options[$arg_name]))
             unset($this->_options[$arg_name]);
@@ -804,7 +804,7 @@
             or (!empty($this->_excluded_pages)
                 and in_array($page_handle->getName(), $this->_excluded_pages)))
             return; // exclude page.
-          
+
         // enforce view permission
         if (!mayAccessPage('view', $page_handle->getName()))
             return;
@@ -927,7 +927,7 @@
     function asXML() {
         return AsXML($this->getContent());
     }
-  
+
     /**
      * Handle sortby requests for the DB iterator and table header links.
      * Prefix the column with + or - like "+pagename","-mtime", ...
@@ -936,7 +936,7 @@
      *   'init'       :   unify with predefined order. "pagename" => "+pagename"
      *   'flip_order' :   "mtime" => "+mtime" => "-mtime" ...
      *   'db'         :   "-pagename" => "pagename DESC"
-     *   'check'      : 
+     *   'check'      :
      *
      * Now all columns are sortable. (patch by DanFr)
      * Some columns have native DB backend methods, some not.
@@ -1454,11 +1454,11 @@
         }
         return $tokens;
     }
-  
+
     // make a table given the caption
     function _generateTable($caption) {
         if (count($this->_sortby) > 0) $this->_sortPages();
-      
+
         // wikiadminutils hack. that's a way to pagelist non-pages
         $rows = isset($this->_rows) ? $this->_rows : array();
         $i = 0;
@@ -1614,7 +1614,7 @@
                 $cols));
             return $out;
         }
-      
+
         // Ignore azhead if not sorted by pagename
         if (!empty($this->_options['azhead'])
             and strstr($this->sortby($this->_options['sortby'], 'init'), "pagename")
@@ -1734,7 +1734,7 @@
         }
         return $html;
     }
-  
+
     function _emptyList($caption) {
         $html = HTML();
         if ($caption) {

Modified: trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php	2010-10-22 16:45:32 UTC (rev 11151)
+++ trunk/src/plugins/wiki/www/lib/plugin/UpLoad.php	2010-10-22 18:21:27 UTC (rev 11152)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: UpLoad.php 7659 2010-08-31 14:55:29Z vargenau $');
+// rcs_id('$Id: UpLoad.php 7719 2010-10-22 09:30:47Z vargenau $');
 /*
  * Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -132,7 +132,6 @@
 reg
 sc[frt]
 sh[bsm]?
-swf
 url
 vb[esx]?
 vxd

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css	2010-10-22 16:45:32 UTC (rev 11151)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print-min.css	2010-10-22 18:21:27 UTC (rev 11152)
@@ -1 +1 @@
-.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file
+.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}#rateit-widget-top{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css	2010-10-22 16:45:32 UTC (rev 11151)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/fusionforge-print.css	2010-10-22 18:21:27 UTC (rev 11152)
@@ -1,5 +1,5 @@
 /**
- * $Id: fusionforge-print.css 7662 2010-08-31 15:12:14Z vargenau $
+ * $Id: fusionforge-print.css 7718 2010-10-22 08:26:31Z vargenau $
  *
  * Copyright (C) 2008 Alcatel-Lucent
  *
@@ -51,6 +51,9 @@
 /* Do not print main wiki browse banner */
 .browsebanner { display: none; }
 
+/* Do not print rateit widget */
+#rateit-widget-top { display: none; }
+
 /* Do not print date of last edition */
 .editdate { display: none; }
 




More information about the Fusionforge-commits mailing list