Merge branch 'master' of git://github.com/splitbrain/dokuwiki

29 files changed, 132 insertions, 166 deletions

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index f9cc3158a..f35f9ed72 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -26,7 +26,8 @@ if(!$defer){
 $ID = cleanID($_REQUEST['id']);
 
 // Catch any possible output (e.g. errors)
-if(!isset($_REQUEST['debug'])) ob_start();
+$output = isset($_REQUEST['debug']) && $conf['allowdebug'];
+if(!$output) ob_start();
 
 // run one of the jobs
 $tmp = array(); // No event data
@@ -42,7 +43,7 @@ if ($evt->advise_before()) {
 }
 if($defer) sendGIF();
 
-if(!isset($_REQUEST['debug'])) ob_end_clean();
+if(!$output) ob_end_clean();
 exit;
 
 // --------------------------------------------------------------------
@@ -228,88 +229,10 @@ function metaUpdate(){
  * @link   https://www.google.com/webmasters/sitemaps/docs/en/about.html
  */
 function runSitemapper(){
-    global $conf;
     print "runSitemapper(): started".NL;
-    if(!$conf['sitemap']) return false;
-
-    if($conf['compression'] == 'bz2' || $conf['compression'] == 'gz'){
-        $sitemap = 'sitemap.xml.gz';
-    }else{
-        $sitemap = 'sitemap.xml';
-    }
-    print "runSitemapper(): using $sitemap".NL;
-
-    if(@file_exists(DOKU_INC.$sitemap)){
-        if(!is_writable(DOKU_INC.$sitemap)) return false;
-    }else{
-        if(!is_writable(DOKU_INC)) return false;
-    }
-
-    if(@filesize(DOKU_INC.$sitemap) &&
-       @filemtime(DOKU_INC.$sitemap) > (time()-($conf['sitemap']*60*60*24))){
-       print 'runSitemapper(): Sitemap up to date'.NL;
-       return false;
-    }
-
-    $pages = idx_getIndex('page', '');
-    print 'runSitemapper(): creating sitemap using '.count($pages).' pages'.NL;
-
-    // build the sitemap
-    ob_start();
-    print '<?xml version="1.0" encoding="UTF-8"?>'.NL;
-    print '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'.NL;
-    foreach($pages as $id){
-        $id = trim($id);
-        $file = wikiFN($id);
-
-        //skip hidden, non existing and restricted files
-        if(isHiddenPage($id)) continue;
-        $date = @filemtime($file);
-        if(!$date) continue;
-        if(auth_aclcheck($id,'','') < AUTH_READ) continue;
-
-        print '  <url>'.NL;
-        print '    <loc>'.wl($id,'',true).'</loc>'.NL;
-        print '    <lastmod>'.date_iso8601($date).'</lastmod>'.NL;
-        print '  </url>'.NL;
-    }
-    print '</urlset>'.NL;
-    $data = ob_get_contents();
-    ob_end_clean();
-
-    //save the new sitemap
-    io_saveFile(DOKU_INC.$sitemap,$data);
-
-    //ping search engines...
-    $http = new DokuHTTPClient();
-    $http->timeout = 8;
-
-    //ping google
-    print 'runSitemapper(): pinging google'.NL;
-    $url  = 'http://www.google.com/webmasters/sitemaps/ping?sitemap=';
-    $url .= urlencode(DOKU_URL.$sitemap);
-    $resp = $http->get($url);
-    if($http->error) print 'runSitemapper(): '.$http->error.NL;
-    print 'runSitemapper(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp)).NL;
-
-    //ping yahoo
-    print 'runSitemapper(): pinging yahoo'.NL;
-    $url  = 'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=dokuwiki&url=';
-    $url .= urlencode(DOKU_URL.$sitemap);
-    $resp = $http->get($url);
-    if($http->error) print 'runSitemapper(): '.$http->error.NL;
-    print 'runSitemapper(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp)).NL;
-
-    //ping microsoft
-    print 'runSitemapper(): pinging microsoft'.NL;
-    $url  = 'http://www.bing.com/webmaster/ping.aspx?siteMap=';
-    $url .= urlencode(DOKU_URL.$sitemap);
-    $resp = $http->get($url);
-    if($http->error) print 'runSitemapper(): '.$http->error.NL;
-    print 'runSitemapper(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp)).NL;
-
+    $result = Sitemapper::generate() && Sitemapper::pingSearchEngines();
     print 'runSitemapper(): finished'.NL;
-    return true;
+    return $result;
 }
 
 /**
@@ -405,21 +328,6 @@ function sendDigest() {
 }
 
 /**
- * Formats a timestamp as ISO 8601 date
- *
- * @author <ungu at terong dot com>
- * @link http://www.php.net/manual/en/function.date.php#54072
- */
-function date_iso8601($int_date) {
-   //$int_date: current date in UNIX timestamp
-   $date_mod = date('Y-m-d\TH:i:s', $int_date);
-   $pre_timezone = date('O', $int_date);
-   $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2);
-   $date_mod .= $time_zone;
-   return $date_mod;
-}
-
-/**
  * Just send a 1x1 pixel blank gif to the browser
  *
  * @author Andreas Gohr <andi@splitbrain.org>
diff --git a/lib/exe/js.php b/lib/exe/js.php
index dbef6e073..f9682e1e9 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -117,7 +117,7 @@ function js_out(){
     js_runonstart('scrollToMarker()');
     js_runonstart('focusMarker()');
     // init hotkeys - must have been done after init of toolbar
-    js_runonstart('initializeHotkeys()');
+# disabled for FS#1958    js_runonstart('initializeHotkeys()');
 
     // end output buffering and get contents
     $js = ob_get_contents();
diff --git a/lib/images/fileicons/gif.png b/lib/images/fileicons/gif.png
index b4c07a912..aa4cc23a5 100644
--- a/lib/images/fileicons/gif.png
+++ b/lib/images/fileicons/gif.png
diff --git a/lib/images/fileicons/html.png b/lib/images/fileicons/html.png
index 672cbce42..1a6812185 100644
--- a/lib/images/fileicons/html.png
+++ b/lib/images/fileicons/html.png
diff --git a/lib/images/fileicons/jpg.png b/lib/images/fileicons/jpg.png
index 1fb6cc1fb..aa4cc23a5 100644
--- a/lib/images/fileicons/jpg.png
+++ b/lib/images/fileicons/jpg.png
diff --git a/lib/images/fileicons/odg.png b/lib/images/fileicons/odg.png
index 434f18262..74f6303d3 100644
--- a/lib/images/fileicons/odg.png
+++ b/lib/images/fileicons/odg.png
diff --git a/lib/images/fileicons/odp.png b/lib/images/fileicons/odp.png
index a5c77f845..2a94290d7 100644
--- a/lib/images/fileicons/odp.png
+++ b/lib/images/fileicons/odp.png
diff --git a/lib/images/fileicons/ods.png b/lib/images/fileicons/ods.png
index 2ab1273f0..47f65c84d 100644
--- a/lib/images/fileicons/ods.png
+++ b/lib/images/fileicons/ods.png
diff --git a/lib/images/fileicons/png.png b/lib/images/fileicons/png.png
index f0b5b00ee..aa4cc23a5 100644
--- a/lib/images/fileicons/png.png
+++ b/lib/images/fileicons/png.png
diff --git a/lib/images/fileicons/sxc.png b/lib/images/fileicons/sxc.png
index 419c183c1..47f65c84d 100644
--- a/lib/images/fileicons/sxc.png
+++ b/lib/images/fileicons/sxc.png
diff --git a/lib/images/fileicons/sxd.png b/lib/images/fileicons/sxd.png
index 5801bb23a..74f6303d3 100644
--- a/lib/images/fileicons/sxd.png
+++ b/lib/images/fileicons/sxd.png
diff --git a/lib/images/fileicons/sxw.png b/lib/images/fileicons/sxw.png
index 6da97beb3..b0c21fc1f 100644
--- a/lib/images/fileicons/sxw.png
+++ b/lib/images/fileicons/sxw.png
diff --git a/lib/images/fileicons/tgz.png b/lib/images/fileicons/tgz.png
index 141acf564..2426bd169 100644
--- a/lib/images/fileicons/tgz.png
+++ b/lib/images/fileicons/tgz.png
diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index e806ad434..d79a78089 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -10,6 +10,7 @@
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
  * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
  */
 $lang['admin_acl']             = '访问控制列表（ACL）管理器';
 $lang['acl_group']             = '组';
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 49712b73f..d245d3fce 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -109,7 +109,11 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       elseif ($this->_changed)
         ptln('<div class="success">'.$this->getLang('updated').'</div>');
 
+      // POST to script() instead of wl($ID) so config manager still works if
+      // rewrite config is broken. Add $ID as hidden field to remember
+      // current ID in most cases.
       ptln('<form action="'.script().'" method="post">');
+      ptln('<input type="hidden" name="id" value="'.$ID.'" />');
       formSecurityToken();
       $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
 
diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php
index 8d721b62c..01beeeeb9 100644
--- a/lib/plugins/config/lang/de-informal/lang.php
+++ b/lib/plugins/config/lang/de-informal/lang.php
@@ -118,17 +118,17 @@ $lang['renderer_xhtml']        = 'Standard-Renderer für die normale (XHTML) Wik
 $lang['renderer__core']        = '%s (DokuWiki Kern)';
 $lang['renderer__plugin']      = '%s (Erweiterung)';
 $lang['rememberme']            = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)';
