X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=pukiwiki.ini.php;h=63e3b4a2edef1edb153616569d1be1adc5b65896;hb=5944633aac73ffcf6a0226bfc2311f32ef404098;hp=43185f5f2a5bf3f72f795f2d9943869453173912;hpb=1712f2fd25b66c0303a47751ca34f095a895d133;p=pukiwiki%2Fpukiwiki.git diff --git a/pukiwiki.ini.php b/pukiwiki.ini.php index 43185f5..63e3b4a 100644 --- a/pukiwiki.ini.php +++ b/pukiwiki.ini.php @@ -1,6 +1,10 @@ password 'foo' => 'foo_passwd', // Cleartext - 'bar' => '{x-php-md5}f53ae779077e987718cc285b14dfbe86', // md5('bar_passwd') - 'hoge' => '{SMD5}OzJo/boHwM4q5R+g7LCOx2xGMkFKRVEx', // SMD5 'hoge_passwd' + 'bar' => '{x-php-md5}f53ae779077e987718cc285b14dfbe86', // PHP md5() 'bar_passwd' + 'hoge' => '{SMD5}OzJo/boHwM4q5R+g7LCOx2xGMkFKRVEx', // LDAP SMD5 'hoge_passwd' ); ///////////////////////////////////////////////// // Authentication method -$auth_method_type = 'contents'; // By Page contents -//$auth_method_type = 'pagename'; // By Page name +$auth_method_type = 'pagename'; // By Page name +//$auth_method_type = 'contents'; // By Page contents ///////////////////////////////////////////////// // Read auth (0:Disable, 1:Enable) $read_auth = 0; -// Read auth regex $read_auth_pages = array( - '#¤Ò¤­¤³¤â¤ë¤Û¤²#' => 'hoge', - '#(¥Í¥¿¥Ð¥ì|¤Í¤¿¤Ð¤ì)#' => 'foo,bar,hoge', + // Regex Username + '#HogeHoge#' => 'hoge', + '#(NETABARE|NetaBare)#' => 'foo,bar,hoge', ); ///////////////////////////////////////////////// // Edit auth (0:Disable, 1:Enable) $edit_auth = 0; -// Edit auth regex $edit_auth_pages = array( - '#Bar¤Î¸ø³«Æüµ­#' => 'bar', - '#¤Ò¤­¤³¤â¤ë¤Û¤²#' => 'hoge', - '#(¥Í¥¿¥Ð¥ì|¤Í¤¿¤Ð¤ì)#' => 'foo,bar,hoge', + // Regex Username + '#BarDiary#' => 'bar', + '#HogeHoge#' => 'hoge', + '#(NETABARE|NetaBare)#' => 'foo,bar,hoge', ); ///////////////////////////////////////////////// @@ -280,9 +328,17 @@ $maxage = 120; // Stock latest N backups define('PKWK_SPLITTER', '>>>>>>>>>>'); ///////////////////////////////////////////////// -// Command executed per update -$update_exec = ''; -//$update_exec = '/usr/bin/mknmz --media-type=text/pukiwiki -O /var/lib/namazu/index/ -L ja -c -K /var/www/wiki/'; +// Command execution per update + +define('PKWK_UPDATE_EXEC', ''); + +// Sample: Namazu (Search engine) +//$target = '/var/www/wiki/'; +//$mknmz = '/usr/bin/mknmz'; +//$output_dir = '/var/lib/namazu/index/'; +//define('PKWK_UPDATE_EXEC', +// $mknmz . ' --media-type=text/pukiwiki' . +// ' -O ' . $output_dir . ' -L ja -c -K ' . $target); ///////////////////////////////////////////////// // HTTP proxy setting (for TrackBack etc) @@ -328,8 +384,8 @@ $notify_from = 'from@example.com'; // From: $notify_subject = '[PukiWiki] $page'; // Mail header -$notify_header = "From: $notify_from\r\n" . - 'X-Mailer: PukiWiki/' . S_VERSION . ' PHP/' . phpversion(); +// NOTE: Multiple items must be divided by "\r\n", not "\n". +$notify_header = ''; ///////////////////////////////////////////////// // Mail: POP / APOP Before SMTP @@ -436,7 +492,7 @@ $agents = array( // Opera, dressing up as other embedded browsers // Sample: "Mozilla/3.0(DDIPOCKET;KYOCERA/AH-K3001V/1.4.1.67.000000/0.1/C100) Opera 7.0" (Like CNF at 'keitai'-mode) - array('pattern'=>'#\bDDIPOCKET\b.+\b(Opera) ([0-9\.]+)\b#', 'profile'=>'keitai'), + array('pattern'=>'#\b(?:DDIPOCKET|WILLCOM)\b.+\b(Opera) ([0-9\.]+)\b#', 'profile'=>'keitai'), // Planetweb http://www.planetweb.com/ // Sample: "Mozilla/3.0 (Planetweb/v1.07 Build 141; SPS JP)" ("EGBROWSER", Web browser for PlayStation 2)