修订版 | 607a766d4946a37c7793301e0cd07274dc77b5d2 (tree) |
---|---|
时间 | 2009-01-12 12:50:33 |
作者 | henoheno <henoheno> |
Commiter | henoheno |
load_once()
@@ -1,6 +1,6 @@ | ||
1 | 1 | <?php |
2 | 2 | // PukiWiki - Yet another WikiWikiWeb clone. |
3 | -// $Id: pkwk14.php,v 1.3 2009/01/12 02:58:07 henoheno Exp $ | |
3 | +// $Id: pkwk14.php,v 1.4 2009/01/12 03:50:33 henoheno Exp $ | |
4 | 4 | // Copyright (C) 2009 PukiWiki Developers Team |
5 | 5 | // License: GPL v2 or (at your option) any later version |
6 | 6 | // |
@@ -9,6 +9,7 @@ | ||
9 | 9 | |
10 | 10 | # Name and Usage -------------------------------------------- |
11 | 11 | define('PKWK_CLI_NAME', $argv[0]); |
12 | +//define('CLI_PATH', rtrim(getcwd(), '/\\')); | |
12 | 13 | |
13 | 14 | function usage() |
14 | 15 | { |
@@ -32,7 +33,7 @@ error_reporting(E_ALL); // Debug purpose | ||
32 | 33 | function warn($string = ''){ fwrite(STDERR, $string . "\n"); } |
33 | 34 | function err( $string = ''){ warn($string); exit(1); } |
34 | 35 | |
35 | -function load($filepath) | |
36 | +function load_once($filepath) | |
36 | 37 | { |
37 | 38 | if (strpos($filepath, ':') !== FALSE) { |
38 | 39 | err('load: Error: URL-like string'); |
@@ -48,51 +49,50 @@ function load($filepath) | ||
48 | 49 | |
49 | 50 | // PKWK_ROOT |
50 | 51 | if (isset($_ENV['PKWK_ROOT'])) { |
51 | - $pkwk_root = rtrim($_ENV['PKWK_ROOT'], '/') . '/'; | |
52 | + $pkwk_root = rtrim($_ENV['PKWK_ROOT'], '/\\') . '/'; | |
52 | 53 | if (! file_exists($pkwk_root)) { |
53 | 54 | err('Error: [PKWK_ROOT] No such directory: ' . $pkwk_root); |
54 | 55 | } |
55 | - | |
56 | 56 | } else { |
57 | 57 | $pkwk_root = './'; |
58 | 58 | } |
59 | 59 | define('PKWK_ROOT', $pkwk_root); |
60 | 60 | unset($pkwk_root); |
61 | 61 | |
62 | -// LIB_DIR | |
63 | -define('LIB_DIR', PKWK_ROOT . 'lib/'); | |
64 | 62 | |
65 | -// DATA_HOME | |
66 | -define('DATA_HOME', './'); | |
67 | -// Where to | |
68 | -// * pukiwiki.ini.php | |
63 | +# Load libraries -------------------------------------------- | |
69 | 64 | |
65 | +define('LIB_DIR', PKWK_ROOT . 'lib' . '/'); | |
66 | +if (! file_exists(LIB_DIR)) { | |
67 | + err('Error: LIB_DIR not found: ' . LIB_DIR); | |
68 | +} | |
70 | 69 | |
71 | -# Load libraries -------------------------------------------- | |
72 | -// From pukiwiki.php | |
73 | - | |
74 | -load(LIB_DIR . 'func.php'); | |
75 | -load(LIB_DIR . 'file.php'); | |
76 | -load(LIB_DIR . 'html.php'); | |
77 | -load(LIB_DIR . 'backup.php'); | |
78 | - | |
79 | -load(LIB_DIR . 'convert_html.php'); | |
80 | -load(LIB_DIR . 'make_link.php'); | |
81 | -load(LIB_DIR . 'diff.php'); | |
82 | -load(LIB_DIR . 'config.php'); | |
83 | -load(LIB_DIR . 'link.php'); | |
84 | -load(LIB_DIR . 'auth.php'); | |
85 | -load(LIB_DIR . 'proxy.php'); | |
70 | +load_once(LIB_DIR . 'func.php'); | |
71 | +load_once(LIB_DIR . 'file.php'); | |
72 | +load_once(LIB_DIR . 'html.php'); | |
73 | +load_once(LIB_DIR . 'backup.php'); | |
74 | + | |
75 | +load_once(LIB_DIR . 'convert_html.php'); | |
76 | +load_once(LIB_DIR . 'make_link.php'); | |
77 | +load_once(LIB_DIR . 'diff.php'); | |
78 | +load_once(LIB_DIR . 'config.php'); | |
79 | +load_once(LIB_DIR . 'link.php'); | |
80 | +load_once(LIB_DIR . 'auth.php'); | |
81 | +load_once(LIB_DIR . 'proxy.php'); | |
86 | 82 | if (! extension_loaded('mbstring')) { |
87 | - load(LIB_DIR . 'mbstring.php'); | |
83 | + load_once(LIB_DIR . 'mbstring.php'); | |
88 | 84 | } |
89 | 85 | |
90 | -load(LIB_DIR . 'mail.php'); | |
91 | -load(LIB_DIR . 'spam.php'); | |
86 | +load_once(LIB_DIR . 'mail.php'); | |
87 | +load_once(LIB_DIR . 'spam.php'); | |
92 | 88 | |
93 | 89 | |
94 | 90 | # Default variables 2 --------------------------------------- |
95 | -// From pukiwiki.ini.php | |
91 | + | |
92 | +define('DATA_HOME', './'); | |
93 | +// Where to | |
94 | +// * pukiwiki.ini.php | |
95 | +// * xxx_DIR | |
96 | 96 | |
97 | 97 | if (! defined('LANG')) define('LANG', 'ja'); |
98 | 98 | if (! defined('UI_LANG')) define('UI_LANG', LANG); |