-$lang['rss_type']              = 'XML Feed-Typ';
+$lang['rss_type']              = 'XML-Feed-Format';
 $lang['rss_linkto']            = 'XML-Feed verlinken auf';
 $lang['rss_content']           = 'Was soll in XML-Feedinhalten angezeigt werden?';
 $lang['rss_update']            = 'Aktualisierungsintervall für XML-Feeds (Sekunden)';
 $lang['recent_days']           = 'Wie viele Änderungen sollen vorgehalten werden? (Tage)';
 $lang['rss_show_summary']      = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
 $lang['target____wiki']        = 'Zielfenstername für interne Links';
-$lang['target____interwiki']   = 'Zielfenstername für interwiki Links';
+$lang['target____interwiki']   = 'Zielfenstername für InterWiki-Links';
 $lang['target____extern']      = 'Zielfenstername für externe Links';
 $lang['target____media']       = 'Zielfenstername für Medienlinks';
-$lang['target____windows']     = 'Zielfenstername für Windowslinks';
+$lang['target____windows']     = 'Zielfenstername für Windows-Freigaben-Links';
 $lang['proxy____host']         = 'Proxyadresse';
 $lang['proxy____port']         = 'Proxyport';
 $lang['proxy____user']         = 'Benutzername für den Proxy';
diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php
index 380b00971..a50bd6d4e 100644
--- a/lib/plugins/config/lang/eu/lang.php
+++ b/lib/plugins/config/lang/eu/lang.php
@@ -91,6 +91,7 @@ $lang['useslash']              = 'Erabili barra (/) izen-espazio banatzaile modu
 $lang['usedraft']              = 'Automatikoki zirriborroa gorde editatze garaian';
 $lang['sepchar']               = 'Orri izenaren hitz banatzailea';
 $lang['canonical']             = 'Erabili URL erabat kanonikoak';
+$lang['fnencode']              = 'Non-ASCII fitxategi izenak kodetzeko metodoa.';
 $lang['autoplural']            = 'Kontrolatu forma pluralak esteketan';
 $lang['compression']           = 'Trinkotze metodoa attic fitxategientzat';
 $lang['cachetime']             = 'Adin maximoa cachearentzat (seg)';
@@ -104,6 +105,7 @@ $lang['gdlib']                 = 'GD Lib bertsioa';
 $lang['im_convert']            = 'ImageMagick-en aldaketa tresnara bidea';
 $lang['jpg_quality']           = 'JPG konprimitze kalitatea (0-100)';
 $lang['subscribers']           = 'Gaitu orri harpidetza euskarria';
+$lang['subscribe_time']        = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.';
 $lang['compress']              = 'Trinkotu CSS eta javascript irteera';
 $lang['hidepages']             = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)';
 $lang['send404']               = 'Bidali "HTTP 404/Ez Da Orria Aurkitu" existitzen ez diren orrientzat';
@@ -130,6 +132,7 @@ $lang['proxy____port']         = 'Proxy portua';
 $lang['proxy____user']         = 'Proxyaren erabiltzaile izena';
 $lang['proxy____pass']         = 'Proxyaren pasahitza ';
 $lang['proxy____ssl']          = 'Erabili SSL Proxyra konektatzeko';
