Hump.fm: remove remaining dumpfm attributions

11 files changed, 18 insertions, 17 deletions

diff --git a/template/banner.old.st b/template/banner.old.st
index eaee156..8917685 100755
--- a/template/banner.old.st
+++ b/template/banner.old.st
@@ -67,7 +67,7 @@
       
       $if(user_nick)$
       <!--  <div id="facebooklike">
-            <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149%3Fref%3Dts&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+            <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
       </div> -->
 
 
diff --git a/template/banner.st b/template/banner.st
index 17b8ff1..b55463f 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -25,7 +25,7 @@
 </div>
 
 <!--
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
 -->
         
 
@@ -67,7 +67,7 @@
  <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
      <a href="/register" id="disregister">Register!</a>    -->  
 	        $endif$     
 
diff --git a/template/banner_dis.st b/template/banner_dis.st
index ecb0642..cbc8d63 100755
--- a/template/banner_dis.st
+++ b/template/banner_dis.st
@@ -43,7 +43,7 @@ $endif$
     
 	    $if(user_nick)$
 	  <!--  <div id="facebooklike">
-	    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149%3Fref%3Dts&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+	    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
 	    </div> ---!>
 
     <div id="dissearchbox">
diff --git a/template/frontpage copy.st b/template/frontpage copy.st
index 0cea7f0..64d5f73 100755
--- a/template/frontpage copy.st
+++ b/template/frontpage copy.st
@@ -66,7 +66,7 @@
 	    <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
 	  </a>
         </div>
-        <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+        <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
 	$else$
 	                   <!--
 <div id="toplinks">	 
@@ -78,7 +78,7 @@
 <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>-->
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
     <!--       <a href="$domain$/register" id="disregister">Register!</a>-->
 	   $endif$     
 
diff --git a/template/frontpage.st b/template/frontpage.st
index 358b06f..a1c58aa 100755
--- a/template/frontpage.st
+++ b/template/frontpage.st
@@ -67,7 +67,7 @@
 	  </a>
         </div>
 <!--
-	        <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+	        <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
 -->
 	$else$
 	                   <!--
@@ -80,7 +80,7 @@
 <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>-->
-	    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+	    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
     <!--       <a href="$domain$/register" id="disregister">Register!</a>-->
 	   $endif$     
 
diff --git a/template/frontpagePROFILE.st b/template/frontpagePROFILE.st
index 0f9dd9d..727843c 100755
--- a/template/frontpagePROFILE.st
+++ b/template/frontpagePROFILE.st
@@ -82,7 +82,7 @@ $endif$
 	        </a>
 </div>
 
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
             
 	        $else$
 	                   
@@ -95,7 +95,7 @@ $endif$
 <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
            <a href="/register" id="disregister">Register!</a>
 	        $endif$     
 
diff --git a/template/frontpage_halloffame.st b/template/frontpage_halloffame.st
index 8d028a6..a74eb94 100755
--- a/template/frontpage_halloffame.st
+++ b/template/frontpage_halloffame.st
@@ -66,7 +66,7 @@
 	    <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
 	  </a>
         </div>
-        <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+        <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
 	$else$
 	                   <!--
 <div id="toplinks">	 
@@ -78,7 +78,7 @@
 <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>-->
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
     <!--       <a href="$domain$/register" id="disregister">Register!</a>-->
 	   $endif$     
 
diff --git a/template/newlog.st b/template/newlog.st
index 726c7f0..559c4b7 100755
--- a/template/newlog.st
+++ b/template/newlog.st
@@ -76,7 +76,7 @@ window.location = "/error/ie";
 	        </a>
 </div>
 
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
             
 	        $else$
 	        <a href="/register" id="disregister">Register</a>
diff --git a/template/reset.st b/template/reset.st
index a388122..6aace41 100755
--- a/template/reset.st
+++ b/template/reset.st
@@ -21,7 +21,8 @@
                 return false;
             }
             var nick = '$nick$';
-            var hash = hex_sha1(nick + '\$' + p1 + '\$dumpfm');
+            var salt = (typeof window.AuthSalt === 'string' && window.AuthSalt) ? window.AuthSalt : 'humpfm';
+            var hash = hex_sha1(nick + '\$' + p1 + '\$' + salt);
             jQuery('#hash').val(hash);
             return true;
         });
diff --git a/template/simplerlog.st b/template/simplerlog.st
index c5f633e..d54f6b3 100755
--- a/template/simplerlog.st
+++ b/template/simplerlog.st
@@ -82,7 +82,7 @@ $endif$
 	        </a>
 </div>
 
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
             
 	        $else$
 	                   
@@ -95,7 +95,7 @@ $endif$
 <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>
-    <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
+    <iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fhump.fm%2F&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" allowTransparency="true" id="fblike"></iframe>
            <a href="/register" id="disregister">Register!</a>
 	        $endif$     
 
diff --git a/template/tinychat.st b/template/tinychat.st
index 9af7f4d..ab75ac1 100755
--- a/template/tinychat.st
+++ b/template/tinychat.st
@@ -6,7 +6,7 @@ $if(user_nick)$
   , oper: "none"
   , urlsuper: "/"
   , join: "auto"
-  , nick: "dumpfm"
+  , nick: "humpfm"
   };
   
 </script>