sync abook entries from redmatrix

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php

doc/credits.bb

@@ -1,7 +1,6 @@
 [b]Credits[/b]
 
 Mike Macgirvin
-Thomas Willingham
 Fabio Comuni
 Simon L'nu
 marijus

doc/debian_install.bb

@@ -1,32 +0,0 @@
-[b]Installing On Debian[/b]
-
-While following the instructions for any other installation will work on Debian, for this platform we also provide an install script 
-which can be [url=http://gitweb.whogotzot.com/debian-install-script]downloaded here[/url]
-
-[b]THIS SCRIPT IS MEANT TO BE RUN ON A NEW OR JUST REINSTALLED SERVER[/b]
-
-Some programs such as Apache & Samba are removed by this script.
-
-Note, this script will use Nginx as the webserver.  It will also install PHP and MySQL from the DotDeb repository.  The DotDeb is not an official Debian repository, though it is maintained by Debian developers.
-
-The file setup-debian.sh has to be on your server.
-
-For the initial setup git may not be installed on your server, to install git:
-
-[code]apt-get install git[/code]
-
-If wget is installed try
-
-[code]wget http://git.beardyunixer.com/debian-install-script/blob/HEAD:/debian-setup.sh[/code]
-
-To install wget:
-[code]apt-get install wget[/code]
-
-For intitial server setup run
-[code]bash setup-debian.sh all[/code]
-
-To install Red for domain example.com, after the initial server setup run
-
-[code]bash setup-debian.sh red example.com[/code]
-
-#include doc/macros/main_footer.bb;

doc/main.bb

@@ -37,7 +37,6 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
 
 [h3]Administrators Help[/h3]
 [zrl=[baseurl]/help/install]Install[/zrl]
-[zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]
 [zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]
 [zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
 [zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]

doc/problems-following-an-update.bb

@@ -20,7 +20,7 @@ If you're using php5-fpm, this problem is usually resolved with [code]service ph
 
 Symptoms:  
 
-1) [zrl=https://beardyunixer.com/page/jargon/wsod]White Screen Of Death[/zrl].  This is most prevalent on the settings and admin pages.
+1) White Screen Of Death.  This is most prevalent on the settings and admin pages.
 
 2) Missing icons, tabs, menus or features.
 

include/zot.php