+$lang['proxy____except']       = 'URLak detektatzeko espresio erregularra, zeinentzat Proxy-a sahiestu beharko litzatekeen.';
 $lang['safemodehack']          = 'Gaitu modu segurua hack-a';
 $lang['ftp____host']           = 'FTP zerbitzaria modu seguruarentzat';
 $lang['ftp____port']           = 'FTP portua modu seguruarentzat';
@@ -177,3 +180,4 @@ $lang['useheading_o_0']        = 'Inoiz';
 $lang['useheading_o_navigation'] = 'Nabigazioa Bakarrik';
 $lang['useheading_o_content']  = 'Wiki Edukia Bakarrik';
 $lang['useheading_o_1']        = 'Beti';
+$lang['readdircache']          = 'Aintzintasun maximoa readdir cache-rentzat (seg)';
diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php
index 6345451d5..0419968c7 100644
--- a/lib/plugins/config/lang/zh/lang.php
+++ b/lib/plugins/config/lang/zh/lang.php
@@ -10,6 +10,7 @@
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
  * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
  */
 $lang['menu']                  = '配置设置';
 $lang['error']                 = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。
@@ -115,7 +116,7 @@ $lang['jpg_quality']           = 'JPG 压缩质量（0-100）';
 $lang['subscribers']           = '启用页面订阅支持';
 $lang['subscribe_time']        = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。
 ';
-$lang['compress']              = '使 CSS 和 javascript 输出更紧密';
+$lang['compress']              = '使 CSS 和 javascript 的输出更紧密';
 $lang['hidepages']             = '隐藏匹配的界面（正则表达式）';
 $lang['send404']               = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面';
 $lang['sitemap']               = '生成 Google sitemap（天）';
diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 656b4762b..2982a3ebb 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -121,7 +121,7 @@ class ap_manage {
 
         // update latest plugin date - FIXME
         global $ID;
-        send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true));
+        send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true, '&'));
     }
 
     /**
diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index d5b456604..af2db4ee5 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/lang/zh/lang.php
@@ -10,6 +10,7 @@
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
  * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
  */
 $lang['menu']                  = '插件管理器';
 $lang['download']              = '下载并安装新的插件';
@@ -51,7 +52,7 @@ $lang['error_dircreate']       = '无法创建用于接收下载文件的';
 $lang['error_decompress']      = '插件管理器无法解压下载的文件。这可能是由于下载出现错误，遇到这种情况，请您再次尝试;或者是压缩格式无法识别，遇到这种情况，您需要手动下载并安装该插件。';
 $lang['error_copy']            = '尝试安装插件 <em>%s</em> 的相关文件时产生一个复制错误：磁盘空间已满或文件访问权限错误。这可能是由于一个安装了一部分的插件，并使得您的维基系统不稳定。';
 $lang['error_delete']          = '尝试删除插件 <em>%s</em> 时产生一个错误。最有可能的情况是文件或路径的访问权限不够';
-$lang['enabled']               = '%s 插件开';
-$lang['notenabled']            = '%s插件打开失败，请检查文件权限。';
-$lang['disabled']              = '%s 插件关';
-$lang['notdisabled']           = '%s插件关闭失败，请检查文件权限。';
+$lang['enabled']               = '%s 插件启用';
+$lang['notenabled']            = '%s插件启用失败，请检查文件权限。';
+$lang['disabled']              = '%s 插件禁用';
+$lang['notdisabled']           = '%s插件禁用失败，请检查文件权限。';
diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php
index ee13b9f77..191b9c1af 100644
--- a/lib/plugins/popularity/lang/zh/lang.php
+++ b/lib/plugins/popularity/lang/zh/lang.php
@@ -9,6 +9,7 @@
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
  * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
  */
 $lang['name']                  = '人气反馈（载入可能需要一些时间）';
 $lang['submit']                = '发送数据';
diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php
index 36c8267d6..5ff1ed426 100644
--- a/lib/plugins/revert/lang/zh/lang.php
+++ b/lib/plugins/revert/lang/zh/lang.php
@@ -10,6 +10,7 @@
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
  * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
  */
 $lang['menu']                  = '还原管理器';
 $lang['filter']                = '搜索包含垃圾信息的页面';
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index bae5454d4..5836d3346 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -9,6 +9,7 @@
  * @author mr.jinyi@gmail.com
  * @author ben <ben@livetom.com>
  * @author lainme <lainme993@gmail.com>
