From dfd2fbae1d760ad18fa0866b9c1ba913c2de86f7 Mon Sep 17 00:00:00 2001
From: Dylan Lloyd <dylan@disinclined.org>
Date: Wed, 8 Mar 2017 13:00:51 -0500
Subject: [PATCH] s/dylansserver/disinclined/g, should really be parametized

---
 404.php               |  2 +-
 model/rss.php         |  2 +-
 view/analytics.php    |  4 ++--
 view/archive.php      |  5 ++---
 view/comment-form.php |  2 +-
 view/index.php        | 12 ++++++++----
 view/note.php         |  6 +++---
 view/page.php         |  4 ++--
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/404.php b/404.php
index 4d293c7..9cd8a80 100644
--- a/404.php
+++ b/404.php
@@ -55,7 +55,7 @@
     "font-size:20em;font-family:'MuseoSlab500';">sorry</span><br>
     <br>
     <span style="font-size:3em;font-family:'InconsolataMedium'">can't find that. maybe try
-    <a href="http://dylansserver.com">here</a>?</span><br>
+    <a href="http://disinclined.org">here</a>?</span><br>
   </div>
 </body>
 </html>
diff --git a/model/rss.php b/model/rss.php
index a169ead..9fa7b49 100644
--- a/model/rss.php
+++ b/model/rss.php
@@ -14,7 +14,7 @@ class rss extends model {
 					  FROM notes ORDER BY date_posted DESC
 					  LIMIT 5");
 	while ($entry = $result->fetch_object()) {
-	  $entry->url = "http://dylansserver.com/note/" . $entry->url;
+	  $entry->url = "http://disinclined.org/note/" . $entry->url;
 	  $entry->text = strip_tags($entry->text);
 	  $end_of_first_sentence = strpos($entry->text, '.');
 	  if ($end_of_first_sentence) {
diff --git a/view/analytics.php b/view/analytics.php
index b235fd1..c39836f 100644
--- a/view/analytics.php
+++ b/view/analytics.php
@@ -4,12 +4,12 @@
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://dylansserver.com/piwik/";
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://disinclined.org/piwik/";
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', 1]);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('body')[0]; g.type='text/javascript';
     g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.appendChild(g);
   })();
 </script>
-<noscript><p><img src="http://dylansserver.com/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+<noscript><p><img src="http://disinclined.org/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
 <!-- End Piwik Code -->
diff --git a/view/archive.php b/view/archive.php
index 043cefc..3a58484 100644
--- a/view/archive.php
+++ b/view/archive.php
@@ -52,13 +52,12 @@
         ?>
       </div>
       <div id="contact_me"><h1><a href=
-      "mailto:dylan@dylansserver.com">dylan</a></h1><a href=
-      "mailto:dylan@dylansserver.com">@dylansserver.com</a>
+      "mailto:dylan@disinclined.org">dylan</a></h1><a href=
+      "mailto:dylan@disinclined.org">@disinclined.org</a>
       </div>
     </div>
     <br>
     <br>
   </div>
-<? include 'analytics.php' ?>
 </body>
 </html>
diff --git a/view/comment-form.php b/view/comment-form.php
index 745226b..611318b 100644
--- a/view/comment-form.php
+++ b/view/comment-form.php
@@ -8,7 +8,7 @@ Recaptcha.create("$publickey",
    });
 </script>
 <?php
-require_once('/srv/http/dylansserver.com/includes/recaptchalib.php');
+require_once('/srv/http/disinclined.org/includes/recaptchalib.php');
 $url = $this->url . "verify";
 ?>
 <form id='comment_form'  method='post' action='$url'>
diff --git a/view/index.php b/view/index.php
index e755393..b3cbb51 100644
--- a/view/index.php
+++ b/view/index.php
@@ -38,8 +38,10 @@
         ?>
 
         <li><h3>code repositories:</h3></li>
-        <li><a href="/git/">git://dylansserver.com</a></li>
-        <li><a href="https://github.com/nospampleasemam">git://github.com/nospampleasemam</a></li>
+        <div class="indent">
+          <li><a href="/git/">git://disinclined.org</a></li>
+          <li><a href="https://github.com/majuscule">git://github.com</a></li>
+        </div>
 
         <li><h3>some notes:</h3></li>
         <li><a href="/notes/">here</a> [<a href="/notes/rss">rss</a>]</li>
@@ -48,8 +50,10 @@
         <li>[<a href="/resume.html">html</a>] [<a href="/resume">pdf</a>]</li>
 
         <li><h3>contact:</h3></li>
-        <li><a href="mailto:dylan@disinclined.org">email</a>
-            [<a href="/pubkey.pgp.asc">pgp</a>]</li>
+        <div class="indent">
+          <li><a href="mailto:dylan@disinclined.org">email</a>
+              [<a href="/pubkey.pgp.asc">pgp</a>]</li>
+        </div>
       </ul>
     </div>
     <br>
diff --git a/view/note.php b/view/note.php
index ac4fcb6..6247cc0 100644
--- a/view/note.php
+++ b/view/note.php
@@ -28,7 +28,7 @@
 
 <body onload="return typeof highlight == 'function' ? highlight() : true">
   <div id="structure">
-    <a class=title href="<?php echo $this->home_link ?>"><?php echo $this->title ?></a>
+    <a class=title href="<?php echo $this->home_link ?>"><?php echo $this->site_title ?></a>
     <div id="content">
       <div id='notes'>
         <div class='note'>
@@ -48,8 +48,8 @@
           </h1>
         </div>
         <div id="contact_me"><h1><a href=
-        "mailto:dylan@dylansserver.com">dylan</a></h1><a href=
-        "mailto:dylan@dylansserver.com">@dylansserver.com</a>
+        "mailto:dylan@disinclined.org">dylan</a></h1><a href=
+        "mailto:dylan@disinclined.org">@disinclined.org</a>
         </div>
       </div>
     <br>
diff --git a/view/page.php b/view/page.php
index 5f25de1..92ad171 100644
--- a/view/page.php
+++ b/view/page.php
@@ -63,8 +63,8 @@
     </h1>
     </div>
       <div id="contact_me"><h1><a href=
-      "mailto:dylan@dylansserver.com">dylan</a></h1><a href=
-      "mailto:dylan@dylansserver.com">@dylansserver.com</a>
+      "mailto:dylan@disinclined.org">dylan</a></h1><a href=
+      "mailto:dylan@disinclined.org">@disinclined.org</a>
       </div>
     </div>
     <br>
-- 
2.30.2