Merge branch 'master' into groups

diff --combined js/util.js
index 4aad8413409ab1c6d9e10733be0e412a8138319b,d98b63dd790bf44480b7ee9ef2f94f7aeb8a64b0..bb68c25879dc4f82b121c032cae9ed12914b4c77
--- 1/js/util.js
--- 2/js/util.js
+++ b/js/util.js
@@@ -24,7 -24,7 +24,7 @@@ $(document).ready(function()
                var remaining = maxLength - currentLength;
                var counter = $("#notice_text-count");
                counter.text(remaining);
 -              
 +
                if (remaining <= 0) {
                        $("#form_notice").addClass("warning");
                } else {
@@@ -45,10 -45,10 +45,10 @@@
        if ($("#notice_data-text").length) {
                $("#notice_data-text").bind("keyup", counter);
                $("#notice_data-text").bind("keydown", submitonreturn);
 -              
 +
                // run once in case there's something in there
                counter();
 -              
 +
                // set the focus
                $("#notice_data-text").focus();
        }
@@@ -73,24 -73,6 +73,24 @@@
                                                                                          }
                                         };
  
 +      var joinoptions = { dataType: 'xml',
 +                                         success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
 +                                                                                              var leave = new_form.id;
 +                                                                                              var join = leave.replace('leave', 'join');
 +                                                                                              $('form#'+join).replaceWith(new_form);
 +                                                                                              $('form#'+leave).ajaxForm(leaveoptions).each(addAjaxHidden);
 +                                                                                        }
 +                                       };
 +
 +      var leaveoptions = { dataType: 'xml',
 +                                         success: function(xml) { var new_form = document._importNode($('form', xml).get(0), true);
 +                                                                                              var join = new_form.id;
 +                                                                                              var leave = join.replace('join', 'leave');
 +                                                                                              $('form#'+leave).replaceWith(new_form);
 +                                                                                              $('form#'+join).ajaxForm(joinoptions).each(addAjaxHidden);
 +                                                                                        }
 +                                       };
 +
        function addAjaxHidden() {
                var ajax = document.createElement('input');
                ajax.setAttribute('type', 'hidden');
@@@ -101,18 -83,14 +101,18 @@@
  
        $("form.form_favor").ajaxForm(favoptions);
        $("form.form_disfavor").ajaxForm(disoptions);
 +      $("form.form_group_join").ajaxForm(joinoptions);
 +      $("form.form_group_leave").ajaxForm(leaveoptions);
        $("form.form_favor").each(addAjaxHidden);
        $("form.form_disfavor").each(addAjaxHidden);
 +      $("form.form_group_join").each(addAjaxHidden);
 +      $("form.form_group_leave").each(addAjaxHidden);
  
        $("#nudge").ajaxForm ({ dataType: 'xml',
                                                        beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled");
                                                                                                                  $("form#nudge input[type=submit]").addClass("disabled");
                                                                                                                },
 -                                                      success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true)); 
 +                                                      success: function(xml) { $("#nudge").replaceWith(document._importNode($("#nudge_response", xml).get(0),true));
                                                                                                     $("#nudge input[type=submit]").removeAttr("disabled");
                                                                                                     $("#nudge input[type=submit]").removeClass("disabled");
                                                                                                   }
