Fixed merge conflict in /files/ajax/move.php

2012-01-04 16:31:06 +00:00 · 2012-01-04 16:31:06 +00:00 · 6dcabdc61c
parent ebe3ae58cf e0a058c732
commit 6dcabdc61c
31 changed files with 5241 additions and 74 deletions
--- a/.htaccess
+++ b/.htaccess
@ -5,6 +5,8 @@ php_value post_max_size 512M
 php_value memory_limit 512M
 SetEnv htaccessWorking true
 </IfModule>
+<IfModule mod_rewrite.c>
 RewriteEngine on
 RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+</IfModule>
 Options -Indexes
--- a/apps/contacts/ajax/addcard.php
+++ b/apps/contacts/ajax/addcard.php
@ -61,5 +61,6 @@ foreach( $add as $propname){
 	$vcard->addProperty($propname, $value, $prop_parameters);
 }
 $id = OC_Contacts_VCard::add($aid,$vcard->serialize());
+OC_Log::write('contacts','ajax/addcard.php - adding id: '.$id,OC_Log::DEBUG);

 OC_Contacts_App::renderDetails($id, $vcard);
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@ -6,14 +6,14 @@
 * See the COPYING-README file.
 */

-function contacts_namesort($a,$b){
-	return strcasecmp($a['fullname'],$b['fullname']);
-}
-
 require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');

+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+//OC_Log::write('contacts','contacts.php: '.count($contacts).' contacts.',OC_Log::DEBUG);
+/*
 $addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());
 $contacts = array();
 foreach( $addressbooks as $addressbook ){
@ -26,6 +26,7 @@ foreach( $addressbooks as $addressbook ){
 	}
 }
 usort($contacts,'contacts_namesort');
+*/
 $tmpl = new OC_TEMPLATE("contacts", "part.contacts");
 $tmpl->assign('contacts', $contacts);
 $page = $tmpl->fetchPage();
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@ -1,4 +1,5 @@
-#contacts li { padding-left:25px;background:url('../img/person.svg') no-repeat; }
+#contacts { padding-left:2px; padding-top: 5px; background: #fff; }
+#leftcontent a { height: 23px; display: block; margin: 0 0 0 0; padding: 0 0 0 25px; }
 #chooseaddressbook {margin-right: 170px; float: right;}
 #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;}
 #contacts_details_photo { margin:.5em 0em .5em 25%; }
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@ -32,6 +32,9 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');

 // Get active address books. This creates a default one if none exists.
+$ids = OC_Contacts_Addressbook::activeIds(OC_User::getUser());
+$contacts = OC_Contacts_VCard::all($ids);
+
 $addressbooks = OC_Contacts_Addressbook::active(OC_User::getUser());

 // Load the files we need
@ -39,7 +42,7 @@ OC_App::setActiveNavigationEntry( 'contacts_index' );

 // Load a specific user?
 $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
-
+/*
 // sort addressbooks  (use contactsort)
 usort($addressbooks,'contacts_namesort');

@ -55,8 +58,10 @@ foreach( $addressbooks as $addressbook ){
 }

 usort($contacts,'contacts_namesort');
-
+*/
 $details = array();
