Revision: 6334 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6334&view=rev Author: vargenau Date: 2008年10月24日 13:50:21 +0000 (2008年10月24日) Log Message: ----------- "Rename Page" and "Purge Page" in menu Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2008年10月24日 13:28:58 UTC (rev 6333) +++ trunk/lib/WikiTheme.php 2008年10月24日 13:50:21 UTC (rev 6334) @@ -987,9 +987,11 @@ case 'diff': return _("Diff"); case 'logout': return _("Sign Out"); case 'login': return _("Sign In"); + case 'rename': return _("Rename Page"); case 'lock': return _("Lock Page"); case 'unlock': return _("Unlock Page"); case 'remove': return _("Remove Page"); + case 'purge': return _("Purge Page"); default: // I don't think the rest of these actually get used. // 'setprefs' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6407 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6407&view=rev Author: rurban Date: 2009年01月17日 14:32:39 +0000 (2009年1月17日) Log Message: ----------- quote js_script array Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年01月17日 14:31:56 UTC (rev 6406) +++ trunk/lib/WikiTheme.php 2009年01月17日 14:32:39 UTC (rev 6407) @@ -1493,10 +1493,13 @@ $js_exist = '{"'.join('":1,"',$existing).'":1}'; //var SPECIAL_DAYS = {"2004-05-11":1,"2004-05-12":1,"2004-06-01":1} $this->addMoreHeaders(JavaScript(' -// This table holds the existing calender entries for the current user -// calculated from the database -var SPECIAL_DAYS = '.$js_exist.'; -// This function returns true if the date exists in SPECIAL_DAYS +/* This table holds the existing calender entries for the current user + * calculated from the database + */ + +var SPECIAL_DAYS = '.javascript_quote_string($js_exist).'; + +/* This function returns true if the date exists in SPECIAL_DAYS */ function dateExists(date, y, m, d) { var year = date.getFullYear(); m = m + 1; @@ -1513,7 +1516,8 @@ function dateStatusFunc(date, y, m, d) { if (dateExists(date, y, m, d)) return "existing"; else return false; -}')); +} +')); } else { $this->addMoreHeaders(JavaScript(' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6412 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6412&view=rev Author: rurban Date: 2009年01月19日 08:55:40 +0000 (2009年1月19日) Log Message: ----------- Fix findFile fallback for php-4.x break some long lines Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年01月17日 14:50:05 UTC (rev 6411) +++ trunk/lib/WikiTheme.php 2009年01月19日 08:55:40 UTC (rev 6412) @@ -206,7 +206,7 @@ $parent = $this; /* derived classes should search all parent classes */ while ($parent = get_parent_class($parent)) { - if ($parent == 'WikiTheme') { + if (strtolower($parent) == 'wikitheme') { $this->_default_theme = new WikiTheme('default', true); $this->_parents[] = $this->_default_theme; } elseif ($parent) { @@ -220,10 +220,13 @@ $script_url = deduce_script_name(); if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug'])) $script_url .= ("?start_debug=".$_GET['start_debug']); - $this->addMoreHeaders(JavaScript("var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" - ."var pagename = '". javascript_quote_string($GLOBALS['request']->getArg('pagename')) ."';\n" - ."var script_url= '". javascript_quote_string($script_url) ."';\n" - ."var stylepath = '". javascript_quote_string(DATA_PATH) . '/'.$this->_theme."/';\n")); + $pagename = $GLOBALS['request']->getArg('pagename'); + $this->addMoreHeaders + (JavaScript + ("var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" + ."var pagename = '". javascript_quote_string($pagename) ."';\n" + ."var script_url= '". javascript_quote_string($script_url) ."';\n" + ."var stylepath = '". javascript_quote_string(DATA_PATH) . '/'.$this->_theme."/';\n")); // by pixels if ((is_object($GLOBALS['request']) // guard against unittests and $GLOBALS['request']->getPref('doubleClickEdit')) @@ -260,7 +263,7 @@ if ($path) { return $path; } elseif (DEBUG & _DEBUG_VERBOSE) { - ; //trigger_error("$parent->_theme/$file: not found", E_USER_NOTICE); + trigger_error("$parent->_theme/$file: not found", E_USER_NOTICE); } } if (isset($this->_default_theme)) { @@ -891,7 +894,9 @@ * * @return object A Button object. */ - function makeActionButton ($action, $label = false, $page_or_rev = false, $options = false) { + function makeActionButton ($action, $label = false, + $page_or_rev = false, $options = false) + { extract($this->_get_name_and_rev($page_or_rev)); if (is_array($action)) { @@ -1389,7 +1394,7 @@ // define ENABLE_DOUBLECLICKEDIT function initDoubleClickEdit() { if (!$this->HTML_DUMP_SUFFIX) - $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); + $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" OnDblClick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); } // Immediate title search results via XMLHTML(HttpRequest) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6461 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6461&view=rev Author: rurban Date: 2009年01月28日 10:09:28 +0000 (2009年1月28日) Log Message: ----------- Optimize _findData for _findButton Disable over-verbose template search-path notices Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年01月28日 09:44:44 UTC (rev 6460) +++ trunk/lib/WikiTheme.php 2009年01月28日 10:09:28 UTC (rev 6461) @@ -1,5 +1,5 @@ <?php rcs_id('$Id$'); -/* Copyright (C) 2002,2004,2005,2006 $ThePhpWikiProgrammingTeam +/* Copyright (C) 2002,2004,2005,2006,2008,2009 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -254,6 +254,7 @@ // FIXME: this is a short-term hack. Delete this after all files // get moved into themes/... + // Needed for button paths in parent themes if (file_exists($this->_path . $file)) return $file; @@ -262,7 +263,7 @@ $path = $parent->_findFile($file, 1); if ($path) { return $path; - } elseif (DEBUG & _DEBUG_VERBOSE) { + } elseif (0 and DEBUG & (_DEBUG_VERBOSE + _DEBUG_REMOTE)) { trigger_error("$parent->_theme/$file: not found", E_USER_NOTICE); } } @@ -271,7 +272,7 @@ } else if (!$missing_okay) { trigger_error("$this->_theme/$file: not found", E_USER_NOTICE); - if (DEBUG & _DEBUG_TRACE && function_exists('debug_backtrace')) { // >= 4.3.0 + if ((DEBUG & _DEBUG_TRACE) && function_exists('debug_backtrace')) { // >= 4.3.0 echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n"; } } @@ -279,7 +280,19 @@ } function _findData ($file, $missing_okay = false) { - $path = $this->_findFile($file, $missing_okay); + if (!string_starts_with($file, "themes")) { // common case + $path = $this->_findFile($file, $missing_okay); + } else { + // _findButton only + if (file_exists($file)) { + $path = $file; + } elseif (defined('DATA_PATH') + and file_exists(DATA_PATH . "/$file")) { + $path = $file; + } else { // fallback for buttons in parent themes + $path = $this->_findFile($file, $missing_okay); + } + } if (!$path) return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6856 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6856&view=rev Author: rurban Date: 2009年06月04日 08:29:25 +0000 (2009年6月04日) Log Message: ----------- Add _initGlobals to ->load() (later to have the correct stylepath) Move sortable.js to wikicommon.js Add AJAX support Add headers and attr is request specific, not theme, to support inherited themes Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年06月04日 08:24:05 UTC (rev 6855) +++ trunk/lib/WikiTheme.php 2009年06月04日 08:29:25 UTC (rev 6856) @@ -216,19 +216,14 @@ } } if ($noinit) return; - + $this->_css = array(); + + // on derived classes do not add headers twice + if (count($this->_parents) > 1) { + return; + } $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js")))); - $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); - $script_url = deduce_script_name(); - if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug'])) - $script_url .= ("?start_debug=".$_GET['start_debug']); - $pagename = $GLOBALS['request']->getArg('pagename'); - $this->addMoreHeaders - (JavaScript - ("var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" - ."var pagename = '". javascript_quote_string($pagename) ."';\n" - ."var script_url= '". javascript_quote_string($script_url) ."';\n" - ."var stylepath = '". javascript_quote_string(DATA_PATH) . '/'.$this->_theme."/';\n")); + //$this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); // by pixels if ((is_object($GLOBALS['request']) // guard against unittests and $GLOBALS['request']->getPref('doubleClickEdit')) @@ -240,10 +235,12 @@ $this->initLiveSearch(); } // replaces external LiveSearch - if (defined("ENABLE_ACDROPDOWN") and ENABLE_ACDROPDOWN) { + // enable ENABLE_AJAX for DynamicIncludePage + if (ENABLE_ACDROPDOWN or ENABLE_AJAX) { $this->initMoAcDropDown(); + if (ENABLE_AJAX) + $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("ajax.js")))); } - $this->_css = array(); } function file ($file) { @@ -1193,9 +1190,9 @@ } } - var $_MoreHeaders = array(); + //$GLOBALS['request']->_MoreHeaders = array(); function addMoreHeaders ($element) { - $this->_MoreHeaders[] = $element; + $GLOBALS['request']->_MoreHeaders[] = $element; if (!empty($this->_headers_printed) and $this->_headers_printed) { trigger_error(_("Some action(page) wanted to add more headers, but they were already printed.") ."\n". $element->asXML(), @@ -1207,14 +1204,15 @@ * Singleton. Only called once, by the head template. See the warning above. */ function getMoreHeaders () { + global $request; // actionpages cannot add headers, because recursive template expansion // already expanded the head template before. $this->_headers_printed = 1; - if (empty($this->_MoreHeaders)) + if (empty($request->_MoreHeaders)) return ''; $out = ''; //$out = "<!-- More Headers -->\n"; - foreach ($this->_MoreHeaders as $h) { + foreach ($request->_MoreHeaders as $h) { if (is_object($h)) $out .= printXML($h); else @@ -1223,26 +1221,28 @@ return $out; } - var $_MoreAttr = array(); + //$GLOBALS['request']->_MoreAttr = array(); // new arg: named elements to be able to remove them. such as DoubleClickEdit for htmldumps function addMoreAttr ($tag, $name, $element) { + global $request; // protect from duplicate attr (body jscript: themes, prefs, ...) static $_attr_cache = array(); $hash = md5($tag."/".$element); if (!empty($_attr_cache[$hash])) return; $_attr_cache[$hash] = 1; - if (empty($this->_MoreAttr) or !is_array($this->_MoreAttr[$tag])) - $this->_MoreAttr[$tag] = array($name => $element); + if (empty($request->_MoreAttr) or !is_array($request->_MoreAttr[$tag])) + $request->_MoreAttr[$tag] = array($name => $element); else - $this->_MoreAttr[$tag][$name] = $element; + $request->_MoreAttr[$tag][$name] = $element; } function getMoreAttr ($tag) { - if (empty($this->_MoreAttr[$tag])) + global $request; + if (empty($request->_MoreAttr[$tag])) return ''; $out = ''; - foreach ($this->_MoreAttr[$tag] as $name => $element) { + foreach ($request->_MoreAttr[$tag] as $name => $element) { if (is_object($element)) $out .= printXML($element); else @@ -1257,10 +1257,13 @@ /** * The ->load() method replaces the formerly global code in themeinfo.php. + * This is run only once for the selected theme, and not for the parent themes. * Without this you would not be able to derive from other themes. */ function load() { + $this->initGlobals(); + // CSS file defines fonts, colors and background images for this // style. The companion '*-heavy.css' file isn't defined, it's just // expected to be in the same directory that the base style is in. @@ -1404,6 +1407,24 @@ } } + function initGlobals() { + global $request; + static $already = 0; + if (!$already) { + $script_url = deduce_script_name(); + if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug'])) + $script_url .= ("?start_debug=".$_GET['start_debug']); + $pagename = $request->getArg('pagename'); + $js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" + ."var pagename = '". javascript_quote_string($pagename) ."';\n" + ."var script_url= '". javascript_quote_string($script_url) ."';\n" + ."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n" + ."var use_path_info = " . (USE_PATH_INFO ? "true" : "false") .";\n"; + $this->addMoreHeaders(JavaScript($js)); + $already = 1; + } + } + // Works only on action=browse. Patch #970004 by pixels // Usage: call $WikiTheme->initDoubleClickEdit() from theme init or // define ENABLE_DOUBLECLICKEDIT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7091 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7091&view=rev Author: vargenau Date: 2009年08月27日 19:38:42 +0000 (2009年8月27日) Log Message: ----------- Valid XHTML code Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年08月26日 10:47:03 UTC (rev 7090) +++ trunk/lib/WikiTheme.php 2009年08月27日 19:38:42 UTC (rev 7091) @@ -1470,7 +1470,7 @@ } //$this->addMoreHeaders($this->_CSSlink(0, // $this->_findFile('moacdropdown/css/dropdown.css'), 'all')); - $this->addMoreHeaders(HTML::style(" @import url( $dir/css/dropdown.css );\n")); + $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), " @import url( $dir/css/dropdown.css );\n")); /* // for local xmlrpc requests $xmlrpc_url = deduce_script_name(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7140 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7140&view=rev Author: rurban Date: 2009年09月17日 10:15:21 +0000 (2009年9月17日) Log Message: ----------- remove all folderArrow images but default. use global var folderArrowPath Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年09月17日 10:13:01 UTC (rev 7139) +++ trunk/lib/WikiTheme.php 2009年09月17日 10:15:21 UTC (rev 7140) @@ -1414,11 +1414,13 @@ $script_url = deduce_script_name(); if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug'])) $script_url .= ("?start_debug=".$_GET['start_debug']); + $folderArrowPath = dirname($this->_findData('images/folderArrowLoading.gif')); $pagename = $request->getArg('pagename'); $js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" ."var pagename = '". javascript_quote_string($pagename) ."';\n" ."var script_url= '". javascript_quote_string($script_url) ."';\n" ."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n" + ."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n" ."var use_path_info = " . (USE_PATH_INFO ? "true" : "false") .";\n"; $this->addMoreHeaders(JavaScript($js)); $already = 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7199 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7199&view=rev Author: vargenau Date: 2009年10月09日 16:55:08 +0000 (2009年10月09日) Log Message: ----------- Do not display "01 January 1970 1:00" for nonexistent pages Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年10月09日 16:54:30 UTC (rev 7198) +++ trunk/lib/WikiTheme.php 2009年10月09日 16:55:08 UTC (rev 7199) @@ -388,7 +388,12 @@ * @return string The date and time. */ function formatDateTime ($time_t) { - return $this->formatDate($time_t) . ' ' . $this->formatTime($time_t); + if ($time_t == 0) { + // Do not display "01 January 1970 1:00" for nonexistent pages + return ""; + } else { + return $this->formatDate($time_t) . ' ' . $this->formatTime($time_t); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7233 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7233&view=rev Author: vargenau Date: 2009年10月23日 15:35:29 +0000 (2009年10月23日) Log Message: ----------- Do not load "sortable.js" for Gforge (already done by Gforge) Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年10月23日 11:15:47 UTC (rev 7232) +++ trunk/lib/WikiTheme.php 2009年10月23日 15:35:29 UTC (rev 7233) @@ -223,7 +223,10 @@ return; } $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js")))); - $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); + if (! defined('GFORGE') or !GFORGE) { + // Gforge already loads this + $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); + } // by pixels if ((is_object($GLOBALS['request']) // guard against unittests and $GLOBALS['request']->getPref('doubleClickEdit')) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7282 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7282&view=rev Author: vargenau Date: 2009年12月04日 17:08:19 +0000 (2009年12月04日) Log Message: ----------- Strip leading zeros from date elements as in French "09 mai 2009" Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2009年12月04日 15:33:47 UTC (rev 7281) +++ trunk/lib/WikiTheme.php 2009年12月04日 17:08:19 UTC (rev 7282) @@ -309,7 +309,7 @@ // //////////////////////////////////////////////////////////////// - // Note: Windows' implemetation of strftime does not include certain + // Note: Windows' implementation of strftime does not include certain // format specifiers, such as %e (for date without leading zeros). In // general, see: // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_crt_strftime.2c_.wcsftime.asp @@ -355,11 +355,12 @@ */ function formatDate ($time_t) { global $request; - + $offset_time = $time_t + 3600 * $request->getPref('timeOffset'); - // strip leading zeros from date elements (ie space followed by zero) - return preg_replace('/ 0/', ' ', - strftime($this->_dateFormat, $offset_time)); + // strip leading zeros from date elements (ie space followed by zero + // or leading 0 as in French "09 mai 2009") + return preg_replace('/ 0/', ' ', preg_replace('/^0/', ' ', + strftime($this->_dateFormat, $offset_time))); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7335 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7335&view=rev Author: vargenau Date: 2010年04月15日 10:14:06 +0000 (2010年4月15日) Log Message: ----------- Temp remove pagename because of XSS warning Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年04月15日 10:10:42 UTC (rev 7334) +++ trunk/lib/WikiTheme.php 2010年04月15日 10:14:06 UTC (rev 7335) @@ -1426,7 +1426,8 @@ $folderArrowPath = dirname($this->_findData('images/folderArrowLoading.gif')); $pagename = $request->getArg('pagename'); $js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" - ."var pagename = '". javascript_quote_string($pagename) ."';\n" + // Temp remove pagename because of XSS warning + // ."var pagename = '". javascript_quote_string($pagename) ."';\n" ."var script_url= '". javascript_quote_string($script_url) ."';\n" ."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n" ."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7343 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7343&view=rev Author: rurban Date: 2010年04月20日 14:41:13 +0000 (2010年4月20日) Log Message: ----------- use -min Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年04月20日 14:39:33 UTC (rev 7342) +++ trunk/lib/WikiTheme.php 2010年04月20日 14:41:13 UTC (rev 7343) @@ -1,5 +1,5 @@ <?php rcs_id('$Id$'); -/* Copyright (C) 2002,2004,2005,2006,2008,2009 $ThePhpWikiProgrammingTeam +/* Copyright (C) 2002,2004,2005,2006,2008,2009,2010 $ThePhpWikiProgrammingTeam * * This file is part of PhpWiki. * @@ -223,8 +223,8 @@ return; } $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js")))); - if (! defined('GFORGE') or !GFORGE) { - // Gforge already loads this + if (!DEBUG and (!defined('GFORGE') or !GFORGE)) { + // Gforge and non-debug already load this $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); } // by pixels @@ -241,7 +241,7 @@ // enable ENABLE_AJAX for DynamicIncludePage if (ENABLE_ACDROPDOWN or ENABLE_AJAX) { $this->initMoAcDropDown(); - if (ENABLE_AJAX) + if (ENABLE_AJAX and DEBUG) // minified all together $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("ajax.js")))); } } @@ -288,7 +288,7 @@ // _findButton only if (file_exists($file)) { $path = $file; - } elseif (defined('DATA_PATH') + } elseif (defined('DATA_PATH') and file_exists(DATA_PATH . "/$file")) { $path = $file; } else { // fallback for buttons in parent themes @@ -297,6 +297,10 @@ } if (!$path) return false; + if (!DEBUG) { + $min = preg_replace("/\.(css|js)$/", "-min.\1円", $file); + if ($min and ($x = $this->_findFile($min, true))) $path = $x; + } if (defined('DATA_PATH')) return DATA_PATH . "/$path"; @@ -1199,6 +1203,11 @@ } } + /** + * Add a random header element to head + * TODO: first css, then js. Maybe seperate it into addJSHeaders/addCSSHeaders + * or use an optional type argument, and seperate it within _MoreHeaders[] + */ //$GLOBALS['request']->_MoreHeaders = array(); function addMoreHeaders ($element) { $GLOBALS['request']->_MoreHeaders[] = $element; @@ -1220,6 +1229,21 @@ if (empty($request->_MoreHeaders)) return ''; $out = ''; + if (false and ($file = $this->_findData('delayed.js'))) { + $request->_MoreHeaders[] = JavaScript(' +// Add a script element as a child of the body +function downloadJSAtOnload() { +var element = document.createElement("script"); +element.src = "' . $file . '"; +document.body.appendChild(element); +} +// Check for browser support of event handling capability +if (window.addEventListener) +window.addEventListener("load", downloadJSAtOnload, false); +else if (window.attachEvent) +window.attachEvent("onload", downloadJSAtOnload); +else window.onload = downloadJSAtOnload;'); + } //$out = "<!-- More Headers -->\n"; foreach ($request->_MoreHeaders as $h) { if (is_object($h)) @@ -1426,8 +1450,8 @@ $folderArrowPath = dirname($this->_findData('images/folderArrowLoading.gif')); $pagename = $request->getArg('pagename'); $js = "var data_path = '". javascript_quote_string(DATA_PATH) ."';\n" - // Temp remove pagename because of XSS warning - // ."var pagename = '". javascript_quote_string($pagename) ."';\n" + // XSS warning with pagename + ."var pagename = '". javascript_quote_string($pagename) ."';\n" ."var script_url= '". javascript_quote_string($script_url) ."';\n" ."var stylepath = data_path+'/".javascript_quote_string($this->_theme)."/';\n" ."var folderArrowPath = '".javascript_quote_string($folderArrowPath)."';\n" @@ -1469,6 +1493,11 @@ static $already = 0; if (!$this->HTML_DUMP_SUFFIX and !$already) { $dir = $this->_findData('moacdropdown'); + if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown-min.css'))) { + $this->addMoreHeaders($this->_CSSlink(0, $css, 'all')); + } else { + $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), " @import url( $dir/css/dropdown.css );\n")); + } // if autocomplete_remote is used: (getobject2 also for calc. the showlist width) if (DEBUG) { foreach (array("mobrowser.js","modomevent3.js","modomt.js", @@ -1478,11 +1507,9 @@ } $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/acdropdown.js"))); } else { - $this->addMoreHeaders(JavaScript('', array('src' => DATA_PATH . "/themes/default/moacdropdown.js"))); + // already in wikicommon-min.js + ; //$this->addMoreHeaders(JavaScript('', array('src' => DATA_PATH . "/themes/default/moacdropdown.js"))); } - //$this->addMoreHeaders($this->_CSSlink(0, - // $this->_findFile('moacdropdown/css/dropdown.css'), 'all')); - $this->addMoreHeaders(HTML::style(array('type' => 'text/css'), " @import url( $dir/css/dropdown.css );\n")); /* // for local xmlrpc requests $xmlrpc_url = deduce_script_name(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7477 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7477&view=rev Author: rurban Date: 2010年06月07日 12:10:14 +0000 (2010年6月07日) Log Message: ----------- use the method Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年06月07日 12:08:07 UTC (rev 7476) +++ trunk/lib/WikiTheme.php 2010年06月07日 12:10:14 UTC (rev 7477) @@ -23,7 +23,7 @@ * and more formatting. */ -require_once(dirname(__FILE__).'/HtmlElement.php'); +//require_once(dirname(__FILE__).'/HtmlElement.php'); /** * Make a link to a wiki page (in this wiki). @@ -1247,7 +1247,7 @@ //$out = "<!-- More Headers -->\n"; foreach ($request->_MoreHeaders as $h) { if (is_object($h)) - $out .= printXML($h); + $out .= $h->printXML(); else $out .= "$h\n"; } @@ -1277,7 +1277,7 @@ $out = ''; foreach ($request->_MoreAttr[$tag] as $name => $element) { if (is_object($element)) - $out .= printXML($element); + $out .= $element->printXML(); else $out .= "$element"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7490 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7490&view=rev Author: rurban Date: 2010年06月08日 08:15:49 +0000 (2010年6月08日) Log Message: ----------- simplify if GFORGE Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年06月08日 06:27:08 UTC (rev 7489) +++ trunk/lib/WikiTheme.php 2010年06月08日 08:15:49 UTC (rev 7490) @@ -223,7 +223,7 @@ return; } $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js")))); - if (!DEBUG and (!defined('GFORGE') or !GFORGE)) { + if (!DEBUG and !GFORGE) { // Gforge and non-debug already load this $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7499 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7499&view=rev Author: rurban Date: 2010年06月08日 12:08:05 +0000 (2010年6月08日) Log Message: ----------- invert wrong logic. sortable is included in -min Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年06月08日 12:04:40 UTC (rev 7498) +++ trunk/lib/WikiTheme.php 2010年06月08日 12:08:05 UTC (rev 7499) @@ -223,7 +223,7 @@ return; } $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js")))); - if (!DEBUG and !GFORGE) { + if (DEBUG and !GFORGE) { // Gforge and non-debug already load this $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7563 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7563&view=rev Author: vargenau Date: 2010年06月23日 15:37:35 +0000 (2010年6月23日) Log Message: ----------- Remove unused functions addImageAlt, getImageAlt, calendarLink Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年06月23日 15:31:48 UTC (rev 7562) +++ trunk/lib/WikiTheme.php 2010年06月23日 15:37:35 UTC (rev 7563) @@ -696,7 +696,6 @@ // //////////////////////////////////////////////////////////////// var $_imageAliases = array(); - var $_imageAlt = array(); /** * @@ -710,13 +709,6 @@ $this->_imageAliases[$alias] = $image_name; } - function addImageAlt ($alias, $alt_text) { - $this->_imageAlt[$alias] = $alt_text; - } - function getImageAlt ($alias) { - return $this->_imageAlt[$alias]; - } - function getImageURL ($image) { $aliases = &$this->_imageAliases; @@ -1523,11 +1515,6 @@ } } - function calendarLink($date = false) { - return $this->calendarBase() . SUBPAGE_SEPARATOR . - strftime("%Y-%m-%d", $date ? $date : time()); - } - function calendarBase() { static $UserCalPageTitle = false; global $request; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7583 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7583&view=rev Author: vargenau Date: 2010年06月27日 17:17:30 +0000 (2010年6月27日) Log Message: ----------- Use CSS to underline Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年06月26日 22:09:45 UTC (rev 7582) +++ trunk/lib/WikiTheme.php 2010年06月27日 17:17:30 UTC (rev 7583) @@ -624,7 +624,8 @@ } if ($this->DUMP_MODE) { // HTML, PDF or XML - $link = HTML::u( empty($linktext) ? $wikiword : $linktext); + $link = HTML::span( empty($linktext) ? $wikiword : $linktext); + $link->setAttr('style', 'text-decoration: underline'); $link->addTooltip(sprintf(_("Empty link to: %s"), $wikiword)); $link->setAttr('class', empty($linktext) ? 'wikiunknown' : 'named-wikiunknown'); return $link; @@ -646,11 +647,13 @@ $link = HTML::span(); if (!empty($linktext)) { - $link->pushContent(HTML::u($linktext)); + $link->pushContent(HTML::span($linktext)); + $link->setAttr('style', 'text-decoration: underline'); $link->setAttr('class', 'named-wikiunknown'); } else { - $link->pushContent(HTML::u($this->maybeSplitWikiWord($default_text))); + $link->pushContent(HTML::span($this->maybeSplitWikiWord($default_text))); + $link->setAttr('style', 'text-decoration: underline'); $link->setAttr('class', 'wikiunknown'); } if (!isa($button, "ImageButton")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7619 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7619&view=rev Author: vargenau Date: 2010年07月16日 07:16:29 +0000 (2010年7月16日) Log Message: ----------- Patch 3024802 by S?195円?169円bastien Le Callonnec: Error : sortables_init is not defined Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年07月16日 06:59:16 UTC (rev 7618) +++ trunk/lib/WikiTheme.php 2010年07月16日 07:16:29 UTC (rev 7619) @@ -223,8 +223,8 @@ return; } $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js")))); - if (DEBUG and !GFORGE) { - // Gforge and non-debug already load this + if (!GFORGE) { + // Gforge already loads this $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js")))); } // by pixels This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7685 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7685&view=rev Author: vargenau Date: 2010年09月13日 12:27:54 +0000 (2010年9月13日) Log Message: ----------- Valid XHTML Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010年09月10日 12:13:48 UTC (rev 7684) +++ trunk/lib/WikiTheme.php 2010年09月13日 12:27:54 UTC (rev 7685) @@ -1469,7 +1469,7 @@ // define ENABLE_DOUBLECLICKEDIT function initDoubleClickEdit() { if (!$this->HTML_DUMP_SUFFIX) - $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" OnDblClick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); + $this->addMoreAttr('body', 'DoubleClickEdit', HTML::Raw(" ondblclick=\"url = document.URL; url2 = url; if (url.indexOf('?') != -1) url2 = url.slice(0, url.indexOf('?')); if ((url.indexOf('action') == -1) || (url.indexOf('action=browse') != -1)) document.location = url2 + '?action=edit';\"")); } // Immediate title search results via XMLHTML(HttpRequest) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7946 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7946&view=rev Author: vargenau Date: 2011年03月02日 10:51:08 +0000 (2011年3月02日) Log Message: ----------- Let's be consistent Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011年03月02日 10:15:46 UTC (rev 7945) +++ trunk/lib/WikiTheme.php 2011年03月02日 10:51:08 UTC (rev 7946) @@ -459,7 +459,7 @@ $date, $this->formatTime($mtime)); if ($show_version) - return fmt("Version %s, saved %s", $revision->getVersion(), $date); + return fmt("Version %s, saved on %s", $revision->getVersion(), $date); else return fmt("Last edited %s", $date); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7961 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7961&view=rev Author: vargenau Date: 2011年03月04日 16:21:08 +0000 (2011年3月04日) Log Message: ----------- Remove unused functions Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011年03月04日 13:58:21 UTC (rev 7960) +++ trunk/lib/WikiTheme.php 2011年03月04日 16:21:08 UTC (rev 7961) @@ -23,8 +23,6 @@ * and more formatting. */ -//require_once(dirname(__FILE__).'/HtmlElement.php'); - /** * Make a link to a wiki page (in this wiki). * @@ -699,7 +697,6 @@ // //////////////////////////////////////////////////////////////// var $_imageAliases = array(); - var $_imageAlt = array(); /** * @@ -713,13 +710,6 @@ $this->_imageAliases[$alias] = $image_name; } - function addImageAlt ($alias, $alt_text) { - $this->_imageAlt[$alias] = $alt_text; - } - function getImageAlt ($alias) { - return $this->_imageAlt[$alias]; - } - function getImageURL ($image) { $aliases = &$this->_imageAliases; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8032 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8032&view=rev Author: vargenau Date: 2011年04月11日 08:46:26 +0000 (2011年4月11日) Log Message: ----------- Fix syntax error Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011年04月11日 08:36:32 UTC (rev 8031) +++ trunk/lib/WikiTheme.php 2011年04月11日 08:46:26 UTC (rev 8032) @@ -272,7 +272,7 @@ } else if (!$missing_okay) { trigger_error("$this->_theme/$file: not found", E_USER_NOTICE); - if ((DEBUG & _DEBUG_TRACE) { + if (DEBUG & _DEBUG_TRACE) { echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8146 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8146&view=rev Author: vargenau Date: 2011年10月03日 08:48:37 +0000 (2011年10月03日) Log Message: ----------- Use same message Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011年10月03日 08:20:28 UTC (rev 8145) +++ trunk/lib/WikiTheme.php 2011年10月03日 08:48:37 UTC (rev 8146) @@ -446,7 +446,7 @@ $mtime = $revision->get('mtime'); if ($mtime <= EPOCH) - return fmt("Never edited"); + return _("Never edited"); if ($show_version == 'auto') $show_version = !$revision->isCurrent(); @@ -459,7 +459,7 @@ if ($show_version) return fmt("Version %s, saved on %s", $revision->getVersion(), $date); else - return fmt("Last edited %s", $date); + return fmt("Last edited on %s", $date); } if ($this->_showModTime) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8170 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8170&view=rev Author: vargenau Date: 2011年11月02日 13:08:16 +0000 (2011年11月02日) Log Message: ----------- Allow all numeric page names Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011年10月20日 13:44:48 UTC (rev 8169) +++ trunk/lib/WikiTheme.php 2011年11月02日 13:08:16 UTC (rev 8170) @@ -1016,9 +1016,6 @@ } $pagename = $page->getName(); } - elseif (is_numeric($page_or_rev)) { - $version = $page_or_rev; - } else { $pagename = (string) $page_or_rev; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 8690 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8690&view=rev Author: vargenau Date: 2012年12月27日 11:04:56 +0000 (2012年12月27日) Log Message: ----------- Remove PHP4 comment Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2012年12月27日 11:04:00 UTC (rev 8689) +++ trunk/lib/WikiTheme.php 2012年12月27日 11:04:56 UTC (rev 8690) @@ -552,10 +552,6 @@ // //////////////////////////////////////////////////////////////// - //FIXME: PHP 4.1 Warnings - //lib/WikiTheme.php:84: Notice[8]: The call_user_method() function is deprecated, - //use the call_user_func variety with the array(&$obj, "method") syntax instead - function getFormatter($type, $format) { $method = strtolower("get${type}Formatter"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.