@@@ -120,8 -98,8 +120,8 @@@
        $("#nudge").each(addAjaxHidden);
  
        var Subscribe = { dataType: 'xml',
-                                         beforeSubmit: function(formData, jqForm, options) { $("form.subscribe input[type=submit]").attr("disabled", "disabled");
-                                                                                                                                             $("form.subscribe input[type=submit]").addClass("disabled");
+                                         beforeSubmit: function(formData, jqForm, options) { $(".form_user_subscribe input[type=submit]").attr("disabled", "disabled");
+                                                                                                                                             $(".form_user_subscribe input[type=submit]").addClass("disabled");
                                                                                                                                            },
                                          success: function(xml) { var form_unsubscribe = document._importNode($('form', xml).get(0), true);
                                                                                           var form_unsubscribe_id = form_unsubscribe.id;
@@@ -129,14 -107,14 +129,14 @@@
                                                                                           $("form#"+form_subscribe_id).replaceWith(form_unsubscribe);
                                                                                           $("form#"+form_unsubscribe_id).ajaxForm(UnSubscribe).each(addAjaxHidden);
                                                                                           $("dd.subscribers").text(parseInt($("dd.subscribers").text())+1);
-                                                                                          $("form.subscribe input[type=submit]").removeAttr("disabled");
-                                                                                          $("form.subscribe input[type=submit]").removeClass("disabled");
+                                                                                          $(".form_user_subscribe input[type=submit]").removeAttr("disabled");
+                                                                                          $(".form_user_subscribe input[type=submit]").removeClass("disabled");
                                                                                     }
                                        };
  
        var UnSubscribe = { dataType: 'xml',
-                                               beforeSubmit: function(formData, jqForm, options) { $("form.unsubscribe input[type=submit]").attr("disabled", "disabled");
-                                                                                                                                                   $("form.unsubscribe input[type=submit]").addClass("disabled");
+                                               beforeSubmit: function(formData, jqForm, options) { $(".form_user_unsubscribe input[type=submit]").attr("disabled", "disabled");
+                                                                                                                                                   $(".form_user_unsubscribe input[type=submit]").addClass("disabled");
                                                                                                                                                  },
                                            success: function(xml) { var form_subscribe = document._importNode($('form', xml).get(0), true);
                                                                                                 var form_subscribe_id = form_subscribe.id;
@@@ -146,16 -124,17 +146,16 @@@
                                                                                                 $("#profile_send_a_new_message").remove();
                                                                                                 $("#profile_nudge").remove();
                                                                                             $("dd.subscribers").text(parseInt($("dd.subscribers").text())-1);
-                                                                                                $("form.unsubscribe input[type=submit]").removeAttr("disabled");
-                                                                                                $("form.unsubscribe input[type=submit]").removeClass("disabled");
+                                                                                                $(".form_user_unsubscribe input[type=submit]").removeAttr("disabled");
+                                                                                                $(".form_user_unsubscribe input[type=submit]").removeClass("disabled");
                                                                                           }
                                          };
  
-       $("form.subscribe").ajaxForm(Subscribe);
-       $("form.unsubscribe").ajaxForm(UnSubscribe);
-       $("form.subscribe").each(addAjaxHidden);
-       $("form.unsubscribe").each(addAjaxHidden);
+       $(".form_user_subscribe").ajaxForm(Subscribe);
+       $(".form_user_unsubscribe").ajaxForm(UnSubscribe);
+       $(".form_user_subscribe").each(addAjaxHidden);
+       $(".form_user_unsubscribe").each(addAjaxHidden);
  
 -
        var PostNotice = { dataType: 'xml',
                                           beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
                                                                                                                                                                $("#form_notice").addClass("warning");
@@@ -187,7 -166,7 +187,7 @@@
      $(".notice").hover(
          function () {
              $(this).addClass('hover');
 -        }, 
 +        },
          function () {
              $(this).removeClass('hover');
          }

diff --combined lib/util.php
index 56fbc29f5001a145acb81d0b7ac8f757684fba3f,ed7284183f2824cdc15bef9855b376198cbd10c2..4d4a3b20f2debe7c1ac77884808a9d3133afab60
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -915,24 -915,6 +915,24 @@@ function common_fancy_url($action, $arg
          } else {
              return common_path('main/sup');
          }
 +     case 'newgroup':
 +        return common_path('group/new');
 +     case 'showgroup':
 +        return common_path('group/'.$args['nickname']);
 +     case 'editgroup':
 +        return common_path('group/'.$args['nickname'].'/edit');
 +     case 'joingroup':
 +        return common_path('group/'.$args['nickname'].'/join');
 +     case 'leavegroup':
 +        return common_path('group/'.$args['nickname'].'/leave');
 +     case 'groupbyid':
 +        return common_path('group/'.$args['id'].'/id');
 +     case 'grouprss':
 +        return common_path('group/'.$args['nickname'].'/rss');
 +     case 'groupmembers':
 +        return common_path('group/'.$args['nickname'].'/members');
 +     case 'usergroups':
 +        return common_path($args['nickname'].'/groups');
       default:
          return common_simple_url($action, $args);
      }
@@@ -1044,16 -1026,14 +1044,16 @@@ function common_redirect($url, $code=30
                             302 => "Found",
                             303 => "See Other",
                             307 => "Temporary Redirect");
 +
      header("Status: ${code} $status[$code]");
      header("Location: $url");
  
 -    common_start_xml('a',
 -                     '-//W3C//DTD XHTML 1.0 Strict//EN',
 -                     'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 -    common_element('a', array('href' => $url), $url);
 -    common_end_xml();
 +    $xo = new XMLOutputter();
 +    $xo->startXML('a',
 +                  '-//W3C//DTD XHTML 1.0 Strict//EN',
 +                  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
 +    $xo->output('a', array('href' => $url), $url);
 +    $xo->endXML();
      exit;
  }
  
@@@ -1665,25 -1645,6 +1665,6 @@@ function common_nudge_response(
      common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
  }
  
- // XXX: Refactor this code
- function common_profile_new_message_nudge ($cur, $profile)
- {
-     $user = User::staticGet('id', $profile->id);
- 
-     if ($cur && $cur->id != $user->id && $cur->mutuallySubscribed($user)) {
-         common_element_start('li', array('id' => 'profile_send_a_new_message'));
-         common_element('a', array('href' => common_local_url('newmessage', array('to' => $user->id))),
-                        _('Send a message'));
-         common_element_end('li');
- 
-         if ($user->email && $user->emailnotifynudge) {
-             common_element_start('li', array('id' => 'profile_nudge'));
-             common_nudge_form($user);
-             common_element_end('li');
-         }
-     }
- }
- 
  function common_cache_key($extra)
  {
      return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;