diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/exe/ajax.php | 2 | ||||
| -rw-r--r-- | lib/plugins/config/lang/sk/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/popularity/admin.php | 10 |
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index 533b8f91c..e9c59ca5d 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -136,7 +136,7 @@ function ajax_lock(){ if(!$client) $client = clientIP(true); $draft = array('id' => $id, - 'prefix' => $_POST['prefix'], + 'prefix' => substr($_POST['prefix'], 0, -1), 'text' => $_POST['wikitext'], 'suffix' => $_POST['suffix'], 'date' => (int) $_POST['date'], diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 7b94f26d0..c3b15a842 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -134,6 +134,7 @@ $lang['proxy____port'] = 'Proxy server - port'; $lang['proxy____user'] = 'Proxy server - užívateľské meno'; $lang['proxy____pass'] = 'Proxy server - heslo'; $lang['proxy____ssl'] = 'Proxy server - použiť SSL'; +$lang['proxy____except'] = 'Regulárny výraz popisujúci URL odkazy, pre ktoré by proxy nemala byť použitá.'; $lang['safemodehack'] = 'Povoliť "safemode hack"'; $lang['ftp____host'] = 'FTP server pre "safemode hack"'; $lang['ftp____port'] = 'FTP port pre "safemode hack"'; diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php index c72beafdb..71ea40799 100644 --- a/lib/plugins/popularity/admin.php +++ b/lib/plugins/popularity/admin.php @@ -13,7 +13,7 @@ if(!defined('DOKU_INC')) die(); * need to inherit from this class */ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { - var $version = '2008-02-20'; + var $version = '2010-09-17'; /** @@ -26,7 +26,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { 'date' => $this->version, 'name' => 'Popularity Feedback Plugin', 'desc' => 'Send anonymous data about your wiki to the developers.', - 'url' => 'http://dokuwiki.org/plugin:popularity', + 'url' => 'http://www.dokuwiki.org/plugin:popularity', ); } @@ -114,6 +114,8 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { $data['page_size'] = $list['file_size']; $data['page_biggest'] = $list['file_max']; $data['page_smallest'] = $list['file_min']; + $data['page_nscount'] = $list['dir_count']; + $data['page_nsnest'] = $list['dir_nest']; if($list['file_count']) $data['page_avg'] = $list['file_size'] / $list['file_count']; $data['page_oldest'] = $list['file_oldest']; unset($list); @@ -125,6 +127,8 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { $data['media_size'] = $list['file_size']; $data['media_biggest'] = $list['file_max']; $data['media_smallest'] = $list['file_min']; + $data['media_nscount'] = $list['dir_count']; + $data['media_nsnest'] = $list['dir_nest']; if($list['file_count']) $data['media_avg'] = $list['file_size'] / $list['file_count']; unset($list); @@ -209,6 +213,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { function _search_count(&$data,$base,$file,$type,$lvl,$opts){ // traverse if($type == 'd'){ + if($data['dir_nest'] < $lvl) $data['dir_nest'] = $lvl; $data['dir_count']++; return true; } @@ -223,6 +228,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin { if($data['file_max'] < $size) $data['file_max'] = $size; if(!isset($data['file_oldest']) || $data['file_oldest'] > $date) $data['file_oldest'] = $date; } + return false; } |