Merge https://github.com/friendica/friendica into pull

.gitignore

@@ -33,3 +33,4 @@ report/
 #ignore cache folders
 /privacy_image_cache/
 /photo/
+nbproject

include/ostatus_conversation.php

@@ -75,116 +75,131 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 	require_once('include/items.php');
 
 	$conv = str_replace("/conversation/", "/api/statusnet/conversation/", $conversation_url).".as";
+	$pageno = 1;
+	$items = array();
 
 	logger('complete_conversation: fetching conversation url '.$conv.' for '.$itemid);
-	$conv_as = fetch_url($conv);
 
-	if ($conv_as) {
+	do {
+		$conv_as = file_get_contents($conv."?page=".$pageno);
 		$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
 		$conv_as = json_decode($conv_as);
 
-		$first_id = "";
+		if (@is_array($conv_as->items))
+			$items = array_merge($items, $conv_as->items);
+		else
+			break;
 
-                if (!is_array($conv_as->items))
-                    return;
-		$items = array_reverse($conv_as->items);
+		$pageno++;
 
-		foreach ($items as $single_conv) {
-			if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
-				$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+	} while (true);
 
-			if (@!$single_conv->id)
-				continue;
+	if (!sizeof($items))
+		return;
+
+	$items = array_reverse($items);
+
+	foreach ($items as $single_conv) {
+		if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
+			$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+
+		if (@!$single_conv->id)
+			continue;
 
-			if ($first_id == "") {
-				$first_id = $single_conv->id;
+		if ($first_id == "") {
+			$first_id = $single_conv->id;
 
-				$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
-					intval($message["uid"]), dbesc($first_id));
-				if ($new_parents) {
-					$parent = $new_parents[0];
-					logger('complete_conversation: adopting new parent '.$parent["id"].' for '.$itemid);
-				} else {
-					$parent["id"] = 0;
-					$parent["uri"] = $first_id;
-				}
+			$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+				intval($message["uid"]), dbesc($first_id));
+			if ($new_parents) {
+				$parent = $new_parents[0];
+				logger('complete_conversation: adopting new parent '.$parent["id"].' for '.$itemid);
+			} else {
+				$parent["id"] = 0;
+				$parent["uri"] = $first_id;
 			}
+		}
 
-			if (isset($single_conv->context->inReplyTo->id))
-				$parent_uri = $single_conv->context->inReplyTo->id;
-			else
-				$parent_uri = $parent["uri"];
+		if (isset($single_conv->context->inReplyTo->id))
+			$parent_uri = $single_conv->context->inReplyTo->id;
+		else
+			$parent_uri = $parent["uri"];
 
-			$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+		$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
 							intval($message["uid"]), dbesc($single_conv->id));
-			if ($message_exists) {
-				if ($parent["id"] != 0) {
-					$existing_message = $message_exists[0];
-					$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d LIMIT 1",
-						intval($parent["id"]),
-						dbesc($parent["uri"]),
-						dbesc($parent_uri),
-						intval($existing_message["id"]));
-				}
-				continue;
+		if ($message_exists) {
+			if ($parent["id"] != 0) {
+				$existing_message = $message_exists[0];
+				$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d LIMIT 1",
+					intval($parent["id"]),
+					dbesc($parent["uri"]),
+					dbesc($parent_uri),
+					intval($existing_message["id"]));
 			}
+			continue;
+		}
 
