From 0e6e7edc037beedfe9fc7d181c863f1dbd04c6df Mon Sep 17 00:00:00 2001
From: "Richard C. Davis" <rcdavis@smu.edu.sg>
Date: Fri, 1 Nov 2013 18:27:01 +0800
Subject: [PATCH] Fixed broken commit

---
 app/js/angular/console-controller.js |  4 ---
 app/js/angular/groups-controller.js  |  4 ---
 app/js/angular/index-controller.js   |  4 ---
 app/js/angular/profile-controller.js |  4 ---
 app/js/angular/search-controller.js  |  4 ---
 app/js/angular/sketch-controller.js  |  4 ---
 app/js/angular/view-controller.js    |  4 ---
 app/profile.html                     | 37 ----------------------------
 app/search.html                      | 37 ----------------------------
 app/sketch.html                      | 37 ----------------------------
 app/view.html                        | 30 ----------------------
 rpx.py                               | 10 +-------
 12 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/app/js/angular/console-controller.js b/app/js/angular/console-controller.js
index 4ca1786..ca46a22 100644
--- a/app/js/angular/console-controller.js
+++ b/app/js/angular/console-controller.js
@@ -8,11 +8,7 @@ function ConsoleController($scope,$resource,sharedProperties, sharedFunctions){
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
 
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.showdetails = false;
diff --git a/app/js/angular/groups-controller.js b/app/js/angular/groups-controller.js
index 900c32a..a116733 100644
--- a/app/js/angular/groups-controller.js
+++ b/app/js/angular/groups-controller.js
@@ -8,11 +8,7 @@ function GroupsController($scope,$resource,sharedProperties, sharedFunctions){
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "",  'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
     
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.showdetails = false;
diff --git a/app/js/angular/index-controller.js b/app/js/angular/index-controller.js
index 1f4eda0..8ae9e17 100644
--- a/app/js/angular/index-controller.js
+++ b/app/js/angular/index-controller.js
@@ -8,11 +8,7 @@ function IndexController($scope,$resource,sharedProperties, sharedFunctions){
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "",  'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
   
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.showdetails = false;
diff --git a/app/js/angular/profile-controller.js b/app/js/angular/profile-controller.js
index bd5824f..76f13fe 100644
--- a/app/js/angular/profile-controller.js
+++ b/app/js/angular/profile-controller.js
@@ -10,11 +10,7 @@ function ProfileController($scope,$resource,sharedProperties, sharedFunctions){
   $scope.profile_user = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "g_hash": "", 'u_isadmin': false, 'u_isactive': false, 'u_changed': 0};
     
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.showdetails = false;
diff --git a/app/js/angular/search-controller.js b/app/js/angular/search-controller.js
index a484fdf..77c400b 100644
--- a/app/js/angular/search-controller.js
+++ b/app/js/angular/search-controller.js
@@ -8,11 +8,7 @@ function SearchController($scope,$resource,sharedProperties, sharedFunctions){
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "",  'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
   
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.showdetails = false;
diff --git a/app/js/angular/sketch-controller.js b/app/js/angular/sketch-controller.js
index c0c4334..06c43ba 100644
--- a/app/js/angular/sketch-controller.js
+++ b/app/js/angular/sketch-controller.js
@@ -8,11 +8,7 @@ function SketchController($scope,$resource,sharedProperties,sharedFunctions){
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
 
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.search = "";
diff --git a/app/js/angular/view-controller.js b/app/js/angular/view-controller.js
index f6c2be9..5d89d1a 100644
--- a/app/js/angular/view-controller.js
+++ b/app/js/angular/view-controller.js
@@ -8,11 +8,7 @@ function ViewController($scope,$resource,sharedProperties,sharedFunctions){
 	$scope.User = {"id": 0, "u_name" :"Anonymous User",  "u_realname" :"Anonymous User", "u_login": false, "u_email": "", "g_hash": "", 'u_created': "", 'u_lastlogin': "", 'u_logincount': "", 'u_version': 1.0, 'u_isadmin': false, 'u_isactive': false};
 
   $scope.backend_locations = [
-<<<<<<< HEAD
-    {url : 'ksketchweb.appspot.com', urlName : 'remote backend' },       
-=======
     {url : sharedProperties.getBackendUrl(), urlName : 'remote backend' },       
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     {url : 'localhost:8080', urlName : 'localhost' } ];
 
   $scope.search = "";
diff --git a/app/profile.html b/app/profile.html
index 0de36f2..ab117c9 100644
--- a/app/profile.html
+++ b/app/profile.html
@@ -48,45 +48,8 @@
     
     <script type="text/javascript" src="swf/swfobject.js"></script>
     
-<<<<<<< HEAD
-    <!-- SWF Save/Load JS Code Go HERE! This was originally taken from "KSketchCallBacks.js". -->
-    
-    <!-- script type="text/javascript" src="KSketchCallBacks.js"></script -->
-    <script type="text/javascript">
-      
-      //Function to trigger Janrain login plugin
-      
-      (function() {
-        if (typeof window.janrain !== 'object') window.janrain = {};
-        if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
-        
-        janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';
-        
-        function isReady() { janrain.ready = true; };
-        if (document.addEventListener) {
-          document.addEventListener("DOMContentLoaded", isReady, false);
-        } else {
-          window.attachEvent('onload', isReady);
-        }
-        
-        var e = document.createElement('script');
-        e.type = 'text/javascript';
-        e.id = 'janrainAuthWidget';
-        
-        if (document.location.protocol === 'https:') {
-          e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
-        } else {
-          e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
-        }
-        
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(e, s);
-      })();
-    </script>
-=======
     <script type="text/javascript" src="js/janrain/janrain_widget.js"></script>
     <script type="text/javascript" src="js/common/notification.js"></script>
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     
     <script type="text/javascript">
       function QueryString() {
diff --git a/app/search.html b/app/search.html
index 80d3d82..d2c4001 100644
--- a/app/search.html
+++ b/app/search.html
@@ -48,45 +48,8 @@
     
     <script type="text/javascript" src="swf/swfobject.js"></script>
     
-<<<<<<< HEAD
-    <!-- SWF Save/Load JS Code Go HERE! This was originally taken from "KSketchCallBacks.js". -->
-    
-    <!-- script type="text/javascript" src="KSketchCallBacks.js"></script -->
-    <script type="text/javascript">
-      
-      //Function to trigger Janrain login plugin
-      
-      (function() {
-        if (typeof window.janrain !== 'object') window.janrain = {};
-        if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
-        
-        janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';
-        
-        function isReady() { janrain.ready = true; };
-        if (document.addEventListener) {
-          document.addEventListener("DOMContentLoaded", isReady, false);
-        } else {
-          window.attachEvent('onload', isReady);
-        }
-        
-        var e = document.createElement('script');
-        e.type = 'text/javascript';
-        e.id = 'janrainAuthWidget';
-        
-        if (document.location.protocol === 'https:') {
-          e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
-        } else {
-          e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
-        }
-        
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(e, s);
-      })();
-    </script>
-=======
     <script type="text/javascript" src="js/janrain/janrain_widget.js"></script>
     <script type="text/javascript" src="js/common/notification.js"></script>
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     
     <script type="text/javascript">
       function QueryString() {
diff --git a/app/sketch.html b/app/sketch.html
index 4d1a950..ef479ee 100644
--- a/app/sketch.html
+++ b/app/sketch.html
@@ -49,45 +49,8 @@
     
     <script type="text/javascript" src="swf/swfobject.js"></script>
     
-<<<<<<< HEAD
-    <!-- SWF Save/Load JS Code Go HERE! This was originally taken from "KSketchCallBacks.js". -->
-    
-    <!-- script type="text/javascript" src="swf/KSketchCallBacks.js"></script -->
-    <script type="text/javascript">
-      
-      //Function to trigger Janrain login plugin
-      
-      (function() {
-        if (typeof window.janrain !== 'object') window.janrain = {};
-        if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
-        
-        janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';
-        
-        function isReady() { janrain.ready = true; };
-        if (document.addEventListener) {
-          document.addEventListener("DOMContentLoaded", isReady, false);
-        } else {
-          window.attachEvent('onload', isReady);
-        }
-        
-        var e = document.createElement('script');
-        e.type = 'text/javascript';
-        e.id = 'janrainAuthWidget';
-        
-        if (document.location.protocol === 'https:') {
-          e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
-        } else {
-          e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
-        }
-        
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(e, s);
-      })();
-    </script>
-=======
     <script type="text/javascript" src="js/janrain/janrain_widget.js"></script>
     <script type="text/javascript" src="js/common/notification.js"></script>
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
     
     <script type="text/javascript">
       window.onbeforeunload = function(){
diff --git a/app/view.html b/app/view.html
index 796a003..28f1c26 100644
--- a/app/view.html
+++ b/app/view.html
@@ -51,37 +51,7 @@
     <script type="text/javascript" src="js/janrain/janrain_widget.js"></script>
     <script type="text/javascript" src="js/common/notification.js"></script>
     
-<<<<<<< HEAD
-    <!-- script type="text/javascript" src="swf/KSketchCallBacks.js"></script -->
-    <script type="text/javascript">
-      
-      //Function to trigger Janrain login plugin
-      
-      (function() {
-        if (typeof window.janrain !== 'object') window.janrain = {};
-        if (typeof window.janrain.settings !== 'object') window.janrain.settings = {};
-        
-        janrain.settings.tokenUrl = 'http://ksketchweb.appspot.com/user/janrain';
-        
-        function isReady() { janrain.ready = true; };
-        if (document.addEventListener) {
-          document.addEventListener("DOMContentLoaded", isReady, false);
-        } else {
-          window.attachEvent('onload', isReady);
-        }
-        
-        var e = document.createElement('script');
-        e.type = 'text/javascript';
-        e.id = 'janrainAuthWidget';
-        
-        if (document.location.protocol === 'https:') {
-          e.src = 'https://rpxnow.com/js/lib/ksketch/engage.js';
-        } else {
-          e.src = 'http://widget-cdn.rpxnow.com/js/lib/ksketch/engage.js';
-        }
-=======
     <!-- SWF Save/Load JS Code Go HERE! This was originally taken from "KSketchCallBacks.js". -->
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
         
     <script type="text/javascript">
       //Function to trigger a save procedure in the flash object
diff --git a/rpx.py b/rpx.py
index 1d2e703..60fa371 100644
--- a/rpx.py
+++ b/rpx.py
@@ -37,11 +37,7 @@
     else:
         BASE_URL = 'localhost:%s' % os.environ['SERVER_PORT']
 else:
-<<<<<<< HEAD
     BASE_URL = 'ksketchweb.appspot.com'
-=======
-    BASE_URL = 'k-sketch-test.appspot.com'  #Change this to desired URL
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
 LOGIN_IFRAME = '<iframe src="http://gae-sesssions-demo.rpxnow.com/openid/embed?token_url=http%3A%2F%2F' + BASE_URL + '%2Frpx_response" scrolling="no" frameBorder="no" allowtransparency="true" style="width:400px;height:240px"></iframe>'
 
 class UTC(datetime.tzinfo):
@@ -399,11 +395,7 @@ def post(self): #/user/janrain
         url = 'https://rpxnow.com/api/v2/auth_info'
         args = {
             'format': 'json',
-<<<<<<< HEAD
-            'apiKey': '6c8271a5a23692efa86799f3438e3ac7b0525ac0',
-=======
-            'apiKey': '5fa9fabfa1141896e2d4025efd640ea5c1f54776',   #Change to api key provided in Janrain
->>>>>>> 57f7773d73da6e3f5bb6a146206c037708c7111c
+            'apiKey': '6c8271a5a23692efa86799f3438e3ac7b0525ac0',   #Change to api key provided in Janrain
             'token': token
         }
         r = urlfetch.fetch(url=url,