Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x

actions/showstream.php

@@ -380,8 +380,13 @@ class ShowstreamAction extends ProfileAction
             $this->showEmptyListMessage();
         }
 
+        $args = array('nickname' => $this->user->nickname);
+        if (!empty($this->tag))
+        {
+            $args['tag'] = $this->tag;
+        }
         $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
-                          'showstream', array('nickname' => $this->user->nickname));
+                          'showstream', $args);
     }
 
     function showAnonymousMessage()

actions/twitapistatuses.php

@@ -136,6 +136,11 @@ class TwitapistatusesAction extends TwitterapiAction
 
     }
 
+    function home_timeline($args, $apidata)
+    {
+        call_user_func(array($this, 'friends_timeline'), $args, $apidata);
+    }
+
     function user_timeline($args, $apidata)
     {
         parent::handle($args);

classes/User.php

@@ -120,11 +120,15 @@ class User extends Memcached_DataObject
     function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
-        static $blacklist = array('rss', 'xrds', 'doc', 'main',
+
-                                  'settings', 'notice', 'user',
+        $blacklist = array();
-                                  'search', 'avatar', 'tag', 'tags',
+
-                                  'api', 'message', 'group', 'groups',
+        //all directory and file names should be blacklisted
-                                  'local');
+        $d = dir(INSTALLDIR);
+        while (false !== ($entry = $d->read())) {
+            $blacklist[]=$entry;
+        }
+        $d->close();
         $merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
         return !in_array($nickname, $merged);
     }

doc-src/im

@@ -37,7 +37,7 @@ currently-implemented commands:
 * **help**: Show this help. List available Jabber/XMPP commands
 * **follow <nickname>**: Subscribe to <nickname>
 * **sub <nickname>**: Same as follow
-* **leave <nickname>**: Subscribe to <nickname>
+* **leave <nickname>**: Unsubscribe from <nickname>
 * **unsub <nickname>**: Same as leave
 * **d <nickname> <text>**: Send direct message to <nickname> with message body <text>
 * **get <nickname>**: Get last notice from <nickname>

lib/designsettings.php

@@ -325,7 +325,6 @@ class DesignSettingsAction extends AccountSettingsAction
         parent::showScripts();
 
         $this->script('js/farbtastic/farbtastic.js');
-        $this->script('js/farbtastic/farbtastic.go.js');
         $this->script('js/userdesign.go.js');
 
         $this->autofocus('design_background-image_file');

lib/noticelist.php

@@ -261,7 +261,7 @@ class NoticeListItem extends Widget
         $attrs = array('href' => $this->profile->profileurl,
                        'class' => 'url');
         if (!empty($this->profile->fullname)) {
-            $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
+            $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
         }
         $this->out->elementStart('a', $attrs);
         $this->showAvatar();