+
+// FIXME: This cannot work..?
 if( !is_null($id)/* || count($contacts)*/){
 	if(is_null($id)) $id = $contacts[0]['id'];
 	$vcard = OC_Contacts_App::getContactVCard($id);
--- a/apps/contacts/js/LICENSE.jquery.inview
+++ b/apps/contacts/js/LICENSE.jquery.inview
@ -0,0 +1,41 @@
+Attribution-Non-Commercial-Share Alike 2.0 UK: England & Wales
+
+http://creativecommons.org/licenses/by-nc-sa/2.0/uk/
+
+You are free:
+
+    * to copy, distribute, display, and perform the work
+    * to make derivative works
+
+
+Under the following conditions:
+
+    * Attribution — You must give the original author credit.
+      Attribute this work:
+      Information
+      What does "Attribute this work" mean?
+      The page you came from contained embedded licensing metadata, 
+      including how the creator wishes to be attributed for re-use. 
+      You can use the HTML here to cite the work. Doing so will 
+      also include metadata on your page so that others can find the 
+      original work as well.
+
+    * Non-Commercial — You may not use this work for commercial 
+      purposes.
+    * Share Alike — If you alter, transform, or build upon this 
+      work, you may distribute the resulting work only under a 
+      licence identical to this one.
+
+With the understanding that:
+
+    * Waiver — Any of the above conditions can be waived if you get 
+      permission from the copyright holder.
+    * Other Rights — In no way are any of the following rights 
+      affected by the license:
+          o Your fair dealing or fair use rights;
+          o The author's moral rights;
+          o Rights other persons may have either in the work itself 
+            or in how the work is used, such as publicity or privacy rights.
+    * Notice — For any reuse or distribution, you must make clear to 
+      others the licence terms of this work.
+
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@ -113,9 +113,9 @@ Contacts={
 			lazyupdate:function(){
 				//alert('lazyupdate');
 				$('#contacts li').live('inview', function(){
-					if (!$(this).attr('style')) {
+					if (!$(this).find('a').attr('style')) {
 						//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
-						$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+						$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
 					}/* else {
 						alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
 					}*/
@ -301,9 +301,9 @@ $(document).ready(function(){
 				// bottom part of element is visible
 			} else {
 				// whole part of element is visible
-				if (!$(this).attr('style')) {
+				if (!$(this).find('a').attr('style')) {
 					//alert($(this).data('id') + ' has background: ' + $(this).attr('style'));
-					$(this).css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
+					$(this).find('a').css('background','url(thumbnail.php?id='+$(this).data('id')+') no-repeat');
 				}/* else {
 					alert($(this).data('id') + ' has style ' + $(this).attr('style').match('url'));
 				}*/
--- a/apps/contacts/js/jquery.inview.txt
+++ b/apps/contacts/js/jquery.inview.txt
@ -0,0 +1,15 @@
+jQuery.inview is licensed Attribution-Non-Commercial-Share Alike 2.0 but the
+conditions has been waived by the author in the following tweet:
+
+https://twitter.com/#!/ChristopherBlum/status/148382899887013888 
+
+Saying:
+
+Thomas Tanghus @tanghus 18 Dec. 2011
+
+@ChristopherBlum Hi. Is it OK if I use https://github.com/protonet/jquery.inview in ownCloud? Preferably under an AGPL license ;-) owncloud.org
+
+
+Christopher Blum Christopher Blum @ChristopherBlum 18 Dec. 2011
+
+@tanghus Feel free to! :)
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@ -140,6 +140,25 @@ class OC_Contacts_Addressbook{
 		return true;
 	}

+	public static function cleanArray($array, $remove_null_number = true){
+		$new_array = array();
+
+		$null_exceptions = array();
+
+		foreach ($array as $key => $value){
+			$value = trim($value);
+
+			if($remove_null_number){
+				$null_exceptions[] = '0';
+			}
+
+			if(!in_array($value, $null_exceptions) && $value != "")	{
+				$new_array[] = $value;
+			}
+		}
+		return $new_array;
+	}
+
 	/**
 	 * @brief Get active addressbooks for a user.
 	 * @param integer $uid User id. If null current user will be used.
@ -170,8 +189,21 @@ class OC_Contacts_Addressbook{
 	public static function active($uid){
 		$active = self::activeIds($uid);
 		$addressbooks = array();
-		/** FIXME: Is there a way to prepare a statement 'WHERE id IN ([range])'?
-		*/
+		$ids_sql = join(',', array_fill(0, count($active), '?'));
+		$prep = 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN ('.$ids_sql.') ORDER BY displayname';
+		try {
+			$stmt = OC_DB::prepare( $prep );
+			$result = $stmt->execute($active);
+		} catch(Exception $e) {
+			OC_Log::write('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+			OC_Log::write('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OC_Log::DEBUG);
+			OC_Log::write('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OC_Log::DEBUG);
+		}
+
+		while( $row = $result->fetchRow()){
+			$addressbooks[] = $row;
+		}
+		/*
 		foreach( $active as $aid ){
 			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ? ORDER BY displayname' );
 			$result = $stmt->execute(array($aid,));
@ -179,7 +211,7 @@ class OC_Contacts_Addressbook{
 			while( $row = $result->fetchRow()){
 				$addressbooks[] = $row;
 			}
-		}
+		}*/

 		return $addressbooks;
 	}
@ -208,6 +240,7 @@ class OC_Contacts_Addressbook{
 				unset($openaddressbooks[array_search($id, $openaddressbooks)]);
 			}
 		}
+		$openaddressbooks = self::cleanArray($openaddressbooks, false);
 		sort($openaddressbooks, SORT_NUMERIC);
 		// FIXME: I alway end up with a ';' prepending when imploding the array..?
 		OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',implode(';', $openaddressbooks));
@ -221,7 +254,7 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function isActive($id){
-		OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG);
+		//OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG);
 		return in_array($id, self::activeIds());
 	}

--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@ -47,9 +47,21 @@ class OC_Contacts_VCard{
 	 * ['carddata']
 	 */
 	public static function all($id){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
-		$result = $stmt->execute(array($id));
-
+		if(is_array($id)) {
+			$id_sql = join(',', array_fill(0, count($id), '?'));
+			$prep = 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid IN ('.$id_sql.') ORDER BY fullname';
+			try {
+				$stmt = OC_DB::prepare( $prep );
+				$result = $stmt->execute($id);
+			} catch(Exception $e) {
+				OC_Log::write('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OC_Log::DEBUG);
+				OC_Log::write('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OC_Log::DEBUG);
+				OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG);
+			}
+		} else {
+			$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+			$result = $stmt->execute(array($id));
+		}
 		$cards = array();
 		while( $row = $result->fetchRow()){
 			$cards[] = $row;
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@ -79,20 +79,16 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		if ($path == "" || $path == "/") {
 			$path = $this->datadir.$path;
 			$sharedItems = OC_Share::getItemsInFolder($path);
-			if (empty($sharedItems)) {
-				return false;
-			} else {
-				global $FAKEDIRS;
-				$files = array();
-				foreach ($sharedItems as $item) {
-					// If item is in the root of the shared storage provider and the item exists add it to the fakedirs
-					if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
-						$files[] = basename($item['target']);
-					}
+			global $FAKEDIRS;
+			$files = array();
+			foreach ($sharedItems as $item) {
+				// If item is in the root of the shared storage provider and the item exists add it to the fakedirs
+				if (dirname($item['target'])."/" == $path && $this->file_exists(basename($item['target']))) {
+					$files[] = basename($item['target']);
 				}
-				$FAKEDIRS['shared'] = $files;
-				return opendir('fakedir://shared');
 			}
+			$FAKEDIRS['shared'] = $files;
+			return opendir('fakedir://shared');
 		} else {
 			$source = $this->getSource($path);
 			if ($source) {
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
@ -0,0 +1,415 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 2.1.0
+ * Date: 1st September 2011
+ *
+ * FlashVars expected: (AS3 property of: loaderInfo.parameters)
+ *	id: 	(URL Encoded: String) Id of jPlayer instance
+ *	vol:	(Number) Sets the initial volume
+ *	muted:	(Boolean in a String) Sets the initial muted state
+ *	jQuery:	(URL Encoded: String) Sets the jQuery var name. Used with: someVar = jQuery.noConflict(true);
+ *
+ * Compiled using: Adobe Flex Compiler (mxmlc) Version 4.5.1 build 21328
+ */
+
+package {
+	import flash.system.Security;
+	import flash.external.ExternalInterface;
+
+	import flash.utils.Timer;
+	import flash.events.TimerEvent;
+	
+	import flash.text.TextField;
+	import flash.text.TextFormat;
+
+	import flash.events.KeyboardEvent;
+
+	import flash.display.Sprite;
+	import happyworm.jPlayer.*;
+
+	import flash.display.StageAlign;
+	import flash.display.StageScaleMode;
+	import flash.events.Event;
+	import flash.events.MouseEvent;
+
+	import flash.ui.ContextMenu;
+	import flash.ui.ContextMenuItem;
+	import flash.events.ContextMenuEvent;
+	import flash.net.URLRequest;
+	import flash.net.navigateToURL;
+
+	public class Jplayer extends Sprite {
+		private var jQuery:String;
+		private var sentNumberFractionDigits:uint = 2;
+
+		public var commonStatus:JplayerStatus = new JplayerStatus(); // Used for inital ready event so volume is correct.
+
+		private var myInitTimer:Timer = new Timer(100, 0);
+
+		private var myMp3Player:JplayerMp3;
+		private var myMp4Player:JplayerMp4;
+
+		private var isMp3:Boolean = false;
+		private var isVideo:Boolean = false;
+
+		private var txLog:TextField;
+		private var debug:Boolean = false; // Set debug to false for release compile!
+
+		public function Jplayer() {
+			flash.system.Security.allowDomain("*");
+
+			jQuery = loaderInfo.parameters.jQuery + "('#" + loaderInfo.parameters.id + "').jPlayer";
+			commonStatus.volume = Number(loaderInfo.parameters.vol);
+			commonStatus.muted = loaderInfo.parameters.muted == "true";
+
+			stage.scaleMode = StageScaleMode.NO_SCALE;
+			stage.align = StageAlign.TOP_LEFT;
+			stage.addEventListener(Event.RESIZE, resizeHandler);
+			stage.addEventListener(MouseEvent.CLICK, clickHandler);
+
+			var initialVolume:Number = commonStatus.volume;
+			if(commonStatus.muted) {
+				initialVolume = 0;
+			}
+			myMp3Player = new JplayerMp3(initialVolume);
+			addChild(myMp3Player);
+
+			myMp4Player = new JplayerMp4(initialVolume);
+			addChild(myMp4Player);
+
+			setupListeners(!isMp3, isMp3); // Set up the listeners to the default isMp3 state.
+
+			// The ContextMenu only partially works. The menu select events never occur.
+			// Investigated and it is something to do with the way jPlayer inserts the Flash on the page.
+			// A simple test inserting the Jplayer.swf on a page using: 1) SWFObject 2.2 works. 2) AC_FL_RunContent() works.
+			// jPlayer Flash insertion is based on SWFObject 2.2 and the resaon behind this failure is not clear. The Flash insertion HTML on the page looks similar.
+			var myContextMenu:ContextMenu = new ContextMenu();
+			myContextMenu.hideBuiltInItems();
+			var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION);
+			var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2011 Happyworm Ltd", true);
+			menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer);
+			menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm);
+			myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm);
+			contextMenu = myContextMenu;
+
+			// Log console for dev compile option: debug
+			if(debug) {
+				txLog = new TextField();
+				txLog.x = 5;
+				txLog.y = 5;
+				txLog.width = 540;
+				txLog.height = 390;
+				txLog.border = true;
+				txLog.background = true;
+				txLog.backgroundColor = 0xEEEEFF;
+				txLog.multiline = true;
+				txLog.text = "jPlayer " + JplayerStatus.VERSION;
+				txLog.visible = false;
+				this.addChild(txLog);
+				this.stage.addEventListener(KeyboardEvent.KEY_UP, keyboardHandler);
+
+				myMp3Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
+				myMp4Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
+			}
+
+			// Delay init() because Firefox 3.5.7+ developed a bug with local testing in Firebug.
+			myInitTimer.addEventListener(TimerEvent.TIMER, init);
+			myInitTimer.start();
+		}
+		
+		private function init(e:TimerEvent):void {
+			myInitTimer.stop();
+			if(ExternalInterface.available) {
+				ExternalInterface.addCallback("fl_setAudio_mp3", fl_setAudio_mp3);
+				ExternalInterface.addCallback("fl_setAudio_m4a", fl_setAudio_m4a);
+				ExternalInterface.addCallback("fl_setVideo_m4v", fl_setVideo_m4v);
+				ExternalInterface.addCallback("fl_clearMedia", fl_clearMedia);
+				ExternalInterface.addCallback("fl_load", fl_load);
+				ExternalInterface.addCallback("fl_play", fl_play);
+				ExternalInterface.addCallback("fl_pause", fl_pause);
+				ExternalInterface.addCallback("fl_play_head", fl_play_head);
+				ExternalInterface.addCallback("fl_volume", fl_volume);
+				ExternalInterface.addCallback("fl_mute", fl_mute);
+
+				ExternalInterface.call(jQuery, "jPlayerFlashEvent", JplayerEvent.JPLAYER_READY, extractStatusData(commonStatus)); // See JplayerStatus() class for version number.
+			}
+		}
+		private function setupListeners(oldMP3:Boolean, newMP3:Boolean):void {
+			if(oldMP3 != newMP3) {
+				if(newMP3) {
+					listenToMp3(true);
+					listenToMp4(false);
+				} else {
+					listenToMp3(false);
+					listenToMp4(true);
+				}
+			}
+		}
+		private function listenToMp3(active:Boolean):void {
+			if(active) {
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+				
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+			} else {
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+				
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+			}
+		}
+		private function listenToMp4(active:Boolean):void {
+			if(active) {
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+
+				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
+			} else {
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
+
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
+
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
+
+				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
+			}
+		}
+		private function fl_setAudio_mp3(src:String):Boolean {
+			if (src != null) {
+				log("fl_setAudio_mp3: "+src);
+				setupListeners(isMp3, true);
+				isMp3 = true;
+				isVideo = false;
+				myMp4Player.clearFile();
+				myMp3Player.setFile(src);
+				return true;
+			} else {
+				log("fl_setAudio_mp3: null");
+				return false;
+			}
+		}
+		private function fl_setAudio_m4a(src:String):Boolean {
+			if (src != null) {
+				log("fl_setAudio_m4a: "+src);
+				setupListeners(isMp3, false);
+				isMp3 = false;
+				isVideo = false;
+				myMp3Player.clearFile();
+				myMp4Player.setFile(src);
+				return true;
+			} else {
+				log("fl_setAudio_m4a: null");
+				return false;
+			}
+		}
+		private function fl_setVideo_m4v(src:String):Boolean {
+			if (src != null) {
+				log("fl_setVideo_m4v: "+src);
+				setupListeners(isMp3, false);
+				isMp3 = false;
+				isVideo = true;
+				myMp3Player.clearFile();
+				myMp4Player.setFile(src);
+				return true;
+			} else {
+				log("fl_setVideo_m4v: null");
+				return false;
+			}
+		}
+		private function fl_clearMedia():void {
+			log("clearMedia.");
+			myMp3Player.clearFile();
+			myMp4Player.clearFile();
+		}
+		private function fl_load():Boolean {
+			log("load.");
+			if(isMp3) {
+				return myMp3Player.load();
+			} else {
+				return myMp4Player.load();
+			}
+		}
+		private function fl_play(time:Number = NaN):Boolean {
+			log("play: time = " + time);
+			if(isMp3) {
+				return myMp3Player.play(time * 1000); // Flash uses milliseconds
+			} else {
+				return myMp4Player.play(time * 1000); // Flash uses milliseconds
+			}
+		}
+		private function fl_pause(time:Number = NaN):Boolean {
+			log("pause: time = " + time);
+			if(isMp3) {
+				return myMp3Player.pause(time * 1000); // Flash uses milliseconds
+			} else {
+				return myMp4Player.pause(time * 1000); // Flash uses milliseconds
+			}
+		}
+		private function fl_play_head(percent:Number):Boolean {
+			log("play_head: "+percent+"%");
+			if(isMp3) {
+				return myMp3Player.playHead(percent);
+			} else {
+				return myMp4Player.playHead(percent);
+			}
+		}
+		private function fl_volume(v:Number):void {
+			log("volume: "+v);
+			commonStatus.volume = v;
+			if(!commonStatus.muted) {
+				myMp3Player.setVolume(v);
+				myMp4Player.setVolume(v);
+			}
+		}
+		private function fl_mute(mute:Boolean):void {
+			log("mute: "+mute);
+			commonStatus.muted = mute;
+			if(mute) {
+				myMp3Player.setVolume(0);
+				myMp4Player.setVolume(0);
+			} else {
+				myMp3Player.setVolume(commonStatus.volume);
+				myMp4Player.setVolume(commonStatus.volume);
+			}
+		}
+		private function jPlayerFlashEvent(e:JplayerEvent):void {
+			log("jPlayer Flash Event: " + e.type + ": " + e.target);
+			if(ExternalInterface.available) {
+				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
+			}
+		}
+		private function extractStatusData(data:JplayerStatus):Object {
+			var myStatus:Object = {
+				version: JplayerStatus.VERSION,
+				src: data.src,
+				paused: !data.isPlaying, // Changing this name requires inverting all assignments and conditional statements.
+				srcSet: data.srcSet,
+				seekPercent: data.seekPercent,
+				currentPercentRelative: data.currentPercentRelative,
+				currentPercentAbsolute: data.currentPercentAbsolute,
+				currentTime: data.currentTime / 1000, // JavaScript uses seconds
+				duration: data.duration / 1000, // JavaScript uses seconds
+				volume: commonStatus.volume,
+				muted: commonStatus.muted
+			};
+			log("extractStatusData: sp="+myStatus.seekPercent+" cpr="+myStatus.currentPercentRelative+" cpa="+myStatus.currentPercentAbsolute+" ct="+myStatus.currentTime+" d="+myStatus.duration);
+			return myStatus;
+		}
+		private function jPlayerMetaDataHandler(e:JplayerEvent):void {
+			log("jPlayerMetaDataHandler:" + e.target);
+			if(ExternalInterface.available) {
+				resizeHandler(new Event(Event.RESIZE));
+				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
+			}
+		}
+		private function resizeHandler(e:Event):void {
+			log("resizeHandler: stageWidth = " + stage.stageWidth + " | stageHeight = " + stage.stageHeight);
+
+			var mediaX:Number = 0;
+			var mediaY:Number = 0;
+			var mediaWidth:Number = 0;
+			var mediaHeight:Number = 0;
+
+			if(stage.stageWidth > 0 && stage.stageHeight > 0 && myMp4Player.myVideo.width > 0 && myMp4Player.myVideo.height > 0) {
+				var aspectRatioStage:Number = stage.stageWidth / stage.stageHeight;
+				var aspectRatioVideo:Number = myMp4Player.myVideo.width / myMp4Player.myVideo.height;
+				if(aspectRatioStage < aspectRatioVideo) {
+					mediaWidth = stage.stageWidth;
+					mediaHeight = stage.stageWidth / aspectRatioVideo;
+					mediaX = 0;
+					mediaY = (stage.stageHeight - mediaHeight) / 2;
+				} else {
+					mediaWidth = stage.stageHeight * aspectRatioVideo;
+					mediaHeight = stage.stageHeight;
+					mediaX = (stage.stageWidth - mediaWidth) / 2;
+					mediaY = 0;
+				}
+				resizeEntity(myMp4Player, mediaX, mediaY, mediaWidth, mediaHeight);
+			}
+			if(debug && stage.stageWidth > 20 && stage.stageHeight > 20) {
+				txLog.width = stage.stageWidth - 10;
+				txLog.height = stage.stageHeight - 10;
+			}
+		}
+		private function resizeEntity(entity:Sprite, mediaX:Number, mediaY:Number, mediaWidth:Number, mediaHeight:Number):void {
+			entity.x = mediaX;
+			entity.y = mediaY;
+			entity.width = mediaWidth;
+			entity.height = mediaHeight;
+		}
+		private function clickHandler(e:MouseEvent):void {
+			if(isMp3) {
+				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp3Player.myStatus, "click"))
+			} else {
+				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp4Player.myStatus, "click"))
+			}
+		}
+		// This event is never called. See comments in class constructor.
+		private function menuSelectHandler_jPlayer(e:ContextMenuEvent):void {
+			navigateToURL(new URLRequest("http://jplayer.org/"), "_blank");
+		}
+		// This event is never called. See comments in class constructor.
+		private function menuSelectHandler_happyworm(e:ContextMenuEvent):void {
+			navigateToURL(new URLRequest("http://happyworm.com/"), "_blank");
+		}
+		private function log(t:String):void {
+			if(debug) {
+				txLog.text = t + "\n" + txLog.text;
+			}
+		}
+		private function debugMsgHandler(e:JplayerEvent):void {
+			log(e.msg);
+		}
+		private function keyboardHandler(e:KeyboardEvent):void {
+			log("keyboardHandler: e.keyCode = " + e.keyCode);
+			switch(e.keyCode) {
+				case 68 : // d
+					txLog.visible = !txLog.visible;
+					log("Toggled log display: " + txLog.visible);
+					break;
+				case 76 : // l
+					if(e.ctrlKey && e.shiftKey) {
+						txLog.text = "Cleared log.";
+					}
+					break;
+			}
+		}
+	}
+}
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
@ -0,0 +1,452 @@
+/*
+ * Playlist Object for the jPlayer Plugin
+ * http://www.jplayer.org
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 2.1.0 (jPlayer 2.1.0)
+ * Date: 1st September 2011
+ */
+
+/* Code verified using http://www.jshint.com/ */
+/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
+/*global  jPlayerPlaylist: true, jQuery:false, alert:false */
+
+(function($, undefined) {
+
+	jPlayerPlaylist = function(cssSelector, playlist, options) {
+		var self = this;
+
+		this.current = 0;
+		this.loop = false; // Flag used with the jPlayer repeat event
+		this.shuffled = false;
+		this.removing = false; // Flag is true during remove animation, disabling the remove() method until complete.
+
+		this.cssSelector = $.extend({}, this._cssSelector, cssSelector); // Object: Containing the css selectors for jPlayer and its cssSelectorAncestor
+		this.options = $.extend(true, {}, this._options, options); // Object: The jPlayer constructor options for this playlist and the playlist options
+
+		this.playlist = []; // Array of Objects: The current playlist displayed (Un-shuffled or Shuffled)
+		this.original = []; // Array of Objects: The original playlist
+
+		this._initPlaylist(playlist); // Copies playlist to this.original. Then mirrors this.original to this.playlist. Creating two arrays, where the element pointers match. (Enables pointer comparison.)
+
+		// Setup the css selectors for the extra interface items used by the playlist.
+		this.cssSelector.title = this.cssSelector.cssSelectorAncestor + " .jp-title"; // Note that the text is written to the decendant li node.
+		this.cssSelector.playlist = this.cssSelector.cssSelectorAncestor + " .jp-playlist";
+		this.cssSelector.next = this.cssSelector.cssSelectorAncestor + " .jp-next";
+		this.cssSelector.previous = this.cssSelector.cssSelectorAncestor + " .jp-previous";
+		this.cssSelector.shuffle = this.cssSelector.cssSelectorAncestor + " .jp-shuffle";
+		this.cssSelector.shuffleOff = this.cssSelector.cssSelectorAncestor + " .jp-shuffle-off";
+
+		// Override the cssSelectorAncestor given in options
+		this.options.cssSelectorAncestor = this.cssSelector.cssSelectorAncestor;
+
+		// Override the default repeat event handler
+		this.options.repeat = function(event) {
+			self.loop = event.jPlayer.options.loop;
+		};
+
+		// Create a ready event handler to initialize the playlist
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ready, function(event) {
+			self._init();
+		});
+
+		// Create an ended event handler to move to the next item
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ended, function(event) {
+			self.next();
+		});
+
+		// Create a play event handler to pause other instances
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.play, function(event) {
+			$(this).jPlayer("pauseOthers");
+		});
+
+		// Create a resize event handler to show the title in full screen mode.
+		$(this.cssSelector.jPlayer).bind($.jPlayer.event.resize, function(event) {
+			if(event.jPlayer.options.fullScreen) {
+				$(self.cssSelector.title).show();
+			} else {
+				$(self.cssSelector.title).hide();
+			}
+		});
+
+		// Create click handlers for the extra buttons that do playlist functions.
+		$(this.cssSelector.previous).click(function() {
+			self.previous();
+			$(this).blur();
+			return false;
+		});
+
+		$(this.cssSelector.next).click(function() {
+			self.next();
+			$(this).blur();
+			return false;
+		});
+
+		$(this.cssSelector.shuffle).click(function() {
+			self.shuffle(true);
+			return false;
+		});
+		$(this.cssSelector.shuffleOff).click(function() {
+			self.shuffle(false);
+			return false;
+		}).hide();
+
+		// Put the title in its initial display state
+		if(!this.options.fullScreen) {
+			$(this.cssSelector.title).hide();
+		}
+
+		// Remove the empty <li> from the page HTML. Allows page to be valid HTML, while not interfereing with display animations
+		$(this.cssSelector.playlist + " ul").empty();
+
+		// Create .live() handlers for the playlist items along with the free media and remove controls.
+		this._createItemHandlers();
+
+		// Instance jPlayer
+		$(this.cssSelector.jPlayer).jPlayer(this.options);
+	};
+
+	jPlayerPlaylist.prototype = {
+		_cssSelector: { // static object, instanced in constructor
+			jPlayer: "#jquery_jplayer_1",
+			cssSelectorAncestor: "#jp_container_1"
+		},
+		_options: { // static object, instanced in constructor
+			playlistOptions: {
+				autoPlay: false,
+				loopOnPrevious: false,
+				shuffleOnLoop: true,
+				enableRemoveControls: false,
+				displayTime: 'slow',
+				addTime: 'fast',
+				removeTime: 'fast',
+				shuffleTime: 'slow',
+				itemClass: "jp-playlist-item",
+				freeGroupClass: "jp-free-media",
+				freeItemClass: "jp-playlist-item-free",
+				removeItemClass: "jp-playlist-item-remove"
+			}
+		},
+		option: function(option, value) { // For changing playlist options only
+			if(value === undefined) {
+				return this.options.playlistOptions[option];
+			}
+
+			this.options.playlistOptions[option] = value;
+
+			switch(option) {
+				case "enableRemoveControls":
+					this._updateControls();
+					break;
+				case "itemClass":
+				case "freeGroupClass":
+				case "freeItemClass":
+				case "removeItemClass":
+					this._refresh(true); // Instant
+					this._createItemHandlers();
+					break;
+			}
+			return this;
+		},
+		_init: function() {
+			var self = this;
+			this._refresh(function() {
+				if(self.options.playlistOptions.autoPlay) {
+					self.play(self.current);
+				} else {
+					self.select(self.current);
+				}
+			});
+		},
+		_initPlaylist: function(playlist) {
+			this.current = 0;
+			this.shuffled = false;
+			this.removing = false;
+			this.original = $.extend(true, [], playlist); // Copy the Array of Objects
+			this._originalPlaylist();
+		},
+		_originalPlaylist: function() {
+			var self = this;
+			this.playlist = [];
+			// Make both arrays point to the same object elements. Gives us 2 different arrays, each pointing to the same actual object. ie., Not copies of the object.
+			$.each(this.original, function(i,v) {
+				self.playlist[i] = self.original[i];
+			});
+		},
+		_refresh: function(instant) {
+			/* instant: Can be undefined, true or a function.
+			 *	undefined -> use animation timings
+			 *	true -> no animation
+			 *	function -> use animation timings and excute function at half way point.
+			 */
+			var self = this;
+
+			if(instant && !$.isFunction(instant)) {
+				$(this.cssSelector.playlist + " ul").empty();
+				$.each(this.playlist, function(i,v) {
+					$(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i]));
+				});
+				this._updateControls();
+			} else {
+				var displayTime = $(this.cssSelector.playlist + " ul").children().length ? this.options.playlistOptions.displayTime : 0;
+
+				$(this.cssSelector.playlist + " ul").slideUp(displayTime, function() {
+					var $this = $(this);
+					$(this).empty();
+					
+					$.each(self.playlist, function(i,v) {
+						$this.append(self._createListItem(self.playlist[i]));
+					});
+					self._updateControls();
+					if($.isFunction(instant)) {
+						instant();
+					}
+					if(self.playlist.length) {
+						$(this).slideDown(self.options.playlistOptions.displayTime);
+					} else {
+						$(this).show();
+					}
+				});
+			}
+		},
+		_createListItem: function(media) {
+			var self = this;
+
+			// Wrap the <li> contents in a <div>
+			var listItem = "<li><div>";
+
+			// Create remove control
+			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.removeItemClass + "'>&times;</a>";
+
+			// Create links to free media
+			if(media.free) {
+				var first = true;
+				listItem += "<span class='" + this.options.playlistOptions.freeGroupClass + "'>(";
+				$.each(media, function(property,value) {
+					if($.jPlayer.prototype.format[property]) { // Check property is a media format.
+						if(first) {
+							first = false;
+						} else {
+							listItem += " | ";
+						}
+						listItem += "<a class='" + self.options.playlistOptions.freeItemClass + "' href='" + value + "' tabindex='1'>" + property + "</a>";
+					}
+				});
+				listItem += ")</span>";
+			}
+
+			// The title is given next in the HTML otherwise the float:right on the free media corrupts in IE6/7
+			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.itemClass + "' tabindex='1'>" + media.title + (media.artist ? " <span class='jp-artist'>by " + media.artist + "</span>" : "") + "</a>";
+			listItem += "</div></li>";
+
+			return listItem;
+		},
+		_createItemHandlers: function() {
+			var self = this;
+			// Create .live() handlers for the playlist items
+			$(this.cssSelector.playlist + " a." + this.options.playlistOptions.itemClass).die("click").live("click", function() {
+				var index = $(this).parent().parent().index();
+				if(self.current !== index) {
+					self.play(index);
+				} else {
+					$(self.cssSelector.jPlayer).jPlayer("play");
+				}
+				$(this).blur();
+				return false;
+			});
+
+			// Create .live() handlers that disable free media links to force access via right click
+			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.freeItemClass).die("click").live("click", function() {
+				$(this).parent().parent().find("." + self.options.playlistOptions.itemClass).click();
+				$(this).blur();
+				return false;
+			});
+
+			// Create .live() handlers for the remove controls
+			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.removeItemClass).die("click").live("click", function() {
+				var index = $(this).parent().parent().index();
+				self.remove(index);
+				$(this).blur();
+				return false;
+			});
+		},
+		_updateControls: function() {
+			if(this.options.playlistOptions.enableRemoveControls) {
+				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).show();
+			} else {
+				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).hide();
+			}
+			if(this.shuffled) {
+				$(this.cssSelector.shuffleOff).show();
+				$(this.cssSelector.shuffle).hide();
+			} else {
+				$(this.cssSelector.shuffleOff).hide();
+				$(this.cssSelector.shuffle).show();
+			}
+		},
+		_highlight: function(index) {
+			if(this.playlist.length && index !== undefined) {
+				$(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current");
+				$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
+				$(this.cssSelector.title + " li").html(this.playlist[index].title + (this.playlist[index].artist ? " <span class='jp-artist'>by " + this.playlist[index].artist + "</span>" : ""));
+			}
+		},
+		setPlaylist: function(playlist) {
+			this._initPlaylist(playlist);
+			this._init();
+		},
+		add: function(media, playNow) {
+			$(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);
+			this._updateControls();
+			this.original.push(media);
+			this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system.
+
+			if(playNow) {
+				this.play(this.playlist.length - 1);
+			} else {
+				if(this.original.length === 1) {
+					this.select(0);
+				}
+			}
+		},
+		remove: function(index) {
+			var self = this;
+
+			if(index === undefined) {
+				this._initPlaylist([]);
+				this._refresh(function() {
+					$(self.cssSelector.jPlayer).jPlayer("clearMedia");
+				});
+				return true;
+			} else {
+
+				if(this.removing) {
+					return false;
+				} else {
+					index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
+					if(0 <= index && index < this.playlist.length) {
+						this.removing = true;
+
+						$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() {
+							$(this).remove();
+
+							if(self.shuffled) {
+								var item = self.playlist[index];
+								$.each(self.original, function(i,v) {
+									if(self.original[i] === item) {
+										self.original.splice(i, 1);
+										return false; // Exit $.each
+									}
+								});
+								self.playlist.splice(index, 1);
+							} else {
+								self.original.splice(index, 1);
+								self.playlist.splice(index, 1);
+							}
+
+							if(self.original.length) {
+								if(index === self.current) {
+									self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
+									self.select(self.current);
+								} else if(index < self.current) {
+									self.current--;
+								}
+							} else {
+								$(self.cssSelector.jPlayer).jPlayer("clearMedia");
+								self.current = 0;
+								self.shuffled = false;
+								self._updateControls();
+							}
+
+							self.removing = false;
+						});
+					}
+					return true;
+				}
+			}
+		},
+		select: function(index) {
+			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
+			if(0 <= index && index < this.playlist.length) {
+				this.current = index;
+				this._highlight(index);
+				$(this.cssSelector.jPlayer).jPlayer("setMedia", this.playlist[this.current]);
+			} else {
+				this.current = 0;
+			}
+		},
+		play: function(index) {
+			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
+			if(0 <= index && index < this.playlist.length) {
+				if(this.playlist.length) {
+					this.select(index);
+					$(this.cssSelector.jPlayer).jPlayer("play");
+				}
+			} else if(index === undefined) {
+				$(this.cssSelector.jPlayer).jPlayer("play");
+			}
+		},
+		pause: function() {
+			$(this.cssSelector.jPlayer).jPlayer("pause");
+		},
+		next: function() {
+			var index = (this.current + 1 < this.playlist.length) ? this.current + 1 : 0;
+
+			if(this.loop) {
+				// See if we need to shuffle before looping to start, and only shuffle if more than 1 item.
+				if(index === 0 && this.shuffled && this.options.playlistOptions.shuffleOnLoop && this.playlist.length > 1) {
+					this.shuffle(true, true); // playNow
+				} else {
+					this.play(index);
+				}
+			} else {
+				// The index will be zero if it just looped round
+				if(index > 0) {
+					this.play(index);
+				}
+			}
+		},
+		previous: function() {
+			var index = (this.current - 1 >= 0) ? this.current - 1 : this.playlist.length - 1;
+
+			if(this.loop && this.options.playlistOptions.loopOnPrevious || index < this.playlist.length - 1) {
+				this.play(index);
+			}
+		},
+		shuffle: function(shuffled, playNow) {
+			var self = this;
+
+			if(shuffled === undefined) {
+				shuffled = !this.shuffled;
+			}
+
+			if(shuffled || shuffled !== this.shuffled) {
+
+				$(this.cssSelector.playlist + " ul").slideUp(this.options.playlistOptions.shuffleTime, function() {
+					self.shuffled = shuffled;
+					if(shuffled) {
+						self.playlist.sort(function() {
+							return 0.5 - Math.random();
+						});
+					} else {
+						self._originalPlaylist();
+					}
+					self._refresh(true); // Instant
+
+					if(playNow || !$(self.cssSelector.jPlayer).data("jPlayer").status.paused) {
+						self.play(0);
+					} else {
+						self.select(0);
+					}
+
+					$(this).slideDown(self.options.playlistOptions.shuffleTime);
+				});
+			}
+		}
+	};
+})(jQuery);
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
@ -0,0 +1,331 @@
+/*
+ * jPlayerInspector Plugin for jPlayer (2.0.0+) Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Version: 1.0.3
+ * Date: 7th August 2011
+ *
+ * For use with jPlayer Version: 2.0.29
+ *
+ * Note: Declare inspector instances after jPlayer instances. ie., Otherwise the jPlayer instance is nonsense.
+ */
+
+(function($, undefined) {
+	$.jPlayerInspector = {};
+	$.jPlayerInspector.i = 0;
+	$.jPlayerInspector.defaults = {
+		jPlayer: undefined, // The jQuery selector of the jPlayer instance to inspect.
+		idPrefix: "jplayer_inspector_",
+		visible: false
+	};
+	
+	var methods = {
+		init: function(options) {
+			var self = this;
+			var $this = $(this);
+			
+			var config = $.extend({}, $.jPlayerInspector.defaults, options);
+			$(this).data("jPlayerInspector", config);
+
+			config.id = $(this).attr("id");
+			config.jPlayerId = config.jPlayer.attr("id");
+
+			config.windowId = config.idPrefix + "window_" + $.jPlayerInspector.i;
+			config.statusId = config.idPrefix + "status_" + $.jPlayerInspector.i;
+			config.configId = config.idPrefix + "config_" + $.jPlayerInspector.i;
+			config.toggleId = config.idPrefix + "toggle_" + $.jPlayerInspector.i;
+			config.eventResetId = config.idPrefix + "event_reset_" + $.jPlayerInspector.i;
+			config.updateId = config.idPrefix + "update_" + $.jPlayerInspector.i;
+			config.eventWindowId = config.idPrefix + "event_window_" + $.jPlayerInspector.i;
+			
+			config.eventId = {};
+			config.eventJq = {};
+			config.eventTimeout = {};
+			config.eventOccurrence = {};
+			
+			$.each($.jPlayer.event, function(eventName,eventType) {
+				config.eventId[eventType] = config.idPrefix + "event_" + eventName + "_" + $.jPlayerInspector.i;
+				config.eventOccurrence[eventType] = 0;
+			});
+			
+			var structure = 
+				'<p><a href="#" id="' + config.toggleId + '">' + (config.visible ? "Hide" : "Show") + '</a> jPlayer Inspector</p>' 
+				+ '<div id="' + config.windowId + '">'
+					+ '<div id="' + config.statusId + '"></div>'
+					+ '<div id="' + config.eventWindowId + '" style="padding:5px 5px 0 5px;background-color:#eee;border:1px dotted #000;">'
+						+ '<p style="margin:0 0 10px 0;"><strong>jPlayer events that have occurred over the past 1 second:</strong>'
+						+ '<br />(Backgrounds: <span style="padding:0 5px;background-color:#eee;border:1px dotted #000;">Never occurred</span> <span style="padding:0 5px;background-color:#fff;border:1px dotted #000;">Occurred before</span> <span style="padding:0 5px;background-color:#9f9;border:1px dotted #000;">Occurred</span> <span style="padding:0 5px;background-color:#ff9;border:1px dotted #000;">Multiple occurrences</span> <a href="#" id="' + config.eventResetId + '">reset</a>)</p>';
+			
+			// MJP: Would use the next 3 lines for ease, but the events are just slapped on the page.
+			// $.each($.jPlayer.event, function(eventName,eventType) {
+			// 	structure += '<div id="' + config.eventId[eventType] + '" style="float:left;">' + eventName + '</div>';
+			// });
+			
+			var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;";
+			// MJP: Doing it longhand so order and layout easier to control.
+			structure +=
+						'<div id="' + config.eventId[$.jPlayer.event.ready] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.flashreset] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.resize] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.repeat] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.click] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.error] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.warning] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.loadstart] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.progress] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.timeupdate] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.volumechange] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.play] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.pause] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.waiting] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.playing] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.seeking] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.seeked] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.ended] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.loadeddata] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.loadedmetadata] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.canplay] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.canplaythrough] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div id="' + config.eventId[$.jPlayer.event.suspend] + '" style="clear:left;' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.abort] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.emptied] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.stalled] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.ratechange] + '" style="' + eventStyle + '"></div>'
+						+ '<div id="' + config.eventId[$.jPlayer.event.durationchange] + '" style="' + eventStyle + '"></div>'
+
+						+ '<div style="clear:both"></div>';
+
+			// MJP: Would like a check here in case we missed an event.
+
+			// MJP: Check fails, since it is not on the page yet.
+/*			$.each($.jPlayer.event, function(eventName,eventType) {
+				if($("#" + config.eventId[eventType])[0] === undefined) {
+					structure += '<div id="' + config.eventId[eventType] + '" style="clear:left;' + eventStyle + '">' + eventName + '</div>';
+				}
+			});
+*/
+			structure +=
+					'</div>'
+					+ '<p><a href="#" id="' + config.updateId + '">Update</a> jPlayer Inspector</p>'
+					+ '<div id="' + config.configId + '"></div>'
+				+ '</div>';
+			$(this).html(structure);
+			
+			config.windowJq = $("#" + config.windowId);
+			config.statusJq = $("#" + config.statusId);
+			config.configJq = $("#" + config.configId);
+			config.toggleJq = $("#" + config.toggleId);
+			config.eventResetJq = $("#" + config.eventResetId);
+			config.updateJq = $("#" + config.updateId);
+
+			$.each($.jPlayer.event, function(eventName,eventType) {
+				config.eventJq[eventType] = $("#" + config.eventId[eventType]);
+				config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0);
+				
+				config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) {
+					config.eventOccurrence[e.type]++;
+					if(config.eventOccurrence[e.type] > 1) {
+						config.eventJq[e.type].css("background-color","#ff9");
+					} else {
+						config.eventJq[e.type].css("background-color","#9f9");
+					}
+					config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
+					// The timer to handle the color
+					clearTimeout(config.eventTimeout[e.type]);
+					config.eventTimeout[e.type] = setTimeout(function() {
+						config.eventJq[e.type].css("background-color","#fff");
+					}, 1000);
+					// The timer to handle the occurences.
+					setTimeout(function() {
+						config.eventOccurrence[e.type]--;
+						config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
+					}, 1000);
+					if(config.visible) { // Update the status, if inspector open.
+						$this.jPlayerInspector("updateStatus");
+					}
+				});
+			});
+
+			config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) {
+				$this.jPlayerInspector("updateConfig");
+			});
+
+			config.toggleJq.click(function() {
+				if(config.visible) {
+					$(this).text("Show");
+					config.windowJq.hide();
+					config.statusJq.empty();
+					config.configJq.empty();
+				} else {
+					$(this).text("Hide");
+					config.windowJq.show();
+					config.updateJq.click();
+				}
+				config.visible = !config.visible;
+				$(this).blur();
+				return false;
+			});
+
+			config.eventResetJq.click(function() {
+				$.each($.jPlayer.event, function(eventName,eventType) {
+					config.eventJq[eventType].css("background-color","#eee");
+				});
+				$(this).blur();
+				return false;
+			});
+
+			config.updateJq.click(function() {
+				$this.jPlayerInspector("updateStatus");
+				$this.jPlayerInspector("updateConfig");
+				return false;
+			});
+
+			if(!config.visible) {
+				config.windowJq.hide();
+			} else {
+				// config.updateJq.click();
+			}
+			
+			$.jPlayerInspector.i++;
+
+			return this;
+		},
+		destroy: function() {
+			$(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector");
+			$(this).empty();
+		},
+		updateConfig: function() { // This displays information about jPlayer's configuration in inspector
+		
+			var jPlayerInfo = "<p>This jPlayer instance is running in your browser where:<br />"
+
+			for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) {
+				var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i];
+				jPlayerInfo += "&nbsp;jPlayer's <strong>" + solution + "</strong> solution is";				
+				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) {
+					jPlayerInfo += " being <strong>used</strong> and will support:<strong>";
+					for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) {
+						if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) {
+							jPlayerInfo += " " + format;
+						}
+					}
+					jPlayerInfo += "</strong><br />";
+				} else {
+					jPlayerInfo += " <strong>not required</strong><br />";
+				}
+			}
+			jPlayerInfo += "</p>";
+
+			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) {
+				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
+					jPlayerInfo += "<strong>Problem with jPlayer since both HTML5 and Flash are active.</strong>";
+				} else {
+					jPlayerInfo += "The <strong>HTML5 is active</strong>.";
+				}
+			} else {
+				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
+					jPlayerInfo += "The <strong>Flash is active</strong>.";
+				} else {
+					jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia().";
+				}
+			}
+			jPlayerInfo += "</p>";
+
+			var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType;
+			jPlayerInfo += "<p><code>status.formatType = '" + formatType + "'</code><br />";
+			if(formatType) {
+				jPlayerInfo += "<code>Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')</code>";
+			} else {
+				jPlayerInfo += "</p>";
+			}
+			
+			jPlayerInfo += "<p><code>status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'</code></p>";
+
+			jPlayerInfo += "<p><code>status.media = {<br />";
+			for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) {
+				jPlayerInfo += "&nbsp;" + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "<br />"; // Some are strings
+			}
+			jPlayerInfo += "};</code></p>"
+
+			+ "<p>Raw browser test for HTML5 support. Should equal a function if HTML5 is available.<br />";
+			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) {
+				jPlayerInfo += "<code>htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"</code><br />"
+			}
+			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) {
+				jPlayerInfo += "<code>htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +"</code>";
+			}
+			jPlayerInfo += "</p>";
+
+			jPlayerInfo += "<p>This instance is using the constructor options:<br />"
+			+ "<code>$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({<br />"
+
+			+ "&nbsp;swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',<br />"
+
+			+ "&nbsp;solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',<br />"
+
+			+ "&nbsp;supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',<br />"
+
+			+ "&nbsp;preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',<br />"
+			
+			+ "&nbsp;volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",<br />"
+			
+			+ "&nbsp;muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",<br />"
+
+			+ "&nbsp;backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',<br />"
+
+			+ "&nbsp;cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',<br />"
+
+			+ "&nbsp;cssSelector: {";
+
+			var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector");
+			for(prop in cssSelector) {
+				
+				// jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys.
+				jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "',"
+			}
+
+			jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me.
+
+			jPlayerInfo += "<br />&nbsp;},<br />"
+
+			+ "&nbsp;errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",<br />"
+			
+			+ "&nbsp;warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "<br />"
+
+			+ "});</code></p>";
+			$(this).data("jPlayerInspector").configJq.html(jPlayerInfo);
+			return this;
+		},
+		updateStatus: function() { // This displays information about jPlayer's status in the inspector
+			$(this).data("jPlayerInspector").statusJq.html(
+				"<p>jPlayer is " +
+				($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") +
+				" at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." +
+				" (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" +
+				", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" +
+				", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" +
+				", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)</p>"
+			);
+			return this;
+		}
+	};
+	$.fn.jPlayerInspector = function( method ) {
+		// Method calling logic
+		if ( methods[method] ) {
+			return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
+		} else if ( typeof method === 'object' || ! method ) {
+			return methods.init.apply( this, arguments );
+		} else {
+			$.error( 'Method ' +  method + ' does not exist on jQuery.jPlayerInspector' );
+		}    
+	};
+})(jQuery);
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
@ -0,0 +1,69 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 8th August 2011
+ */
+
+package happyworm.jPlayer {
+	import flash.events.Event;
+	
+	public class JplayerEvent extends Event {
+		
+		// The event strings must match those in the JavaScript's $.jPlayer.event object
+
+		public static const JPLAYER_READY:String = "jPlayer_ready";
+		public static const JPLAYER_FLASHRESET:String = "jPlayer_flashreset"; // Handled in JavaScript
+		public static const JPLAYER_RESIZE:String = "jPlayer_resize"; // Handled in JavaScript
+		public static const JPLAYER_REPEAT:String = "jPlayer_repeat"; // Handled in JavaScript
+		public static const JPLAYER_CLICK:String = "jPlayer_click";
+		public static const JPLAYER_ERROR:String = "jPlayer_error";
+		public static const JPLAYER_WARNING:String = "jPlayer_warning"; // Currently not used by the flash solution
+
+		public static const JPLAYER_LOADSTART:String = "jPlayer_loadstart";
+		public static const JPLAYER_PROGRESS:String = "jPlayer_progress";
+		public static const JPLAYER_SUSPEND:String = "jPlayer_suspend"; // Not implemented
+		public static const JPLAYER_ABORT:String = "jPlayer_abort"; // Not implemented
+		public static const JPLAYER_EMPTIED:String = "jPlayer_emptied"; // Not implemented
+		public static const JPLAYER_STALLED:String = "jPlayer_stalled"; // Not implemented
+		public static const JPLAYER_PLAY:String = "jPlayer_play";
+		public static const JPLAYER_PAUSE:String = "jPlayer_pause";
+		public static const JPLAYER_LOADEDMETADATA:String = "jPlayer_loadedmetadata"; // MP3 has no equivilent
+		public static const JPLAYER_LOADEDDATA:String = "jPlayer_loadeddata"; // Not implemented
+		public static const JPLAYER_WAITING:String = "jPlayer_waiting"; // Not implemented
+		public static const JPLAYER_PLAYING:String = "jPlayer_playing"; // Not implemented
+		public static const JPLAYER_CANPLAY:String = "jPlayer_canplay"; // Not implemented
+		public static const JPLAYER_CANPLAYTHROUGH:String = "jPlayer_canplaythrough"; // Not implemented
+		public static const JPLAYER_SEEKING:String = "jPlayer_seeking";
+		public static const JPLAYER_SEEKED:String = "jPlayer_seeked";
+		public static const JPLAYER_TIMEUPDATE:String = "jPlayer_timeupdate";
+		public static const JPLAYER_ENDED:String = "jPlayer_ended";
+		public static const JPLAYER_RATECHANGE:String = "jPlayer_ratechange"; // Not implemented
+		public static const JPLAYER_DURATIONCHANGE:String = "jPlayer_durationchange"; // Not implemented
+		public static const JPLAYER_VOLUMECHANGE:String = "jPlayer_volumechange"; // See JavaScript
+
+		// Events used internal to jPlayer's Flash.
+		public static const DEBUG_MSG:String = "debug_msg";
+
+		public var data:JplayerStatus;
+		public var msg:String = ""
+
+		public function JplayerEvent(type:String, data:JplayerStatus, msg:String = "", bubbles:Boolean = false, cancelable:Boolean = false) {
+			super(type, bubbles, cancelable);
+			this.data = data;
+			this.msg = msg;
+		}
+		public override function clone():Event {
+			return new JplayerEvent(type, data, msg, bubbles, cancelable);
+		}
+		public override function toString():String {
+			return formatToString("JplayerEvent", "type", "bubbles", "cancelable", "eventPhase", "data", "msg");
+		}
+	}
+}
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
@ -0,0 +1,328 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 1st September 2011
+ */
+
+package happyworm.jPlayer {
+	import flash.display.Sprite;
+
+	import flash.media.Sound;
+	import flash.media.SoundChannel;
+	import flash.media.SoundLoaderContext;
+	import flash.media.SoundTransform;
+	import flash.net.URLRequest;
+	import flash.utils.Timer;
+	import flash.errors.IOError;
+	import flash.events.*;
+
+	public class JplayerMp3 extends Sprite {
+		private var mySound:Sound = new Sound();
+		private var myChannel:SoundChannel = new SoundChannel();
+		private var myContext:SoundLoaderContext = new SoundLoaderContext(3000, false);
+		private var myTransform:SoundTransform = new SoundTransform();
+		private var myRequest:URLRequest = new URLRequest();
+
+		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
+		
+		public var myStatus:JplayerStatus = new JplayerStatus();
+
+		public function JplayerMp3(volume:Number) {
+			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
+			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
+			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
+			setVolume(volume);
+		}
+		public function setFile(src:String):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "setFile: " + src));
+			if(myStatus.isPlaying) {
+				myChannel.stop();
+				progressUpdates(false);
+				timeUpdates(false);
+			}
+			try {
+				mySound.close();
+			} catch (err:IOError) {
+				// Occurs if the file is either yet to be opened or has finished downloading.
+			}
+			mySound = null;
+			mySound = new Sound();
+			mySound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
+			mySound.addEventListener(Event.OPEN, loadOpen);
+			mySound.addEventListener(Event.COMPLETE, loadComplete);
+			myRequest = new URLRequest(src);
+			myStatus.reset();
+			myStatus.src = src;
+			myStatus.srcSet = true;
+			timeUpdateEvent();
+		}
+		public function clearFile():void {
+			setFile("");
+			myStatus.srcSet = false;
+		}
+		private function errorHandler(err:IOErrorEvent):void {
+			// MP3 player needs to stop progress and timeupdate events as they are started before the error occurs.
+			// NB: The MP4 player works differently and the error occurs before they are started.
+			progressUpdates(false);
+			timeUpdates(false);
+			myStatus.error(); // Resets status except the src, and it sets srcError property.
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
+		}
+		private function loadOpen(e:Event):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadOpen:"));
+			myStatus.loading();
+			if(myStatus.playOnLoad) {
+				myStatus.playOnLoad = false; // Capture the flag
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); // So loadstart event happens before play event occurs.
+				play();
+			} else {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
+				pause();
+			}
+			progressUpdates(true);
+		}
+		private function loadComplete(e:Event):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadComplete:"));
+			myStatus.loaded();
+			progressUpdates(false);
+			progressEvent();
+		}
+		private function soundCompleteHandler(e:Event):void {
+			myStatus.pausePosition = 0;
+			myStatus.isPlaying = false;
+			timeUpdates(false);
+			timeUpdateEvent();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
+		}
+		private function progressUpdates(active:Boolean):void {
+			// Using a timer rather than Flash's load progress event, because that event gave data at about 200Hz. The 10Hz timer is closer to HTML5 norm.
+			if(active) {
+				progressTimer.start();
+			} else {
+				progressTimer.stop();
+			}
+		}
+		private function progressHandler(e:TimerEvent):void {
+			progressEvent();
+		}
+		private function progressEvent():void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
+		}
+		private function timeUpdates(active:Boolean):void {
+			if(active) {
+				timeUpdateTimer.start();
+			} else {
+				timeUpdateTimer.stop();
+			}
+		}
+		private function timeUpdateHandler(e:TimerEvent):void {
+			timeUpdateEvent();
+		}
+		private function timeUpdateEvent():void {
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
+		}
+		private function seeking(active:Boolean):void {
+			if(active) {
+				if(!myStatus.isSeeking) {
+					seekingEvent();
+					seekingTimer.start();
+				}
+			} else {
+				seekingTimer.stop();
+			}
+		}
+		private function seekingHandler(e:TimerEvent):void {
+			if(myStatus.pausePosition <= getDuration()) {
+				seekedEvent();
+				seeking(false);
+				if(myStatus.playOnSeek) {
+					myStatus.playOnSeek = false; // Capture the flag.
+					play();
+				}
+			} else if(myStatus.isLoaded && (myStatus.pausePosition > getDuration())) {
+				// Illegal seek time
+				seeking(false);
+				seekedEvent();
+				pause(0);
+			}
+		}
+		private function seekingEvent():void {
+			myStatus.isSeeking = true;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
+		}
+		private function seekedEvent():void {
+			myStatus.isSeeking = false;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
+		}
+		public function load():Boolean {
+			if(myStatus.loadRequired()) {
+				myStatus.startingDownload();
+				mySound.load(myRequest, myContext);
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function play(time:Number = NaN):Boolean {
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			if(!isNaN(time) && myStatus.srcSet) {
+				if(myStatus.isPlaying) {
+					myChannel.stop();
+					myStatus.isPlaying = false;
+				}
+				myStatus.pausePosition = time;
+			}
+
+			if(myStatus.isStartingDownload) {
+				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
+				return true;
+			} else if(myStatus.loadRequired()) {
+				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
+				return load();
+			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
+				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
+					myStatus.pausePosition = 0;
+					timeUpdates(false);
+					timeUpdateEvent();
+					if(wasPlaying) { // For when playing and then get a play(huge)
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+					}
+				} else if(myStatus.pausePosition > getDuration()) {
+					myStatus.playOnSeek = true;
+					seeking(true);
+				} else {
+					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
+					myChannel = mySound.play(myStatus.pausePosition);
+					myChannel.soundTransform = myTransform;
+					myChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler);
+					timeUpdates(true);
+					if(!wasPlaying) {
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
+					}
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function pause(time:Number = NaN):Boolean {
+			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before loadOpen() event.
+			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
+
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
+			var alreadyPausedAtTime:Boolean = false;
+			if(!isNaN(time) && myStatus.pausePosition == time) {
+				alreadyPausedAtTime = true;
+			}
+
+			if(myStatus.isPlaying) {
+				myStatus.isPlaying = false;
+				myChannel.stop();
+				if(myChannel.position > 0) { // Required otherwise a fast play then pause causes myChannel.position to equal zero and not the correct value. ie., When it happens leave pausePosition alone.
+					myStatus.pausePosition = myChannel.position;
+				}
+			}
+
+			if(!isNaN(time) && myStatus.srcSet) {
+				myStatus.pausePosition = time;
+			}
+
+			if(wasPlaying) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+			}
+			
+			if(myStatus.isStartingDownload) {
+				return true;
+			} else if(myStatus.loadRequired()) {
+				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
+					return load();
+				} else {
+					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
+				}
+			} else if(myStatus.isLoading || myStatus.isLoaded) {
+				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
+					myStatus.pausePosition = 0;
+				} else if(myStatus.pausePosition > getDuration()) {
+					seeking(true);
+				}
+				timeUpdates(false);
+				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
+				// Neither pause() nor pause(time) will cause a timeupdate loop.
+				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
+					timeUpdateEvent();
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function playHead(percent:Number):Boolean {
+			var time:Number = percent * getDuration() / 100;
+			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
+				return play(time);
+			} else {
+				return pause(time);
+			}
+		}
+		public function setVolume(v:Number):void {
+			myStatus.volume = v;
+			myTransform.volume = v;
+			myChannel.soundTransform = myTransform;
+		}
+		private function updateStatusValues():void {
+			myStatus.seekPercent = 100 * getLoadRatio();
+			myStatus.currentTime = getCurrentTime();
+			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
+			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
+			myStatus.duration = getDuration();
+		}
+		public function getLoadRatio():Number {
+			if((myStatus.isLoading || myStatus.isLoaded) && mySound.bytesTotal > 0) {
+				return mySound.bytesLoaded / mySound.bytesTotal;
+			} else {
+				return 0;
+			}
+		}
+		public function getDuration():Number {
+			if(mySound.length > 0) {
+				return mySound.length;
+			} else {
+				return 0;
+			}
+		}
+		public function getCurrentTime():Number {
+			if(myStatus.isPlaying) {
+				return myChannel.position;
+			} else {
+				return myStatus.pausePosition;
+			}
+		}
+		public function getCurrentRatioRel():Number {
+			if((getDuration() > 0) && (getCurrentTime() <= getDuration())) {
+				return getCurrentTime() / getDuration();
+			} else {
+				return 0;
+			}
+		}
+		public function getCurrentRatioAbs():Number {
+			return getCurrentRatioRel() * getLoadRatio();
+		}
+	}
+}
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
@ -0,0 +1,413 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 7th August 2011
+ */
+
+package happyworm.jPlayer {
+	import flash.display.Sprite;
+
+	import flash.media.Video;
+	import flash.media.SoundTransform;
+
+	import flash.net.NetConnection;
+	import flash.net.NetStream;
+
+	import flash.utils.Timer;
+
+	import flash.events.NetStatusEvent;
+	import flash.events.SecurityErrorEvent;
+	import flash.events.TimerEvent;
+
+	public class JplayerMp4 extends Sprite {
+		
+		public var myVideo:Video = new Video();
+		private var myConnection:NetConnection;
+		private var myStream:NetStream;
+		
+		private var myTransform:SoundTransform = new SoundTransform();
+
+		public var myStatus:JplayerStatus = new JplayerStatus();
+		
+		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
+		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
+
+		public function JplayerMp4(volume:Number) {
+			myConnection = new NetConnection();
+			myConnection.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
+			myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
+			myVideo.smoothing = true;
+			this.addChild(myVideo);
+			
+			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
+			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
+			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
+
+			myStatus.volume = volume;
+		}
+		private function progressUpdates(active:Boolean):void {
+			if(active) {
+				progressTimer.start();
+			} else {
+				progressTimer.stop();
+			}
+		}
+		private function progressHandler(e:TimerEvent):void {
+			if(myStatus.isLoading) {
+				if(getLoadRatio() == 1) { // Close as can get to a loadComplete event since client.onPlayStatus only works with FMS
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressHandler: loadComplete"));
+					myStatus.loaded();
+					progressUpdates(false);
+				}
+			}
+			progressEvent();
+		}
+		private function progressEvent():void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
+		}
+		private function timeUpdates(active:Boolean):void {
+			if(active) {
+				timeUpdateTimer.start();
+			} else {
+				timeUpdateTimer.stop();
+			}
+		}
+		private function timeUpdateHandler(e:TimerEvent):void {
+			timeUpdateEvent();
+		}
+		private function timeUpdateEvent():void {
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
+		}
+		private function seeking(active:Boolean):void {
+			if(active) {
+				if(!myStatus.isSeeking) {
+					seekingEvent();
+				}
+				seekingTimer.start();
+			} else {
+				if(myStatus.isSeeking) {
+					seekedEvent();
+				}
+				seekingTimer.stop();
+			}
+		}
+		private function seekingHandler(e:TimerEvent):void {
+			if(getSeekTimeRatio() <= getLoadRatio()) {
+				seeking(false);
+				if(myStatus.playOnSeek) {
+					myStatus.playOnSeek = false; // Capture the flag.
+					play(myStatus.pausePosition); // Must pass time or the seek time is never set.
+				} else {
+					pause(myStatus.pausePosition); // Must pass time or the stream.time is read.
+				}
+			} else if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) {
+				// Illegal seek time
+				seeking(false);
+				pause(0);
+			}
+		}
+		private function seekingEvent():void {
+			myStatus.isSeeking = true;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
+		}
+		private function seekedEvent():void {
+			myStatus.isSeeking = false;
+			updateStatusValues();
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
+		}
+		private function netStatusHandler(e:NetStatusEvent):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "netStatusHandler: '" + e.info.code + "'"));
+			switch(e.info.code) {
+				case "NetConnection.Connect.Success":
+					connectStream();
+					break;
+				case "NetStream.Play.Start":
+					// This event code occurs once, when the media is opened. Equiv to loadOpen() in mp3 player.
+					myStatus.loading();
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
+					progressUpdates(true);
+					// See onMetaDataHandler() for other condition, since duration is vital.
+					break;
+				case "NetStream.Play.Stop":
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime())));
+
+					// Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough.
+					if(Math.abs(getDuration() - getCurrentTime()) < 150) { // Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play.
+						endedEvent();
+					}
+					break;
+				case "NetStream.Seek.InvalidTime":
+					// Used for capturing invalid set times and clicks on the end of the progress bar.
+					endedEvent();
+					break;
+				case "NetStream.Play.StreamNotFound":
+					myStatus.error(); // Resets status except the src, and it sets srcError property.
+					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
+					break;
+			}
+			// "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready.
+		}
+		private function endedEvent():void {
+			var wasPlaying:Boolean = myStatus.isPlaying;
+			pause(0);
+			timeUpdates(false);
+			timeUpdateEvent();
+			if(wasPlaying) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
+			}
+		}
+		private function securityErrorHandler(event:SecurityErrorEvent):void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "securityErrorHandler."));
+		}
+		private function connectStream():void {
+			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "connectStream."));
+			var customClient:Object = new Object();
+			customClient.onMetaData = onMetaDataHandler;
+			// customClient.onPlayStatus = onPlayStatusHandler; // According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server).
+			myStream = null;
+			myStream = new NetStream(myConnection);
+			myStream.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
+			myStream.client = customClient;
+			myVideo.attachNetStream(myStream);
+			setVolume(myStatus.volume);
+			myStream.play(myStatus.src);
+		}
+		public function setFile(src:String):void {
+			if(myStream != null) {
+				myStream.close();
+			}
+			myVideo.clear();
+			progressUpdates(false);
+			timeUpdates(false);
+
+			myStatus.reset();
+			myStatus.src = src;
+			myStatus.srcSet = true;
+			timeUpdateEvent();
+		}
+		public function clearFile():void {
+			setFile("");
+			myStatus.srcSet = false;
+		}
+		public function load():Boolean {
+			if(myStatus.loadRequired()) {
+				myStatus.startingDownload();
+				myConnection.connect(null);
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function play(time:Number = NaN):Boolean {
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			if(!isNaN(time) && myStatus.srcSet) {
+				if(myStatus.isPlaying) {
+					myStream.pause();
+					myStatus.isPlaying = false;
+				}
+				myStatus.pausePosition = time;
+			}
+
+			if(myStatus.isStartingDownload) {
+				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
+				return true;
+			} else if(myStatus.loadRequired()) {
+				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
+				return load();
+			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
+				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
+					myStream.pause(); // Since it is playing by default at this point.
+					myStatus.pausePosition = 0;
+					myStream.seek(0);
+					timeUpdates(false);
+					timeUpdateEvent();
+					if(wasPlaying) { // For when playing and then get a play(huge)
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+					}
+				} else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
+					myStatus.playOnSeek = true;
+					seeking(true);
+					myStream.pause(); // Since it is playing by default at this point.
+				} else {
+					if(!isNaN(time)) { // Avoid using seek() when it is already correct.
+						myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds
+					}
+					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
+					myStream.resume();
+					timeUpdates(true);
+					if(!wasPlaying) {
+						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
+					}
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function pause(time:Number = NaN):Boolean {
+			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event.
+			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
+
+			var wasPlaying:Boolean = myStatus.isPlaying;
+
+			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
+			var alreadyPausedAtTime:Boolean = false;
+			if(!isNaN(time) && myStatus.pausePosition == time) {
+				alreadyPausedAtTime = true;
+			}
+
+			// Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready.
+			if(myStream != null && myStatus.metaDataReady) { // myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t).
+				myStream.pause();
+			}
+			if(myStatus.isPlaying) {
+				myStatus.isPlaying = false;
+				myStatus.pausePosition = myStream.time * 1000;
+			}
+			
+			if(!isNaN(time) && myStatus.srcSet) {
+				myStatus.pausePosition = time;
+			}
+
+			if(wasPlaying) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
+			}
+
+			if(myStatus.isStartingDownload) {
+				return true;
+			} else if(myStatus.loadRequired()) {
+				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
+					return load();
+				} else {
+					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
+				}
+			} else if(myStatus.isLoading || myStatus.isLoaded) {
+				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
+					myStatus.pausePosition = 0;
+					myStream.seek(0);
+					seekedEvent(); // Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event.
+				} else if(!isNaN(time)) {
+					if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
+						seeking(true);
+					} else {
+						if(myStatus.metaDataReady) { // Otherwise seek(0) will stop the metadata loading.
+							myStream.seek(myStatus.pausePosition/1000);
+						}
+					}
+				}
+				timeUpdates(false);
+				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
+				// Neither pause() nor pause(time) will cause a timeupdate loop.
+				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
+					timeUpdateEvent();
+				}
+				return true;
+			} else {
+				return false;
+			}
+		}
+		public function playHead(percent:Number):Boolean {
+			var time:Number = percent * getDuration() * getLoadRatio() / 100;
+			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
+				return play(time);
+			} else {
+				return pause(time);
+			}
+		}
+		public function setVolume(v:Number):void {
+			myStatus.volume = v;
+			myTransform.volume = v;
+			if(myStream != null) {
+				myStream.soundTransform = myTransform;
+			}
+		}
+		private function updateStatusValues():void {
+			myStatus.seekPercent = 100 * getLoadRatio();
+			myStatus.currentTime = getCurrentTime();
+			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
+			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
+			myStatus.duration = getDuration();
+		}
+		public function getLoadRatio():Number {
+			if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) {
+				return myStream.bytesLoaded / myStream.bytesTotal;
+			} else {
+				return 0;
+			}
+		}
+		public function getDuration():Number {
+			return myStatus.duration; // Set from meta data.
+		}
+		public function getCurrentTime():Number {
+			if(myStatus.isPlaying) {
+				return myStream.time * 1000;
+			} else {
+				return myStatus.pausePosition;
+			}
+		}
+		public function getCurrentRatioRel():Number {
+			if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) {
+				return getCurrentRatioAbs() / getLoadRatio();
+			} else {
+				return 0;
+			}
+		}
+		public function getCurrentRatioAbs():Number {
+			if(getDuration() > 0) {
+				return getCurrentTime() / getDuration();
+			} else {
+				return 0;
+			}
+		}
+		public function getSeekTimeRatio():Number {
+			if(getDuration() > 0) {
+				return myStatus.pausePosition / getDuration();
+			} else {
+				return 1;
+			}
+		}
+		public function onMetaDataHandler(info:Object):void { // Used in connectStream() in myStream.client object.
+			// This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur.
+			if(!myStatus.metaDataReady) {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height));
+
+				myStatus.metaDataReady = true; // Set flag so that this event only effects jPlayer the 1st time.
+				myStatus.metaData = info;
+				myStatus.duration = info.duration * 1000; // Only available via Meta Data.
+				if(info.width != undefined) {
+					myVideo.width = info.width;
+				}
+				if(info.height != undefined) {
+					myVideo.height = info.height;
+				}
+
+				if(myStatus.playOnLoad) {
+					myStatus.playOnLoad = false; // Capture the flag
+					if(myStatus.pausePosition > 0 ) { // Important for setMedia followed by play(time).
+						play(myStatus.pausePosition);
+					} else {
+						play(); // Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
+					}
+				} else {
+					pause(myStatus.pausePosition); // Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
+				}
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA, myStatus));
+			} else {
+				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: Already read (NO EFFECT)"));
+			}
+		}
+	}
+}
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
@ -0,0 +1,101 @@
+/*
+ * jPlayer Plugin for jQuery JavaScript Library
+ * http://www.happyworm.com/jquery/jplayer
+ *
+ * Copyright (c) 2009 - 2011 Happyworm Ltd
+ * Dual licensed under the MIT and GPL licenses.
+ *  - http://www.opensource.org/licenses/mit-license.php
+ *  - http://www.gnu.org/copyleft/gpl.html
+ *
+ * Author: Mark J Panaghiston
+ * Date: 1st September 2011
+ */
+
+package happyworm.jPlayer {
+	public class JplayerStatus {
+
+		public static const VERSION:String = "2.1.0"; // The version of the Flash jPlayer entity.
+
+		public var volume:Number = 0.5; // Not affected by reset()
+		public var muted:Boolean = false; // Not affected by reset()
+
+		public var src:String;
+		public var srcError:Boolean;
+
+		public var srcSet:Boolean;
+		public var isPlaying:Boolean;
+		public var isSeeking:Boolean;
+
+		public var playOnLoad:Boolean;
+		public var playOnSeek:Boolean;
+
+		public var isStartingDownload:Boolean;
+		public var isLoading:Boolean;
+		public var isLoaded:Boolean;
+
+		public var pausePosition:Number;
+
+		public var seekPercent:Number;
+		public var currentTime:Number;
+		public var currentPercentRelative:Number;
+		public var currentPercentAbsolute:Number;
+		public var duration:Number;
+		
+		public var metaDataReady:Boolean;
+		public var metaData:Object;
+
+		public function JplayerStatus() {
+			reset();
+		}
+		public function reset():void {
+			src = "";
+			srcError = false;
+
+			srcSet = false;
+			isPlaying = false;
+			isSeeking = false;
+
+			playOnLoad = false;
+			playOnSeek = false;
+
+			isStartingDownload = false;
+			isLoading = false;
+			isLoaded = false;
+
+			pausePosition = 0;
+
+			seekPercent = 0;
+			currentTime = 0;
+			currentPercentRelative = 0;
+			currentPercentAbsolute = 0;
+			duration = 0;
+			
+			metaDataReady = false;
+			metaData = {};
+		}
+		public function error():void {
+			var srcSaved:String = src;
+			reset();
+			src = srcSaved;
+			srcError = true;
+		}
+		public function loadRequired():Boolean {
+			return (srcSet && !isStartingDownload && !isLoading && !isLoaded);
+		}
+		public function startingDownload():void {
+			isStartingDownload = true;
+			isLoading = false;
+			isLoaded = false;
+		}
+		public function loading():void {
+			isStartingDownload = false;
+			isLoading = true;
+			isLoaded = false;
+		}
+		public function loaded():void {
+			isStartingDownload = false;
+			isLoading = false;
+			isLoaded = true;
+		}
+	}
+}
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
+++ b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@ -3,4 +3,4 @@ $appInfoDir = __DIR__;
 $thisAppDir = dirname($appInfoDir);
 $appsDir = dirname($thisAppDir);
 $ownCloudDir = dirname($appsDir);
