Merge branch 'master' into stable

7 files changed, 212 insertions, 246 deletions

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 9989269cf..9769503a7 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -45,6 +45,8 @@ function ajax_qsearch(){
     global $lang;
     global $INPUT;
 
+    $maxnumbersuggestions = 50;
+
     $query = $INPUT->post->str('q');
     if(empty($query)) $query = $INPUT->get->str('q');
     if(empty($query)) return;
@@ -57,6 +59,7 @@ function ajax_qsearch(){
 
     print '<strong>'.$lang['quickhits'].'</strong>';
     print '<ul>';
+    $counter = 0;
     foreach($data as $id => $title){
         if (useHeading('navigation')) {
             $name = $title;
@@ -69,6 +72,12 @@ function ajax_qsearch(){
             }
         }
         echo '<li>' . html_wikilink(':'.$id,$name) . '</li>';
+
+        $counter ++;
+        if($counter > $maxnumbersuggestions) {
+            echo '<li>...</li>';
+            break;
+        }
     }
     print '</ul>';
 }
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index e597db3a2..db635c016 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -31,7 +31,7 @@ if($AUTH >= AUTH_READ){
     $SRC = mediaFN($IMG);
     if(!@file_exists($SRC)){
         //doesn't exist!
-        header("HTTP/1.0 404 File not Found");
+        http_status(404);
         $ERROR = 'File not found';
     }
 }else{
diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index e8f189256..a558a3db8 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -6,138 +6,167 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-  if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
-  define('DOKU_DISABLE_GZIP_OUTPUT', 1);
-  require_once(DOKU_INC.'inc/init.php');
-
-  //close session
-  session_write_close();
-
-  $mimetypes = getMimeTypes();
-
-  //get input
-  $MEDIA  = stripctl(getID('media',false)); // no cleaning except control chars - maybe external
-  $CACHE  = calc_cache($INPUT->str('cache'));
-  $WIDTH  = $INPUT->int('w');
-  $HEIGHT = $INPUT->int('h');
-  $REV    = &$INPUT->ref('rev');
-  //sanitize revision
-  $REV = preg_replace('/[^0-9]/','',$REV);
-
-  list($EXT,$MIME,$DL) = mimetype($MEDIA,false);
-  if($EXT === false){
-    $EXT  = 'unknown';
-    $MIME = 'application/octet-stream';
-    $DL   = true;
-  }
-
-  // check for permissions, preconditions and cache external files
-  list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE, $REV);
-
-  // prepare data for plugin events
-  $data = array('media'           => $MEDIA,
-                'file'            => $FILE,
-                'orig'            => $FILE,
-                'mime'            => $MIME,
-                'download'        => $DL,
-                'cache'           => $CACHE,
-                'ext'             => $EXT,
-                'width'           => $WIDTH,
-                'height'          => $HEIGHT,
-                'status'          => $STATUS,
-                'statusmessage'   => $STATUSMESSAGE,
-  );
-
-  // handle the file status
-  $evt = new Doku_Event('FETCH_MEDIA_STATUS', $data);
-  if ( $evt->advise_before() ) {
-    // redirects
-    if($data['status'] > 300 && $data['status'] <= 304){
-      send_redirect($data['statusmessage']);
+if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/../../');
+define('DOKU_DISABLE_GZIP_OUTPUT', 1);
+require_once(DOKU_INC.'inc/init.php');
+session_write_close(); //close session
+
+// BEGIN main (if not testing)
+if(!defined('SIMPLE_TEST')) {
+    $mimetypes = getMimeTypes();
+
+    //get input
+    $MEDIA  = stripctl(getID('media', false)); // no cleaning except control chars - maybe external
+    $CACHE  = calc_cache($INPUT->str('cache'));
+    $WIDTH  = $INPUT->int('w');
+    $HEIGHT = $INPUT->int('h');
+    $REV    = & $INPUT->ref('rev');
+    //sanitize revision
+    $REV = preg_replace('/[^0-9]/', '', $REV);
+
+    list($EXT, $MIME, $DL) = mimetype($MEDIA, false);
+    if($EXT === false) {
+        $EXT  = 'unknown';
+        $MIME = 'application/octet-stream';
+        $DL   = true;
     }
-    // send any non 200 status
-    if($data['status'] != 200){
-      header('HTTP/1.0 ' . $data['status'] . ' ' . $data['statusmessage']);
+
+    // check for permissions, preconditions and cache external files
+    list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE, $REV);
+
+    // prepare data for plugin events
+    $data = array(
+        'media'         => $MEDIA,
+        'file'          => $FILE,
+        'orig'          => $FILE,
+        'mime'          => $MIME,
+        'download'      => $DL,
+        'cache'         => $CACHE,
+        'ext'           => $EXT,
+        'width'         => $WIDTH,
+        'height'        => $HEIGHT,
+        'status'        => $STATUS,
+        'statusmessage' => $STATUSMESSAGE,
+        'ispublic'      => media_ispublic($MEDIA),
+    );
+
+    // handle the file status
+    $evt = new Doku_Event('FETCH_MEDIA_STATUS', $data);
+    if($evt->advise_before()) {
+        // redirects
+        if($data['status'] > 300 && $data['status'] <= 304) {
+            send_redirect($data['statusmessage']);
+        }
+        // send any non 200 status
+        if($data['status'] != 200) {
+            http_status($data['status'], $data['statusmessage']);
+        }
+        // die on errors
+        if($data['status'] > 203) {
+            print $data['statusmessage'];
+            exit;
+        }
     }
-    // die on errors
-    if($data['status'] > 203){
-      print $data['statusmessage'];
-      exit;
+    $evt->advise_after();
+    unset($evt);
+
+    //handle image resizing/cropping
+    if((substr($MIME, 0, 5) == 'image') && $WIDTH) {
+        if($HEIGHT) {
+            $data['file'] = $FILE = media_crop_image($data['file'], $EXT, $WIDTH, $HEIGHT);
+        } else {
+            $data['file'] = $FILE = media_resize_image($data['file'], $EXT, $WIDTH, $HEIGHT);
+        }
     }
-  }
-  $evt->advise_after();
-  unset($evt);
-
-  //handle image resizing/cropping
-  if((substr($MIME,0,5) == 'image') && $WIDTH){
-    if($HEIGHT){
-        $data['file'] = $FILE = media_crop_image($data['file'],$EXT,$WIDTH,$HEIGHT);
-    }else{
-        $data['file'] = $FILE  = media_resize_image($data['file'],$EXT,$WIDTH,$HEIGHT);
+
+    // finally send the file to the client
+    $evt = new Doku_Event('MEDIA_SENDFILE', $data);
+    if($evt->advise_before()) {
+        sendFile($data['file'], $data['mime'], $data['download'], $data['cache'], $data['ispublic']);
     }
-  }
+    // Do something after the download finished.
+    $evt->advise_after();  // will not be emitted on 304 or x-sendfile
 
-  // finally send the file to the client
-  $evt = new Doku_Event('MEDIA_SENDFILE', $data);
-  if ($evt->advise_before()) {
-    sendFile($data['file'],$data['mime'],$data['download'],$data['cache']);
-  }
-  // Do something after the download finished.
-  $evt->advise_after();
+}// END DO main
 
 /* ------------------------------------------------------------------------ */
 
 /**
  * Set headers and send the file to the client
  *
+ * The $cache parameter influences how long files may be kept in caches, the $public parameter
+ * influences if this caching may happen in public proxis or in the browser cache only FS#2734
+ *
+ * This function will abort the current script when a 304 is sent or file sending is handled
+ * through x-sendfile
+ *
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Ben Coburn <btcoburn@silicodon.net>
+ * @param string $file   local file to send
+ * @param string $mime   mime type of the file
+ * @param bool   $dl     set to true to force a browser download
+ * @param int    $cache  remaining cache time in seconds (-1 for $conf['cache'], 0 for no-cache)
+ * @param bool   $public is this a public ressource or a private one?
  */
-function sendFile($file,$mime,$dl,$cache){
-  global $conf;
-  $fmtime = @filemtime($file);
-  // send headers
-  header("Content-Type: $mime");
-  // smart http caching headers
-  if ($cache==-1) {
-    // cache
-    // cachetime or one hour
-    header('Expires: '.gmdate("D, d M Y H:i:s", time()+max($conf['cachetime'], 3600)).' GMT');
-    header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.max($conf['cachetime'], 3600));
-    header('Pragma: public');
-  } else if ($cache>0) {
-    // recache
-    // remaining cachetime + 10 seconds so the newly recached media is used
-    header('Expires: '.gmdate("D, d M Y H:i:s", $fmtime+$conf['cachetime']+10).' GMT');
-    header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.max($fmtime-time()+$conf['cachetime']+10, 0));
-    header('Pragma: public');
-  } else if ($cache==0) {
-    // nocache
-    header('Cache-Control: must-revalidate, no-transform, post-check=0, pre-check=0');
-    header('Pragma: public');
-  }
-  //send important headers first, script stops here if '304 Not Modified' response
-  http_conditionalRequest($fmtime);
-
-
-  //download or display?
-  if($dl){
-    header('Content-Disposition: attachment; filename="'.utf8_basename($file).'";');
-  }else{
-    header('Content-Disposition: inline; filename="'.utf8_basename($file).'";');
-  }
-
-  //use x-sendfile header to pass the delivery to compatible webservers
-  if (http_sendfile($file)) exit;
-
-  // send file contents
-  $fp = @fopen($file,"rb");
-  if($fp){
-    http_rangeRequest($fp,filesize($file),$mime);
-  }else{
-    header("HTTP/1.0 500 Internal Server Error");
-    print "Could not read $file - bad permissions?";
-  }
+function sendFile($file, $mime, $dl, $cache, $public = false) {
+    global $conf;
+    // send mime headers
+    header("Content-Type: $mime");
+
+    // calculate cache times
+    if($cache == -1) {
+        $maxage  = max($conf['cachetime'], 3600); // cachetime or one hour
+        $expires = time() + $maxage;
+    } else if($cache > 0) {
+        $maxage  = $cache; // given time
+        $expires = time() + $maxage;
+    } else { // $cache == 0
+        $maxage  = 0;
+        $expires = 0; // 1970-01-01
+    }
+
+    // smart http caching headers
+    if($maxage) {
+        if($public) {
+            // cache publically
+            header('Expires: '.gmdate("D, d M Y H:i:s", $expires).' GMT');
+            header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.$maxage);
+            header('Pragma: public');
+        } else {
+            // cache in browser
+            header('Expires: '.gmdate("D, d M Y H:i:s", $expires).' GMT');
+            header('Cache-Control: private, no-transform, max-age='.$maxage);
+            header('Pragma: no-cache');
+        }
+    } else {
+        // no cache at all
+        header('Expires: Thu, 01 Jan 1970 00:00:00 GMT');
+        header('Cache-Control: no-cache, no-transform');
+        header('Pragma: no-cache');
+    }
+
+    //send important headers first, script stops here if '304 Not Modified' response
+    $fmtime = @filemtime($file);
+    http_conditionalRequest($fmtime);
+
+    //download or display?
+    if($dl) {
+        header('Content-Disposition: attachment; filename="'.utf8_basename($file).'";');
+    } else {
+        header('Content-Disposition: inline; filename="'.utf8_basename($file).'";');
+    }
+
+    //use x-sendfile header to pass the delivery to compatible webservers
+    if(http_sendfile($file)) exit;
+
+    // send file contents
+    $fp = @fopen($file, "rb");
+    if($fp) {
+        http_rangeRequest($fp, filesize($file), $mime);
+    } else {
+        http_status(500);
+        print "Could not read $file - bad permissions?";
+    }
 }
 
 /**
@@ -148,43 +177,43 @@ function sendFile($file,$mime,$dl,$cache){
  *
  * @author Gerry Weissbach <gerry.w@gammaproduction.de>
  * @param $media reference to the media id
- * @param $file reference to the file variable
+ * @param $file  reference to the file variable
  * @returns array(STATUS, STATUSMESSAGE)
  */
-function checkFileStatus(&$media, &$file, $rev='') {
-  global $MIME, $EXT, $CACHE, $INPUT;
-
-  //media to local file
-  if(preg_match('#^(https?)://#i',$media)){
-    //check hash
-    if(substr(md5(auth_cookiesalt().$media),0,6) != $INPUT->str('hash')){
-      return array( 412, 'Precondition Failed');
-    }
-    //handle external images
-    if(strncmp($MIME,'image/',6) == 0) $file = media_get_from_URL($media,$EXT,$CACHE);
-    if(!$file){
-      //download failed - redirect to original URL
-      return array( 302, $media );
-    }
-  }else{
-    $media = cleanID($media);
-    if(empty($media)){
-      return array( 400, 'Bad request' );
+function checkFileStatus(&$media, &$file, $rev = '') {
+    global $MIME, $EXT, $CACHE, $INPUT;
+
+    //media to local file
+    if(preg_match('#^(https?)://#i', $media)) {
+        //check hash
+        if(substr(md5(auth_cookiesalt().$media), 0, 6) !== $INPUT->str('hash')) {
+            return array(412, 'Precondition Failed');
+        }
+        //handle external images
+        if(strncmp($MIME, 'image/', 6) == 0) $file = media_get_from_URL($media, $EXT, $CACHE);
+        if(!$file) {
+            //download failed - redirect to original URL
+            return array(302, $media);
+        }
+    } else {
+        $media = cleanID($media);
+        if(empty($media)) {
+            return array(400, 'Bad request');
+        }
+
+        //check permissions (namespace only)
+        if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ) {
+            return array(403, 'Forbidden');
+        }
+        $file = mediaFN($media, $rev);
     }
 
-    //check permissions (namespace only)
-    if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ){
-      return array( 403, 'Forbidden' );
+    //check file existance
+    if(!@file_exists($file)) {
+        return array(404, 'Not Found');
     }
-    $file  = mediaFN($media, $rev);
-  }
-
-  //check file existance
-  if(!@file_exists($file)){
-      return array( 404, 'Not Found' );
-  }
 
-  return array(200, null);
+    return array(200, null);
 }
 
 /**
@@ -194,12 +223,12 @@ function checkFileStatus(&$media, &$file, $rev='') {
  *
  * @author  Andreas Gohr <andi@splitbrain.org>
  */
-function calc_cache($cache){
-  global $conf;
+function calc_cache($cache) {
+    global $conf;
 
-  if(strtolower($cache) == 'nocache') return 0; //never cache
-  if(strtolower($cache) == 'recache') return $conf['cachetime']; //use standard cache
-  return -1; //cache endless
+    if(strtolower($cache) == 'nocache') return 0; //never cache
+    if(strtolower($cache) == 'recache') return $conf['cachetime']; //use standard cache
+    return -1; //cache endless
 }
 
 //Setup VIM: ex: et ts=2 :
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 1ccede923..27576f76d 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -37,9 +37,12 @@ if ($evt->advise_before()) {
   runTrimRecentChanges(true) or
   $evt->advise_after();
 }
-if($defer) sendGIF();
 
-if(!$output) ob_end_clean();
+if(!$output) {
+    ob_end_clean();
+    if($defer) sendGIF();
+}
+
 exit;
 
 // --------------------------------------------------------------------
@@ -166,93 +169,20 @@ function runSitemapper(){
  * @author Adrian Lang <lang@cosmocode.de>
  */
 function sendDigest() {
-    echo 'sendDigest(): started'.NL;
-    global $ID;
     global $conf;
-    if (!$conf['subscribers']) {
+    global $ID;
+
+    echo 'sendDigest(): started'.NL;
+    if(!actionOK('subscribe')) {
         echo 'sendDigest(): disabled'.NL;
         return false;
     }
-    $subscriptions = subscription_find($ID, array('style' => '(digest|list)',
-                                                  'escaped' => true));
-    /** @var auth_basic $auth */
-    global $auth;
-    global $lang;
-    global $conf;
-    global $USERINFO;
-
-    // remember current user info
-    $olduinfo = $USERINFO;
-    $olduser  = $_SERVER['REMOTE_USER'];
-
-    foreach($subscriptions as $id => $users) {
-        if (!subscription_lock($id)) {
-            continue;
-        }
-        foreach($users as $data) {
-            list($user, $style, $lastupdate) = $data;
-            $lastupdate = (int) $lastupdate;
-            if ($lastupdate + $conf['subscribe_time'] > time()) {
-                // Less than the configured time period passed since last
-                // update.
-                continue;
-            }
-
-            // Work as the user to make sure ACLs apply correctly
-            $USERINFO = $auth->getUserData($user);
-            $_SERVER['REMOTE_USER'] = $user;
-            if ($USERINFO === false) {
-                continue;
-            }
-
-            if (substr($id, -1, 1) === ':') {
-                // The subscription target is a namespace
-                $changes = getRecentsSince($lastupdate, null, getNS($id));
-            } else {
-                if(auth_quickaclcheck($id) < AUTH_READ) continue;
-
-                $meta = p_get_metadata($id);
-                $changes = array($meta['last_change']);
-            }
-
-            // Filter out pages only changed in small and own edits
-            $change_ids = array();
-            foreach($changes as $rev) {
-                $n = 0;
-                while (!is_null($rev) && $rev['date'] >= $lastupdate &&
-                       ($_SERVER['REMOTE_USER'] === $rev['user'] ||
-                        $rev['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT)) {
-                    $rev = getRevisions($rev['id'], $n++, 1);
-                    $rev = (count($rev) > 0) ? $rev[0] : null;
-                }
-
-                if (!is_null($rev) && $rev['date'] >= $lastupdate) {
-                    // Some change was not a minor one and not by myself
-                    $change_ids[] = $rev['id'];
-                }
-            }
-
-            if ($style === 'digest') {
-                foreach($change_ids as $change_id) {
-                    subscription_send_digest($USERINFO['mail'], $change_id,
-                                             $lastupdate);
-                }
-            } elseif ($style === 'list') {
-                subscription_send_list($USERINFO['mail'], $change_ids, $id);
-            }
-            // TODO: Handle duplicate subscriptions.
-
-            // Update notification time.
-            subscription_set($user, $id, $style, time(), true);
-        }
-        subscription_unlock($id);
-    }
+    $sub = new Subscription();
+    $sent = $sub->send_bulk($ID);
 
-    // restore current user info
-    $USERINFO = $olduinfo;
-    $_SERVER['REMOTE_USER'] = $olduser;
+    echo "sendDigest(): sent $sent mails".NL;
     echo 'sendDigest(): finished'.NL;
-    return true;
+    return (bool) $sent;
 }
 
 /**
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 42979eeed..4ff48133e 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -43,6 +43,7 @@ function js_out(){
                 DOKU_INC."lib/scripts/jquery/jquery$min.js",
                 DOKU_INC.'lib/scripts/jquery/jquery.cookie.js',
                 DOKU_INC."lib/scripts/jquery/jquery-ui$min.js",
+                DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js",
                 DOKU_INC."lib/scripts/fileuploader.js",
                 DOKU_INC."lib/scripts/fileuploaderextended.js",
                 DOKU_INC.'lib/scripts/helpers.js',
@@ -61,7 +62,7 @@ function js_out(){
                 DOKU_INC.'lib/scripts/locktimer.js',
                 DOKU_INC.'lib/scripts/linkwiz.js',
                 DOKU_INC.'lib/scripts/media.js',
-                DOKU_INC.'lib/scripts/compatibility.js',
+# deprecated                DOKU_INC.'lib/scripts/compatibility.js',
 # disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
                 DOKU_INC.'lib/scripts/behaviour.js',
                 DOKU_INC.'lib/scripts/page.js',
diff --git a/lib/exe/mediamanager.php b/lib/exe/mediamanager.php
index 04dd178cc..53d438321 100644
--- a/lib/exe/mediamanager.php
+++ b/lib/exe/mediamanager.php
@@ -36,19 +36,16 @@
 
     // do not display the manager if user does not have read access
     if($AUTH < AUTH_READ && !$fullscreen) {
-        header('HTTP/1.0 403 Forbidden');
+        http_status(403);
         die($lang['accessdenied']);
     }
 
-    // create the given namespace (just for beautification)
-    if($AUTH >= AUTH_UPLOAD) { io_createNamespace("$NS:xxx", 'media'); }
-
     // handle flash upload
     if(isset($_FILES['Filedata'])){
         $_FILES['upload'] =& $_FILES['Filedata'];
         $JUMPTO = media_upload($NS,$AUTH);
         if($JUMPTO == false){
-            header("HTTP/1.0 400 Bad Request");
+            http_status(400);
             echo 'Upload failed';
         }
         echo 'ok';
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
index 5e6c197d0..c09daa17c 100644
--- a/lib/exe/xmlrpc.php
+++ b/lib/exe/xmlrpc.php
@@ -29,10 +29,10 @@ class dokuwiki_xmlrpc_server extends IXR_Server {
             return $result;
         } catch (RemoteAccessDeniedException $e) {
             if (!isset($_SERVER['REMOTE_USER'])) {
-                header('HTTP/1.1 401 Unauthorized');
+                http_status(401);
                 return new IXR_Error(-32603, "server error. not authorized to call method $methodname");
             } else {
-                header('HTTP/1.1 403 Forbidden');
+                http_status(403);
                 return new IXR_Error(-32604, "server error. forbidden to call the method $methodname");
             }
         } catch (RemoteException $e) {