Merge https://github.com/redmatrix/redmatrix into pending_merge

include/photos.php

@@ -452,7 +452,7 @@ function photos_album_rename($channel_id, $oldname, $newname) {
 function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') {
 
 	if ($remote_xchan) {
-		$r = q("SELECT distinct resource_id as from photo where xchan = '%s' and uid = %d and album = '%s' ",
+		$r = q("SELECT distinct resource_id from photo where xchan = '%s' and uid = %d and album = '%s' ",
 			dbesc($remote_xchan),
 			intval($channel_id),
 			dbesc($album)

mod/photos.php

@@ -6,6 +6,7 @@ require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 require_once('include/security.php');
 require_once('include/Contact.php');
+require_once('include/text.php');
 
 
 function photos_init(&$a) {
@@ -401,9 +402,20 @@ function photos_post(&$a) {
 	 * default post action - upload a photo
 	 */
 
+	$channel = $a->data['channel'];
+	$observer = $a->data['observer'];
+
 	$_REQUEST['source'] = 'photos';
 
-	$r = photo_upload($a->channel,$a->get_observer(), $_REQUEST);
+	if(!local_channel()) {
+		$_REQUEST['contact_allow'] = expand_acl($channel['channel_allow_cid']);
+		$_REQUEST['group_allow'] = expand_acl($channel['channel_allow_gid']);
+		$_REQUEST['contact_deny'] = expand_acl($channel['channel_deny_cid']);
+		$_REQUEST['group_deny'] = expand_acl($channel['channel_deny_gid']);
+	}
+
+	$r = photo_upload($channel, $observer, $_REQUEST);
+
 	if(! $r['success']) {
 		notice($r['message'] . EOL);
 	}		
@@ -539,7 +551,7 @@ function photos_content(&$a) {
 			$lockstate = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock');
 		}
 
-		$aclselect_e = (($_is_owner) ? populate_acl($channel_acl,false) : '');
+		$aclselect = (($_is_owner) ? populate_acl($channel_acl,false) : '');
 
 		$selname = (($datum) ? hex2bin($datum) : '');
 
@@ -557,7 +569,7 @@ function photos_content(&$a) {
 			'$albums' => $albums['albums'],
 			'$selname' => $selname,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => $aclselect_e,
+			'$aclselect' => $aclselect,
 			'$lockstate' => $lockstate,
 			'$uploader' => $ret['addon_text'],
 			'$default' => (($ret['default_upload']) ? true : false),
@@ -900,7 +912,7 @@ function photos_content(&$a) {
 		if($can_post) {
 			$album_e = $ph[0]['album'];
 			$caption_e = $ph[0]['description'];
-			$aclselect_e = populate_acl($ph[0]);
+			$aclselect_e = (($_is_owner) ? populate_acl($ph[0]) : '');
 			$albums = ((array_key_exists('albums', $a->data)) ? $a->data['albums'] : photos_albums_list($a->data['channel'],$a->data['observer']));
 
 			$_SESSION['album_return'] = bin2hex($ph[0]['album']);

mod/siteinfo.php

@@ -164,7 +164,7 @@ function siteinfo_content(&$a) {
 		'$visit' => t('Please visit <a href="https://redmatrix.me">redmatrix.me</a> to learn more about $Projectname.'),
 		'$bug_text' => t('Bug reports and issues: please visit'),
 		'$bug_link_url' => 'https://github.com/redmatrix/redmatrix/issues',
-		'$bug_link_text' => '$projectname issues',
+		'$bug_link_text' => t('$projectname issues'),
 		'$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
 		'$donate' => $donate,
 		'$adminlabel' => t('Site Administrators'),

view/js/jquery.spin.js

@@ -1,6 +1,7 @@
 /**
- * Copyright (c) 2011-2013 Felix Gnass
+ * Copyright (c) 2011-2014 Felix Gnass
  * Licensed under the MIT license
+ * http://spin.js.org/
  */
 
 /*
@@ -8,42 +9,40 @@
 Basic Usage:
 ============
 
-$('#el').spin(); // Creates a default Spinner using the text color of #el.
+$('#el').spin() // Creates a default Spinner using the text color of #el.
-$('#el').spin({ ... }); // Creates a Spinner using the provided options.
+$('#el').spin({ ... }) // Creates a Spinner using the provided options.
 
-$('#el').spin(false); // Stops and removes the spinner.
+$('#el').spin(false) // Stops and removes the spinner.
 
 Using Presets:
 ==============
 
-$('#el').spin('small'); // Creates a 'small' Spinner using the text color of #el.
+$('#el').spin('small') // Creates a 'small' Spinner using the text color of #el.
-$('#el').spin('large', '#fff'); // Creates a 'large' white Spinner.
+$('#el').spin('large', '#fff') // Creates a 'large' white Spinner.
 
 Adding a custom preset:
 =======================
 
 $.fn.spin.presets.flower = {
   lines:   9
-  length: 10
+, length: 10
-  width: 20
+, width:  20
-  radius: 0
+, radius:  0
 }
 
-$('#el').spin('flower', 'red');
+$('#el').spin('flower', 'red')
 
 */
 
-(function(factory) {
+;(function(factory) {
 
   if (typeof exports == 'object') {
     // CommonJS
-    factory(require('jquery'), require('spin'))
+    factory(require('jquery'), require('spin.js'))
-  }
+  } else if (typeof define == 'function' && define.amd) {
-  else if (typeof define == 'function' && define.amd) {
     // AMD, register as anonymous module
     define(['jquery', 'spin'], factory)
-  }
+  } else {
-  else {
     // Browser globals
     if (!window.Spinner) throw new Error('Spin.js not present')
     factory(window.jQuery, window.Spinner)
@@ -54,17 +53,17 @@ $('#el').spin('flower', 'red');
   $.fn.spin = function(opts, color) {
 
     return this.each(function() {
-      var $this = $(this),
+      var $this = $(this)
-        data = $this.data();
+        , data = $this.data()
 
       if (data.spinner) {
-        data.spinner.stop();
+        data.spinner.stop()
-        delete data.spinner;
+        delete data.spinner
       }
       if (opts !== false) {
         opts = $.extend(
-          { color: color || $this.css('color') },
+          { color: color || $this.css('color') }
-          $.fn.spin.presets[opts] || opts
+        , $.fn.spin.presets[opts] || opts
         )
         data.spinner = new Spinner(opts).spin(this)
       }
@@ -72,9 +71,9 @@ $('#el').spin('flower', 'red');
   }
 
   $.fn.spin.presets = {
-    tiny: { lines: 8, length: 2, width: 2, radius: 3 },
+    tiny:  { lines:  8, length: 2, width: 2, radius: 3, position: 'relative' }
-    small: { lines: 8, length: 4, width: 3, radius: 5 },
+  , small: { lines:  8, length: 4, width: 3, radius: 5, position: 'relative' }
-    large: { lines: 10, length: 8, width: 4, radius: 8 }
+  , large: { lines: 10, length: 8, width: 4, radius: 8, position: 'relative' }
   }
 
 }));

view/js/spin.js

@@ -1,10 +1,35 @@
-//fgnass.github.com/spin.js#v1.3
-
 /**
- * Copyright (c) 2011-2013 Felix Gnass
+ * Copyright (c) 2011-2014 Felix Gnass
  * Licensed under the MIT license
+ * http://spin.js.org/
+ *
+ * Example:
+    var opts = {
+      lines: 12,            // The number of lines to draw
+    , length: 7,            // The length of each line
+    , width: 5,             // The line thickness
+    , radius: 10            // The radius of the inner circle
+    , scale: 1.0            // Scales overall size of the spinner
+    , corners: 1            // Roundness (0..1)
+    , color: '#000'         // #rgb or #rrggbb
+    , opacity: 1/4          // Opacity of the lines
+    , rotate: 0             // Rotation offset
+    , direction: 1          // 1: clockwise, -1: counterclockwise
+    , speed: 1              // Rounds per second
+    , trail: 100            // Afterglow percentage
+    , fps: 20               // Frames per second when using setTimeout()
+    , zIndex: 2e9           // Use a high z-index by default
+    , className: 'spinner'  // CSS class to assign to the element
+    , top: '50%'            // center vertically
+    , left: '50%'           // center horizontally
+    , shadow: false         // Whether to render a shadow
+    , hwaccel: false        // Whether to use hardware acceleration (might be buggy)
+    , position: 'absolute'  // Element positioning
+    }
+    var target = document.getElementById('foo')
+    var spinner = new Spinner(opts).spin(target)
  */
-(function(root, factory) {
+;(function (root, factory) {
 
   /* CommonJS */
   if (typeof exports == 'object') module.exports = factory()
@@ -14,13 +39,13 @@
 
   /* Browser global */
   else root.Spinner = factory()
-}
+}(this, function () {
-(this, function() {
+  "use strict"
-  "use strict";
 
   var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
     , animations = {} /* Animation rules keyed by their name */
     , useCssAnimations /* Whether to use CSS animations or setTimeout */
+    , sheet /* A stylesheet to hold the @keyframe or VML rules. */
 
   /**
    * Utility function to create elements. If no tag name is given,
@@ -38,21 +63,13 @@
    * Appends children and returns the parent.
    */
   function ins (parent /* child1, child2, ...*/) {
-    for (var i=1, n=arguments.length; i<n; i++)
+    for (var i = 1, n = arguments.length; i < n; i++) {
       parent.appendChild(arguments[i])
+    }
 
     return parent
   }
 
-  /**
-   * Insert a new stylesheet to hold the @keyframe or VML rules.
-   */
-  var sheet = (function() {
-    var el = createEl('style', {type : 'text/css'})
-    ins(document.getElementsByTagName('head')[0], el)
-    return el.sheet || el.styleSheet
-  }())
-
   /**
    * Creates an opacity keyframe animation rule and returns its name.
    * Since most mobile Webkits have timing issues with animation-delay,
@@ -89,8 +106,8 @@
       , pp
       , i
 
-    if(s[prop] !== undefined) return prop
     prop = prop.charAt(0).toUpperCase() + prop.slice(1)
+    if (s[prop] !== undefined) return prop
     for (i = 0; i < prefixes.length; i++) {
       pp = prefixes[i]+prop
       if (s[pp] !== undefined) return pp
@@ -101,8 +118,9 @@
    * Sets multiple style properties at once.
    */
   function css (el, prop) {
-    for (var n in prop)
+    for (var n in prop) {
       el.style[vendor(el, n) || n] = prop[n]
+    }
 
     return el
   }
@@ -113,48 +131,47 @@
   function merge (obj) {
     for (var i = 1; i < arguments.length; i++) {
       var def = arguments[i]
-      for (var n in def)
+      for (var n in def) {
         if (obj[n] === undefined) obj[n] = def[n]
       }
+    }
     return obj
   }
 
   /**
-   * Returns the absolute page-offset of the given element.
+   * Returns the line color from the given string or array.
    */
-  function pos(el) {
+  function getColor (color, idx) {
-    var o = { x:el.offsetLeft, y:el.offsetTop }
+    return typeof color == 'string' ? color : color[idx % color.length]
-    while((el = el.offsetParent))
-      o.x+=el.offsetLeft, o.y+=el.offsetTop
-
-    return o
   }
 
   // Built-in defaults
 
   var defaults = {
-    lines: 12,            // The number of lines to draw
+    lines: 12             // The number of lines to draw
-    length: 7,            // The length of each line
+  , length: 7             // The length of each line
-    width: 5,             // The line thickness
+  , width: 5              // The line thickness
-    radius: 10,           // The radius of the inner circle
+  , radius: 10            // The radius of the inner circle
-    rotate: 0,            // Rotation offset
+  , scale: 1.0            // Scales overall size of the spinner
-    corners: 1,           // Roundness (0..1)
+  , corners: 1            // Roundness (0..1)
-    color: '#000',        // #rgb or #rrggbb
+  , color: '#000'         // #rgb or #rrggbb
-    direction: 1,         // 1: clockwise, -1: counterclockwise
+  , opacity: 1/4          // Opacity of the lines
-    speed: 1,             // Rounds per second
+  , rotate: 0             // Rotation offset
-    trail: 100,           // Afterglow percentage
+  , direction: 1          // 1: clockwise, -1: counterclockwise
-    opacity: 1/4,         // Opacity of the lines
+  , speed: 1              // Rounds per second
-    fps: 20,              // Frames per second when using setTimeout()
+  , trail: 100            // Afterglow percentage
-    zIndex: 2e9,          // Use a high z-index by default
+  , fps: 20               // Frames per second when using setTimeout()
-    className: 'spinner', // CSS class to assign to the element
+  , zIndex: 2e9           // Use a high z-index by default
-    top: 'auto',          // center vertically
+  , className: 'spinner'  // CSS class to assign to the element
-    left: 'auto',         // center horizontally
+  , top: '50%'            // center vertically
-    position: 'relative'  // element position
+  , left: '50%'           // center horizontally
+  , shadow: false         // Whether to render a shadow
+  , hwaccel: false        // Whether to use hardware acceleration (might be buggy)
+  , position: 'absolute'  // Element positioning
   }
 
   /** The constructor */
   function Spinner (o) {
-    if (typeof this == 'undefined') return new Spinner(o)
     this.opts = merge(o || {}, Spinner.defaults, defaults)
   }
 
@@ -162,7 +179,6 @@
   Spinner.defaults = {}
 
   merge(Spinner.prototype, {
-
     /**
      * Adds the spinner to the given target element. If this instance is already
      * spinning, it is automatically removed from its previous target b calling
@@ -173,19 +189,18 @@
 
       var self = this
         , o = self.opts
-        , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
+        , el = self.el = createEl(null, {className: o.className})
-        , mid = o.radius+o.length+o.width
+
-        , ep // element position
+      css(el, {
-        , tp // target position
+        position: o.position
+      , width: 0
+      , zIndex: o.zIndex
+      , left: o.left
+      , top: o.top
+      })
 
       if (target) {
         target.insertBefore(el, target.firstChild || null)
-        tp = pos(target)
-        ep = pos(el)
-        css(el, {
-          left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : parseInt(o.left, 10) + mid) + 'px',
-          top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid)  + 'px'
-        })
       }
 
       el.setAttribute('role', 'progressbar')
@@ -202,7 +217,7 @@
           , astep = f / o.lines
 
         ;(function anim () {
-          i++;
+          i++
           for (var j = 0; j < o.lines; j++) {
             alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
 
@@ -212,12 +227,12 @@
         })()
       }
       return self
-    },
+    }
 
     /**
      * Stops and removes the Spinner.
      */
-    stop: function() {
+  , stop: function () {
       var el = this.el
       if (el) {
         clearTimeout(this.timeout)
@@ -225,51 +240,50 @@
         this.el = undefined
       }
       return this
-    },
+    }
 
     /**
      * Internal method that draws the individual lines. Will be overwritten
      * in VML fallback mode below.
      */
-    lines: function(el, o) {
+  , lines: function (el, o) {
       var i = 0
         , start = (o.lines - 1) * (1 - o.direction) / 2
         , seg
 
       function fill (color, shadow) {
         return css(createEl(), {
-          position: 'absolute',
+          position: 'absolute'
-          width: (o.length+o.width) + 'px',
+        , width: o.scale * (o.length + o.width) + 'px'
-          height: o.width + 'px',
+        , height: o.scale * o.width + 'px'
-          background: color,
+        , background: color
-          boxShadow: shadow,
+        , boxShadow: shadow
-          transformOrigin: 'left',
+        , transformOrigin: 'left'
-          transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
+        , transform: 'rotate(' + ~~(360/o.lines*i + o.rotate) + 'deg) translate(' + o.scale*o.radius + 'px' + ',0)'
-          borderRadius: (o.corners * o.width>>1) + 'px'
+        , borderRadius: (o.corners * o.scale * o.width >> 1) + 'px'
         })
       }
 
       for (; i < o.lines; i++) {
         seg = css(createEl(), {
-          position: 'absolute',
+          position: 'absolute'
-          top: 1+~(o.width/2) + 'px',
+        , top: 1 + ~(o.scale * o.width / 2) + 'px'
-          transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
+        , transform: o.hwaccel ? 'translate3d(0,0,0)' : ''
-          opacity: o.opacity,
+        , opacity: o.opacity
-          animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
+        , animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1 / o.speed + 's linear infinite'
         })
 
-        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
+        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px #000'), {top: '2px'}))
-
+        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
-        ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')))
       }
       return el
-    },
+    }
 
     /**
      * Internal method that adjusts the opacity of a single line.
      * Will be overwritten in VML fallback mode below.
      */
-    opacity: function(el, i, val) {
+  , opacity: function (el, i, val) {
       if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
     }
 
@@ -287,43 +301,49 @@
     sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
 
     Spinner.prototype.lines = function (el, o) {
-      var r = o.length+o.width
+      var r = o.scale * (o.length + o.width)
-        , s = 2*r
+        , s = o.scale * 2 * r
 
       function grp () {
         return css(
           vml('group', {
-            coordsize: s + ' ' + s,
+            coordsize: s + ' ' + s
-            coordorigin: -r + ' ' + -r
+          , coordorigin: -r + ' ' + -r
-          }),
+          })
-          { width: s, height: s }
+        , { width: s, height: s }
         )
       }
 
-      var margin = -(o.width+o.length)*2 + 'px'
+      var margin = -(o.width + o.length) * o.scale * 2 + 'px'
         , g = css(grp(), {position: 'absolute', top: margin, left: margin})
         , i
 
       function seg (i, dx, filter) {
-        ins(g,
+        ins(
-          ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
+          g
-            ins(css(vml('roundrect', {arcsize: o.corners}), {
+        , ins(
-                width: r,
+            css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx})
-                height: o.width,
+          , ins(
-                left: o.radius,
+              css(
-                top: -o.width>>1,
+                vml('roundrect', {arcsize: o.corners})
-                filter: filter
+              , { width: r
-              }),
+                , height: o.scale * o.width
-              vml('fill', {color: o.color, opacity: o.opacity}),
+                , left: o.scale * o.radius
-              vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
+                , top: -o.scale * o.width >> 1
+                , filter: filter
+                }
+              )
+            , vml('fill', {color: getColor(o.color, i), opacity: o.opacity})
+            , vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
             )
           )
         )
       }
 
       if (o.shadow)
-        for (i = 1; i <= o.lines; i++)
+        for (i = 1; i <= o.lines; i++) {
           seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
+        }
 
       for (i = 1; i <= o.lines; i++) seg(i)
       return ins(el, g)
@@ -339,10 +359,18 @@
     }
   }
 
+  if (typeof document !== 'undefined') {
+    sheet = (function () {
+      var el = createEl('style', {type : 'text/css'})
+      ins(document.getElementsByTagName('head')[0], el)
+      return el.sheet || el.styleSheet
+    }())
+
     var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
 
     if (!vendor(probe, 'transform') && probe.adj) initVML()
     else useCssAnimations = vendor(probe, 'animation')
+  }
 
   return Spinner
 

view/tpl/field_checkbox.tpl

@@ -1,4 +1,4 @@
-	<div class="form-group field checkbox">
+	<div id="{{$field.0}}_container" class="form-group field checkbox">
 		<label for="id_{{$field.0}}">{{$field.1}}</label>
 		<div class="pull-right"><input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.5}}{{$field.5}}{{/if}} /><label class="switchlabel" for='id_{{$field.0}}'> <span class="onoffswitch-inner" data-on='{{if $field.4}}{{$field.4.1}}{{/if}}' data-off='{{if $field.4}}{{$field.4.0}}{{/if}}'></span><span class="onoffswitch-switch"></span></label></div>
 		<span class="help-block">{{$field.3}}</span>

view/tpl/photo_view.tpl

@@ -79,9 +79,11 @@
 				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
 			</div>
 			<div class="form-group btn-group pull-right">
+				{{if $edit.aclselect}}
 				<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
 				</button>
+				{{/if}}
 				<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$edit.submit}}</button>
 			</div>
 		</form>