From a681ca011e9d291e19a86ee0fd3d9713bc6ffdbc Mon Sep 17 00:00:00 2001
From: ozhozh <ozhozh@12232710-3e20-11de-b438-597f59cd7555>
Date: Thu, 17 Sep 2009 20:29:59 +0000
Subject: [PATCH] Allow multiple short URLs for the same long URL. Fixes Issue
 35.

git-svn-id: http://yourls.googlecode.com/svn/trunk@181 12232710-3e20-11de-b438-597f59cd7555
---
 images/chart_bar_add.png   | Bin 0 -> 626 bytes
 includes/config-sample.php |   5 +++++
 includes/functions.php     |  21 ++++++++++++++++++--
 readme.html                |   4 ++++
 yourls-infos.php           |  38 +++++++++++++++++++++++++++++++++++--
 5 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 images/chart_bar_add.png

diff --git a/images/chart_bar_add.png b/images/chart_bar_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..d283e846a29f929681435f01c961faf486f274a6
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!1W80eR5;6}
zlRZn;VHAh2|Ks!c5{6I^86`vnI;292s6$`|Eqw=9$tfcH1}<&k&=P^rT7*kr5r{Zg
zWF<H>v?QT{`n=t5=RT+5AJm{BbjCAW=lY$)Da?%jsp?V9`R99<Rfz&QD^Zjn%Cp%^
z#fbnRDwBh!5LMJbvhi}GesTksl$e#hLm_3Oucw2i(~|>QPKcuTq)0YGwL-(m(ExjR
zzuclKmIO;e`|<-qG<-6WDBZP8-RFN8Ox*-kikvBOrm?96F<i)`3_UfYeq01gLLmYl
z-h(6<9;N9bJ}K>3M(~{l;?gmI5KBPtkOY!&7>tk<7nGEZ-Y!L3%G}C~r6|OhNInrl
zqM|;42>1ZrLyR<AijRhirG-z%Q2!d8Uo*DdK(_Z8&;fkQQ&snSatIJ3h#)SN22qLG
z2<>HVOl)v{XpD<zuJU&41?yi{IM@{`+AgQ!TxpOJ+ERQh0WK=-#tTLVN63}TNdGjs
zNQ_+@CpHeLSlj&-p^T$Wap@0Wzxjh&(aW8oIRNfWJ>kl^VKAerZ3ijA_ypt(BA64R
z80Y(Hh{E@82W;)EvAMI#{Pa^6UeD0o(N$jIQP(YWX%`EErHrMF_GXrsb|5O2g|h><
zS^xBg@!?5ceO{!qsIvO;9rd3>6eoS>vAY)*fLY))&;S<KAMecn0;<1#zjgxaaR2}S
M07*qoM6N<$g1QV8ZvX%Q

literal 0
HcmV?d00001

diff --git a/includes/config-sample.php b/includes/config-sample.php
index e6505a6..0767fe4 100644
--- a/includes/config-sample.php
+++ b/includes/config-sample.php
@@ -38,6 +38,11 @@
 /** Timezone GMT offset */
 define('YOURLS_HOURS_OFFSET', 0); 
 
+/** Allow multiple short URLs for a same long URL
+ ** Set to true to have only one pair of shortURL/longURL (default YOURLS behavior)
+ ** Set to false to allow multiple short URLs pointing to the same long URL (bit.ly behavior) */
+define('YOURLS_UNIQUE_URLS', true);
+
 /** Private means protected with login/pass as defined below. Set to false for public usage. */
 define('YOURLS_PRIVATE', true);
 
diff --git a/includes/functions.php b/includes/functions.php
index fca5c6a..e66c3ed 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -215,8 +215,8 @@ function yourls_add_new_link( $url, $keyword = '' ) {
 	$ip = yourls_get_IP();
 	$return = array();
 
-	// New URL : store it
-	if( !$url_exists ) {
+	// New URL : store it -- or: URL exists, but duplicates allowed
+	if( !$url_exists || yourls_allow_duplicate_longurls() ) {
 
 		// Custom keyword provided
 		if ( $keyword ) {
@@ -1203,4 +1203,21 @@ function yourls_trim_long_string( $string, $length = 60, $append = '[...]' ) {
 		$string = substr( $string, 0, $length - strlen( $append ) ) . $append;	
 	}
 	return $string;
+}
+
+// Allow several short URLs for the same long URL ?
+function yourls_allow_duplicate_longurls() {
+	return ( defined( 'YOURLS_UNIQUE_URLS' ) && YOURLS_UNIQUE_URLS == false );
+}
+
+// Return list of all shorturls associated to the same long URL. Returns NULL or array of keywords.
+function yourls_get_duplicate_keywords( $longurl ) {
+	if( !yourls_allow_duplicate_longurls() )
+		return NULL;
+	
+	global $ydb;
+	$longurl = mysql_real_escape_string( yourls_sanitize_url($longurl) );
+	$table = YOURLS_DB_TABLE_URL;
+	
+	return $ydb->get_col( "SELECT `keyword` FROM `$table` WHERE `url` = '$longurl'" );
 }
\ No newline at end of file
diff --git a/readme.html b/readme.html
index 5d64e16..c5e2467 100644
--- a/readme.html
+++ b/readme.html
@@ -309,6 +309,10 @@
 				<li><code>YOURLS_PRIVATE</code><br/>
 				Private means protected with login/pass as defined below. Set to false for public usage<br/>
 				<em>Example:</em> <tt>'true'</tt></li>
+				<li><code>YOURLS_UNIQUE_URLS</code><br/>
+				Allow multiple short URLs for a same long URL<br/>
+				Set to <tt>true</tt> to allow only one pair of shortURL/longURL (default YOURLS behavior), or to <tt>false</tt> to allow creation of multiple short URLs pointing to the same long URL (as bit.ly does)<br/>
+				<em>Example:</em> <tt>'true'</tt></li>
 				<li><code>YOURLS_COOKIEKEY</code><br/>
 				A random secret hash used to encrypt cookies. You don't have to remember it, make it long and complicated. Hint: generate a unique one at <a href="http://yourls.org/cookie">http://yourls.org/cookie</a><br/>
 				<em>Example:</em> <tt>'qQ4KhL_pu|s@Zm7n#%:b^{A[vhm'</tt></li>
diff --git a/yourls-infos.php b/yourls-infos.php
index ce55728..eb79765 100644
--- a/yourls-infos.php
+++ b/yourls-infos.php
@@ -6,18 +6,35 @@
 
 if ( !isset( $_GET['id'] ) )
 	yourls_redirect( YOURLS_SITE, 307 );
+	
+$aggregate = false;
+if ( isset( $_GET['all'] ) && $_GET['all'] == 1 && yourls_allow_duplicate_longurls() )
+	$aggregate = true;
 
 // Get basic infos for this shortened URL
 $keyword = yourls_sanitize_string( $_GET['id'] );
 $longurl = yourls_get_keyword_longurl( $keyword );
 $clicks = yourls_get_keyword_clicks( $keyword );
 $timestamp = yourls_get_keyword_timestamp( $keyword );
+
 if ( $longurl === false )
 	yourls_redirect( YOURLS_SITE, 307 );
+
+// Duplicate keywords, if applicable
+$keyword_list = yourls_get_duplicate_keywords( $longurl );
 	
 // Fetch all information from the table log
 $table = YOURLS_DB_TABLE_LOG;
-$hits = $ydb->get_results( "SELECT `click_time`, `referrer`, `user_agent`, `country_code` FROM `$table` WHERE `shorturl` = '$keyword';" );
+
+
+if( $aggregate ) {
+	$keywords = join( "', '", $keyword_list );
+	// Fetch information for all keywords pointing to $longurl
+	$hits = $ydb->get_results( "SELECT `shorturl`, `click_time`, `referrer`, `user_agent`, `country_code` FROM `$table` WHERE `shorturl` IN ( '$keywords' );" );
+} else {
+	// Fetch information for current keyword only
+	$hits = $ydb->get_results( "SELECT `click_time`, `referrer`, `user_agent`, `country_code` FROM `$table` WHERE `shorturl` = '$keyword';" );
+}
 
 $referrers = array();
 $direct = 0;
@@ -145,7 +162,24 @@
 
 <h2 id="informations">Informations</h2>
 
-<h3>Short URL: <img class="fix_images" src="<?php echo YOURLS_SITE; ?>/images/favicon.gif"/> <?php yourls_html_link( YOURLS_SITE."/$keyword" ); ?></h3>
+<h3>Short URL: <img src="<?php echo YOURLS_SITE; ?>/images/favicon.gif"/>
+<?php if( $aggregate ) {
+	$i = 0;
+	foreach( $keyword_list as $k ) {
+		$i++;
+		if ( $i == 1 ) {
+			yourls_html_link( YOURLS_SITE."/$k" );
+		} else {
+			yourls_html_link( YOURLS_SITE."/$k", "/$k" );
+		}
+		if ( $i < count( $keyword_list ) )
+			echo ' + ';
+	}
+} else {
+	yourls_html_link( YOURLS_SITE."/$keyword" );
+	if( count( $keyword_list ) > 1 )
+		echo ' <a href="'. YOURLS_SITE .'/'.$keyword.'+all" title="Aggregate stats for duplicate short URLs"><img src="' . YOURLS_SITE . '/images/chart_bar_add.png" border="0" /></a>';
+} ?></h3>
 <h3 id="longurl">Long URL: <img class="fix_images" src="<?php echo yourls_get_domain( $longurl, true );?>/favicon.ico"/> <?php yourls_html_link( $longurl, '', 'longurl' ); ?></h3>
 
 <div id="tabs">
-- 
2.45.0