-			$arr = array();
-			$arr["uri"] = $single_conv->id;
-			$arr["plink"] = $single_conv->id;
-			$arr["uid"] = $message["uid"];
-			$arr["contact-id"] = $parent["contact-id"]; // To-Do
-			if ($parent["id"] != 0)
-				$arr["parent"] = $parent["id"];
-			$arr["parent-uri"] = $parent["uri"];
-			$arr["thr-parent"] = $parent_uri;
-			$arr["created"] = $single_conv->published;
-			$arr["edited"] = $single_conv->published;
-			//$arr["owner-name"] = $single_conv->actor->contact->displayName;
-			$arr["owner-name"] = $single_conv->actor->contact->preferredUsername;
-			$arr["owner-link"] = $single_conv->actor->id;
-			$arr["owner-avatar"] = $single_conv->actor->image->url;
-			//$arr["author-name"] = $single_conv->actor->contact->displayName;
-			$arr["author-name"] = $single_conv->actor->contact->preferredUsername;
-			$arr["author-link"] = $single_conv->actor->id;
-			$arr["author-avatar"] = $single_conv->actor->image->url;
-			$arr["body"] = html2bbcode($single_conv->content);
-			$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
-			if ($arr["app"] == "")
-				$arr["app"] = $single_conv->provider->displayName;
-			$arr["verb"] = $parent["verb"];
-			$arr["visible"] = $parent["visible"];
-			$arr["location"] = $single_conv->location->displayName;
-			$arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon);
-
-			if ($arr["location"] == "")
-				unset($arr["location"]);
-
-			if ($arr["coord"] == "")
-				unset($arr["coord"]);
-
-			$newitem = item_store($arr);
-
-			// Add the conversation entry (but don't fetch the whole conversation)
-			complete_conversation($newitem, $conversation_url, true);
-
-			// If the newly created item is the top item then change the parent settings of the thread
-			if ($newitem AND ($arr["uri"] == $first_id)) {
-				logger('complete_conversation: setting new parent to id '.$newitem);
-				$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-					intval($message["uid"]), intval($newitem));
-				if ($new_parents) {
-					$parent = $new_parents[0];
-					logger('complete_conversation: done changing parents to parent '.$newitem);
-				}
-
-				/*logger('complete_conversation: changing parents to parent '.$newitem.' old parent: '.$parent["id"].' new uri: '.$arr["uri"]);
-				$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s' WHERE `parent` = %d",
-					intval($newitem),
-					dbesc($arr["uri"]),
-					intval($parent["id"]));
-				logger('complete_conversation: done changing parents to parent '.$newitem.' '.print_r($r, true));*/
+		$arr = array();
+		$arr["uri"] = $single_conv->id;
+		$arr["plink"] = $single_conv->id;
+		$arr["uid"] = $message["uid"];
+		$arr["contact-id"] = $parent["contact-id"]; // To-Do
+		if ($parent["id"] != 0)
+			$arr["parent"] = $parent["id"];
+		$arr["parent-uri"] = $parent["uri"];
+		$arr["thr-parent"] = $parent_uri;
+		$arr["created"] = $single_conv->published;
+		$arr["edited"] = $single_conv->published;
+		//$arr["owner-name"] = $single_conv->actor->contact->displayName;
+		$arr["owner-name"] = $single_conv->actor->contact->preferredUsername;
+		if ($arr["owner-name"] == '')
+			$arr["owner-name"] = $single_conv->actor->portablecontacts_net->preferredUsername;
+		if ($arr["owner-name"] == '')
+			$arr["owner-name"] =  $single_conv->actor->displayName;
+
+		$arr["owner-link"] = $single_conv->actor->id;
+		$arr["owner-avatar"] = $single_conv->actor->image->url;
+		//$arr["author-name"] = $single_conv->actor->contact->displayName;
+		//$arr["author-name"] = $single_conv->actor->contact->preferredUsername;
+		$arr["author-name"] = $arr["owner-name"];
+		$arr["author-link"] = $single_conv->actor->id;
+		$arr["author-avatar"] = $single_conv->actor->image->url;
+		$arr["body"] = html2bbcode($single_conv->content);
+		$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
+		if ($arr["app"] == "")
+			$arr["app"] = $single_conv->provider->displayName;
+		$arr["verb"] = $parent["verb"];
+		$arr["visible"] = $parent["visible"];
+		$arr["location"] = $single_conv->location->displayName;
+		$arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon);
+
+		if ($arr["location"] == "")
+			unset($arr["location"]);
+
+		if ($arr["coord"] == "")
+			unset($arr["coord"]);
+
+		$newitem = item_store($arr);
+
+		// Add the conversation entry (but don't fetch the whole conversation)
+		complete_conversation($newitem, $conversation_url, true);
+
+		// If the newly created item is the top item then change the parent settings of the thread
+		if ($newitem AND ($arr["uri"] == $first_id)) {
+			logger('complete_conversation: setting new parent to id '.$newitem);
+			$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+				intval($message["uid"]), intval($newitem));
+			if ($new_parents) {
+				$parent = $new_parents[0];
+				logger('complete_conversation: done changing parents to parent '.$newitem);
 			}
+
+			/*logger('complete_conversation: changing parents to parent '.$newitem.' old parent: '.$parent["id"].' new uri: '.$arr["uri"]);
+			$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s' WHERE `parent` = %d",
+				intval($newitem),
+				dbesc($arr["uri"]),
+				intval($parent["id"]));
+			logger('complete_conversation: done changing parents to parent '.$newitem.' '.print_r($r, true));*/
 		}
 	}
 }

include/uimport.php

