From 96c982b914a8dbf4cd2ea6a012e9c4653da78d24 Mon Sep 17 00:00:00 2001 From: rurban Date: Sun, 30 Oct 2005 16:38:14 +0000 Subject: [PATCH] minor fixes git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4953 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- ImageTile.php | 8 ++-- index.php | 4 +- lib/ErrorManager.php | 7 +++- locale/.exclude | 1 - locale/Makefile | 9 +++-- pgsrc/GraphVizPlugin | 96 ++++++++++++++++++++++---------------------- pgsrc/ReleaseNotes | 6 +-- 7 files changed, 68 insertions(+), 63 deletions(-) diff --git a/ImageTile.php b/ImageTile.php index d427b40b0..ef19cb3e4 100644 --- a/ImageTile.php +++ b/ImageTile.php @@ -9,11 +9,11 @@ if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) { list($usec, $sec) = explode(" ", microtime()); $fp = fopen('config/config.ini','r'); - while($config=fgetcsv($fp,1024,';')) { + while($config = fgetcsv($fp,1024,';')) { if (preg_match('/DATA_PATH/',$config[0])) { list($key,$value) = split('=',$config[0]); $data_path = trim($value).'/'; - } + } } fclose($fp); @mkdir($data_path."uploads/thumbs"); @@ -24,7 +24,7 @@ if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) { if (!$fp) { header ("Content-type: text/html"); echo "ERROR : unable to open $file in write mode"; - } + } fwrite($fp,$source); $remove = 1; @@ -131,7 +131,7 @@ function show_plain () { $mime = mime_content_type ($_REQUEST['url']); header ("Content-type: $mime"); readfile($_REQUEST['url']); - exit (); + exit(); } ?> \ No newline at end of file diff --git a/index.php b/index.php index 88168ac8e..13495b596 100644 --- a/index.php +++ b/index.php @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ require_once (dirname(__FILE__).'/lib/prepend.php'); -rcs_id('$Id: index.php,v 1.147 2005-01-13 07:28:36 rurban Exp $'); +rcs_id('$Id: index.php,v 1.148 2005-10-30 16:38:13 rurban Exp $'); require_once(dirname(__FILE__).'/lib/IniConfig.php'); IniConfig(dirname(__FILE__)."/config/config.ini"); @@ -63,4 +63,4 @@ if (@is_dir(SCRIPT_FILENAME) or realpath(SCRIPT_FILENAME) == realpath(__FILE__)) // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> +?> \ No newline at end of file diff --git a/lib/ErrorManager.php b/lib/ErrorManager.php index 9b812af21..7cb0e07fe 100644 --- a/lib/ErrorManager.php +++ b/lib/ErrorManager.php @@ -1,4 +1,4 @@ -finish or session_close // @@ -704,4 +707,4 @@ if (!isset($GLOBALS['ErrorManager'])) { // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> +?> \ No newline at end of file diff --git a/locale/.exclude b/locale/.exclude index 23851df86..21773ed33 100644 --- a/locale/.exclude +++ b/locale/.exclude @@ -22,4 +22,3 @@ themes/wikilens/templates/newuserwelcomepage.tmpl themes/wikilens/templates/categorypage.tmpl themes/archX/ themes/film/ -themes/blog/templates/_info.tmpl diff --git a/locale/Makefile b/locale/Makefile index 572179e9c..04efa564f 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,4 +1,4 @@ - # $Id: Makefile,v 1.48 2005-10-29 13:07:14 rurban Exp $ + # $Id: Makefile,v 1.49 2005-10-30 16:38:14 rurban Exp $ # # locale/Makefile # @@ -177,6 +177,10 @@ ${POT_FILE}: ../lib/WikiUser/PearDb.php ${POT_FILE}: ../lib/WikiUser/PersonalPage.php ${POT_FILE}: ../lib/WikiUser/Session.php ${POT_FILE}: ../lib/WikiUserNew.php +${POT_FILE}: ../lib/WysiwygEdit.php +${POT_FILE}: ../lib/WysiwygEdit/htmlarea2.php +${POT_FILE}: ../lib/WysiwygEdit/htmlarea3.php +${POT_FILE}: ../lib/WysiwygEdit/tinymce.php ${POT_FILE}: ../lib/XmlElement.php ${POT_FILE}: ../lib/XmlParser.php ${POT_FILE}: ../lib/XmlRpcServer.php @@ -188,7 +192,6 @@ ${POT_FILE}: ../lib/display.php ${POT_FILE}: ../lib/editpage.php ${POT_FILE}: ../lib/fortune.php ${POT_FILE}: ../lib/gif.php -${POT_FILE}: ../lib/htmlarea.php ${POT_FILE}: ../lib/imagecache.php ${POT_FILE}: ../lib/install.php ${POT_FILE}: ../lib/loadsave.php @@ -309,7 +312,6 @@ ${POT_FILE}: ../lib/prepend.php ${POT_FILE}: ../lib/removepage.php ${POT_FILE}: ../lib/spam_babycart.php ${POT_FILE}: ../lib/stdlib.php -${POT_FILE}: ../lib/tinymce.php ${POT_FILE}: ../lib/upgrade.php ${POT_FILE}: ../lib/wikilens/Buddy.php ${POT_FILE}: ../lib/wikilens/CustomPrefs.php @@ -394,6 +396,7 @@ ${POT_FILE}: ../themes/blog/templates/navbar.tmpl ${POT_FILE}: ../themes/blog/templates/search.tmpl ${POT_FILE}: ../themes/blog/templates/sidebar.tmpl ${POT_FILE}: ../themes/blog/templates/top.tmpl +${POT_FILE}: ../themes/blog/templates/viewsource.tmpl ${POT_FILE}: ../themes/blog/templates/wikiblog.tmpl ${POT_FILE}: ../themes/blog/themeinfo.php ${POT_FILE}: ../themes/default/htmlarea3/popups/insert_pagelink.php diff --git a/pgsrc/GraphVizPlugin b/pgsrc/GraphVizPlugin index f5cb79739..fc779b4ee 100644 --- a/pgsrc/GraphVizPlugin +++ b/pgsrc/GraphVizPlugin @@ -1,48 +1,48 @@ -Date: Mon, 19 Sep 2005 19:28:52 +0100 -Mime-Version: 1.0 (Produced by PhpWiki 1.3.11p1) -X-Rcs-Id: $Id: GraphVizPlugin,v 1.2 2005-10-10 19:58:13 rurban Exp $ -Content-Type: application/x-phpwiki; - pagename=GraphVizPlugin; - pgsrc_version="2 $Revision: 1.2 $"; - flags=""; - markup=2; - charset=iso-8859-1 -Content-Transfer-Encoding: binary - -! Example - - - 2 [ label = "a " ]; - 0 -> 1 [ label = "other " ]; - 1 -> 2 [ label = "a " ]; - 1 -> 1 [ label = "other " ]; - 2 -> 2 [ label = "a " ]; - 2 -> 1 [ label = "other " ]; - "Machine: a" [ shape = plaintext ]; -} -?> - - -is rendered as - - 2 [ label = "a " ]; - 0 -> 1 [ label = "other " ]; - 1 -> 2 [ label = "a " ]; - 1 -> 1 [ label = "other " ]; - 2 -> 2 [ label = "a " ]; - 2 -> 1 [ label = "other " ]; - "Machine: a" [ shape = plaintext ]; -} -?> +Date: Sat, 29 Oct 2005 19:28:52 +0100 +Mime-Version: 1.0 (Produced by PhpWiki 1.3.11p1) +X-Rcs-Id: $Id: GraphVizPlugin,v 1.3 2005-10-30 16:38:14 rurban Exp $ +Content-Type: application/x-phpwiki; + pagename=GraphVizPlugin; + pgsrc_version="2 $Revision: 1.3 $"; + flags=""; + markup=2; + charset=iso-8859-1 +Content-Transfer-Encoding: binary + +! Example + + + 2 [ label = "a " ]; + 0 -> 1 [ label = "other " ]; + 1 -> 2 [ label = "a " ]; + 1 -> 1 [ label = "other " ]; + 2 -> 2 [ label = "a " ]; + 2 -> 1 [ label = "other " ]; + "Machine: a" [ shape = plaintext ]; +} +?> + + +is rendered as + + 2 [ label = "a " ]; + 0 -> 1 [ label = "other " ]; + 1 -> 2 [ label = "a " ]; + 1 -> 1 [ label = "other " ]; + 2 -> 2 [ label = "a " ]; + 2 -> 1 [ label = "other " ]; + "Machine: a" [ shape = plaintext ]; +} +?> diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index 84aa631b4..64e7ec418 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -1,9 +1,9 @@ Date: Sat, 28 Oct 2005 15:01:44 +0100 Mime-Version: 1.0 (Produced by PhpWiki 1.3.11) -X-Rcs-Id: $Id: ReleaseNotes,v 1.58 2005-10-29 14:36:45 uckelman Exp $ +X-Rcs-Id: $Id: ReleaseNotes,v 1.59 2005-10-30 16:38:14 rurban Exp $ Content-Type: application/x-phpwiki; pagename=ReleaseNotes; - pgsrc_version="2 $Revision: 1.58 $"; + pgsrc_version="2 $Revision: 1.59 $"; flags=PAGE_LOCKED; markup=2; charset=iso-8859-1 @@ -21,7 +21,7 @@ changes: * generalized ENABLE_HTMLAREA3 to ENABLE_WYSIWYG, added preliminary tiny_mce support * cache EditToolbar popup content -* DB: foreign key support, simplify methods +* DB: foreign key support in schemas, simplify methods new: * new ENABLE_SPAMBLOCKLIST, lib/SpamBlocklist.php: -- 2.45.0