@@ -418,9 +418,17 @@ class NoticeListItem extends Widget
 
     function showContext()
     {
-        // XXX: also show context if there are replies to this notice
+        $hasConversation = false;
-        if (!empty($this->notice->conversation)
+        if( !empty($this->notice->conversation)
-            && $this->notice->conversation != $this->notice->id) {
+            && $this->notice->conversation != $this->notice->id){
+            $hasConversation = true;
+        }else{
+            $conversation = Notice::conversationStream($this->notice->id, 1, 1);
+            if($conversation->N > 0){
+                $hasConversation = true;
+            }
+        }
+        if ($hasConversation){
             $convurl = common_local_url('conversation',
                                          array('id' => $this->notice->conversation));
             $this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,

lib/router.php

@@ -272,12 +272,12 @@ class Router
         $m->connect('api/statuses/:method',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(public_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
+                    array('method' => '(public_timeline|home_timeline|friends_timeline|user_timeline|update|replies|mentions|show|friends|followers|featured)(\.(atom|rss|xml|json))?'));
 
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 
@@ -436,7 +436,7 @@ class Router
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(user_timeline|home_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         $m->connect('api/statusnet/groups/:method/:argument',
                     array('action' => 'api',

plugins/Autocomplete/readme.txt

@@ -1,5 +1,7 @@
 Autocomplete allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user's friends' screen names.
 
+Note: This plugin doesn't work if the site is in Private mode, i.e. when $config['site']['private'] is set to true.
+
 Installation
 ============
 Add "addPlugin('Autocomplete');" to the bottom of your config.php

plugins/InfiniteScroll/InfiniteScrollPlugin.php

@@ -40,7 +40,7 @@ class InfiniteScrollPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.min.js');
+        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
         $action->script('plugins/InfiniteScroll/infinitescroll.js');
     }
 }

plugins/InfiniteScroll/infinitescroll.js

@@ -1,6 +1,7 @@
 jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
     debug: true,
+    infiniteScroll  : false,
     nextSelector    : "li.nav_next a",
     loadingImg      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
     text            : "<em>Loading the next set of posts...</em>",
@@ -12,4 +13,3 @@ jQuery(document).ready(function($){
         NoticeAttachments();
     });
 });
-

plugins/InfiniteScroll/jquery.infinitescroll.js

@@ -92,14 +92,14 @@
     
         if (props.isDuringAjax || props.isInvalidPage || props.isDone) return; 
     
-    		if ( !isNearBottom(opts,props) ) return; 
+    		if ( opts.infiniteScroll && !isNearBottom(opts,props) ) return; 
     		  
     		// we dont want to fire the ajax multiple times
     		props.isDuringAjax = true; 
     		
     		// show the loading message and hide the previous/next links
     		props.loadingMsg.appendTo( opts.contentSelector ).show();
-    		$( opts.navSelector ).hide(); 
+    		if(opts.infiniteScroll) $( opts.navSelector ).hide(); 
     		
     		// increment the URL bit. e.g. /page/3/
     		props.currPage++;
@@ -205,10 +205,19 @@
       } 
     });
     
-    // bind scroll handler to element (if its a local scroll) or window  
+    if(opts.infiniteScroll){
-    $(opts.localMode ? this : window)
+      // bind scroll handler to element (if its a local scroll) or window  
-      .bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
+      $(opts.localMode ? this : window)
-      .trigger('scroll.infscr'); // trigger the event, in case it's a short page
+        .bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
+        .trigger('scroll.infscr'); // trigger the event, in case it's a short page
+    }else{
+      $(opts.nextSelector).click(
+        function(){
+          infscrSetup(path,opts,props,callback);
+          return false;
+        }
+      );
+    }
     
     
     return this;