+ * @author caii <zhoucaiqi@gmail.com>
  */
 $lang['menu']                  = '用户管理器';
 $lang['noauth']                = '（用户认证不可用）';
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index c8ddfa40a..5b9372b68 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -206,7 +206,7 @@ var media_manager = {
         media_manager.id = id;
         if(!opener){
             // if we don't run in popup display example
-            var ex = $('ex_'+id.replace(/:/g,'_'));
+            var ex = $('ex'+id.replace(/:/g,'_'));
             if(ex.style.display == ''){
                 ex.style.display = 'none';
             } else {
@@ -215,6 +215,14 @@ var media_manager = {
             return false;
         }
 
+        // FIXME these lines deactivate the media options dialog and restore
+        // the old behavior according to FS#2047
+        //opener.insertTags('wiki__text','{{'+id+'|','}}','');
+        //if(!media_manager.keepopen) window.close();
+        //opener.focus();
+        //return false;
+
+
         media_manager.ext = false;
         var dot = id.lastIndexOf(".");
         if (dot != -1) {
@@ -234,21 +242,11 @@ var media_manager = {
         media_manager.popup.style.top = event.pageY + 'px';
 
         // set all buttons to outset
-        media_manager.outSet('media__linkbtn1');
-        media_manager.outSet('media__linkbtn2');
-        media_manager.outSet('media__linkbtn3');
-        media_manager.outSet('media__linkbtn4');
-
-        media_manager.outSet('media__alignbtn0');
-        media_manager.outSet('media__alignbtn1');
-        media_manager.outSet('media__alignbtn2');
-        media_manager.outSet('media__alignbtn3');
-
-        media_manager.outSet('media__sizebtn1');
-        media_manager.outSet('media__sizebtn2');
-        media_manager.outSet('media__sizebtn3');
-        media_manager.outSet('media__sizebtn4');
-
+        for (var i = 1; i < 5; i++) {
+            media_manager.outSet('media__linkbtn' + i);
+            media_manager.outSet('media__alignbtn' + i);
+            media_manager.outSet('media__sizebtn' + i);
+        }
 
         if (ext == '.swf') {
             media_manager.ext = 'swf';
@@ -258,7 +256,7 @@ var media_manager = {
             $('media__linkbtn2').style.display = 'none';
 
             // set the link button to default
-            if (media_manager.link != false) {
+            if (media_manager.link !== false) {
                 if ( media_manager.link == '2' || media_manager.link == '1')  {
                     media_manager.inSet('media__linkbtn3');
                     media_manager.link = '3';
@@ -285,6 +283,11 @@ var media_manager = {
 
             // disable button for original size
             $('media__sizebtn4').style.display = 'none';
+            if (media_manager.size == 4) {
+                media_manager.size = 2;
+                DokuCookie.setValue('size', '2');
+                media_manager.inSet('media__sizebtn2');
+            }
 
         } else {
             media_manager.ext = 'img';
@@ -298,7 +301,7 @@ var media_manager = {
             if (DokuCookie.getValue('link')) {
                 media_manager.link = DokuCookie.getValue('link');
             }
-            if (media_manager.link == false) {
+            if (!media_manager.link) {
                 // default case
                 media_manager.link = '1';
                 DokuCookie.setValue('link','1');
@@ -316,23 +319,23 @@ var media_manager = {
             $('media__size').style.display = 'block';
 
             // set the align button to default
-            if (media_manager.align != false) {
+            if (media_manager.align !== false) {
                 media_manager.inSet('media__alignbtn'+media_manager.align);
             } else if (DokuCookie.getValue('align')) {
                 media_manager.inSet('media__alignbtn'+DokuCookie.getValue('align'));
                 media_manager.align = DokuCookie.getValue('align');
             } else {
                 // default case
-                media_manager.align = '0';
-                media_manager.inSet('media__alignbtn0');
-                DokuCookie.setValue('align','0');
+                media_manager.align = '1';
+                media_manager.inSet('media__alignbtn1');
+                DokuCookie.setValue('align','1');
             }
 
             // set the size button to default
             if (DokuCookie.getValue('size')) {
                 media_manager.size = DokuCookie.getValue('size');
             }
-            if (media_manager.size == false || (media_manager.size === '4' && ext === '.swf')) {
+            if (!media_manager.size || (media_manager.size === '4' && ext === '.swf')) {
                 // default case
                 media_manager.size = '2';
                 DokuCookie.setValue('size','2');
@@ -356,7 +359,7 @@ var media_manager = {
         media_manager.popup.setAttribute('id','media__popup');
 
         var root = document.getElementById('media__manager');
-        if (root == null) return;
+        if (root === null) return;
         root.appendChild(media_manager.popup);
 
         var headline    = document.createElement('h1');
@@ -386,8 +389,7 @@ var media_manager = {
         for (var i = 0 ; i < linkbtns.length ; ++i) {
             var linkbtn = document.createElement('button');
             linkbtn.className = 'button';
-            linkbtn.value = i + 1;
-            linkbtn.id    = "media__linkbtn" + (i + 1);
+            linkbtn.id    = "media__linkbtn" + (i+1);
             linkbtn.title = LANG['media' + linkbtns[i]];
             linkbtn.style.borderStyle = 'outset';
             addEvent(linkbtn,'click',function(event){ return media_manager.setlink(event,this); });
@@ -419,8 +421,7 @@ var media_manager = {
             var alignimg = document.createElement('img');
             alignimg.src = DOKU_BASE + 'lib/images/media_align_' + alignbtns[n] + '.png';
 
-            alignbtn.id    = "media__alignbtn" + n;
-            alignbtn.value = n;
+            alignbtn.id    = "media__alignbtn" + (n+1);
             alignbtn.title = LANG['media' + alignbtns[n]];
             alignbtn.className = 'button';
             alignbtn.appendChild(alignimg);
@@ -454,7 +455,6 @@ var media_manager = {
 
             sizebtn.className = 'button';
             sizebtn.appendChild(sizeimg);
-            sizebtn.value = size + 1;
             sizebtn.id    = 'media__sizebtn' + (size + 1);
             sizebtn.title = LANG['media' + sizebtns[size]];
             sizebtn.style.borderStyle = 'outset';
@@ -508,7 +508,7 @@ var media_manager = {
                     optsstart = true;
                 }
 
-                var s = parseInt(media_manager.size);
+                var s = parseInt(media_manager.size, 10);
 
                 if (s && s >= 1) {
                     opts += (optsstart)?'&':'?';
@@ -529,15 +529,15 @@ var media_manager = {
                         }
                     }
                 }
-                if (media_manager.align == '1') {
+                if (media_manager.align == '2') {
                     alignleft = '';
                     alignright = ' ';
                 }
-                if (media_manager.align == '2') {
+                if (media_manager.align == '3') {
                     alignleft = ' ';
                     alignright = ' ';
                 }
-                if (media_manager.align == '3') {
+                if (media_manager.align == '4') {
                     alignleft = ' ';
                     alignright = '';
                 }
@@ -663,14 +663,15 @@ var media_manager = {
      * @author Dominik Eckelmann <eckelmann@cosmocode.de>
      */
     setalign: function(event,cb){
-        if(cb.value){
-            DokuCookie.setValue('align',cb.value);
-            media_manager.align = cb.value;
-            media_manager.outSet("media__alignbtn0");
-            media_manager.outSet("media__alignbtn1");
-            media_manager.outSet("media__alignbtn2");
-            media_manager.outSet("media__alignbtn3");
-            media_manager.inSet("media__alignbtn"+cb.value);
+
+        var id = cb.id.substring(cb.id.length -1);
+        if(id){
+            DokuCookie.setValue('align',id);
+            media_manager.align = id;
+            for (var i = 1; i<=4; i++) {
+                media_manager.outSet("media__alignbtn" + i);
+            }
+            media_manager.inSet("media__alignbtn"+id);
         }else{
             DokuCookie.setValue('align','');
             media_manager.align = false;
@@ -682,23 +683,34 @@ var media_manager = {
      * @author Dominik Eckelmann <eckelmann@cosmocode.de>
      */
     setlink: function(event,cb){
-        if(cb.value){
-            DokuCookie.setValue('link',cb.value);
-            media_manager.link = cb.value;
-            media_manager.outSet("media__linkbtn1");
-            media_manager.outSet("media__linkbtn2");
-            media_manager.outSet("media__linkbtn3");
-            media_manager.outSet("media__linkbtn4");
-            media_manager.inSet("media__linkbtn"+cb.value);
+        var id = cb.id.substring(cb.id.length -1);
+        if(id){
+            DokuCookie.setValue('link',id);
+            for (var i = 1; i<=4; i++) {
+                media_manager.outSet("media__linkbtn"+i);
+            }
+            media_manager.inSet("media__linkbtn"+id);
+
             var size = document.getElementById("media__size");
             var align = document.getElementById("media__align");
-            if (cb.value != '4') {
+            if (id != '4') {
                 size.style.display  = "block";
                 align.style.display = "block";
+                if (media_manager.link == '4') {
+                    media_manager.align = '1';
+                    DokuCookie.setValue('align', '1');
+                    media_manager.inSet('media__alignbtn1');
+
+                    media_manager.size = '2';
+                    DokuCookie.setValue('size', '2');
+                    media_manager.inSet('media__sizebtn2');
+                }
+
             } else {
                 size.style.display  = "none";
                 align.style.display = "none";
             }
+            media_manager.link = id;
         }else{
             DokuCookie.setValue('link','');
             media_manager.link = false;
@@ -747,13 +759,14 @@ var media_manager = {
      * @author Dominik Eckelmann <eckelmann@cosmocode.de>
      */
     setsize: function(event,cb){
-        if (cb.value) {
-            DokuCookie.setValue('size',cb.value);
-            media_manager.size = cb.value;
-            for (var i = 1 ; i <= 4 ; ++i) {
+        var id = cb.id.substring(cb.id.length -1);
+        if (id) {
+            DokuCookie.setValue('size',id);
+            media_manager.size = id;
+            for (var i = 1 ; i <=4 ; ++i) {
                 media_manager.outSet("media__sizebtn" + i);
             }
-            media_manager.inSet("media__sizebtn"+cb.value);
+            media_manager.inSet("media__sizebtn"+id);
         } else {
             DokuCookie.setValue('size','');
             media_manager.width = false;
diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
index 7ac489929..19e2c4853 100644
--- a/lib/tpl/default/_mediaoptions.css
+++ b/lib/tpl/default/_mediaoptions.css
@@ -5,7 +5,7 @@
     display:none;
     border: 1px solid __border__;
     position: absolute;
-    width:270px;
+    width:280px;
 }
 
 #media__popup h1 {
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index d9231678b..754a6e482 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die();
 
   <?php tpl_metaheaders()?>
 
-  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" />
+  <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" />
 
   <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
 </head>
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 2831c984f..d412fd9cf 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -1,5 +1,5 @@
 /**
- * The CSS in here cotrols the appearance of the media manager
+ * The CSS in here controls the appearance of the media manager
  */
 
 #media__manager {
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
index 60c172585..15c6dad29 100644
--- a/lib/tpl/default/print.css
+++ b/lib/tpl/default/print.css
@@ -43,6 +43,14 @@ div.secedit {
   display: none;
 }
 
+div.clearer {
+  clear: both;
+  line-height: 0;
+  height: 0;
+  overflow: hidden;
+}
+
+
 /* --------------------- Text formating -------------------------------- */
 
 /* external link */
@@ -114,6 +122,21 @@ img.mediaright {
   margin: 0 0 0 1.5em;
 }
 
+img.mediacenter {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* underline */
+em.u {
+  font-style: normal;
+  text-decoration: underline;
+}
+em em.u {
+  font-style: italic;
+}
+
 /* unordered lists */
 ul {
     line-height: 1.5em;
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index 6c2d1fbd2..e40dd966d 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -1,5 +1,5 @@
 /**
- * Layout and dedsign corrections for right-to-left languages
+ * Layout and design corrections for right-to-left languages
  *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Dotan Kamber <kamberd@yahoo.com>
@@ -145,3 +145,11 @@ div.dokuwiki blockquote {
     text-align: right;
 }
 
+/* Search corrections */
+div.dokuwiki ul.search_quickhits li {
+    float: right;
+}
+
+div#qsearch__out {
+    text-align: right;
+}