From c998bc1215cce9508d2cf42b49fefab0a573baaf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind1991@gmail.com>
Date: Fri, 5 Aug 2011 16:05:10 +0200
Subject: [PATCH] fix some issues with browsers not supporting html5
 localStorage

---
 apps/media/js/loader.js                 |  2 +-
 apps/media/js/player.js                 |  4 ++--
 apps/user_openid/settings.php           | 23 -----------------------
 apps/user_openid/templates/settings.php |  7 -------
 4 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 apps/user_openid/settings.php
 delete mode 100644 apps/user_openid/templates/settings.php

diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index c49d90cf3e..b7ef2fb7be 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -50,7 +50,7 @@ $(document).ready(function() {
 		FileActions.setDefault('application/ogg','Play');
 	}
 	if(typeof PlayList==='undefined'){
-		if(typeof localStorage !== 'undefined'){
+		if(typeof localStorage !== 'undefined' && localStorage){
 			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
 				loadPlayer();
 			}
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index ec22b0eaf9..4e1cc3cd75 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -143,7 +143,7 @@ var PlayList={
 		}
 	},
 	save:function(){
-		if(typeof localStorage !== 'undefined'){
+		if(typeof localStorage !== 'undefined' && localStorage){
 			localStorage.setItem(oc_current_user+'oc_playlist_items',JSON.stringify(PlayList.items));
 			localStorage.setItem(oc_current_user+'oc_playlist_current',PlayList.current);
 			var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
@@ -156,7 +156,7 @@ var PlayList={
 		}
 	},
 	load:function(){
-		if(typeof localStorage !== 'undefined'){
+		if(typeof localStorage !== 'undefined' && localStorage){
 			PlayList.active=true;
 			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
 			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){
diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php
deleted file mode 100644
index 4293a6c8aa..0000000000
--- a/apps/user_openid/settings.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require_once('../../lib/base.php');
-if( !OC_User::isLoggedIn()){
-    header( "Location: ".OC_Helper::linkTo( "index.php" ));
-    exit();
-}
-
-if(isset($_POST['input_identity'])){
-	OC_Preferences::setValue(OC_User::getUser(),'user_openid','identity',$_POST['input_identity']);
-}
-
-OC_App::setActiveNavigationEntry( "user_openid_settings" );
-
-$identity=OC_Preferences::getValue(OC_User::getUser(),'user_openid','identity','');
-
-$tmpl = new OC_Template( "user_openid", "settings", "admin");
-$tmpl->assign('identity',$identity);
-$tmpl->assign('user',OC_User::getUser());
-
-$tmpl->printPage();
-
-?>
diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php
deleted file mode 100644
index 7a1b530fbc..0000000000
--- a/apps/user_openid/templates/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<form id="identity" action='#' method='post'>
-	<fieldset>
-		<legend><?php echo $l->t( 'OpenID identity' );?></legend>
-		<label for='input_identity'>OpenID identity for <b><?php echo $_['user'];?></b></label><br/>
-		<input name='input_identity' id='input_identity' value="<?php echo $_['identity'];?>"/><input type='submit' value='Save'/>
-	</fieldset>
-</form>