]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'friendika/master' into newui
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 16 Sep 2011 07:39:29 +0000 (09:39 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 16 Sep 2011 07:39:29 +0000 (09:39 +0200)
1  2 
boot.php
include/template_processor.php
include/text.php
js/acl.js
js/main.js
mod/network.php
mod/search.php

diff --cc boot.php
index f171bdac7443dacfbd427c212e36f4580dc576aa,a9cfb7cac0dfbdf953ebab4818bee3a14ac7a477..f7670f459dbed1a9fdc2cfc37bf1002d8cbc1a46
+++ b/boot.php
@@@ -5,10 -5,9 +5,10 @@@ require_once('include/network.php')
  require_once('include/plugin.php');
  require_once('include/text.php');
  require_once("include/pgettext.php");
 +require_once('include/nav.php');
  
  
- define ( 'FRIENDIKA_VERSION',      '2.2.1096' );
+ define ( 'FRIENDIKA_VERSION',      '2.2.1103' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
  define ( 'DB_UPDATE_VERSION',      1087      );
  
Simple merge
Simple merge
diff --cc js/acl.js
index 82b631ee9444f0a98f666a08b4e31010a1ccfb08,0000000000000000000000000000000000000000..ba6c6af7382e5a29faeaa7bbd34f3821d7ef94a1
mode 100644,000000..100644
--- /dev/null
+++ b/js/acl.js
@@@ -1,240 -1,0 +1,246 @@@
-       that.updateview();
 +function ACL(backend_url, preset){
 +      that = this;
 +      
 +      that.url = backend_url;
 +      
 +      that.kp_timer = null;
 +      
 +      if (preset==undefined) preset = [];
 +      that.allow_cid = (preset[0] || []);
 +      that.allow_gid = (preset[1] || []);
 +      that.deny_cid  = (preset[2] || []);
 +      that.deny_gid  = (preset[3] || []);
 +      that.group_uids = [];
 +      that.nw = 4; //items per row. should be calulated from #acl-list.width
 +      
 +      that.list_content = $("#acl-list-content");
 +      that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
 +      that.showall = $("#acl-showall");
 +
 +      if (preset.length==0) that.showall.addClass("selected");
 +      
 +      /*events*/
 +      that.showall.click(that.on_showall);
 +      $(".acl-button-show").live('click', that.on_button_show);
 +      $(".acl-button-hide").live('click', that.on_button_hide);
 +      $("#acl-search").keypress(that.on_search);
 +      $("#acl-wrapper").parents("form").submit(that.on_submit);
 +      
 +      /* startup! */
 +      that.get(0,100);
 +}
 +
 +ACL.prototype.on_submit = function(){
 +      aclfileds = $("#acl-fields").html("");
 +      $(that.allow_gid).each(function(i,v){
 +              aclfileds.append("<input type='hidden' name='group_allow[]' value='"+v+"'>");
 +      });
 +      $(that.allow_cid).each(function(i,v){
 +              aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+v+"'>");
 +      });
 +      $(that.deny_gid).each(function(i,v){
 +              aclfileds.append("<input type='hidden' name='group_deny[]' value='"+v+"'>");
 +      });
 +      $(that.deny_cid).each(function(i,v){
 +              aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+v+"'>");
 +      });     
 +}
 +
 +ACL.prototype.search = function(){
 +      var srcstr = $("#acl-search").val();
 +      that.list_content.html("");
 +      that.get(0,100, srcstr);
 +}
 +
 +ACL.prototype.on_search = function(event){
 +      if (that.kp_timer) clearTimeout(that.kp_timer);
 +      that.kp_timer = setTimeout( that.search, 1000);
 +}
 +
 +ACL.prototype.on_showall = function(event){
++      event.preventDefault()
 +      event.stopPropagation();
++      
 +      if (that.showall.hasClass("selected")){
 +              return false;
 +      }
 +      that.showall.addClass("selected");
 +      
 +      that.allow_cid = [];
 +      that.allow_gid = [];
 +      that.deny_cid  = [];
 +      that.deny_gid  = [];
 +      
-       that.updateview();
++      that.update_view();
 +      
 +      return false;
 +}
 +
 +ACL.prototype.on_button_show = function(event){
++      event.preventDefault()
++      event.stopImmediatePropagation()
 +      event.stopPropagation();
 +
 +      /*that.showall.removeClass("selected");
 +      $(this).siblings(".acl-button-hide").removeClass("selected");
 +      $(this).toggleClass("selected");*/
 +
 +      that.set_allow($(this).parent().attr('id'));
 +
 +      return false;
 +}
 +ACL.prototype.on_button_hide = function(event){
++      event.preventDefault()
++      event.stopImmediatePropagation()
 +      event.stopPropagation();
 +
 +      /*that.showall.removeClass("selected");
 +      $(this).siblings(".acl-button-show").removeClass("selected");
 +      $(this).toggleClass("selected");*/
 +
 +      that.set_deny($(this).parent().attr('id'));
 +
 +      return false;
 +}
 +
 +ACL.prototype.set_allow = function(itemid){
 +      type = itemid[0];
 +      id       = parseInt(itemid.substr(1));
 +      switch(type){
 +              case "g":
 +                      if (that.allow_gid.indexOf(id)<0){
 +                              that.allow_gid.push(id)
 +                      }else {
 +                              that.allow_gid.remove(id);
 +                      }
 +                      if (that.deny_gid.indexOf(id)>=0) that.deny_gid.remove(id);
 +                      break;
 +              case "c":
 +                      if (that.allow_cid.indexOf(id)<0){
 +                              that.allow_cid.push(id)
 +                      } else {
 +                              that.allow_cid.remove(id);
 +                      }
 +                      if (that.deny_cid.indexOf(id)>=0) that.deny_cid.remove(id);                     
 +                      break;
 +      }
-       that.updateview();
++      that.update_view();
 +}
 +
 +ACL.prototype.set_deny = function(itemid){
 +      type = itemid[0];
 +      id       = parseInt(itemid.substr(1));
 +      switch(type){
 +              case "g":
 +                      if (that.deny_gid.indexOf(id)<0){
 +                              that.deny_gid.push(id)
 +                      } else {
 +                              that.deny_gid.remove(id);
 +                      }
 +                      if (that.allow_gid.indexOf(id)>=0) that.allow_gid.remove(id);
 +                      break;
 +              case "c":
 +                      if (that.deny_cid.indexOf(id)<0){
 +                              that.deny_cid.push(id)
 +                      } else {
 +                              that.deny_cid.remove(id);
 +                      }
 +                      if (that.allow_cid.indexOf(id)>=0) that.allow_cid.remove(id);
 +                      break;
 +      }
- ACL.prototype.updateview = function(){
++      that.update_view();
 +}
 +
-                               if(editor != false) {
++ACL.prototype.update_view = function(){
 +      if (that.allow_gid.length==0 && that.allow_cid.length==0 &&
 +              that.deny_gid.length==0 && that.deny_cid.length==0){
 +                      that.showall.addClass("selected");
 +                      /* jot acl */
 +                              $('#jot-perms-icon').removeClass('lock').addClass('unlock');
 +                              $('#jot-public').show();
 +                              $('.profile-jot-net input').attr('disabled', false);                    
-       that.updateview();
++                              if(typeof editor != 'undefined' && editor != false) {
 +                                      $('#profile-jot-desc').html(ispublic);
 +                              }
 +                      
 +      } else {
 +                      that.showall.removeClass("selected");
 +                      /* jot acl */
 +                              $('#jot-perms-icon').removeClass('unlock').addClass('lock');
 +                              $('#jot-public').hide();
 +                              $('.profile-jot-net input').attr('disabled', 'disabled');                       
 +                              $('#profile-jot-desc').html('&nbsp;');
 +      }
 +      
 +      $("#acl-list-content .acl-list-item").each(function(){
 +              itemid = $(this).attr('id');
 +              type = itemid[0];
 +              id       = parseInt(itemid.substr(1));
 +              
 +              btshow = $(this).children(".acl-button-show").removeClass("selected");
 +              bthide = $(this).children(".acl-button-hide").removeClass("selected");  
 +              
 +              switch(type){
 +                      case "g":
 +                              var uclass = "";
 +                              if (that.allow_gid.indexOf(id)>=0){
 +                                      btshow.addClass("selected");
 +                                      bthide.removeClass("selected");
 +                                      uclass="groupshow";
 +                              }
 +                              if (that.deny_gid.indexOf(id)>=0){
 +                                      btshow.removeClass("selected");
 +                                      bthide.addClass("selected");
 +                                      uclass="grouphide";
 +                              }
 +                              
 +                              $(that.group_uids[id]).each(function(i,v){
 +                                      $("#c"+v).removeClass("groupshow grouphide").addClass(uclass);
 +                              });
 +                              
 +                              break;
 +                      case "c":
 +                              if (that.allow_cid.indexOf(id)>=0){
 +                                      btshow.addClass("selected");
 +                                      bthide.removeClass("selected");
 +                              }
 +                              if (that.deny_cid.indexOf(id)>=0){
 +                                      btshow.removeClass("selected");
 +                                      bthide.addClass("selected");
 +                              }                       
 +              }
 +              
 +      });
 +      
 +}
 +
 +
 +ACL.prototype.get = function(start,count, search){
 +      var postdata = {
 +              start:start,
 +              count:count,
 +              search:search,
 +      }
 +      
 +      $.ajax({
 +              type:'POST',
 +              url: that.url,
 +              data: postdata,
 +              dataType: 'json',
 +              success:that.populate
 +      });
 +}
 +
 +ACL.prototype.populate = function(data){
 +      var height = Math.ceil(data.tot / that.nw) * 42;
 +      that.list_content.height(height);
 +      $(data.items).each(function(){
 +              html = "<div class='acl-list-item {4} {5}' id='{2}{3}'>"+that.item_tpl+"</div>";
 +              html = html.format( this.photo, this.name, this.type, this.id, '', this.network );
 +              if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
 +              //console.log(html);
 +              that.list_content.append(html);
 +      });
++      that.update_view();
 +}
 +
diff --cc js/main.js
index 452cb845140c3400a69f3c1e1ab4e7ea9776d5b5,0000000000000000000000000000000000000000..d5d38062e929009a7b4b9d76f114df4bf2b217ea
mode 100644,000000..100644
--- /dev/null
@@@ -1,447 -1,0 +1,448 @@@
 +
 +  function openClose(theID) {
 +    if(document.getElementById(theID).style.display == "block") { 
 +      document.getElementById(theID).style.display = "none" 
 +    }
 +    else { 
 +      document.getElementById(theID).style.display = "block" 
 +    } 
 +  }
 +
 +  function openMenu(theID) {
 +      document.getElementById(theID).style.display = "block" 
 +  }
 +
 +  function closeMenu(theID) {
 +      document.getElementById(theID).style.display = "none" 
 +  }
 +
 +      
 +      var src = null;
 +      var prev = null;
 +      var livetime = null;
 +      var msie = false;
 +      var stopped = false;
 +      var timer = null;
 +      var pr = 0;
 +      var liking = 0;
 +      var in_progress = false;
 +      var langSelect = false;
 +      var commentBusy = false;
 +
 +      $(function() {
 +              $.ajaxSetup({cache: false});
 +
 +              msie = $.browser.msie ;
 +              
 +              /* setup tooltips */
 +              $("a,.tt").each(function(){
 +                      var e = $(this);
 +                      var pos="bottom";
 +                      if (e.hasClass("tttop")) pos="top";
 +                      if (e.hasClass("ttbottom")) pos="bottom";
 +                      if (e.hasClass("ttleft")) pos="left";
 +                      if (e.hasClass("ttright")) pos="right";
 +                      e.tipTip({defaultPosition: pos});
 +              });
 +              
 +              
 +              
 +              /* setup onoff widgets */
 +              $(".onoff input").each(function(){
 +                      val = $(this).val();
 +                      id = $(this).attr("id");
 +                      $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 +                      
 +              });
 +              $(".onoff > a").click(function(event){
 +                      event.preventDefault(); 
 +                      var input = $(this).siblings("input");
 +                      var val = 1-input.val();
 +                      var id = input.attr("id");
 +                      $("#"+id+"_onoff ."+ (val==0?"on":"off")).addClass("hidden");
 +                      $("#"+id+"_onoff ."+ (val==1?"on":"off")).removeClass("hidden");
 +                      input.val(val);
 +                      //console.log(id);
 +              });
 +              
 +              /* setup field_richtext */
 +              setupFieldRichtext();
 +
 +              /* popup menus */
 +              $('a[rel^=#]').click(function(e){
 +                      menu = $( $(this).attr('rel') );
 +                      e.stopPropagation();
 +                      if (menu.attr('popup')=="false") return false;
 +                      $(this).parent().toggleClass("selected");
 +                      menu.toggle();
 +                      return false;
 +              });
 +              
 +              
 +
 +              /* notifications template */
 +              var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
 +              var notifications_empty = unescape($("#nav-notifications-menu").html());
 +              
 +              /* nav update event  */
 +              $('nav').bind('nav-update', function(e,data){;
 +                      var net = $(data).find('net').text();
 +                      if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
 +                      $('#net-update').html(net);
 +
 +                      var home = $(data).find('home').text();
 +                      if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
 +                      $('#home-update').html(home);
 +
 +                      var eNotif = $(data).find('notif')
 +                      notif = eNotif.attr('count');
 +                      if (notif>0){
 +                              $("#nav-notifications-linkmenu").addClass("on");
 +                              nnm = $("#nav-notifications-menu");
 +                              nnm.html("");
 +                              //nnm.attr('popup','true');
 +                              eNotif.children("note").each(function(){
 +                                      e = $(this);
 +                                      text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
 +                                      html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'));
 +                                      nnm.append(html);
 +                              });
 +                      } else {
 +                              $("#nav-notifications-linkmenu").removeClass("on");
 +                              $("#nav-notifications-menu").html(notifications_empty);
 +                      }
 +                      if(notif == 0) { notif = ''; $('#notify-update').removeClass('show') } else { $('#notify-update').addClass('show') }
 +                      $('#notify-update').html(notif);
 +                      
 +                      var eSysmsg = $(data).find('sysmsgs');
 +                      eSysmsg.children("notice").each(function(){
 +                              text = $(this).text();
 +                              $.jGrowl(text, { sticky: true, theme: 'notice' });
 +                      });
 +                      eSysmsg.children("info").each(function(){
 +                              text = $(this).text();
 +                              $.jGrowl(text, { sticky: false, theme: 'info' });
 +                      });
 +                      
 +              });
 +              
 +              
 +              NavUpdate(); 
 +              // Allow folks to stop the ajax page updates with the pause/break key
 +              $(document).keypress(function(event) {
 +                      if(event.keyCode == '19') {
 +                              event.preventDefault();
 +                              if(stopped == false) {
 +                                      stopped = true;
 +                                      $('#pause').html('<img src="images/pause.gif" alt="pause" style="border: 1px solid black;" />');
 +                              }
 +                              else {
 +                                      stopped = false;
 +                                      $('#pause').html('');
 +                              }
 +                      }
 +                      else {
 +                              // any key to resume
 +                              if(stopped == true) {
 +                                      stopped = false;
 +                                      $('#pause').html('');
 +                              }
 +                      }
 +
 +              });                                     
 +      });
 +
 +      function NavUpdate() {
 +
 +              if($('#live-network').length)   { src = 'network'; liveUpdate(); }
 +              if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
 +              if($('#live-community').length) { src = 'community'; liveUpdate(); }
++              if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
 +              if($('#live-display').length) { 
 +                      if(liking) {
 +                              liking = 0;
 +                              window.location.href=window.location.href 
 +                      }
 +              }
 +              if($('#live-photos').length)  { 
 +                      if(liking) {
 +                              liking = 0;
 +                              window.location.href=window.location.href 
 +                      }
 +              }
 +
 +              if(! stopped) {
 +                      $.get("ping",function(data) {
 +                              $(data).find('result').each(function() {
 +                                      // send nav-update event
 +                                      $('nav').trigger('nav-update', this);
 +                              });
 +                      }) ;
 +              }
 +              timer = setTimeout(NavUpdate,30000);
 +      }
 +
 +      function liveUpdate() {
 +              if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
 +              if(($('.comment-edit-text-full').length) || (in_progress)) {
 +                      livetime = setTimeout(liveUpdate, 10000);
 +                      return;
 +              }
 +              prev = 'live-' + src;
 +
 +              in_progress = true;
 +              var udargs = ((netargs.length) ? '/' + netargs : '');
 +              var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0);
 +
 +              $.get(update_url,function(data) {
 +                      in_progress = false;
 +                      $('.ccollapse-wrapper',data).each(function() {
 +                              var ident = $(this).attr('id');
 +                              var is_hidden = $('#' + ident).is(':hidden');
 +                              if($('#' + ident).length) {
 +                                      $('#' + ident).replaceWith($(this));
 +                                      if(is_hidden)
 +                                              $('#' + ident).hide();
 +                              }
 +                      });
 +                      $('.wall-item-outside-wrapper',data).each(function() {
 +                              var ident = $(this).attr('id');
 +                              if($('#' + ident).length == 0) {
 +                                      $('img',this).each(function() {
 +                                              $(this).attr('src',$(this).attr('dst'));
 +                                      });
 +                                      $('#' + prev).after($(this));
 +                              }
 +                              else { 
 +
 +                                      $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
 +                                      if($('#' + ident + ' ' + '.comment-edit-text-empty').length)
 +                                              $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
 +                                      $('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
 +                                      $('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
 +                                      $('#' + ident + ' ' + '.my-comment-photo').each(function() {
 +                                              $(this).attr('src',$(this).attr('dst'));
 +                                      });
 +                              }
 +                              prev = ident; 
 +                      });
 +                      $('.like-rotator').hide();
 +                      if(commentBusy) {
 +                              commentBusy = false;
 +                              $('body').css('cursor', 'auto');
 +                      }
 +              });
 +      }
 +
 +      function imgbright(node) {
 +              $(node).removeClass("drophide").addClass("drop");
 +      }
 +
 +      function imgdull(node) {
 +              $(node).removeClass("drop").addClass("drophide");
 +      }
 +
 +      // Since our ajax calls are asynchronous, we will give a few 
 +      // seconds for the first ajax call (setting like/dislike), then 
 +      // run the updater to pick up any changes and display on the page.
 +      // The updater will turn any rotators off when it's done. 
 +      // This function will have returned long before any of these
 +      // events have completed and therefore there won't be any
 +      // visible feedback that anything changed without all this
 +      // trickery. This still could cause confusion if the "like" ajax call
 +      // is delayed and NavUpdate runs before it completes.
 +
 +      function dolike(ident,verb) {
 +              $('#like-rotator-' + ident.toString()).show();
 +              $.get('like/' + ident.toString() + '?verb=' + verb );
 +              if(timer) clearTimeout(timer);
 +              timer = setTimeout(NavUpdate,3000);
 +              liking = 1;
 +      }
 +
 +      function dostar(ident) {
 +              $('#like-rotator-' + ident.toString()).show();
 +              $.get('starred/' + ident.toString(), function(data) {
 +                      if(data.match(/1/)) {
 +                              $('#starred-' + ident.toString()).addClass('starred');
 +                              $('#starred-' + ident.toString()).removeClass('unstarred');
 +                      }
 +                      else {                  
 +                              $('#starred-' + ident.toString()).addClass('unstarred');
 +                              $('#starred-' + ident.toString()).removeClass('starred');
 +                      }
 +                      $('#like-rotator-' + ident.toString()).hide();  
 +              });
 +      }
 +
 +      function getPosition(e) {
 +              var cursor = {x:0, y:0};
 +              if ( e.pageX || e.pageY  ) {
 +                      cursor.x = e.pageX;
 +                      cursor.y = e.pageY;
 +              }
 +              else {
 +                      if( e.clientX || e.clientY ) {
 +                              cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
 +                              cursor.y = e.clientY + (document.documentElement.scrollTop  || document.body.scrollTop)  - document.documentElement.clientTop;
 +                      }
 +                      else {
 +                              if( e.x || e.y ) {
 +                                      cursor.x = e.x;
 +                                      cursor.y = e.y;
 +                              }
 +                      }
 +              }
 +              return cursor;
 +      }
 +
 +      var lockvisible = false;
 +
 +      function lockview(event,id) {
 +              event = event || window.event;
 +              cursor = getPosition(event);
 +              if(lockvisible) {
 +                      lockviewhide();
 +              }
 +              else {
 +                      lockvisible = true;
 +                      $.get('lockview/' + id, function(data) {
 +                              $('#panel').html(data);
 +                              $('#panel').css({ 'left': cursor.x + 5 , 'top': cursor.y + 5});
 +                              $('#panel').show();
 +                      });
 +              }
 +      }
 +
 +      function lockviewhide() {
 +              lockvisible = false;
 +              $('#panel').hide();
 +      }
 +
 +      function post_comment(id) {
 +              commentBusy = true;
 +              $('body').css('cursor', 'wait');
 +              $.post(  
 +             "item",  
 +             $("#comment-edit-form-" + id).serialize(),
 +                      function(data) {
 +                              if(data.success) {
 +                                      $("#comment-edit-wrapper-" + id).hide();
 +                                      $("#comment-edit-text-" + id).val('');
 +                              var tarea = document.getElementById("comment-edit-text-" + id);
 +                                      if(tarea)
 +                                              commentClose(tarea,id);
 +                                      if(timer) clearTimeout(timer);
 +                                      timer = setTimeout(NavUpdate,10);
 +                              }
 +                              if(data.reload) {
 +                                      window.location.href=data.reload;
 +                              }
 +                      },
 +                      "json"  
 +         );  
 +         return false;  
 +      }
 +
 +
 +    function bin2hex(s){  
 +        // Converts the binary representation of data to hex    
 +        //   
 +        // version: 812.316  
 +        // discuss at: http://phpjs.org/functions/bin2hex  
 +        // +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)  
 +        // +   bugfixed by: Onno Marsman  
 +        // +   bugfixed by: Linuxworld  
 +        // *     example 1: bin2hex('Kev');  
 +        // *     returns 1: '4b6576'  
 +        // *     example 2: bin2hex(String.fromCharCode(0x00));  
 +        // *     returns 2: '00'  
 +        var v,i, f = 0, a = [];  
 +        s += '';  
 +        f = s.length;  
 +          
 +        for (i = 0; i<f; i++) {  
 +            a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");  
 +        }  
 +          
 +        return a.join('');  
 +    }  
 +
 +      function groupChangeMember(gid,cid) {
 +              $('body .fakelink').css('cursor', 'wait');
 +              $.get('group/' + gid + '/' + cid, function(data) {
 +                              $('#group-update-wrapper').html(data);
 +                              $('body .fakelink').css('cursor', 'auto');                              
 +              });
 +      }
 +
 +      function profChangeMember(gid,cid) {
 +              $('body .fakelink').css('cursor', 'wait');
 +              $.get('profperm/' + gid + '/' + cid, function(data) {
 +                              $('#prof-update-wrapper').html(data);
 +                              $('body .fakelink').css('cursor', 'auto');                              
 +              });
 +      }
 +
 +      function contactgroupChangeMember(gid,cid) {
 +              $('body').css('cursor', 'wait');
 +              $.get('contactgroup/' + gid + '/' + cid, function(data) {
 +                              $('body').css('cursor', 'auto');
 +              });
 +      }
 +
 +
 +function checkboxhighlight(box) {
 +  if($(box).is(':checked')) {
 +      $(box).addClass('checkeditem');
 +  }
 +  else {
 +      $(box).removeClass('checkeditem');
 +  }
 +}
 +
 +function setupFieldRichtext(){
 +      tinyMCE.init({
 +              theme : "advanced",
 +              mode : "specific_textareas",
 +              editor_selector: "fieldRichtext",
 +              plugins : "bbcode,paste",
 +              theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 +              theme_advanced_buttons2 : "",
 +              theme_advanced_buttons3 : "",
 +              theme_advanced_toolbar_location : "top",
 +              theme_advanced_toolbar_align : "center",
 +              theme_advanced_blockformats : "blockquote,code",
 +              paste_text_sticky : true,
 +              entity_encoding : "raw",
 +              add_unload_trigger : false,
 +              remove_linebreaks : false,
 +              force_p_newlines : false,
 +              force_br_newlines : true,
 +              forced_root_block : '',
 +              convert_urls: false,
 +              content_css: baseurl+"/view/custom_tinymce.css",
 +              theme_advanced_path : false,
 +      });
 +}
 +
 +/** 
 + * sprintf in javascript 
 + *    "{0} and {1}".format('zero','uno'); 
 + **/
 +String.prototype.format = function() {
 +    var formatted = this;
 +    for (var i = 0; i < arguments.length; i++) {
 +        var regexp = new RegExp('\\{'+i+'\\}', 'gi');
 +        formatted = formatted.replace(regexp, arguments[i]);
 +    }
 +    return formatted;
 +};
 +// Array Remove
 +Array.prototype.remove = function(item) {
 +  to=undefined; from=this.indexOf(item);
 +  var rest = this.slice((to || from) + 1 || this.length);
 +  this.length = from < 0 ? this.length + from : from;
 +  return this.push.apply(this, rest);
 +};
 +
diff --cc mod/network.php
Simple merge
diff --cc mod/search.php
Simple merge