@@ -222,6 +231,7 @@
   $.infinitescroll = {     
         defaults      : {
                           debug           : false,
+                          infiniteScroll  : true,
                           preload         : false,
                           nextSelector    : "div.navigation a:first",
                           loadingImg      : "http://www.infinite-scroll.com/loading.gif",

plugins/Meteor/meteorupdater.js

@@ -1,21 +1,37 @@
-// update the local timeline from a Meteor server
+// Update the local timeline from a Meteor server
-//
+// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
+//      Do Replies timeline.
 
 var MeteorUpdater = function()
 {
-     return {
+    return {
 
-          init: function(server, port, timeline)
+        init: function(server, port, timeline)
-          {
+        {
-               Meteor.callbacks["process"] = function(data) {
+            Meteor.callbacks["process"] = function(data) {
-                    RealtimeUpdate.receive(JSON.parse(data));
+                var d = JSON.parse(data);
-               };
 
-               Meteor.host = server;
+                var user_url = $('address .url')[0].href+d['user']['screen_name'];
-               Meteor.port = port;
+
-               Meteor.joinChannel(timeline, 0);
+                var wlh = window.location.href;
-               Meteor.connect();
+
-          }
+                if (wlh.indexOf('?') > 0) {
-     }
+                   wlh = wlh.slice(0, wlh.indexOf('?'))
+                }
+
+                if (timeline == 'public' ||
+                    user_url+'/all' == wlh ||
+                    user_url == wlh) {
+
+                    RealtimeUpdate.receive(d);
+                }
+            };
+
+            Meteor.host = server;
+            Meteor.port = port;
+            Meteor.joinChannel(timeline, 0);
+            Meteor.connect();
+        }
+    }
 }();
 

plugins/Realtime/RealtimePlugin.php

@@ -63,20 +63,22 @@ class RealtimePlugin extends Plugin
     {
         $path = null;
 
-        switch ($action->trimmed('action')) {
+        $a = $action->trimmed('action');
-         case 'public':
+
-            $path = array('public');
+        switch ($a) {
-            break;
+            case 'public': case 'all': case 'replies': case 'showstream':
-         case 'tag':
+                $path = array($a);
-            $tag = $action->trimmed('tag');
+                break;
-            if (!empty($tag)) {
+            case 'tag':
-                $path = array('tag', $tag);
+                $tag = $action->trimmed('tag');
-            } else {
+                if (!empty($tag)) {
+                    $path = array('tag', $tag);
+                } else {
+                    return true;
+                }
+                break;
+             default:
                 return true;
-            }
-            break;
-         default:
-            return true;
         }
 
         $timeline = $this->_pathToChannel($path);
@@ -95,10 +97,16 @@ class RealtimePlugin extends Plugin
             $user_id = 0;
         }
 
+        $action->script('plugins/Realtime/jquery.getUrlParam.js');
+
         $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw("$(document).ready(function() { ");
+        $action->raw('
-        $action->raw($this->_updateInitialize($timeline, $user_id));
+        <!--
-        $action->raw(" });");
+        $(document).ready(function() {
+            ' . $this->_updateInitialize($timeline, $user_id) . '
+        });
+        -->
+        ');
         $action->elementEnd('script');
 
         return true;
@@ -108,11 +116,13 @@ class RealtimePlugin extends Plugin
     {
         $paths = array();
 
-        // XXX: Add other timelines; this is just for the public one
+        // TODO: Replies timeline
 
         if ($notice->is_local ||
             ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
-            $paths[] = array('public');
+            foreach (array('public', 'all', 'replies', 'showstream') as $a) {
+                $paths[] = array($a);
+            }
         }
 
         $tags = $this->getNoticeTags($notice);

plugins/Realtime/jquery.getUrlParam.js

@@ -0,0 +1,72 @@
+/* Copyright (c) 2006-2007 Mathias Bank (http://www.mathias-bank.de)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ * 
+ * Version 2.1
+ * 
+ * Thanks to 
+ * Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing.
+ * Tom Leonard for some improvements
+ * 
+ */
+jQuery.fn.extend({
+/**
+* Returns get parameters.
+*
+* If the desired param does not exist, null will be returned
+*
+* To get the document params:
+* @example value = $(document).getUrlParam("paramName");
+* 
+* To get the params of a html-attribut (uses src attribute)
+* @example value = $('#imgLink').getUrlParam("paramName");
+*/ 
+ getUrlParam: function(strParamName){
+	  strParamName = escape(unescape(strParamName));
+	  
+	  var returnVal = new Array();
+	  var qString = null;
+	  
+	  if ($(this).attr("nodeName")=="#document") {
+	  	//document-handler
+		
+		if (window.location.search.search(strParamName) > -1 ){
+			
+			qString = window.location.search.substr(1,window.location.search.length).split("&");
+		}
+			
+	  } else if ($(this).attr("src")!="undefined") {
+	  	
+	  	var strHref = $(this).attr("src")
+	  	if ( strHref.indexOf("?") > -1 ){
+	    	var strQueryString = strHref.substr(strHref.indexOf("?")+1);
+	  		qString = strQueryString.split("&");
+	  	}
+	  } else if ($(this).attr("href")!="undefined") {
+	  	
+	  	var strHref = $(this).attr("href")
+	  	if ( strHref.indexOf("?") > -1 ){
+	    	var strQueryString = strHref.substr(strHref.indexOf("?")+1);
+	  		qString = strQueryString.split("&");
+	  	}
+	  } else {
+	  	return null;
+	  }
+	  	
+	  
+	  if (qString==null) return null;
+	  
+	  
+	  for (var i=0;i<qString.length; i++){
+			if (escape(unescape(qString[i].split("=")[0])) == strParamName){
+				returnVal.push(qString[i].split("=")[1]);
+			}
+			
+	  }
+	  
+	  
+	  if (returnVal.length==0) return null;
+	  else if (returnVal.length==1) return returnVal[0];
+	  else return returnVal;
+	}
+});

plugins/Realtime/realtimeupdate.js

@@ -1,113 +1,152 @@
-// add a notice encoded as JSON into the current timeline
+$(document).ready(function() {
-//
+    if (!$(document).getUrlParam('realtime')) {
-// TODO: i18n
+        $('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Pop this tab">&#8599;</button>');
 
-RealtimeUpdate = {
+        $('#realtime_timeline').css({
-     _userid: 0,
+            'margin':'2px 0 0 11px',
-     _replyurl: '',
+            'background':'transparent url('+$('address .url')[0].href+'/plugins/Realtime/icon_external.gif) no-repeat 45% 45%',
-     _favorurl: '',
+            'text-indent':'-9999px',
-     _deleteurl: '',
+            'width':'16px',
+            'height':'16px',
+            'padding':'0',
+            'display':'block',
+            'float':'right',
+            'border':'none',
+            'cursor':'pointer'
+        });
 
-     init: function(userid, replyurl, favorurl, deleteurl)
+        $('#realtime_timeline').click(function() {
-     {
+            window.open($(this).parent('a').attr('href')+'?realtime=1',
-          RealtimeUpdate._userid = userid;
+                        $(this).parent('a').attr('title'),
-          RealtimeUpdate._replyurl = replyurl;
+                        'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
-          RealtimeUpdate._favorurl = favorurl;
-          RealtimeUpdate._deleteurl = deleteurl;
-     },
 
-     receive: function(data)
+            return false;
-     {
+        });
-          id = data.id;
+    }
+    else {
+        window.resizeTo(575, 640);
+        address = $('address');
+        content = $('#content');
+        $('body').html(address);
+        $('address').hide();
+        $('body').append(content);
+        $('#content').css({'width':'92%'});
+    }
 
-          // Don't add it if it already exists
 
-          if ($("#notice-"+id).length > 0) {
+    // add a notice encoded as JSON into the current timeline
-               return;
+    //
-          }
+    // TODO: i18n
 
-          var noticeItem = RealtimeUpdate.makeNoticeItem(data);
+    RealtimeUpdate = {
-          $("#notices_primary .notices").prepend(noticeItem, true);
+        _userid: 0,
-          $("#notices_primary .notice:first").css({display:"none"});
+        _replyurl: '',
-          $("#notices_primary .notice:first").fadeIn(1000);
+        _favorurl: '',
-          NoticeReply();
+        _deleteurl: '',
-     },
 
-     makeNoticeItem: function(data)
+        init: function(userid, replyurl, favorurl, deleteurl)
-     {
+        {
-          user = data['user'];
+            RealtimeUpdate._userid = userid;
-          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+            RealtimeUpdate._replyurl = replyurl;
-          source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+            RealtimeUpdate._favorurl = favorurl;
+            RealtimeUpdate._deleteurl = deleteurl;
+        },
 
-          ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
+        receive: function(data)
-               "<div class=\"entry-title\">"+
+        {
-               "<span class=\"vcard author\">"+
+            id = data.id;
-               "<a href=\""+user['profile_url']+"\" class=\"url\">"+
-               "<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
-               "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
-               "</a>"+
-               "</span>"+
-               "<p class=\"entry-content\">"+html+"</p>"+
-               "</div>"+
-               "<div class=\"entry-content\">"+
-               "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
-               "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
-               "</a> "+
-               "<span class=\"source\">"+
-               "from "+
-               "<span class=\"device\">+source+</span>"+ // may have a link
-               "</span>";
-          if (data['in_reply_to_status_id']) {
-               ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
-          }
 
-          ni = ni+"</div>"+
+            // Don't add it if it already exists
-               "<div class=\"notice-options\">";
 
-          if (RealtimeUpdate._userid != 0) {
+            if ($("#notice-"+id).length > 0) {
-               var input = $("form#form_notice fieldset input#token");
+                return;
-               var session_key = input.val();
+            }
-               ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
+
-               ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
+            var noticeItem = RealtimeUpdate.makeNoticeItem(data);
-               if (RealtimeUpdate._userid == data['user']['id']) {
+            $("#notices_primary .notices").prepend(noticeItem, true);
+            $("#notices_primary .notice:first").css({display:"none"});
+            $("#notices_primary .notice:first").fadeIn(1000);
+            NoticeReply();
+        },
+
+        makeNoticeItem: function(data)
+        {
+            user = data['user'];
+            html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+            source = data['source'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
+
+            ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
+                "<div class=\"entry-title\">"+
+                "<span class=\"vcard author\">"+
+                "<a href=\""+user['profile_url']+"\" class=\"url\">"+
+                "<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
+                "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
+                "</a>"+
+                "</span>"+
+                "<p class=\"entry-content\">"+html+"</p>"+
+                "</div>"+
+                "<div class=\"entry-content\">"+
+                "<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
+                "<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
+                "</a> "+
+                "<span class=\"source\">"+
+                "from "+
+                "<span class=\"device\">"+source+"</span>"+ // may have a link
+                "</span>";
+            if (data['in_reply_to_status_id']) {
+                ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
+            }
+
+            ni = ni+"</div>"+
+            "<div class=\"notice-options\">";
+
+            if (RealtimeUpdate._userid != 0) {
+                var input = $("form#form_notice fieldset input#token");
+                var session_key = input.val();
+                ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
+                ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
+                if (RealtimeUpdate._userid == data['user']['id']) {
                     ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
-               }
+                }
-          }
+             }
 
-          ni = ni+"</div>"+
+            ni = ni+"</div>"+
-               "</li>";
+            "</li>";
-          return ni;
+            return ni;
-     },
+        },
 
-     makeFavoriteForm: function(id, session_key)
+        makeFavoriteForm: function(id, session_key)
-     {
+        {
-          var ff;
+            var ff;
 
-          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
+            ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
-               "<fieldset>"+
+                "<fieldset>"+
-               "<legend>Favor this notice</legend>"+
+                "<legend>Favor this notice</legend>"+
-               "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
+                "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
-               "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
+                "<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
-               "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
+                "<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
-               "</fieldset>"+
+                "</fieldset>"+
-               "</form>";
+                "</form>";
-          return ff;
+            return ff;
-     },
+        },
 
-     makeReplyLink: function(id, nickname)
+        makeReplyLink: function(id, nickname)
-     {
+        {
-          var rl;
+            var rl;
-          rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
+            rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
-          return rl;
+            return rl;
-     },
+        },
 
-     makeDeleteLink: function(id)
+        makeDeleteLink: function(id)
-     {
+        {
-          var dl, delurl;
+            var dl, delurl;
-          delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
+            delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
 
-          dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
+            dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
+
+            return dl;
+        }
+    }
+
+});
 
-          return dl;
-     },
-}

plugins/recaptcha/README

@@ -6,7 +6,7 @@ Use:
 1. Get an API key from http://recaptcha.net
 
 2. In config.php add:
-include_once('plugins/recaptcha.php');
+include_once('plugins/recaptcha/recaptcha.php');
 $captcha = new recaptcha(publickey, privatekey, showErrors);
 
 Changelog