3 files changed, 10 insertions, 87 deletions

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 28ee5331f..27576f76d 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -169,97 +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;
-
-    $sent = false;
-
-    // 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);
-                    $sent = true;
-                }
-            } elseif ($style === 'list') {
-                subscription_send_list($USERINFO['mail'], $change_ids, $id);
-                $sent = true;
-            }
-            // 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 $sent;
+    return (bool) $sent;
 }
 
 /**
diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index 4abd63bef..0ba7a0525 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -173,7 +173,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
 
         if (result.success){
             qq.addClass(item, this._classes.success);
-            $link = '<a href="' + result.link + '" name="h_:' + result.id + '" class="select">' + nameInput.value + '</a>';
+            $link = '<a href="' + result.link + '" id="h_:' + result.id + '" class="select">' + nameInput.value + '</a>';
             jQuery(fileElement).html($link);
 
         } else {
diff --git a/lib/scripts/toolbar.js b/lib/scripts/toolbar.js
index 04d30c1a6..059a4ba5c 100644
--- a/lib/scripts/toolbar.js
+++ b/lib/scripts/toolbar.js
@@ -94,7 +94,7 @@ function tb_format(btn, props, edid) {
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function tb_formatln(btn, props, edid) {
-    var sample = props.title || props.sample,
+    var sample = props.sample || props.title,
         opts,
         selection = getSelection(jQuery('#'+edid)[0]);