-symlink($thisAppDir, $ownCloudDir.'/.well-known');
+@symlink($thisAppDir, $ownCloudDir.'/.well-known');
--- a/core/js/jquery.infieldlabel.js
+++ b/core/js/jquery.infieldlabel.js
@ -0,0 +1,140 @@
+/*
+ * In-Field Label jQuery Plugin
+ * http://fuelyourcoding.com/scripts/infield.html
+ *
+ * Copyright (c) 2009 Doug Neiner
+ * Dual licensed under the MIT and GPL licenses.
+ * Uses the same license as jQuery, see:
+ * http://docs.jquery.com/License
+ *
+ * @version 0.1
+ */
+(function($){
+	
+    $.InFieldLabels = function(label,field, options){
+        // To avoid scope issues, use 'base' instead of 'this'
+        // to reference this class from internal events and functions.
+        var base = this;
+        
+        // Access to jQuery and DOM versions of each element
+        base.$label = $(label);
+        base.label = label;
+
+ 		base.$field = $(field);
+		base.field = field;
+        
+		base.$label.data("InFieldLabels", base);
+		base.showing = true;
+        
+        base.init = function(){
+			// Merge supplied options with default options
+            base.options = $.extend({},$.InFieldLabels.defaultOptions, options);
+
+			// Check if the field is already filled in
+			if(base.$field.val() != ""){
+				base.$label.hide();
+				base.showing = false;
+			};
+			
+			base.$field.focus(function(){
+				base.fadeOnFocus();
+			}).blur(function(){
+				base.checkForEmpty(true);
+			}).bind('keydown.infieldlabel',function(e){
+				// Use of a namespace (.infieldlabel) allows us to
+				// unbind just this method later
+				base.hideOnChange(e);
+			}).change(function(e){
+				base.checkForEmpty();
+			}).bind('onPropertyChange', function(){
+				base.checkForEmpty();
+			});
+        };
+
+		// If the label is currently showing
+		// then fade it down to the amount
+		// specified in the settings
+		base.fadeOnFocus = function(){
+			if(base.showing){
+				base.setOpacity(base.options.fadeOpacity);
+			};
+		};
+		
+		base.setOpacity = function(opacity){
+			base.$label.stop().animate({ opacity: opacity }, base.options.fadeDuration);
+			base.showing = (opacity > 0.0);
+		};
+		
+		// Checks for empty as a fail safe
+		// set blur to true when passing from
+		// the blur event
+		base.checkForEmpty = function(blur){
+			if(base.$field.val() == ""){
+				base.prepForShow();
+				base.setOpacity( blur ? 1.0 : base.options.fadeOpacity );
+			} else {
+				base.setOpacity(0.0);
+			};
+		};
+		
+		base.prepForShow = function(e){
+			if(!base.showing) {
+				// Prepare for a animate in...
+				base.$label.css({opacity: 0.0}).show();
+				
+				// Reattach the keydown event
+				base.$field.bind('keydown.infieldlabel',function(e){
+					base.hideOnChange(e);
+				});
+			};
+		};
+
+		base.hideOnChange = function(e){
+			if(
+				(e.keyCode == 16) || // Skip Shift
+				(e.keyCode == 9) // Skip Tab
+			  ) return; 
+			
+			if(base.showing){
+				base.$label.hide();
+				base.showing = false;
+			};
+			
+			// Remove keydown event to save on CPU processing
+			base.$field.unbind('keydown.infieldlabel');
+		};
+      
+		// Run the initialization method
+        base.init();
+    };
+	
+    $.InFieldLabels.defaultOptions = {
+        fadeOpacity: 0.5, // Once a field has focus, how transparent should the label be
+		fadeDuration: 300 // How long should it take to animate from 1.0 opacity to the fadeOpacity
+    };
+	
+
+    $.fn.inFieldLabels = function(options){
+        return this.each(function(){
+			// Find input or textarea based on for= attribute
+			// The for attribute on the label must contain the ID
+			// of the input or textarea element
+			var for_attr = $(this).attr('for');
+			if( !for_attr ) return; // Nothing to attach, since the for field wasn't used
+			
+			
+			// Find the referenced input or textarea element
+			var $field = $(
+				"input#" + for_attr + "[type='text']," + 
+				"input#" + for_attr + "[type='password']," + 
+				"textarea#" + for_attr
+				);
+				
+			if( $field.length == 0) return; // Again, nothing to attach
+			
+			// Only create object for input[text], input[password], or textarea
+            (new $.InFieldLabels(this, $field[0], options));
+        });
+    };
+	
+})(jQuery);
--- a/core/js/setup.js
+++ b/core/js/setup.js
@ -7,7 +7,9 @@ $(document).ready(function() {
 		$('#dbhost').hide();
 		$('#dbhostlabel').hide();
 	}
-
+	$('#adminlogin').change(function(){
+		$('#adminlogin').val($.trim($('#adminlogin').val()));
+	});
 	$('#sqlite').click(function() {
 		$('#use_other_db').slideUp(250);
 		$('#dbhost').hide(250);
--- a/files/ajax/move.php
+++ b/files/ajax/move.php
@ -14,7 +14,7 @@ $target = $_GET["target"];
 if(OC_Files::move($dir,$file,$target,$file)){
 	OC_JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
 }else{
-	OC_JSON::error(array("data" => array( "message" => "Couldn't move $file" )));
+	OC_JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }

 ?>
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@ -53,7 +53,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		return is_readable($this->datadir.$path);
 	}
 	public function is_writeable($path){
-		return is_writeable($this->datadir.$path);
+		return is_writable($this->datadir.$path);
 	}
 	public function file_exists($path){
 		return file_exists($this->datadir.$path);
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@ -130,35 +130,6 @@ class OC_Filesystem{
 		return $internalPath;
 	}
 	
-	/**
-	* check if the current users has the right premissions to read a file
-	* @param  string  path
-	* @return bool
-	*/
-	static private function canRead($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there
-	}
-	/**
-	* check if the current users has the right premissions to write a file
-	* @param  string  path
-	* @return bool
-	*/
-	static private function canWrite($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there
-	}
-	
 	/**
 	* mount an OC_Filestorage in our virtual filesystem
 	* @param OC_Filestorage storage
@ -228,11 +199,26 @@ class OC_Filesystem{
 	*/
 	static public function getLocalFile($path){
 		$parent=substr($path,0,strrpos($path,'/'));
-		if(self::canRead($parent) and $storage=self::getStorage($path)){
+		if(self::isValidPath($parent) and $storage=self::getStorage($path)){
 			return $storage->getLocalFile(self::getInternalPath($path));
 		}
 	}
 	
+	/**
+	 * check if the requested path is valid
+	 * @param string path
+	 * @return bool
+	 */
+	static public function isValidPath($path){
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
+			return false;
+		}
+		return true;
+	}
+	
 	static public function mkdir($path){
 		return self::basicOperation('mkdir',$path,array('create','write'));
 	}
@ -297,7 +283,7 @@ class OC_Filesystem{
 		return self::basicOperation('unlink',$path,array('delete'));
 	}
 	static public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::canWrite($path1) and self::canWrite($path2)){
+		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			if($run){
@ -318,7 +304,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function copy($path1,$path2){
-		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::canRead($path1) and self::canWrite($path2)){
+		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			$exists=self::file_exists($path2);
@ -373,13 +359,13 @@ class OC_Filesystem{
 		return self::basicOperation('fopen',$path,$hooks,$mode);
 	}
 	static public function toTmpFile($path){
-		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::canRead($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->toTmpFile(self::getInternalPath($path));
 		}
 	}
 	static public function fromTmpFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
@ -399,7 +385,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function fromUploadedFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('fromUploadedFile',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
@ -462,7 +448,7 @@ class OC_Filesystem{
 	 * @return mixed
 	 */
 	private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::canRead($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$interalPath=self::getInternalPath($path);
 			$run=true;
 			foreach($hooks as $hook){
--- a/lib/image.php
+++ b/lib/image.php
@ -0,0 +1,474 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/** From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
+ * Don't know if it can come in handy?
+if ( ! function_exists( 'exif_imagetype' ) ) {
+    function exif_imagetype ( $filename ) {
+        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
+            return $type;
+        }
+    return false;
+    }
+}
+*/
+
+function ellipsis($str, $maxlen) {
+	if (strlen($str) > $maxlen) {
+		$characters = floor($maxlen / 2);
+		return substr($str, 0, $characters) . '...' . substr($str, -1 * $characters);
+	}
+	return $str;
+}
+
+/**
+ * Class for image manipulation
+ * Ideas: imagerotate, chunk_split(base64_encode())
+ *
+ */
+class OC_Image {
+	static private $resource = false; // tmp resource.
+	static private $destroy = false; // if the resource is created withing the object.
+	static private $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
+	static private $filepath = null;
+	/**
+	* @brief Constructor.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
+	* @returns bool False on error
+	*/
+	function __construct($imageref = null) {
+		//OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
+		if(!extension_loaded('gd') || !function_exists('gd_info')) {
+		//if(!function_exists('imagecreatefromjpeg')) {
+			OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
+			return false;
+		}
+		if(!is_null($imageref)) {
+			self::load($imageref);
+		}
+	}
+
+	/**
+	* @brief Destructor.
+	*/
+	function __destruct() {
+		if(is_resource(self::$resource) && self::$destroy) {
+			imagedestroy(self::$resource); // Why does this issue a warning.
+		}
+	}
+
+	/**
+	* @brief Determine whether the object contains an image resource.
+	* @returns bool
+	*/
+	public function valid() { // apparently you can't name a method 'empty'...
+		$ret = is_resource(self::$resource);
+		return $ret;
+	}
+
+	/**
+	* @brief Returns the MIME type of the image or an empty string if no image is loaded.
+	* @returns int
+	*/
+	public function mimeType() {
+		return is_resource(self::$resource) ? image_type_to_mime_type(self::$imagetype) : '';
+	}
+
+	/**
+	* @brief Returns the width of the image or -1 if no image is loaded.
+	* @returns int
+	*/
+	public function width() {
+		return is_resource(self::$resource) ? imagesx(self::$resource) : -1;
+	}
+
+	/**
+	* @brief Returns the height of the image or -1 if no image is loaded.
+	* @returns int
+	*/
+	public function height() {
+		return is_resource(self::$resource) ? imagesy(self::$resource) : -1;
+	}
+
+	/**
+	* @brief Outputs the image.
+	* @returns bool
+	*/
+	public function show() {
+		return $this->_output();
+	}
+
+	/**
+	* @brief Saves the image.
+	* @returns bool
+	*/
+
+	public function save($filepath=null) {
+		if($filepath === null && $this->filepath === null) {
+			OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
+			return false;
+		} elseif($filepath === null && $this->filepath !== null) {
+			$filepath = $this->filepath;
+		}
+		return $this->_output($filepath, true);
+	}
+
+	/**
+	* @brief Outputs/saves the image.
+	*/
+	private function _output($filepath=null, $really=false) {
+		header('Content-Type: '.self::mimeType());
+		if($really === false) {
+			$filepath = null; // Just being cautious ;-)
+		} else {
+			if(!is_writable(dirname($filepath))) {
+				OC_Log::write('core','OC_Image::save. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
+				return false;
+			} elseif(is_writable(dirname($filepath)) && !is_writable($filepath)) {
+				OC_Log::write('core','OC_Image::save. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+				return false;
+			}
+		}
+		$retval = false;
+		switch(self::$imagetype) {
+			case IMAGETYPE_GIF:
+				$retval = imagegif(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_JPEG:
+				$retval = imagejpeg(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_PNG:
+				$retval = imagepng(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_XBM:
+				$retval = imagexbm(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_WBMP:
+			case IMAGETYPE_BMP:
+				$retval = imagewbmp(self::$resource, $filepath);
+				break;
+			default:
+				$retval = imagepng(self::$resource, $filepath);
+		}
+		return $retval;
+	}
+
+	/**
+	* @brief Prints the image when called as $image().
+	*/
+	public function __invoke() {
+		return self::show();
+	}
+
+	/**
+	* @returns Returns the image resource in any.
+	*/
+	public function resource() {
+		return self::$resource;
+	}
+
+	/**
+	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	*/
+	function __toString() {
+		ob_start();
+		$res = imagepng(self::$resource);
+		if (!$res) {
+			OC_Log::write('core','OC_Image::_string. Error writing image',OC_Log::ERROR);
+		}
+		return chunk_split(base64_encode(ob_get_clean()));
+	}
+
+	/**
+	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
+	* @returns An image resource or false on error
+	*/
+	public function load($imageref) {
+		if(self::loadFromFile($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromBase64($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromData($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromResource($imageref) !== false) {
+			return self::$resource;
+		} else {
+			OC_Log::write('core','OC_Image::load, couldn\'t load anything. Giving up!', OC_Log::DEBUG);
+			return false;
+		}
+	}
+
+	/**
+	* @brief Loads an image from a local file.
+	* @param $imageref The path to a local file.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromFile($imagepath=false) {
+		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
+			// Debug output disabled because this method is tried before loadFromBase64?
+			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
+			return false;
+		}
+		$itype = exif_imagetype($imagepath);
+		switch($itype) {
+			case IMAGETYPE_GIF:
+				if (imagetypes() & IMG_GIF) {
+					self::$resource = imagecreatefromgif($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_JPEG:
+				if (imagetypes() & IMG_JPG) {
+					self::$resource = imagecreatefromjpeg($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_PNG:
+				if (imagetypes() & IMG_PNG) {
+					self::$resource = imagecreatefrompng($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_XBM:
+				if (imagetypes() & IMG_XPM) {
+					self::$resource = imagecreatefromxbm($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_WBMP:
+			case IMAGETYPE_BMP:
+				if (imagetypes() & IMG_WBMP) {
+					self::$resource = imagecreatefromwbmp($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			/*
+			case IMAGETYPE_TIFF_II: // (intel byte order)
+				break;
+			case IMAGETYPE_TIFF_MM: // (motorola byte order)
+				break;
+			case IMAGETYPE_JPC:
+				break;
+			case IMAGETYPE_JP2:
+				break;
+			case IMAGETYPE_JPX:
+				break;
+			case IMAGETYPE_JB2:
+				break;
+			case IMAGETYPE_SWC:
+				break;
+			case IMAGETYPE_IFF:
+				break;
+			case IMAGETYPE_ICO:
+				break;
+			case IMAGETYPE_SWF:
+				break;
+			case IMAGETYPE_PSD:
+				break;
+			*/
+			default:
+				self::$resource = imagecreatefromstring(file_get_contents($imagepath));
+				$itype = IMAGETYPE_PNG;
+				OC_Log::write('core','OC_Image::loadFromFile, Default', OC_Log::DEBUG);
+				break;
+		}
+		if($this->valid()) {
+			self::$imagetype = $itype;
+			self::$filepath = $imagepath;
+			self::$destroy = true;
+		}
+		return self::$resource;
+	}
+
+	/**
+	* @brief Loads an image from a string of data.
+	* @param $str A string of image data as read from a file.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromData($str) {
+		if(is_resource($str)) {
+			return false;
+		}
+		self::$resource = imagecreatefromstring($str);
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::loadFromData, couldn\'t load', OC_Log::DEBUG);
+			return false;
+		}
+		self::$destroy = true;
+		return self::$resource;
+	}
+
+	/**
+	* @brief Loads an image from a base64 encoded string.
+	* @param $str A string base64 encoded string of image data.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromBase64($str) {
+		if(!is_string($str)) {
+			return false;
+		}
+		$data = base64_decode($str);
+		if($data) { // try to load from string data
+			self::$resource = imagecreatefromstring($data);
+			if(!self::$resource) {
+				OC_Log::write('core','OC_Image::loadFromBase64, couldn\'t load', OC_Log::DEBUG);
+				return false;
+			}
+			self::$destroy = true;
+			return self::$resource;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	* @brief Checks if image resource is valid and assigns it to self::$resource.
+	* @param $res An image resource.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromResource($res) {
+		if(!is_resource($res)) {
+			return false;
+		}
+		self::$resource = $res;
+	}
+
+	/**
+	* @brief Resizes the image preserving ratio.
+	* @param $maxsize The maximum size of either the width or height.
+	* @returns bool
+	*/
+	public function resize($maxsize) {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		$ratio_orig = $width_orig/$height_orig;
+		
+		if ($ratio_orig > 1) {
+			$new_height = round($maxsize/$ratio_orig);
+			$new_width = $maxsize;
+		} else {
+			$new_width = round($maxsize*$ratio_orig);
+			$new_height = $maxsize;
+		}
+
+		$process = imagecreatetruecolor(round($new_width), round($new_height));
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::resize. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+
+		imagecopyresampled($process, self::$resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::resize. Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+
+	/**
+	* @brief Crops the image to the middle square. If the image is already square it just returns.
+	* @returns bool for success or failure
+	*/
+	public function centerCrop() {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::centerCrop, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		if($width_orig === $height_orig) {
+			return true;
+		}
+		$ratio_orig = $width_orig/$height_orig;
+		$width = $height = min($width_orig, $height_orig);
+
+		if ($ratio_orig > 1) {
+			$x = ($width_orig/2) - ($width/2);
+			$y = 0;
+		} else {
+			$y = ($height_orig/2) - ($height/2);
+			$x = 0;
+		}
+		$process = imagecreatetruecolor($width, $height);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::centerCrop. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $width, $height, $width, $height);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+
+	/**
+	* @brief Crops the image from point $x$y with dimension $wx$h.
+	* @param $x Horizontal position
+	* @param $y Vertical position
+	* @param $w Width
+	* @param $h Hight
+	* @returns bool for success or failure
+	*/
+	public function crop($x, $y, $w, $h) {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::crop, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		//OC_Log::write('core','OC_Image::crop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
+		$process = imagecreatetruecolor($w, $h);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::crop. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $w, $h, $w, $h);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::crop. Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+}
--- a/lib/setup.php
+++ b/lib/setup.php
@ -275,7 +275,7 @@ class OC_Setup {
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
-		$content.= "<IfModule !mod_php5.c>\n";
+		$content.= "<IfModule mod_rewrite.c>";
 		$content.= "RewriteEngine on\n";
 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
 		$content.= "</IfModule>\n";
--- a/lib/user.php
+++ b/lib/user.php
@ -120,7 +120,7 @@ class OC_User {
 			return false;
 		}
 		// No empty username
-		if( !$uid ){
+		if(trim($uid) == ''){
 			return false;
 		}
 		// Check if user already exists
--- a/lib/util.php
+++ b/lib/util.php
@ -175,7 +175,7 @@ class OC_Util {
 		$errors=array();

 		//check for database drivers
-		if(!is_callable('sqlite_open') and !is_callable('mysql_connect') and !is_callable('pg_connect')){
+		if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')){
 			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint
 		}
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
--- a/settings/js/users.js
+++ b/settings/js/users.js
@ -126,7 +126,7 @@ $(document).ready(function(){
 	$('#newuser').submit(function(event){
 		event.preventDefault();
 		var username=$('#newusername').val();
-		if(username == '') {
+		if($.trim(username) == '') {
 			alert('Please provide a username!');
 			return false;
 		}