@@ -2887,6 +2887,27 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
 			foreach($arr['abook'] as $abook) {
 
+				if(! array_key_exists('abook_blocked',$abook)) {
+					// convert from redmatrix
+					if($abook['abook_flags'] & 0x0001)
+						$abook['abook_blocked'] = 1;
+					if($abook['abook_flags'] & 0x0002)
+						$abook['abook_ignored'] = 1;
+					if($abook['abook_flags'] & 0x0004)
+						$abook['abook_hidden'] = 1;
+					if($abook['abook_flags'] & 0x0008)
+						$abook['abook_archived'] = 1;
+					if($abook['abook_flags'] & 0x0010)
+						$abook['abook_pending'] = 1;
+					if($abook['abook_flags'] & 0x0020)
+						$abook['abook_unconnected'] = 1;
+					if($abook['abook_flags'] & 0x0080)
+						$abook['abook_self'] = 1;
+					if($abook['abook_flags'] & 0x0100)
+						$abook['abook_feed'] = 1;
+				}
+
+
 				$clean = array();
 				if($abook['abook_xchan'] && $abook['entry_deleted']) {
 					logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);

library/justifiedGallery/justifiedGallery.css

@@ -1,5 +1,5 @@
 /*!
- * Justified Gallery - v3.5.4
+ * Justified Gallery - v3.6.0
  * http://miromannino.github.io/Justified-Gallery/
  * Copyright (c) 2015 Miro Mannino
  * Licensed under the MIT license.
@@ -126,6 +126,9 @@
   -moz-animation: justified-gallery-show-entry-animation 500ms 0 ease;
   -ms-animation: justified-gallery-show-entry-animation 500ms 0 ease;
 }
+.justified-gallery > .jg-filtered {
+  display: none;
+}
 .justified-gallery > .spinner {
   position: absolute;
   bottom: 0;

library/justifiedGallery/justifiedGallery.min.css

@@ -0,0 +1,7 @@
+/*!
+ * Justified Gallery - v3.6.0
+ * http://miromannino.github.io/Justified-Gallery/
+ * Copyright (c) 2015 Miro Mannino
+ * Licensed under the MIT license.
+ */
+@-webkit-keyframes justified-gallery-show-caption-animation{from{opacity:0}to{opacity:.7}}@-moz-keyframes justified-gallery-show-caption-animation{from{opacity:0}to{opacity:.7}}@-o-keyframes justified-gallery-show-caption-animation{from{opacity:0}to{opacity:.7}}@keyframes justified-gallery-show-caption-animation{from{opacity:0}to{opacity:.7}}@-webkit-keyframes justified-gallery-show-entry-animation{from{opacity:0}to{opacity:1}}@-moz-keyframes justified-gallery-show-entry-animation{from{opacity:0}to{opacity:1}}@-o-keyframes justified-gallery-show-entry-animation{from{opacity:0}to{opacity:1}}@keyframes justified-gallery-show-entry-animation{from{opacity:0}to{opacity:1}}.justified-gallery{width:100%;position:relative;overflow:hidden}.justified-gallery>a,.justified-gallery>div{position:absolute;display:inline-block;overflow:hidden;opacity:0;filter:alpha(opacity=0)}.justified-gallery>a>img,.justified-gallery>div>img,.justified-gallery>a>a>img,.justified-gallery>div>a>img{position:absolute;top:50%;left:50%;margin:0;padding:0;border:0}.justified-gallery>a>.caption,.justified-gallery>div>.caption{display:none;position:absolute;bottom:0;padding:5px;background-color:#000;left:0;right:0;margin:0;color:#fff;font-size:12px;font-weight:300;font-family:sans-serif}.justified-gallery>a>.caption.caption-visible,.justified-gallery>div>.caption.caption-visible{display:initial;opacity:.7;filter:"alpha(opacity=70)";-webkit-animation:justified-gallery-show-caption-animation 500ms 0 ease;-moz-animation:justified-gallery-show-caption-animation 500ms 0 ease;-ms-animation:justified-gallery-show-caption-animation 500ms 0 ease}.justified-gallery>.entry-visible{opacity:1;filter:alpha(opacity=100);-webkit-animation:justified-gallery-show-entry-animation 500ms 0 ease;-moz-animation:justified-gallery-show-entry-animation 500ms 0 ease;-ms-animation:justified-gallery-show-entry-animation 500ms 0 ease}.justified-gallery>.jg-filtered{display:none}.justified-gallery>.spinner{position:absolute;bottom:0;margin-left:-24px;padding:10px 0;left:50%;opacity:initial;filter:initial;overflow:initial}.justified-gallery>.spinner>span{display:inline-block;opacity:0;filter:alpha(opacity=0);width:8px;height:8px;margin:0 4px;background-color:#000;border-top-left-radius:6px;border-top-right-radius:6px;border-bottom-right-radius:6px;border-bottom-left-radius:6px}

version.inc

@@ -1 +1 @@
-2015-06-29.1078
+2015-07-01.1080

view/js/main.js

@@ -741,6 +741,7 @@ function pageUpdate() {
 function justifyPhotos() {
 	justifiedGalleryActive = true;
 	$('#photo-album-contents').justifiedGallery({
+		selector: '> a, > div:not(.spinner, #page-end)',
 		margins: 3,
 		border: 0,
 		sizeRangeSuffixes: {

view/php/theme_init.php

@@ -9,11 +9,11 @@ head_add_css('library/jRange/jquery.range.css');
 head_add_css('view/css/conversation.css');
 head_add_css('view/css/widgets.css');
 head_add_css('view/css/colorbox.css');
-head_add_css('library/justifiedGallery/justifiedGallery.css');
+head_add_css('library/justifiedGallery/justifiedGallery.min.css');
 
 head_add_js('jquery.js');
 //head_add_js('jquery-migrate-1.1.1.js');
-head_add_js('library/justifiedGallery/jquery.justifiedGallery.js');
+head_add_js('library/justifiedGallery/jquery.justifiedGallery.min.js');
 head_add_js('library/sprintf.js/dist/sprintf.min.js');
 
 //head_add_js('jquery-compat.js');