Revision of SKIN (#3).

miko2u · Apr 6, 2009 · 1b0c33f · 1b0c33f
1 parent efc9749
commit 1b0c33f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/default.ini.php b/default.ini.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki Plus! - Yet another WikiWikiWeb clone.
-// $Id: default.ini.php,v 1.25.10 2006/06/22 19:13:00 miko Exp $
+// $Id: default.ini.php,v 1.25.11 2009/04/07 00:50:00 upk Exp $
 // Copyright (C)
-//   2005-2006 PukiWiki Plus! Team
+//   2005-2006,2009 PukiWiki Plus! Team
 //   2003-2005 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
 // License: GPL v2 or (at your option) any later version
@@ -12,16 +12,13 @@
 /////////////////////////////////////////////////
 // Skin file
 if (defined('TDIARY_THEME')) { 
-//	define('SKIN_FILE', DATA_HOME . SKIN_DIR . 'tdiary.skin.php');
-	define('SKIN_FILE_DEFAULT', SKIN_DIR . 'tdiary.skin.php'); 
+	defined('SKIN_FILE_DEFAULT') or define('SKIN_FILE_DEFAULT', add_skindir('tdiary'));
 } else {
-	//define('SKIN_FILE', DATA_HOME.SKIN_DIR.THEME_PLUS_NAME. 'pukiwiki.skin.php');
-	define('SKIN_FILE_DEFAULT', SKIN_DIR . 'default.skin.php');
-	//define('SKIN_FILE_DEFAULT', SKIN_DIR.THEME_PLUS_NAME.'bluebox.skin.php');
-	//define('SKIN_FILE_DEFAULT', SKIN_DIR.THEME_PLUS_NAME.'cloudwalk.skin.php');
-	//define('SKIN_FILE_DEFAULT', SKIN_DIR.THEME_PLUS_NAME.'iridwire.skin.php');
-	//define('SKIN_FILE_DEFAULT', SKIN_DIR.THEME_PLUS_NAME.'iridorange.skin.php');
-	//define('SKIN_FILE_DEFAULT', SKIN_DIR.THEME_PLUS_NAME.'orangebox.skin.php');
+	if (defined('PLUS_THEME')) {
+		defined('SKIN_FILE_DEFAULT') or define('SKIN_FILE_DEFAULT', add_skindir(PLUS_THEME));
+	} else {
+		defined('SKIN_FILE_DEFAULT') or define('SKIN_FILE_DEFAULT', add_skindir('default'));
+	}
 }
 $skin_file = SKIN_FILE_DEFAULT;
 

diff --git a/index.php b/index.php
@@ -1,8 +1,8 @@
 <?php
 // PukiWiki Plus! - Yet another WikiWikiWeb clone.
-// $Id: index.php,v 1.9.3 2007/07/09 23:32:00 upk Exp $
+// $Id: index.php,v 1.9.4 2009/04/07 00:53:00 upk Exp $
 // Copyright (C)
-//   2005-2007 PukiWiki Plus! Team
+//   2005-2007,2009 PukiWiki Plus! Team
 //   2001-2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -15,7 +15,13 @@
 //define('PKWK_READONLY',  1); // 0,1,2,3,4
 //define('PKWK_SAFE_MODE', 1); // 0,1,2,3,4
 //define('PKWK_OPTIMISE',  1); // Obsolete - Plus! not used
-//define('TDIARY_THEME',   'digital_gadgets');
+
+// THEME
+// tDiary THEME
+//define('TDIARY_THEME', 'digital_gadgets');
+// PLUS! THEME
+// ex. bluebox, cloudwalk, iridwire, iridorange, orangebox, pukiwiki
+//define('PLUS_THEME',   'bluebox');
 
 // Directory definition
 // (Ended with a slash like '../path/to/pkwk/', or '')

diff --git a/lib/funcplus.php b/lib/funcplus.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki Plus! - Yet another WikiWikiWeb clone.
-// $Id: funcplus.php,v 0.1.54 2009/02/23 23:43:00 upk Exp $
+// $Id: funcplus.php,v 0.1.55 2009/04/07 00:36:00 upk Exp $
 // Copyright (C)
 //   2005-2009 PukiWiki Plus! Team
 // License: GPL v2 or (at your option) any later version
@@ -245,6 +245,15 @@ function add_homedir($file)
 	return $file;
 }
 
+function add_skindir($skin_name)
+{
+	$file = basepagename($skin_name).'.skin.php';
+	foreach(array(SKIN_DIR, SKIN_DIR.THEME_PLUS_NAME, EXT_SKIN_DIR, EXT_SKIN_DIR.THEME_PLUS_NAME, SKIN_URI, DATA_HOME.SKIN_DIR) as $dir) {
+		if (file_exists($dir.$file) && is_readable($dir.$file)) return $dir.$file;
+	}
+	return $file;
+}
+
 function is_ignore_page($page)
 {
 	global $navigation,$whatsnew,$whatsdeleted,$interwiki,$menubar,$sidebar,$headarea,$footarea;