Changed out the favicon for one not containing gemerson (just a trial…

… at this point), fleshed some tricks to enable copying of the link, unfortunately it's looking like we're probably going to have to use flash, furthered the MVC cause, as well as moved some layout stuff out into separate stylesheets, also added forced line breaks on recents page.
bontakun · Feb 11, 2009 · b6b435b · b6b435b
1 parent b166f0f
commit b6b435b
Show file tree

Hide file tree

Showing 17 changed files with 178 additions and 107 deletions.
diff --git a/create.php b/create.php
@@ -1,39 +1,20 @@
 <?php /* controller/model */ ?>
 <?php
-	require("library.php");
+	require("models/library.php");
 
 	$url = trim($_REQUEST["url"]);
 
 	//check to see if they're giving us a gemerit link, first
-	if (!(preg_match("/http:\/\/gemerit.com\/[0-9abcdef]+$/", $url))) {
+	if (!(preg_match("/http:\/\/gemerit.com\/[0-9abcdef]+$/", $url)) && strlen($url) > 0) {
 
 		//we're going to preppend http if they gave us a url that doesn't already have it
 		if (!preg_match("/^https?:\/\//", $url))
 			$url = "http://" . $url;
 
-		//attempt to retrieve the item
-		$query = "SELECT id FROM urls where url = '" . 
-				addslashes($url) . "';";
-		$result = mysql_query($query) or die('Query failed: ' . mysql_error());
+		//attempt shorten
+		$hexCode = createLink($url);
 
-		//if it's not there we need to insert and retrieve
-		if (mysql_num_rows($result) == 0)
-		{
-			//insert
-			$query = "INSERT INTO urls (url) VALUES ('" . 
-				addslashes($url) . "');";
-			mysql_query($query) or die('Query failed: ' . mysql_error());
-
-			//get back the thing we just inserted
-			$query = "SELECT id FROM urls where url = '" . 
-				addslashes($url) . "';";
-			$result = mysql_query($query) or die('Query failed: ' . mysql_error());	
-		}
-
-		//get results in easy to use array format
-		$resultArray = mysql_fetch_assoc($result);
-
-		$url = "http://" . $_SERVER["SERVER_NAME"]  . "/" . dechex($resultArray["id"]);
+		$url = "http://" . $_SERVER["SERVER_NAME"]  . "/" . $hexCode;
 
 		//Special iPhone Twitterific integration pending more work
 		if (stristr($_SERVER["HTTP_USER_AGENT"], "iPhone")) {
@@ -43,6 +24,4 @@
 
 	//push to view
 	require("views/createSuccess.php");
-
-	mysql_close($link);
 ?>
diff --git a/favicon.ico b/favicon.ico
diff --git a/get.php b/get.php
@@ -1,19 +1,11 @@
 <?php
-	require("library.php");
+	require("models/library.php");
 
-	//do our search
-	$query = "SELECT url FROM urls where id = " . hexdec($_REQUEST["hash"]) . ";";
-
-	$result = mysql_query($query) or die('Query failed: ' . mysql_error());
-	$resultArray = mysql_fetch_assoc($result);
-
-	//cleanup our URL
-	$url = stripslashes($resultArray["url"]);
+	$url = getLink($_REQUEST["hash"]);
 
 	//check for attempt at making a loop, this is the only hardcoded url in the project
 	if (!(preg_match("/gemerit\.com\/[0-9abcdef]+$/", $url)))
 		header( 'Location: ' . $url, true);
 	else
 		echo($url);
-	mysql_close($link);
 ?>
diff --git a/img/copy.png b/img/copy.png
diff --git a/index.htm b/index.htm
@@ -2,7 +2,9 @@
 	<head>
 		<title>Gemer It: URL Shortening Service</title>
 		<meta name="viewport" content="width=630" />
-		<link rel="stylesheet" type="text/css" href="style/style.css" />
+		<link rel="stylesheet" type="text/css" href="style/global.css" />
+		<link rel="stylesheet" type="text/css" href="style/index.css" />
+		<meta name="version" content="1.11 beta">
 	</head>
 	<body>
 		<form name="gemerForm" method="get" action="create.php">

diff --git a/library.php b/library.php
diff --git a/models/config.php b/models/config.php
@@ -0,0 +1,6 @@
+<?php 
+	$DB_USER = "database username";
+	$DB_PASS = "super secret password";
+	$DB_HOST = "database server";
+	$DB_NAME = "database name";
+?>
diff --git a/models/library.php b/models/library.php
@@ -0,0 +1,90 @@
+<?
+	function dbConnect() {
+		require("config.php");
+
+		$link = mysql_connect($DB_HOST, $DB_USER, $DB_PASS) 
+			or die('Could not connect: ' . mysql_error());
+		mysql_select_db($DB_NAME) 
+			or die('Could not select database');
+		return $link;
+	}
+
+	function dbDisconnect($link) {
+		mysql_close($link);
+	}
+
+	//
+	// Create Link function
+	//
+	function createLink($url) {
+		$link = dbConnect();
+
+		//attempt to retrieve the item
+		$query = "SELECT id FROM urls where url = '" . 
+				addslashes($url) . "';";
+		$result = mysql_query($query) or die('Query failed: ' . mysql_error());
+
+		//if it's not there we need to insert and retrieve
+		if (mysql_num_rows($result) == 0)
+		{
+			//insert
+			$query = "INSERT INTO urls (url) VALUES ('" . 
+				addslashes($url) . "');";
+			mysql_query($query) or die('Query failed: ' . mysql_error());
+
+			//get back the thing we just inserted
+			$query = "SELECT id FROM urls where url = '" . 
+				addslashes($url) . "';";
+			$result = mysql_query($query) or die('Query failed: ' . mysql_error());	
+		}
+
+		//get results in easy to use array format
+		$resultArray = mysql_fetch_assoc($result);
+
+		dbDisconnect($link);
+		return dechex($resultArray["id"]);
+	}
+
+	//
+	// Get Link function
+	//
+	function getLink($hash) {
+		$link = dbConnect();
+
+		//do our search
+		$query = "SELECT url FROM urls where id = " . hexdec($hash) . ";";
+
+		$result = mysql_query($query) or die('Query failed: ' . mysql_error());
+		$resultArray = mysql_fetch_assoc($result);
+
+		//cleanup our URL
+		$url = stripslashes($resultArray["url"]);
+
+		dbDisconnect($link);
+		return $url;
+	}
+
+	//
+	// Get Recent Links function
+	//
+	function getRecents($count) {
+		$link = dbConnect();
+
+		$recentShortens = array();
+
+		$query = "SELECT id, url FROM urls ORDER BY id DESC LIMIT " . $count . ";";
+		$result = mysql_query($query) or die('Query failed: ' . mysql_error());
+
+		$i = 0;
+		while ($resultArray = mysql_fetch_array($result, MYSQL_ASSOC)) {
+			$recentShortens[$i] = $resultArray;
+			//add the hash too.
+			$recentShortens[$i]["hash"] = dechex($resultArray["id"]);
+			$i++;
+		}
+
+		dbDisconnect($link);
+		return $recentShortens;
+	}
+
+?>
diff --git a/recents.php b/recents.php
@@ -1,12 +1,9 @@
 <?php /* controller/model */ ?>
 <?php 
-	require("library.php");
+	require("models/library.php");
 
-	$query = "SELECT id, url FROM urls ORDER BY id DESC LIMIT 20;";
-	$result = mysql_query($query) or die('Query failed: ' . mysql_error());
+	$recents = getRecents(20);
 
 	//push to view
 	require("views/recents.php");
-
-	mysql_close($link);
 ?>
diff --git a/style/createSuccess.css b/style/createSuccess.css
diff --git a/style/global.css b/style/global.css
@@ -0,0 +1,26 @@
+html, body {
+  font-size: 1.0em;
+  font-family: Helvetica, Verdana, Arial, sans-serif;
+}
+
+a, a:visited {
+  font-weight: 900;
+  color: #676767;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #666;
+  text-decoration: underline;
+}
+
+div.container {
+  text-align: center;
+  max-width: 600px;
+  margin-top: 30px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+
+
diff --git a/style/index.css b/style/index.css
@@ -0,0 +1,14 @@
+div.explanations h2, div.explanations p {
+  text-align: left;
+}	
+
+div.urlSection input[type="text"] {
+  color: #676767;
+  font-size: 18pt;
+  padding: 0.2em 0.4em 0.2em 0.4em;
+  width: 100%;
+}
+
+div.urlSection input[type="submit"]{
+  font-size: 18pt;
+}
diff --git a/style/recents.css b/style/recents.css
@@ -0,0 +1,11 @@
+table.results {
+	vertical-align: middle;
+	border-spacing: 2px 2px;
+	border-color: gray;
+	border-collapse: separate;
+}
+
+td.id {
+	text-align: center;
+	min-width: 75px;
+}
diff --git a/style/style.css b/style/style.css
diff --git a/swf/clipboard.swf b/swf/clipboard.swf
diff --git a/views/createSuccess.php b/views/createSuccess.php
@@ -2,9 +2,9 @@
 <html>
 	<head>
 		<title>Gemer It: Results</title>
-		<link rel="stylesheet" type="text/css" href="style/style.css" />
+		<link rel="stylesheet" type="text/css" href="style/global.css" />
 		<meta name="viewport" content="width=630" />
-		<script type="text/javascript" >
+		<script type="text/javascript">
 			var link = "<?php echo($url); ?>";
 		</script>
 	</head>
@@ -13,6 +13,12 @@
 		<h2>Your Link Is:</h2>
 		<p id="link">
 			<span><?php echo($url); ?></span>
+			<!--
+			<div class="flashBox">
+				<embed src="http://gemerit.com/swf/clipboard.swf" flashvars="txtToCopy=<?php echo $url; ?>" width="60" height="30">
+				</embed>
+			</div>
+			-->
 		</p>
 
 <?php 

diff --git a/views/recents.php b/views/recents.php
@@ -2,7 +2,8 @@
 <html>
 	<head>
 		<title>Gemer It: Recent Links</title>
-		<link rel="stylesheet" type="text/css" href="style/style.css" />
+		<link rel="stylesheet" type="text/css" href="style/global.css" />
+		<link rel="stylesheet" type="text/css" href="style/recents.css" />
 		<meta name="viewport" content="width=630" />
 	</head>
 	<body>
@@ -15,15 +16,18 @@
 			<th>URL</th>
 		</tr>
 <?php
-	//if I were less lazy this would build an array and that would keep this controller/model seepage 
-	while ($resultArray = mysql_fetch_array($result, MYSQL_ASSOC)) {
-		$hash = dechex($resultArray["id"]);
-		$url = $resultArray["url"];
+	foreach ($recents as $recent) {
 ?>
 		<tr>
-			<td class='id'><?php echo($hash); ?></td>
+			<td class='id'><?php echo($recent["hash"]); ?></td>
 			<td class='url'>
-				<a href='<?php echo($url); ?>'><?php echo($url); ?></a>
+				<a href='<?php echo($recent["url"]); ?>'>
+					<?php 
+						//use chunk_split to split up the string into segments of 76 chars each
+						//this allows linebreaking, which makes it look much much nicer.
+						echo(chunk_split($recent["url"])); 
+					?>
+				</a>
 			</td>
 		</tr>
 <?php