@@ -170,6 +170,10 @@ function import_account(&$a, $file) {
 			}
 		}
 		if ($contact['uid'] == $olduid && $contact['self'] == '0') {
+			// set contacts 'avatar-date' to "0000-00-00 00:00:00" to let poller to update urls
+			$contact["avatar-date"] = "0000-00-00 00:00:00" ;
+		
+		
 			switch ($contact['network']) {
 				case NETWORK_DFRN:
 					//  send relocate message (below)

library/cropper/cropper.html

@@ -40,17 +40,17 @@ JavaScript:
    1.
       function onEndCrop( coords, dimensions ) {
    2.
-          $( 'x1' ).value = coords.x1;
+          $PR( 'x1' ).value = coords.x1;
    3.
-          $( 'y1' ).value = coords.y1;
+          $PR( 'y1' ).value = coords.y1;
    4.
-          $( 'x2' ).value = coords.x2;
+          $PR( 'x2' ).value = coords.x2;
    5.
-          $( 'y2' ).value = coords.y2;
+          $PR( 'y2' ).value = coords.y2;
    6.
-          $( 'width' ).value = dimensions.width;
+          $PR( 'width' ).value = dimensions.width;
    7.
-          $( 'height' ).value = dimensions.height;
+          $PR( 'height' ).value = dimensions.height;
    8.
       }
 

library/cropper/cropper.uncompressed.js

@@ -113,6 +113,8 @@
  * http://www.opensource.org/licenses/bsd-license.php
  * 
  * See scriptaculous.js for full scriptaculous licence
+ *
+ * Modified 2013/06/01 Zach P to change $() to $PR() for eliminating conflicts with jQuery
  */
  
 /**
@@ -134,7 +136,7 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), {
 			arguments[1] || {}
 		);
 
-		this.element = $(element);
+		this.element = $PR(element);
 
 		this.handle = this.element;
 
@@ -212,12 +214,12 @@ Object.extend( Object.extend( CropDraggable.prototype, Draggable.prototype), {
  *
  * 		Example:
  * 			function onEndCrop( coords, dimensions ) {
- *				$( 'x1' ).value 	= coords.x1;
- *				$( 'y1' ).value 	= coords.y1;
- *				$( 'x2' ).value 	= coords.x2;
- *				$( 'y2' ).value 	= coords.y2;
- *				$( 'width' ).value 	= dimensions.width;
- *				$( 'height' ).value	= dimensions.height;
+ *				$PR( 'x1' ).value 	= coords.x1;
+ *				$PR( 'y1' ).value 	= coords.y1;
+ *				$PR( 'x2' ).value 	= coords.x2;
+ *				$PR( 'y2' ).value 	= coords.y2;
+ *				$PR( 'width' ).value 	= dimensions.width;
+ *				$PR( 'height' ).value	= dimensions.height;
  *			}
  * 
  */
@@ -288,7 +290,7 @@ Cropper.Img.prototype = {
 		 * @var obj
 		 * The img node to attach to
 		 */
-		this.img			= $( element );
+		this.img			= $PR( element );
 		/**
 		 * @var obj
 		 * The x & y coordinates of the click point
@@ -524,7 +526,7 @@ Cropper.Img.prototype = {
 	 */
 	registerHandles: function( registration ) {	
 		for( var i = 0; i < this.handles.length; i++ ) {
-			var handle = $( this.handles[i] );
+			var handle = $PR( this.handles[i] );
 			
 			if( registration ) {
 				var hideHandle	= false;	// whether to hide the handle
@@ -569,16 +571,16 @@ Cropper.Img.prototype = {
 		 */
 		this.imgH = this.img.height;			
 
-		$( this.north ).setStyle( { height: 0 } );
-		$( this.east ).setStyle( { width: 0, height: 0 } );
-		$( this.south ).setStyle( { height: 0 } );
-		$( this.west ).setStyle( { width: 0, height: 0 } );
+		$PR( this.north ).setStyle( { height: 0 } );
+		$PR( this.east ).setStyle( { width: 0, height: 0 } );
+		$PR( this.south ).setStyle( { height: 0 } );
+		$PR( this.west ).setStyle( { width: 0, height: 0 } );
 		
 		// resize the container to fit the image
-		$( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } );
+		$PR( this.imgWrap ).setStyle( { 'width': this.imgW + 'px', 'height': this.imgH + 'px' } );
 		
 		// hide the select area
-		$( this.selArea ).hide();
+		$PR( this.selArea ).hide();
 						
 		// setup the starting position of the select area
 		var startCoords = { x1: 0, y1: 0, x2: 0, y2: 0 };
@@ -1263,7 +1265,7 @@ Object.extend( Object.extend( Cropper.ImgWithPreview.prototype, Cropper.Img.prot
 			 * The preview image wrapper element
 			 * @var obj HTML element
 			 */
-			this.previewWrap 	= $( this.options.previewWrap );
+			this.previewWrap 	= $PR( this.options.previewWrap );
 			/**
 			 * The preview image element
 			 * @var obj HTML IMG element

library/cropper/lib/controls.js

@@ -37,8 +37,8 @@ var Autocompleter = {}
 Autocompleter.Base = function() {};
 Autocompleter.Base.prototype = {
   baseInitialize: function(element, update, options) {
-    this.element     = $(element); 
-    this.update      = $(update);  
+    this.element     = $PR(element); 
+    this.update      = $PR(update);  
     this.hasFocus    = false; 
     this.changed     = false; 
     this.active      = false; 
@@ -88,7 +88,7 @@ Autocompleter.Base.prototype = {
        '<iframe id="' + this.update.id + '_iefix" '+
        'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
        'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
-      this.iefix = $(this.update.id+'_iefix');
+      this.iefix = $PR(this.update.id+'_iefix');
     }
     if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
   },
@@ -456,7 +456,7 @@ Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";
 Ajax.InPlaceEditor.prototype = {
   initialize: function(element, url, options) {
     this.url = url;
-    this.element = $(element);
+    this.element = $PR(element);
 
     this.options = Object.extend({
       okButton: true,
@@ -491,14 +491,14 @@ Ajax.InPlaceEditor.prototype = {
 
     if(!this.options.formId && this.element.id) {
       this.options.formId = this.element.id + "-inplaceeditor";
-      if ($(this.options.formId)) {
+      if ($PR(this.options.formId)) {
         // there's already a form with that name, don't specify an id
         this.options.formId = null;
       }
     }
     
     if (this.options.externalControl) {
-      this.options.externalControl = $(this.options.externalControl);
+      this.options.externalControl = $PR(this.options.externalControl);
     }
     
     this.originalBackground = Element.getStyle(this.element, 'background-color');
@@ -796,7 +796,7 @@ Form.Element.DelayedObserver = Class.create();
 Form.Element.DelayedObserver.prototype = {
   initialize: function(element, delay, callback) {
     this.delay     = delay || 0.5;
-    this.element   = $(element);
+    this.element   = $PR(element);
     this.callback  = callback;
     this.timer     = null;
     this.lastValue = $F(this.element); 

library/cropper/lib/dragdrop.js

@@ -9,11 +9,11 @@ var Droppables = {
   drops: [],
 
   remove: function(element) {
-    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+    this.drops = this.drops.reject(function(d) { return d.element==$PR(element) });
   },
 
   add: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend({
       greedy:     true,
       hoverclass: null,
@@ -26,9 +26,9 @@ var Droppables = {
       var containment = options.containment;
       if((typeof containment == 'object') && 
         (containment.constructor == Array)) {
-        containment.each( function(c) { options._containers.push($(c)) });
+        containment.each( function(c) { options._containers.push($PR(c)) });
       } else {
-        options._containers.push($(containment));
+        options._containers.push($PR(containment));
       }
     }
     
@@ -228,17 +228,17 @@ Draggable.prototype = {
       snap: false   // false, or xy or [x,y] or function(x,y){ return [x,y] }
     }, arguments[1] || {});
 
-    this.element = $(element);
+    this.element = $PR(element);
     
     if(options.handle && (typeof options.handle == 'string')) {
       var h = Element.childrenWithClassName(this.element, options.handle, true);
       if(h.length>0) this.handle = h[0];
     }
-    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = $PR(options.handle);
     if(!this.handle) this.handle = this.element;
     
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML)
-      options.scroll = $(options.scroll);
+      options.scroll = $PR(options.scroll);
 
     Element.makePositioned(this.element); // fix IE    
 
@@ -508,7 +508,7 @@ Draggable.prototype = {
 var SortableObserver = Class.create();
 SortableObserver.prototype = {
   initialize: function(element, observer) {
-    this.element   = $(element);
+    this.element   = $PR(element);
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },
@@ -535,7 +535,7 @@ var Sortable = {
   },
 
   options: function(element) {
-    element = Sortable._findRootElement($(element));
+    element = Sortable._findRootElement($PR(element));
     if(!element) return;
     return Sortable.sortables[element.id];
   },
@@ -553,7 +553,7 @@ var Sortable = {
   },
 
   create: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend({ 
       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
@@ -744,7 +744,7 @@ var Sortable = {
     if(sortable && !sortable.ghosting) return; 
 
     if(!Sortable._marker) {
-      Sortable._marker = $('dropmarker') || document.createElement('DIV');
+      Sortable._marker = $PR('dropmarker') || document.createElement('DIV');
       Element.hide(Sortable._marker);
       Element.addClassName(Sortable._marker, 'dropmarker');
       Sortable._marker.style.position = 'absolute';
@@ -802,7 +802,7 @@ var Sortable = {
   },
 
   tree: function(element) {
-    element = $(element);
+    element = $PR(element);
     var sortableOptions = this.options(element);
     var options = Object.extend({
       tag: sortableOptions.tag,
@@ -833,16 +833,16 @@ var Sortable = {
   },
 
   sequence: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend(this.options(element), arguments[1] || {});
     
-    return $(this.findElements(element, options) || []).map( function(item) {
+    return $PR(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });
   },
 
   setSequence: function(element, new_sequence) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend(this.options(element), arguments[2] || {});
     
     var nodeMap = {};
@@ -862,7 +862,7 @@ var Sortable = {
   },
   
   serialize: function(element) {
-    element = $(element);
+    element = $PR(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || {});
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
@@ -912,4 +912,4 @@ Element.offsetSize = function (element, type) {
     return element.offsetHeight;
   else
     return element.offsetWidth;
-}
+}

library/cropper/lib/effects.js

@@ -25,14 +25,14 @@ String.prototype.parseColor = function() {
 /*--------------------------------------------------------------------------*/
 
 Element.collectTextNodes = function(element) {  
-  return $A($(element).childNodes).collect( function(node) {
+  return $A($PR(element).childNodes).collect( function(node) {
     return (node.nodeType==3 ? node.nodeValue : 
       (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
   }).flatten().join('');
 }
 
 Element.collectTextNodesIgnoreClass = function(element, className) {  
-  return $A($(element).childNodes).collect( function(node) {
+  return $A($PR(element).childNodes).collect( function(node) {
     return (node.nodeType==3 ? node.nodeValue : 
       ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
         Element.collectTextNodesIgnoreClass(node, className) : ''));
@@ -40,7 +40,7 @@ Element.collectTextNodesIgnoreClass = function(element, className) {
 }
 
 Element.setContentZoom = function(element, percent) {
-  element = $(element);  
+  element = $PR(element);  
   Element.setStyle(element, {fontSize: (percent/100) + 'em'});   
   if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
 }
@@ -55,7 +55,7 @@ Element.getOpacity = function(element){
 }
 
 Element.setOpacity = function(element, value){  
-  element= $(element);  
+  element= $PR(element);  
   if (value == 1){
     Element.setStyle(element, { opacity: 
       (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 
@@ -73,12 +73,12 @@ Element.setOpacity = function(element, value){
 }  
  
 Element.getInlineOpacity = function(element){  
-  return $(element).style.opacity || '';
+  return $PR(element).style.opacity || '';
 }  
 
 Element.childrenWithClassName = function(element, className, findFirst) {
   var classNameRegExp = new RegExp("(^|\\s)" + className + "(\\s|$)");
-  var results = $A($(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) { 
+  var results = $A($PR(element).getElementsByTagName('*'))[findFirst ? 'detect' : 'select']( function(c) { 
     return (c.className && c.className.match(classNameRegExp));
   });
   if(!results) results = [];
@@ -87,7 +87,7 @@ Element.childrenWithClassName = function(element, className, findFirst) {
 
 Element.forceRerendering = function(element) {
   try {
-    element = $(element);
+    element = $PR(element);
     var n = document.createTextNode(' ');
     element.appendChild(n);
     element.removeChild(n);
@@ -107,7 +107,7 @@ var Effect = {
   tagifyText: function(element) {
     var tagifyStyle = 'position:relative';
     if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1';
-    element = $(element);
+    element = $PR(element);
     $A(element.childNodes).each( function(child) {
       if(child.nodeType==3) {
         child.nodeValue.toArray().each( function(character) {
@@ -127,7 +127,7 @@ var Effect = {
        (element.length))
       elements = element;
     else
-      elements = $(element).childNodes;
+      elements = $PR(element).childNodes;
       
     var options = Object.extend({
       speed: 0.1,
@@ -145,7 +145,7 @@ var Effect = {
     'appear': ['Appear','Fade']
   },
   toggle: function(element, effect) {
-    element = $(element);
+    element = $PR(element);
     effect = (effect || 'appear').toLowerCase();
     var options = Object.extend({
       queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
@@ -351,7 +351,7 @@ Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
 Effect.Opacity = Class.create();
 Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     // make this work on IE on elements without 'layout'
     if(/MSIE/.test(navigator.userAgent) && (!this.element.hasLayout))
       this.element.setStyle({zoom: 1});
@@ -369,7 +369,7 @@ Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
 Effect.Move = Class.create();
 Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     var options = Object.extend({
       x:    0,
       y:    0,
@@ -408,7 +408,7 @@ Effect.MoveBy = function(element, toTop, toLeft) {
 Effect.Scale = Class.create();
 Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
   initialize: function(element, percent) {
-    this.element = $(element)
+    this.element = $PR(element)
     var options = Object.extend({
       scaleX: true,
       scaleY: true,
@@ -482,7 +482,7 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
 Effect.Highlight = Class.create();
 Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
     this.start(options);
   },
@@ -515,7 +515,7 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
 Effect.ScrollTo = Class.create();
 Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
     this.start(arguments[1] || {});
   },
   setup: function() {
@@ -540,7 +540,7 @@ Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
 /* ------------- combination effects ------------- */
 
 Effect.Fade = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldOpacity = element.getInlineOpacity();
   var options = Object.extend({
   from: element.getOpacity() || 1.0,
@@ -554,7 +554,7 @@ Effect.Fade = function(element) {
 }
 
 Effect.Appear = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options = Object.extend({
   from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
   to:   1.0,
@@ -570,7 +570,7 @@ Effect.Appear = function(element) {
 }
 
 Effect.Puff = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = { opacity: element.getInlineOpacity(), position: element.getStyle('position') };
   return new Effect.Parallel(
    [ new Effect.Scale(element, 200, 
@@ -587,7 +587,7 @@ Effect.Puff = function(element) {
 }
 
 Effect.BlindUp = function(element) {
-  element = $(element);
+  element = $PR(element);
   element.makeClipping();
   return new Effect.Scale(element, 0, 
     Object.extend({ scaleContent: false, 
@@ -602,7 +602,7 @@ Effect.BlindUp = function(element) {
 }
 
 Effect.BlindDown = function(element) {
-  element = $(element);
+  element = $PR(element);
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, 100, 
     Object.extend({ scaleContent: false, 
@@ -623,7 +623,7 @@ Effect.BlindDown = function(element) {
 }
 
 Effect.SwitchOff = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldOpacity = element.getInlineOpacity();
   return new Effect.Appear(element, { 
     duration: 0.4,
@@ -649,7 +649,7 @@ Effect.SwitchOff = function(element) {
 }
 
 Effect.DropOut = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = {
     top: element.getStyle('top'),
     left: element.getStyle('left'),
@@ -671,7 +671,7 @@ Effect.DropOut = function(element) {
 }
 
 Effect.Shake = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = {
     top: element.getStyle('top'),
     left: element.getStyle('left') };
@@ -693,10 +693,10 @@ Effect.Shake = function(element) {
 }
 
 Effect.SlideDown = function(element) {
-  element = $(element);
+  element = $PR(element);
   element.cleanWhitespace();
   // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  var oldInnerBottom = $PR(element.firstChild).getStyle('bottom');
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, 100, Object.extend({ 
     scaleContent: false, 
@@ -731,9 +731,9 @@ Effect.SlideDown = function(element) {
 }
   
 Effect.SlideUp = function(element) {
-  element = $(element);
+  element = $PR(element);
   element.cleanWhitespace();
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
+  var oldInnerBottom = $PR(element.firstChild).getStyle('bottom');
   return new Effect.Scale(element, window.opera ? 0 : 1,
    Object.extend({ scaleContent: false, 
     scaleX: false, 
@@ -772,7 +772,7 @@ Effect.Squish = function(element) {
 }
 
 Effect.Grow = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options = Object.extend({
     direction: 'center',
     moveTransition: Effect.Transitions.sinoidal,
@@ -851,7 +851,7 @@ Effect.Grow = function(element) {
 }
 
 Effect.Shrink = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options = Object.extend({
     direction: 'center',
     moveTransition: Effect.Transitions.sinoidal,
@@ -908,7 +908,7 @@ Effect.Shrink = function(element) {
 }
 
 Effect.Pulsate = function(element) {
-  element = $(element);
+  element = $PR(element);
   var options    = arguments[1] || {};
   var oldOpacity = element.getInlineOpacity();
   var transition = options.transition || Effect.Transitions.sinoidal;
@@ -921,7 +921,7 @@ Effect.Pulsate = function(element) {
 }
 
 Effect.Fold = function(element) {
-  element = $(element);
+  element = $PR(element);
   var oldStyle = {
     top: element.style.top,
     left: element.style.left,
@@ -952,7 +952,7 @@ Element.Methods.visualEffect = function(element, effect, options) {
   s = effect.gsub(/_/, '-').camelize();
   effect_class = s.charAt(0).toUpperCase() + s.substring(1);
   new Effect[effect_class](element, options);
-  return $(element);
+  return $PR(element);
 };
 
-Element.addMethods();
+Element.addMethods();

library/cropper/lib/prototype.js

@@ -784,9 +784,9 @@ Ajax.Updater = Class.create();
 Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
   initialize: function(container, url, options) {
     this.containers = {
-      success: container.success ? $(container.success) : $(container),
-      failure: container.failure ? $(container.failure) :
-        (container.success ? null : $(container))
+      success: container.success ? $PR(container.success) : $PR(container),
+      failure: container.failure ? $PR(container.failure) :
+        (container.success ? null : $PR(container))
     }
 
     this.transport = Ajax.getTransport();
@@ -866,7 +866,7 @@ Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
     this.updater = new Ajax.Updater(this.container, this.url, this.options);
   }
 });
-function $() {
+function $PR() {
   var results = [], element;
   for (var i = 0; i < arguments.length; i++) {
     element = arguments[i];
@@ -878,7 +878,7 @@ function $() {
 }
 
 document.getElementsByClassName = function(className, parentElement) {
-  var children = ($(parentElement) || document.body).getElementsByTagName('*');
+  var children = ($PR(parentElement) || document.body).getElementsByTagName('*');
   return $A(children).inject([], function(elements, child) {
     if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
       elements.push(Element.extend(child));
@@ -918,42 +918,42 @@ Element.extend.cache = {
 
 Element.Methods = {
   visible: function(element) {
-    return $(element).style.display != 'none';
+    return $PR(element).style.display != 'none';
   },
 
   toggle: function() {
     for (var i = 0; i < arguments.length; i++) {
-      var element = $(arguments[i]);
+      var element = $PR(arguments[i]);
       Element[Element.visible(element) ? 'hide' : 'show'](element);
     }
   },
 
   hide: function() {
     for (var i = 0; i < arguments.length; i++) {
-      var element = $(arguments[i]);
+      var element = $PR(arguments[i]);
       element.style.display = 'none';
     }
   },
 
   show: function() {
     for (var i = 0; i < arguments.length; i++) {
-      var element = $(arguments[i]);
+      var element = $PR(arguments[i]);
       element.style.display = '';
     }
   },
 
   remove: function(element) {
-    element = $(element);
+    element = $PR(element);
     element.parentNode.removeChild(element);
   },
 
   update: function(element, html) {
-    $(element).innerHTML = html.stripScripts();
+    $PR(element).innerHTML = html.stripScripts();
     setTimeout(function() {html.evalScripts()}, 10);
   },
 
   replace: function(element, html) {
-    element = $(element);
+    element = $PR(element);
     if (element.outerHTML) {
       element.outerHTML = html.stripScripts();
     } else {
@@ -966,7 +966,7 @@ Element.Methods = {
   },
 
   getHeight: function(element) {
-    element = $(element);
+    element = $PR(element);
     return element.offsetHeight;
   },
 
@@ -975,23 +975,23 @@ Element.Methods = {
   },
 
   hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
+    if (!(element = $PR(element))) return;
     return Element.classNames(element).include(className);
   },
 
   addClassName: function(element, className) {
-    if (!(element = $(element))) return;
+    if (!(element = $PR(element))) return;
     return Element.classNames(element).add(className);
   },
 
   removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
+    if (!(element = $PR(element))) return;
     return Element.classNames(element).remove(className);
   },
 
   // removes whitespace-only text node children
   cleanWhitespace: function(element) {
-    element = $(element);
+    element = $PR(element);
     for (var i = 0; i < element.childNodes.length; i++) {
       var node = element.childNodes[i];
       if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
@@ -1000,25 +1000,25 @@ Element.Methods = {
   },
 
   empty: function(element) {
-    return $(element).innerHTML.match(/^\s*$/);
+    return $PR(element).innerHTML.match(/^\s*$/);
   },
 
   childOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
+    element = $PR(element), ancestor = $PR(ancestor);
     while (element = element.parentNode)
       if (element == ancestor) return true;
     return false;
   },
 
   scrollTo: function(element) {
-    element = $(element);
+    element = $PR(element);
     var x = element.x ? element.x : element.offsetLeft,
         y = element.y ? element.y : element.offsetTop;
     window.scrollTo(x, y);
   },
 
   getStyle: function(element, style) {
-    element = $(element);
+    element = $PR(element);
     var value = element.style[style.camelize()];
     if (!value) {
       if (document.defaultView && document.defaultView.getComputedStyle) {
@@ -1036,13 +1036,13 @@ Element.Methods = {
   },
 
   setStyle: function(element, style) {
-    element = $(element);
+    element = $PR(element);
     for (var name in style)
       element.style[name.camelize()] = style[name];
   },
 
   getDimensions: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (Element.getStyle(element, 'display') != 'none')
       return {width: element.offsetWidth, height: element.offsetHeight};
 
@@ -1063,7 +1063,7 @@ Element.Methods = {
   },
 
   makePositioned: function(element) {
-    element = $(element);
+    element = $PR(element);
     var pos = Element.getStyle(element, 'position');
     if (pos == 'static' || !pos) {
       element._madePositioned = true;
@@ -1078,7 +1078,7 @@ Element.Methods = {
   },
 
   undoPositioned: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element._madePositioned) {
       element._madePositioned = undefined;
       element.style.position =
@@ -1090,7 +1090,7 @@ Element.Methods = {
   },
 
   makeClipping: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element._overflow) return;
     element._overflow = element.style.overflow;
     if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
@@ -1098,7 +1098,7 @@ Element.Methods = {
   },
 
   undoClipping: function(element) {
-    element = $(element);
+    element = $PR(element);
     if (element._overflow) return;
     element.style.overflow = element._overflow;
     element._overflow = undefined;
@@ -1141,7 +1141,7 @@ Abstract.Insertion = function(adjacency) {
 
 Abstract.Insertion.prototype = {
   initialize: function(element, content) {
-    this.element = $(element);
+    this.element = $PR(element);
     this.content = content.stripScripts();
 
     if (this.adjacency && this.element.insertAdjacentHTML) {
@@ -1233,7 +1233,7 @@ Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
 Element.ClassNames = Class.create();
 Element.ClassNames.prototype = {
   initialize: function(element) {
-    this.element = $(element);
+    this.element = $PR(element);
   },
 
   _each: function(iterator) {
@@ -1346,7 +1346,7 @@ Selector.prototype = {
   findElements: function(scope) {
     var element;
 
-    if (element = $(this.params.id))
+    if (element = $PR(this.params.id))
       if (this.match(element))
         if (!scope || Element.childOf(element, scope))
           return [element];
@@ -1377,25 +1377,25 @@ function $$() {
 var Field = {
   clear: function() {
     for (var i = 0; i < arguments.length; i++)
-      $(arguments[i]).value = '';
+      $PR(arguments[i]).value = '';
   },
 
   focus: function(element) {
-    $(element).focus();
+    $PR(element).focus();
   },
 
   present: function() {
     for (var i = 0; i < arguments.length; i++)
-      if ($(arguments[i]).value == '') return false;
+      if ($PR(arguments[i]).value == '') return false;
     return true;
   },
 
   select: function(element) {
-    $(element).select();
+    $PR(element).select();
   },
 
   activate: function(element) {
-    element = $(element);
+    element = $PR(element);
     element.focus();
     if (element.select)
       element.select();
@@ -1406,7 +1406,7 @@ var Field = {
 
 var Form = {
   serialize: function(form) {
-    var elements = Form.getElements($(form));
+    var elements = Form.getElements($PR(form));
     var queryComponents = new Array();
 
     for (var i = 0; i < elements.length; i++) {
@@ -1419,7 +1419,7 @@ var Form = {
   },
 
   getElements: function(form) {
-    form = $(form);
+    form = $PR(form);
     var elements = new Array();
 
     for (var tagName in Form.Element.Serializers) {
@@ -1431,7 +1431,7 @@ var Form = {
   },
 
   getInputs: function(form, typeName, name) {
-    form = $(form);
+    form = $PR(form);
     var inputs = form.getElementsByTagName('input');
 
     if (!typeName && !name)
@@ -1478,13 +1478,13 @@ var Form = {
   },
 
   reset: function(form) {
-    $(form).reset();
+    $PR(form).reset();
   }
 }
 
 Form.Element = {
   serialize: function(element) {
-    element = $(element);
+    element = $PR(element);
     var method = element.tagName.toLowerCase();
     var parameter = Form.Element.Serializers[method](element);
 
@@ -1502,7 +1502,7 @@ Form.Element = {
   },
 
   getValue: function(element) {
-    element = $(element);
+    element = $PR(element);
     var method = element.tagName.toLowerCase();
     var parameter = Form.Element.Serializers[method](element);
 
@@ -1570,7 +1570,7 @@ Abstract.TimedObserver = function() {}
 Abstract.TimedObserver.prototype = {
   initialize: function(element, frequency, callback) {
     this.frequency = frequency;
-    this.element   =