From db1565dbe9f69c150d8649ebcef47d78a106d91d Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 18:06:54 +0000 Subject: [PATCH 01/43] A new .gitignore to prepare for additional files on this branch --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6277bc3..695924d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,7 @@ # Except Infinity Squared !public/ !index.php +!result.php +!header.php +!footer.php !.gitignore From 1ee65b690d3d33fcbbc128cab7f54df5f951c4ee Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 18:15:39 +0000 Subject: [PATCH 02/43] Rudimentary basic two-file structure. This should make the code more readable and easier to edit, but we'll see how we go. It's called two file since only two files here are important. I've split the form and the results page together, and the header.php and footer.php are just additional files so we don't double the code. --- footer.php | 16 ++++ header.php | 167 ++++++++++++++++++++++++++++++++++ index.php | 259 ++--------------------------------------------------- result.php | 56 ++++++++++++ 4 files changed, 248 insertions(+), 250 deletions(-) create mode 100644 footer.php create mode 100644 header.php create mode 100644 result.php diff --git a/footer.php b/footer.php new file mode 100644 index 0000000..89af061 --- /dev/null +++ b/footer.php @@ -0,0 +1,16 @@ +
+

+

+ + + + + +
+ +
+

YOURLS. Design by Tom Slominski. Also used: Formalize and qTip². Find this theme on GitHub.', 'isq_translation') ?>

+
+ + + \ No newline at end of file diff --git a/header.php b/header.php new file mode 100644 index 0000000..4ec7ed5 --- /dev/null +++ b/header.php @@ -0,0 +1,167 @@ + +' . yourls__( 'An error has occured :(', 'isq_translation') . ''; + +if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { + $error = '

' . yourls__( 'URL shortened successfully', 'isq_translation') . '

' . yourls__( 'View the details of your short URL below.', 'isq_translation') . '

'; + } elseif ( $message = $url. yourls__( 'already exists in database', 'isq_translation') ) { + $error = $genericerror . '

' . yourls__( 'This URL already exists in this database. This website does not allow a single URL to have multiple short links.', 'isq_translation') . '

'; + } elseif ( $message = yourls__( 'Short URL', 'isq_translation') . $url . yourls__( 'already exists in database or is reserved', 'isq_translation') ) { + $error = $genericerror . '

' . yourls__( 'This short URL already exists in this database or is reserved. This website does not allow a single URL to have multiple short links. It could\'ve also been reserved by the admin.', 'isq_translation') . '

'; + } elseif ( $message = yourls__( 'Missing URL input', 'isq_translation') ) { + $error = $genericerror . '

' . yourls__( 'You did not enter the URL you want to shorten or the server lost it. Please try again.', 'isq_translation') . '

'; + } elseif ( $message = yourls__( 'This URL is a short URL', 'isq_translation') ) { + $error = $genericerror . '

' . yourls__( 'You cannot shorten a short URL!', 'isq_translation') . '

'; + } +?> + + + +<?php echo $ISQtitle; ?> + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
+
+
\ No newline at end of file diff --git a/index.php b/index.php index 6b22030..7d19f2a 100644 --- a/index.php +++ b/index.php @@ -1,227 +1,6 @@ - -' . yourls__( 'An error has occured :(', 'isq_translation') . ''; - -if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { - $error = '

' . yourls__( 'URL shortened successfully', 'isq_translation') . '

' . yourls__( 'View the details of your short URL below.', 'isq_translation') . '

'; - } elseif ( $message = $url. yourls__( 'already exists in database', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'This URL already exists in this database. This website does not allow a single URL to have multiple short links.', 'isq_translation') . '

'; - } elseif ( $message = yourls__( 'Short URL', 'isq_translation') . $url . yourls__( 'already exists in database or is reserved', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'This short URL already exists in this database or is reserved. This website does not allow a single URL to have multiple short links. It could\'ve also been reserved by the admin.', 'isq_translation') . '

'; - } elseif ( $message = yourls__( 'Missing URL input', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'You did not enter the URL you want to shorten or the server lost it. Please try again.', 'isq_translation') . '

'; - } elseif ( $message = yourls__( 'This URL is a short URL', 'isq_translation') ) { - $error = $genericerror . '

' . yourls__( 'You cannot shorten a short URL!', 'isq_translation') . '

'; - } -?> - - - -<?php echo $ISQtitle; ?> - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-

-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-
-
- ' . yourls__( 'Antispam check failed!', 'isq_translation') . '

'); - } - - $url = yourls_sanitize_url( $_REQUEST['url'] ); - $keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; - $title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; - $return = yourls_add_new_link( $url, $keyword, $title ); - - $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; - $message = isset( $return['message'] ) ? $return['message'] : ''; - $title = isset( $return['title'] ) ? $return['title'] : ''; - - if (!empty(ISQ::$social['facebook'])) { $ISQfacebook = ''; } - if (!empty(ISQ::$social['twitter'])) { $ISQtwitter = ''; } - if (!empty(ISQ::$social['plus'])) { $ISQplus = '
'; } - if (!empty(ISQ::$social['linkedin'])) { $ISQlinkedin = ''; } - if (!empty(ISQ::$general['qr'])) { $ISQqr = '

' . yourls__( 'QR code', 'isq-translation' ) . '

' . yourls__( 'Share your link with external devices', 'isq-translation' ) . '

QR'; } - if (!empty(ISQ::$general['clipboard'])) { $ISQlongcopy = ''; } - if (!empty(ISQ::$general['clipboard'])) { $ISQshortcopy = ''; } - if (!empty(ISQ::$general['clipboard'])) { $ISQstatscopy = ''; } - - $output_original = yourls__( 'Original URL:', 'isq_translation'); - $output_short = yourls__( 'Short URL:', 'isq_translation'); - /* translators: This is short for statistics */ - $output_stats = yourls__( 'Stats:', 'isq_translation'); - $output_copy = yourls__( 'Click on a link and press Ctrl+C to quickly copy it.', 'isq_translation'); - $output_share_h2 = yourls__( 'Share', 'isq_translation'); - $output_share_p = yourls__( 'Share your short URL', 'isq_translation'); - - echo << -

$ISQlongcopy

-

$ISQshortcopy

-

$ISQstatscopy

-

$output_copy

-
- - $ISQqr - -

$output_share_h2

-

$output_share_p

- $ISQfacebook - $ISQtwitter - $ISQplus - $ISQlinkedin -RESULT; - - // Part to be executed when no form has been submitted - } else { - $site = YOURLS_SITE; $site_enter = yourls__( 'Enter a new URL to shorten', 'isq_translation'); @@ -233,40 +12,20 @@ RESULT; $site_title = yourls__( 'Optional title:', 'isq_translation'); $site_title_hover = yourls__( 'Optional title used when sharing a link from YOURLS', 'isq_translation'); $site_submit = yourls__( 'Shorten', 'isq_translation'); - $antispam_title = yourls__( 'Antispam check', 'isq_translation'); - $antispam_value = yourls__( 'Are you a bot or a human?', 'isq_translation'); + $antispam_title = yourls__( 'This is an antispam check. Sorry, we have to do this to prevent the database being overrun by bots!', 'isq_translation'); + $antispam_value = yourls__( 'reCAPTCHA', 'isq_translation'); $antispam_bot = yourls__( 'Bot', 'isq_translation'); $antispam_human = yourls__( 'Human', 'isq_translation'); +?> - echo <<$site_enter +

$site_hover

-
+

-

$antispam_bot $antispam_human

+

$captcha

-HTML; - } - ?> -
- -
-

-

- - - - - -
- -
-

YOURLS. Design by Tom Slominski. Also used: Formalize and qTip². Find this theme on GitHub.', 'isq_translation') ?>

-
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/result.php b/result.php new file mode 100644 index 0000000..5a75d9f --- /dev/null +++ b/result.php @@ -0,0 +1,56 @@ +' . yourls__( 'Antispam check failed!', 'isq_translation') . '

'); + // } + + $url = yourls_sanitize_url( $_REQUEST['url'] ); + $keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; + $title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; + $return = yourls_add_new_link( $url, $keyword, $title ); + + $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; + $message = isset( $return['message'] ) ? $return['message'] : ''; + $title = isset( $return['title'] ) ? $return['title'] : ''; + + if (!empty(ISQ::$social['facebook'])) { $ISQfacebook = ''; } + if (!empty(ISQ::$social['twitter'])) { $ISQtwitter = ''; } + if (!empty(ISQ::$social['plus'])) { $ISQplus = '
'; } + if (!empty(ISQ::$social['linkedin'])) { $ISQlinkedin = ''; } + if (!empty(ISQ::$general['qr'])) { $ISQqr = '

' . yourls__( 'QR code', 'isq-translation' ) . '

' . yourls__( 'Share your link with external devices', 'isq-translation' ) . '

QR'; } + if (!empty(ISQ::$general['clipboard'])) { $ISQlongcopy = ''; } + if (!empty(ISQ::$general['clipboard'])) { $ISQshortcopy = ''; } + if (!empty(ISQ::$general['clipboard'])) { $ISQstatscopy = ''; } + + $output_original = yourls__( 'Original URL:', 'isq_translation'); + $output_short = yourls__( 'Short URL:', 'isq_translation'); + /* translators: This is short for statistics */ + $output_stats = yourls__( 'Stats:', 'isq_translation'); + $output_copy = yourls__( 'Click on a link and press Ctrl+C to quickly copy it.', 'isq_translation'); + $output_share_h2 = yourls__( 'Share', 'isq_translation'); + $output_share_p = yourls__( 'Share your short URL', 'isq_translation'); + +?> + $error +
+

$ISQlongcopy

+

$ISQshortcopy

+

$ISQstatscopy

+

$output_copy

+
+ + $ISQqr + +

$output_share_h2

+

$output_share_p

+ $ISQfacebook + $ISQtwitter + $ISQplus + $ISQlinkedin + + \ No newline at end of file From 553a1a8743b0ff9522103f8f608e8b755038ec30 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 18:40:28 +0000 Subject: [PATCH 03/43] Moved the text strings from variables directly into the text. Such readability. Much wow. --- index.php | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/index.php b/index.php index 7d19f2a..1bb7146 100644 --- a/index.php +++ b/index.php @@ -1,31 +1,13 @@ - - $site = YOURLS_SITE; - - $site_enter = yourls__( 'Enter a new URL to shorten', 'isq_translation'); - $site_hover = yourls__( 'Hover over the labels to see more information', 'isq_translation'); - $site_long = yourls__( 'Long URL (required):', 'isq_translation'); - $site_long_hover = yourls__( 'Paste the long URL here', 'isq_translation'); - $site_keyword = yourls__( 'Custom keyword:', 'isq_translation'); - $site_keyword_hover = yourls__( 'A keyword replaces the default short string', 'isq_translation'); - $site_title = yourls__( 'Optional title:', 'isq_translation'); - $site_title_hover = yourls__( 'Optional title used when sharing a link from YOURLS', 'isq_translation'); - $site_submit = yourls__( 'Shorten', 'isq_translation'); - $antispam_title = yourls__( 'This is an antispam check. Sorry, we have to do this to prevent the database being overrun by bots!', 'isq_translation'); - $antispam_value = yourls__( 'reCAPTCHA', 'isq_translation'); - $antispam_bot = yourls__( 'Bot', 'isq_translation'); - $antispam_human = yourls__( 'Human', 'isq_translation'); -?> - -

-

$site_hover

+

+

-

-

-

-

$captcha

-

+

+

+

+

+

- \ No newline at end of file + From 90fbc64d0a724faa515b259c4fe05481b14f1cf1 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 18:45:34 +0000 Subject: [PATCH 04/43] Corrected tabs and comments --- index.php | 8 ++++---- result.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 1bb7146..b21981b 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,13 @@ -

-

-
+

+

+

-
+ diff --git a/result.php b/result.php index 5a75d9f..c8f34b3 100644 --- a/result.php +++ b/result.php @@ -2,7 +2,7 @@ var_dump($_REQUEST); include('header.php'); - + // antispam // if ( isset($_POST['antispam']) && $_POST['antispam'] != user ) { // exit('

' . yourls__( 'Antispam check failed!', 'isq_translation') . '

'); // } From 718420690b7fddd53b9c6e15cc5b02473721148f Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 19:19:35 +0000 Subject: [PATCH 05/43] Sorted out the results page --- result.php | 78 ++++++++++++++++++++++-------------------------------- 1 file changed, 32 insertions(+), 46 deletions(-) diff --git a/result.php b/result.php index c8f34b3..b682e25 100644 --- a/result.php +++ b/result.php @@ -1,56 +1,42 @@ ' . yourls__( 'Antispam check failed!', 'isq_translation') . '

'); - // } +// antispam +// if ( isset($_POST['antispam']) && $_POST['antispam'] != user ) { +// exit('

' . yourls__( 'Antispam check failed!', 'isq_translation') . '

'); +// } - $url = yourls_sanitize_url( $_REQUEST['url'] ); - $keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; - $title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; - $return = yourls_add_new_link( $url, $keyword, $title ); +$url = yourls_sanitize_url( $_REQUEST['url'] ); +$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; +$title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; +$return = yourls_add_new_link( $url, $keyword, $title ); - $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; - $message = isset( $return['message'] ) ? $return['message'] : ''; - $title = isset( $return['title'] ) ? $return['title'] : ''; - - if (!empty(ISQ::$social['facebook'])) { $ISQfacebook = ''; } - if (!empty(ISQ::$social['twitter'])) { $ISQtwitter = ''; } - if (!empty(ISQ::$social['plus'])) { $ISQplus = '
'; } - if (!empty(ISQ::$social['linkedin'])) { $ISQlinkedin = ''; } - if (!empty(ISQ::$general['qr'])) { $ISQqr = '

' . yourls__( 'QR code', 'isq-translation' ) . '

' . yourls__( 'Share your link with external devices', 'isq-translation' ) . '

QR'; } - if (!empty(ISQ::$general['clipboard'])) { $ISQlongcopy = ''; } - if (!empty(ISQ::$general['clipboard'])) { $ISQshortcopy = ''; } - if (!empty(ISQ::$general['clipboard'])) { $ISQstatscopy = ''; } - - $output_original = yourls__( 'Original URL:', 'isq_translation'); - $output_short = yourls__( 'Short URL:', 'isq_translation'); - /* translators: This is short for statistics */ - $output_stats = yourls__( 'Stats:', 'isq_translation'); - $output_copy = yourls__( 'Click on a link and press Ctrl+C to quickly copy it.', 'isq_translation'); - $output_share_h2 = yourls__( 'Share', 'isq_translation'); - $output_share_p = yourls__( 'Share your short URL', 'isq_translation'); +$shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; +$message = isset( $return['message'] ) ? $return['message'] : ''; +$title = isset( $return['title'] ) ? $return['title'] : ''; ?> - $error -
-

$ISQlongcopy

-

$ISQshortcopy

-

$ISQstatscopy

-

$output_copy

-
- $ISQqr + + -

$output_share_h2

-

$output_share_p

- $ISQfacebook - $ISQtwitter - $ISQplus - $ISQlinkedin + +
+

' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

+

' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

+

' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

+

+
- \ No newline at end of file + +' . yourls__( 'QR code', 'isq-translation' ) . '

' . yourls__( 'Share your link with external devices', 'isq-translation' ) . '

QR'; } ?> + + +

+

+Facebook'; } ?> +Tweet'; } ?> +
'; } ?> +'; } ?> + + \ No newline at end of file From 0293dff5779d6b1146f42d3951c55ccffe8cd9e8 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 19:20:38 +0000 Subject: [PATCH 06/43] Less tabs --- index.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index b21981b..e1a5e4a 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,13 @@ -

-

-
-

-

-

-

-

-
+

+

+
+

+

+

+

+

+
From 679dcd09619da25e5f654d27916e0468e06f8c4e Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 19:21:45 +0000 Subject: [PATCH 07/43] New lines at the ends of files --- footer.php | 2 +- header.php | 4 ++-- result.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/footer.php b/footer.php index 89af061..bafd00d 100644 --- a/footer.php +++ b/footer.php @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/header.php b/header.php index 4ec7ed5..be27880 100644 --- a/header.php +++ b/header.php @@ -1,5 +1,5 @@ - -
\ No newline at end of file +
diff --git a/result.php b/result.php index b682e25..16de094 100644 --- a/result.php +++ b/result.php @@ -39,4 +39,4 @@ $title = isset( $return['title'] ) ? $return['title'] : '';
'; } ?> '; } ?> - \ No newline at end of file + From c05a17fbabbeaddc610702e40224a63c01fd8c9b Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 19:27:23 +0000 Subject: [PATCH 08/43] Sorted out header --- header.php | 58 ++++++++++++++++-------------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/header.php b/header.php index be27880..0d1372c 100644 --- a/header.php +++ b/header.php @@ -7,40 +7,15 @@ require_once( dirname(__FILE__).'/includes/load-yourls.php' ); include( dirname(__FILE__).'/public/config.php' ); class ISQ { public static $general = array(), $links = array(), $social = array(); } -// Translations stuff +// Load translations function isq_load_textdomain() { yourls_load_custom_textdomain( 'isq_translation', $site . '/public/languages' ); $site = YOURLS_SITE; } isq_load_textdomain(); -// Settings definitions -$ISQtitle = ISQ::$general['name']; -$ISQname_1= ISQ::$links['name_1']; -$ISQurl_1= ISQ::$links['url_1']; -$ISQname_2= ISQ::$links['name_2']; -$ISQurl_2= ISQ::$links['url_2']; -$ISQname_3= ISQ::$links['name_3']; -$ISQurl_3= ISQ::$links['url_3']; -$ISQname_4= ISQ::$links['name_4']; -$ISQurl_4= ISQ::$links['url_4']; -$ISQname_5= ISQ::$links['name_5']; -$ISQurl_5= ISQ::$links['url_5']; -$ISQname_6= ISQ::$links['name_6']; -$ISQurl_6= ISQ::$links['url_6']; -$ISQname_7= ISQ::$links['name_7']; -$ISQurl_7= ISQ::$links['url_7']; -$ISQname_8= ISQ::$links['name_8']; -$ISQurl_8= ISQ::$links['url_8']; -$ISQname_9= ISQ::$links['name_9']; -$ISQurl_9= ISQ::$links['url_9']; -$ISQname_10= ISQ::$links['name_10']; -$ISQurl_10= ISQ::$links['url_10']; - // Error definitions - $genericerror = '

' . yourls__( 'An error has occured :(', 'isq_translation') . '

'; - if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { $error = '

' . yourls__( 'URL shortened successfully', 'isq_translation') . '

' . yourls__( 'View the details of your short URL below.', 'isq_translation') . '

'; } elseif ( $message = $url. yourls__( 'already exists in database', 'isq_translation') ) { @@ -56,7 +31,7 @@ if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { -<?php echo $ISQtitle; ?> +<?php echo ISQ::$general['name']; ?> @@ -150,18 +125,19 @@ $(document).ready(function()
-

-
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
+

+
    +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
    • +
-
+ +
From 2f98a2707cfc06a429750f1399e0b3338614ba84 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Fri, 1 Nov 2013 23:59:16 +0000 Subject: [PATCH 09/43] Missed a
--- footer.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/footer.php b/footer.php index bafd00d..87452fc 100644 --- a/footer.php +++ b/footer.php @@ -1,15 +1,16 @@ +
-

-

+

+

- - - - + + + +
-

YOURLS. Design by Tom Slominski. Also used: Formalize and qTip². Find this theme on GitHub.', 'isq_translation') ?>

+

YOURLS. Design by Tom Slominski. Also used: Formalize and qTip². Find this theme on GitHub.', 'isq_translation') ?>

From cf605a9ec5f6cfc283322b58c7c71c67dfcb7cb7 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 00:44:41 +0000 Subject: [PATCH 10/43] I've merged some code from YOURLS, but the SATANIC bookmarklets still do not work. Ugh. --- footer.php | 8 ++++---- result.php | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/footer.php b/footer.php index 87452fc..d51f01b 100644 --- a/footer.php +++ b/footer.php @@ -3,10 +3,10 @@

- - - - + + + +
diff --git a/result.php b/result.php index 16de094..6dadcb6 100644 --- a/result.php +++ b/result.php @@ -15,6 +15,16 @@ $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; $message = isset( $return['message'] ) ? $return['message'] : ''; $title = isset( $return['title'] ) ? $return['title'] : ''; +// Stop here if bookmarklet with a JSON callback function ("instant" bookmarklets) +if( isset( $_GET['jsonp'] ) && $_GET['jsonp'] == 'yourls' ) { + $short = $return['shorturl'] ? $return['shorturl'] : ''; + $message = "Short URL (Ctrl+C to copy)"; + header('Content-type: application/json'); + echo yourls_apply_filter( 'bookmarklet_jsonp', "yourls_callback({'short_url':'$short','message':'$message'});" ); + + die(); +} + ?> From 8f818e63b440cb599744326c0446b8ead50235dc Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 13:41:10 +0000 Subject: [PATCH 11/43] Updated .gitignore so my reCAPTCHA keys don't leak --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 695924d..7cc8a53 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ !header.php !footer.php !.gitignore + +# Specifically ignore the config file +public/config.php From 8ca020a5b60644454aa2266583871df25fdbe546 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 13:48:11 +0000 Subject: [PATCH 12/43] Removing config.php from the repo in favour of config-sample.php --- public/config.php | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 public/config.php diff --git a/public/config.php b/public/config.php deleted file mode 100644 index d4561a6..0000000 --- a/public/config.php +++ /dev/null @@ -1,43 +0,0 @@ - 'kwl.me', // The name of your URL shortener - 'qr' => 1, // Do you want to display a QR code? - 'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash) -); - -// Menu- The width of ∞² menu allows you to have about 10 links -// Leave empty to disable -ISQ::$links = array( - 'name_1' => 'Tom Slominski', - 'url_1' => 'http://tomslominski.net/', - 'name_2' => 'Get ∞²!', - 'url_2' => 'https://github.com/tomslominski/infinity-squared/', - 'name_3' => '', - 'url_3' => '', - 'name_4' => '', - 'url_4' => '', - 'name_5' => '', - 'url_5' => '', - 'name_6' => '', - 'url_6' => '', - 'name_7' => '', - 'url_7' => '', - 'name_8' => '', - 'url_8' => '', - 'name_9' => '', - 'url_9' => '', - 'name_10' => '', - 'url_10' => '' -); - -// Social sharing -// 1 to enable, 0 to disable -ISQ::$social = array( - 'facebook' => 1, - 'twitter' => 1, - 'plus' => 1, - 'linkedin' => 1 -); -?> From 9f651f9059c325a3f99675273e69999096067acd Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 13:52:45 +0000 Subject: [PATCH 13/43] config-sample.php gets a special mention because otherwise git won't accept it... --- .gitignore | 1 + public/config-sample.php | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 public/config-sample.php diff --git a/.gitignore b/.gitignore index 7cc8a53..0e7f3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Except Infinity Squared !public/ +!public/config-sample.php !index.php !result.php !header.php diff --git a/public/config-sample.php b/public/config-sample.php new file mode 100644 index 0000000..427e89a --- /dev/null +++ b/public/config-sample.php @@ -0,0 +1,46 @@ + 'URL shortener', // The name of your URL shortener + 'qr' => 1, // Do you want to display a QR code? + 'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash) +); + +// Menu- The width of ∞² menu allows you to have about 10 links +// Leave empty to disable +ISQ::$links = array( + 'name_1' => 'Tom Slominski', + 'url_1' => 'http://tomslominski.net/', + 'name_2' => 'Get ∞²!', + 'url_2' => 'https://github.com/tomslominski/infinity-squared/', + 'name_3' => '', + 'url_3' => '', + 'name_4' => '', + 'url_4' => '', + 'name_5' => '', + 'url_5' => '', + 'name_6' => '', + 'url_6' => '', + 'name_7' => '', + 'url_7' => '', + 'name_8' => '', + 'url_8' => '', + 'name_9' => '', + 'url_9' => '', + 'name_10' => '', + 'url_10' => '' +); + +// Social sharing +// 1 to enable, 0 to disable +ISQ::$social = array( + 'facebook' => 1, + 'twitter' => 1, + 'plus' => 1, + 'linkedin' => 1 +); +?> From 7530b53c56a956bb4b33bf0116477e788307883d Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 14:03:44 +0000 Subject: [PATCH 14/43] config-sample.php gets a special mention because otherwise git won't accept it... --- .gitignore | 1 + public/config-sample.php | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 public/config-sample.php diff --git a/.gitignore b/.gitignore index 7cc8a53..0e7f3a3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Except Infinity Squared !public/ +!public/config-sample.php !index.php !result.php !header.php diff --git a/public/config-sample.php b/public/config-sample.php new file mode 100644 index 0000000..f64b9ee --- /dev/null +++ b/public/config-sample.php @@ -0,0 +1,46 @@ + 'URL shortener', // The name of your URL shortener + 'qr' => 1, // Do you want to display a QR code? + 'clipboard' => 1 // Do you want to enable zeroClipboard? (uses flash) +); + +// Menu- The width of ∞² menu allows you to have about 10 links +// Leave empty to disable +ISQ::$links = array( + 'name_1' => 'Tom Slominski', + 'url_1' => 'http://tomslominski.net/', + 'name_2' => 'Get ∞²!', + 'url_2' => 'https://github.com/tomslominski/infinity-squared/', + 'name_3' => '', + 'url_3' => '', + 'name_4' => '', + 'url_4' => '', + 'name_5' => '', + 'url_5' => '', + 'name_6' => '', + 'url_6' => '', + 'name_7' => '', + 'url_7' => '', + 'name_8' => '', + 'url_8' => '', + 'name_9' => '', + 'url_9' => '', + 'name_10' => '', + 'url_10' => '' +); + +// Social sharing +// 1 to enable, 0 to disable +ISQ::$social = array( + 'facebook' => 1, + 'twitter' => 1, + 'plus' => 1, + 'linkedin' => 1 +); +?> From ea01a72d2b3fcde2011a70007ad72c6aa01e1aa3 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 14:04:53 +0000 Subject: [PATCH 15/43] Typo --- public/config-sample.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/config-sample.php b/public/config-sample.php index 427e89a..f64b9ee 100644 --- a/public/config-sample.php +++ b/public/config-sample.php @@ -1,6 +1,6 @@ Date: Sat, 2 Nov 2013 14:50:39 +0000 Subject: [PATCH 16/43] Fixing the social sharers and whipping out some padding for them --- public/style.css | 5 +++++ result.php | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/public/style.css b/public/style.css index a7d26de..32690a6 100644 --- a/public/style.css +++ b/public/style.css @@ -191,6 +191,11 @@ a.bookmarklet { font-size: 1.2rem; } +.social-sharer { + display: inline-block; + padding: 0 2px; +} + /* Footer */ .footer { text-align: center; diff --git a/result.php b/result.php index 6dadcb6..9b46c60 100644 --- a/result.php +++ b/result.php @@ -44,9 +44,9 @@ if( isset( $_GET['jsonp'] ) && $_GET['jsonp'] == 'yourls' ) {

-Facebook'; } ?> -Tweet'; } ?> -
'; } ?> -'; } ?> +'; } ?> +'; } ?> +'; } ?> +'; } ?> From 78cb3ed559e9768240a4133339589cfc8816d4c7 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 15:17:13 +0000 Subject: [PATCH 17/43] Improvements to the look of the "Too many URLs added too fast" error page --- public/style.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/public/style.css b/public/style.css index 32690a6..8264a43 100644 --- a/public/style.css +++ b/public/style.css @@ -241,3 +241,19 @@ header { display:none; } } + +/* Error page */ +#wrap { + border-left: none; !important +} + +#wrap > h1 > a, +#wrap > h1, +header > h1 { + display: none; +} + +#wrap > h2, +#wrap > p { + color: red; +} \ No newline at end of file From 2c2dcb740d791497d084a44bcd55cf513b77175f Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 15:23:12 +0000 Subject: [PATCH 18/43] Improved the error page as much as I can without affecting the actual theme --- header.php | 1 + public/style.css | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/header.php b/header.php index 0d1372c..394405c 100644 --- a/header.php +++ b/header.php @@ -127,6 +127,7 @@ $(document).ready(function()

    +
    • diff --git a/public/style.css b/public/style.css index 8264a43..818023b 100644 --- a/public/style.css +++ b/public/style.css @@ -243,16 +243,16 @@ header { } /* Error page */ -#wrap { - border-left: none; !important -} - #wrap > h1 > a, #wrap > h1, header > h1 { display: none; } +#container > header > h1 { + display: inline-block; +} + #wrap > h2, #wrap > p { color: red; From 8cbc21f60ff97b5d6543d2009612cb551834ae11 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 15:32:30 +0000 Subject: [PATCH 19/43] A note --- result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result.php b/result.php index 9b46c60..be7ac1a 100644 --- a/result.php +++ b/result.php @@ -15,7 +15,7 @@ $shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; $message = isset( $return['message'] ) ? $return['message'] : ''; $title = isset( $return['title'] ) ? $return['title'] : ''; -// Stop here if bookmarklet with a JSON callback function ("instant" bookmarklets) +// Stop here if bookmarklet with a JSON callback function ("instant" bookmarklets) -- code from YOURLS if( isset( $_GET['jsonp'] ) && $_GET['jsonp'] == 'yourls' ) { $short = $return['shorturl'] ? $return['shorturl'] : ''; $message = "Short URL (Ctrl+C to copy)"; From c97d882872f7fdd496ad134edcb929a27802434b Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 15:34:20 +0000 Subject: [PATCH 20/43] Bit of CSS allowing for user styles which are not overwritten on upgrade --- public/style.css | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/public/style.css b/public/style.css index 818023b..0563a7b 100644 --- a/public/style.css +++ b/public/style.css @@ -243,17 +243,14 @@ header { } /* Error page */ -#wrap > h1 > a, -#wrap > h1, -header > h1 { +#wrap > h1 > a { display: none; } -#container > header > h1 { - display: inline-block; -} - #wrap > h2, #wrap > p { color: red; -} \ No newline at end of file +} + +/* Importing custom user styles */ +@import url("public/user-style.css"); From e898da7e6ca1587382f3adc35c9b03dc9868a892 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sat, 2 Nov 2013 18:19:38 +0000 Subject: [PATCH 21/43] reCAPTCHA support --- header.php | 10 +++++++++- index.php | 3 ++- public/config-sample.php | 7 +++++++ result.php | 33 +++++++++++++++++++-------------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/header.php b/header.php index 394405c..da91fa7 100644 --- a/header.php +++ b/header.php @@ -5,7 +5,7 @@ require_once( dirname(__FILE__).'/includes/load-yourls.php' ); // Ask for Infinity Squared settings include( dirname(__FILE__).'/public/config.php' ); -class ISQ { public static $general = array(), $links = array(), $social = array(); } +class ISQ { public static $general = array(), $links = array(), $social = array(), $recaptcha = array(); } // Load translations function isq_load_textdomain() { @@ -27,6 +27,9 @@ if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { } elseif ( $message = yourls__( 'This URL is a short URL', 'isq_translation') ) { $error = $genericerror . '

    ' . yourls__( 'You cannot shorten a short URL!', 'isq_translation') . '

    '; } + +// Load reCAPTCHA +require_once('public/recaptchalib.php'); ?> @@ -65,6 +68,11 @@ if ( $message = $url. yourls__( 'added to database', 'isq_translation') ) { {lang: "en-GB"} + From 2b9ab972ce61bf29a73fd81c6df2da467142e598 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Wed, 13 Nov 2013 16:46:27 +0000 Subject: [PATCH 25/43] Hiding flash copy on mobile devices --- public/style.css | 2 +- result.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/style.css b/public/style.css index 82097a1..53d0739 100644 --- a/public/style.css +++ b/public/style.css @@ -238,7 +238,7 @@ header { margin-top:0; } -.desktop-only { +.desktop-only, .zclip { display:none; } } diff --git a/result.php b/result.php index 700c1fd..0a9c4bd 100644 --- a/result.php +++ b/result.php @@ -37,9 +37,9 @@ $title = isset( $return['title'] ) ? $return['title'] : '';
    -

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    -

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    -

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    +

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    +

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    +

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    From 7dc37d4de70d019f72cf13c12d521fffbf8dd582 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Wed, 13 Nov 2013 16:48:31 +0000 Subject: [PATCH 26/43] For some reason git wouldn't include a file if I didn't specifically include it in .gitignore, even though other files push... --- .gitignore | 1 + public/recaptchalib.php | 276 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+) create mode 100644 public/recaptchalib.php diff --git a/.gitignore b/.gitignore index 0e7f3a3..9a11881 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Except Infinity Squared !public/ !public/config-sample.php +!public/recaptchalib.php !index.php !result.php !header.php diff --git a/public/recaptchalib.php b/public/recaptchalib.php new file mode 100644 index 0000000..e658a2e --- /dev/null +++ b/public/recaptchalib.php @@ -0,0 +1,276 @@ + $value ) + $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; + + // Cut the last '&' + $req=substr($req,0,strlen($req)-1); + return $req; +} + + + +/** + * Submits an HTTP POST to a reCAPTCHA server + * @param string $host + * @param string $path + * @param array $data + * @param int port + * @return array response + */ +function _recaptcha_http_post($host, $path, $data, $port = 80) { + + $req = _recaptcha_qsencode ($data); + + $http_request = "POST $path HTTP/1.0\r\n"; + $http_request .= "Host: $host\r\n"; + $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; + $http_request .= "Content-Length: " . strlen($req) . "\r\n"; + $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; + $http_request .= "\r\n"; + $http_request .= $req; + + $response = ''; + if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { + die ('Could not open socket'); + } + + fwrite($fs, $http_request); + + while ( !feof($fs) ) + $response .= fgets($fs, 1160); // One TCP-IP packet + fclose($fs); + $response = explode("\r\n\r\n", $response, 2); + + return $response; +} + + + +/** + * Gets the challenge HTML (javascript and non-javascript version). + * This is called from the browser, and the resulting reCAPTCHA HTML widget + * is embedded within the HTML form it was called from. + * @param string $pubkey A public key for reCAPTCHA + * @param string $error The error given by reCAPTCHA (optional, default is null) + * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) + * @return string - The HTML to be embedded in the user's form. + */ +function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) +{ + if ($pubkey == null || $pubkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($use_ssl) { + $server = RECAPTCHA_API_SECURE_SERVER; + } else { + $server = RECAPTCHA_API_SERVER; + } + + $errorpart = ""; + if ($error) { + $errorpart = "&error=" . $error; + } + return ' + + '; +} + + + + +/** + * A ReCaptchaResponse is returned from recaptcha_check_answer() + */ +class ReCaptchaResponse { + var $is_valid; + var $error; +} + + +/** + * Calls an HTTP POST function to verify if the user's guess was correct + * @param string $privkey + * @param string $remoteip + * @param string $challenge + * @param string $response + * @param array $extra_params an array of extra variables to post to the server + * @return ReCaptchaResponse + */ +function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) +{ + if ($privkey == null || $privkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($remoteip == null || $remoteip == '') { + die ("For security reasons, you must pass the remote ip to reCAPTCHA"); + } + + + + //discard spam submissions + if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { + $recaptcha_response = new ReCaptchaResponse(); + $recaptcha_response->is_valid = false; + $recaptcha_response->error = 'incorrect-captcha-sol'; + return $recaptcha_response; + } + + $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify", + array ( + 'privatekey' => $privkey, + 'remoteip' => $remoteip, + 'challenge' => $challenge, + 'response' => $response + ) + $extra_params + ); + + $answers = explode ("\n", $response [1]); + $recaptcha_response = new ReCaptchaResponse(); + + if (trim ($answers [0]) == 'true') { + $recaptcha_response->is_valid = true; + } + else { + $recaptcha_response->is_valid = false; + $recaptcha_response->error = $answers [1]; + } + return $recaptcha_response; + +} + +/** + * gets a URL where the user can sign up for reCAPTCHA. If your application + * has a configuration page where you enter a key, you should provide a link + * using this function. + * @param string $domain The domain where the page is hosted + * @param string $appname The name of your application + */ +function recaptcha_get_signup_url ($domain = null, $appname = null) { + return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname)); +} + +function _recaptcha_aes_pad($val) { + $block_size = 16; + $numpad = $block_size - (strlen ($val) % $block_size); + return str_pad($val, strlen ($val) + $numpad, chr($numpad)); +} + +/* Mailhide related code */ + +function _recaptcha_aes_encrypt($val,$ky) { + if (! function_exists ("mcrypt_encrypt")) { + die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); + } + $mode=MCRYPT_MODE_CBC; + $enc=MCRYPT_RIJNDAEL_128; + $val=_recaptcha_aes_pad($val); + return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); +} + + +function _recaptcha_mailhide_urlbase64 ($x) { + return strtr(base64_encode ($x), '+/', '-_'); +} + +/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ +function recaptcha_mailhide_url($pubkey, $privkey, $email) { + if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { + die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . + "you can do so at http://www.google.com/recaptcha/mailhide/apikey"); + } + + + $ky = pack('H*', $privkey); + $cryptmail = _recaptcha_aes_encrypt ($email, $ky); + + return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); +} + +/** + * gets the parts of the email to expose to the user. + * eg, given johndoe@example,com return ["john", "example.com"]. + * the email is then displayed as john...@example.com + */ +function _recaptcha_mailhide_email_parts ($email) { + $arr = preg_split("/@/", $email ); + + if (strlen ($arr[0]) <= 4) { + $arr[0] = substr ($arr[0], 0, 1); + } else if (strlen ($arr[0]) <= 6) { + $arr[0] = substr ($arr[0], 0, 3); + } else { + $arr[0] = substr ($arr[0], 0, 4); + } + return $arr; +} + +/** + * Gets html to display an email address given a public an private key. + * to get a key, go to: + * + * http://www.google.com/recaptcha/mailhide/apikey + */ +function recaptcha_mailhide_html($pubkey, $privkey, $email) { + $emailparts = _recaptcha_mailhide_email_parts ($email); + $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); + + return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); + +} + + +?> From 2423d8036f1e8bdb11ca5373a6dd09673fb2860f Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sun, 24 Nov 2013 21:35:51 +0000 Subject: [PATCH 27/43] Moving up some definitions to fix the bookmarklets (thanks Sam Tran!) --- result.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/result.php b/result.php index 0a9c4bd..eff584d 100644 --- a/result.php +++ b/result.php @@ -1,12 +1,22 @@ is_valid) { die ( '

    ' . yourls__( 'The reCAPTCHA wasn\'t entered correctly. Go back and try it again.', 'isq_translation' ) . '

    ' ); } -$url = yourls_sanitize_url( $_REQUEST['url'] ); -$keyword = isset( $_REQUEST['keyword'] ) ? yourls_sanitize_keyword( $_REQUEST['keyword'] ): '' ; -$title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title'] ) : '' ; -$return = yourls_add_new_link( $url, $keyword, $title ); - -$shorturl = isset( $return['shorturl'] ) ? $return['shorturl'] : ''; -$message = isset( $return['message'] ) ? $return['message'] : ''; -$title = isset( $return['title'] ) ? $return['title'] : ''; - ?> From e3823abefb44589a2667f1336e44e16cbef35547 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sun, 24 Nov 2013 21:37:24 +0000 Subject: [PATCH 28/43] Adding some ; --- footer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/footer.php b/footer.php index d51f01b..36ccdfd 100644 --- a/footer.php +++ b/footer.php @@ -3,9 +3,9 @@

    - + - + From 1e8eb9fe0813620a4d90442c439524468f023f26 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sun, 29 Dec 2013 18:30:08 +0000 Subject: [PATCH 29/43] Adding proper SSL checking, maybe? --- public/recaptchalib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/recaptchalib.php b/public/recaptchalib.php index e658a2e..c8c3685 100644 --- a/public/recaptchalib.php +++ b/public/recaptchalib.php @@ -108,7 +108,8 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); } - if ($use_ssl) { + if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' + || $_SERVER['SERVER_PORT'] == 443) { $server = RECAPTCHA_API_SECURE_SERVER; } else { $server = RECAPTCHA_API_SERVER; From d2a29663904bb15594bb14ab6bbd5a9a9370c853 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sun, 29 Dec 2013 18:31:55 +0000 Subject: [PATCH 30/43] Removing boolean and popping some documentation down --- public/recaptchalib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/recaptchalib.php b/public/recaptchalib.php index c8c3685..a08e52c 100644 --- a/public/recaptchalib.php +++ b/public/recaptchalib.php @@ -99,17 +99,16 @@ function _recaptcha_http_post($host, $path, $data, $port = 80) { * is embedded within the HTML form it was called from. * @param string $pubkey A public key for reCAPTCHA * @param string $error The error given by reCAPTCHA (optional, default is null) - * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) * @return string - The HTML to be embedded in the user's form. */ -function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) +function recaptcha_get_html ($pubkey, $error = null) { if ($pubkey == null || $pubkey == '') { die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); } if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' - || $_SERVER['SERVER_PORT'] == 443) { + || $_SERVER['SERVER_PORT'] == 443) { // http://stackoverflow.com/questions/1175096/how-to-find-out-if-you-are-using-https-without-serverhttps $server = RECAPTCHA_API_SECURE_SERVER; } else { $server = RECAPTCHA_API_SERVER; From ab37632469f4a0baa19bc71c8283b9d129d9ec70 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sun, 29 Dec 2013 22:09:21 +0000 Subject: [PATCH 31/43] Preparing the index page for the new bookmarklet. The new bookmarklet just takes details of the page you're on and places them in the fields, allowing the user to modify things before submitting the link and fill out a CAPTCHA, avoiding spam. --- index.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 8f85efd..6dc0c0b 100644 --- a/index.php +++ b/index.php @@ -1,11 +1,17 @@ - +

    -

    -

    -

    +

    +

    +

    From c70df5b4d638d4e27fffbe67bcddd58f69a1abb2 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Sun, 29 Dec 2013 23:25:23 +0000 Subject: [PATCH 32/43] New bookmarklet --- footer.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/footer.php b/footer.php index 36ccdfd..01308cc 100644 --- a/footer.php +++ b/footer.php @@ -3,10 +3,8 @@

    - - - - +

    +
    From bd499e0e1d1a11238ffa2f424303bcaf5711284e Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Mon, 30 Dec 2013 23:13:55 +0000 Subject: [PATCH 33/43] Commiting updated .gitignore allowing me to push more files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9a11881..1715c8d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ !header.php !footer.php !.gitignore +!public/fonts/ # Specifically ignore the config file public/config.php From b3cc086649621b19e38a7bb4b0e4162a6bf52e8e Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Mon, 30 Dec 2013 23:26:38 +0000 Subject: [PATCH 34/43] An improved .gitignore thanks to http://stackoverflow.com/a/3694877/1432333 --- .gitignore | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1715c8d..8669f8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,14 @@ # Ignore everything -* +/* +/*/ # Except Infinity Squared !public/ -!public/config-sample.php -!public/recaptchalib.php !index.php !result.php !header.php !footer.php !.gitignore -!public/fonts/ # Specifically ignore the config file public/config.php From cc8cdcc9cd101d94bf0aeaf183f634925557f7df Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Mon, 30 Dec 2013 23:27:33 +0000 Subject: [PATCH 35/43] New bookmarklet button --- footer.php | 9 ++++---- public/fonts/icons.svg | 11 ++++++++++ public/fonts/icons.ttf | Bin 0 -> 1112 bytes public/fonts/icons.woff | Bin 0 -> 1308 bytes public/style.css | 44 ++++++++++++++++++++++++---------------- 5 files changed, 43 insertions(+), 21 deletions(-) create mode 100644 public/fonts/icons.svg create mode 100644 public/fonts/icons.ttf create mode 100644 public/fonts/icons.woff diff --git a/footer.php b/footer.php index 01308cc..9a5ef87 100644 --- a/footer.php +++ b/footer.php @@ -1,10 +1,11 @@
    -
    -

    -

    +
    +

    + +

    - +

    diff --git a/public/fonts/icons.svg b/public/fonts/icons.svg new file mode 100644 index 0000000..a222691 --- /dev/null +++ b/public/fonts/icons.svg @@ -0,0 +1,11 @@ + + + +Generated by IcoMoon + + + + + + + \ No newline at end of file diff --git a/public/fonts/icons.ttf b/public/fonts/icons.ttf new file mode 100644 index 0000000000000000000000000000000000000000..09bb899f9d5dd9178112957ad0e84259b34187b8 GIT binary patch literal 1112 zcmah{&ubGw7=2%McV^p4Ba$Cglm=Q8Q7~1T#Db!TkhUmATSW0-*YrmU-E6QGTJX?= z;KhS~iAV9!zrnviN)@f*LA=zHHNM%|w(+8~%*^}V``$ORGXnw8hYdIwnVK$N^l$un zLuQkGwh;#Honv?b$VtXG7lV~H=c9~gIs1#t>kBjA_68U?*$0~Q!QAifV`(6@LA}}} z;e3=&jNdXIZicIC4gur$9F8nUjR3uP$@nW{KMdB|@bHlF55|R75YBH-4Soh3vu3Fs zt*mmNZ0=>F!%0D2(E+(73uNlayo=*_Zt}XCu*Bc(Itn|G?G8WLW;K@SN-!}u!fsZ~ za5QQLE=D-}{EWs5oxM)y5OqGBNF})>*#ts8-Bp{u+E~04ht3xNVGH+x)0woWk}4Ii zN-0~*<#Sm>=wexlmC;(Ymaph+Ml&NOu1VG8oRV6_cq*eL^3_41i#a-*k3BglnB((_&;8PL^z%{r$}alMu>$YDJUe$dC#Pi2-O91Y+?~Cmc;k*>b1zf;+zSIMK vsS&k|xSxKP>5F)ZWdyVx@^$j9xKw~u&U5_H$5`h$5qod5yjhUD_-FeA@p*=0 literal 0 HcmV?d00001 diff --git a/public/fonts/icons.woff b/public/fonts/icons.woff new file mode 100644 index 0000000000000000000000000000000000000000..0ec14265dc822b811446b37c36ec7546e115fb79 GIT binary patch literal 1308 zcmZ`&&rcIk5T3WYuPi^(B7y-$?ZHH&Mvwyu2_~jWiHTYi;>iS8pwNUCq!2OjXu4@$ z$o9~qe}myR?1q1vWxIpiStrlf zWB7I`?Q=8EG%yGavh4pHip>E8_8R^L7W1q4HkVyq1@<0(8;c2*byk`06U;~;<{0Ii z>wmd zN*x$&O)BG;{jxj@hWQxlXD3)ULy3(JvcT0EJsHpiYGt5*Wn{3wA15P5QkNhtxI*N=dfx$6{ptem%CJ3@J#tgOC)gtcSRa^F&fT0)I+b}HxAL>=&^m1 z;@c#)YWT!f@G?Y0NIb9&Xnty)(7f7-8^n#`{o2H9V5t4B)#_I5%V{Hw1&AR?U_BOO zgW;n)pP!5k?@%kJ6Mg>i@=ATKZDL28@HIOxAcuRzD`JmzW0wqZe*vf?#zKUm^d^iI z!C$TO4B$f{ZUT>owgr1Mv?ZN_r{g0y-^-!hLYL?P@6Kul!dIYe&8cn8scp@vZOy6e z2y*+vT+NxGDO#W$<>?X4&=TfM;K%7YUBihVtn1(Pz@>)>pQRO=CkJVDd=z*tpmJy# Z^E5X4lwLsJ2}<1qJr~rc$0zvj@dr}B7o`9I literal 0 HcmV?d00001 diff --git a/public/style.css b/public/style.css index 53d0739..5585899 100644 --- a/public/style.css +++ b/public/style.css @@ -29,10 +29,32 @@ a, a:visited, .footer a, .footer a:visited { text-decoration: none; } -p { +p, a { font-size: 1.2em; } +@font-face { + font-family: 'icons'; + src:url('fonts/icons.woff') format('woff'), + url('fonts/icons.ttf') format('truetype'), + url('fonts/icons.svg#icons') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="icon-"], [class*=" icon-"] { + font-family: 'icons'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + /* Structure */ body { background: #F1F1F1; @@ -142,22 +164,10 @@ input[type="radio"] { margin-right: 1%; } -a.bookmarklet { - border-radius: 11px; - background: #ddd url(../img/button.png) repeat-x; - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(1, #ddd)); - background: -moz-linear-gradient(top center, #fff 0%, #ddd 100%); - border: 1px solid; - border-color: #ddd #bbb #999; - cursor: pointer; - color: #333; - font: bold 12px/1.2 Arial, sans-serif; - outline: 0; - overflow: visible; - padding: 3px 10px 4px; - text-shadow: #fff 0 1px 1px; - text-decoration: none; - margin-right: 2%; +.bookmarklet:before { + font-family: 'icons'; + content: "\e600"; + margin: 2px; } /* Tooltips */ From 7b5e477585327bcda6e2f31b20ee2af3ff035ae4 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Mon, 30 Dec 2013 23:33:23 +0000 Subject: [PATCH 36/43] Adding a default favicon --- header.php | 1 + 1 file changed, 1 insertion(+) diff --git a/header.php b/header.php index aed0fde..5a089c7 100644 --- a/header.php +++ b/header.php @@ -42,6 +42,7 @@ require_once('public/recaptchalib.php'); } + From bde1a92c19f97e0a9d04871a1d026fa30563d387 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Tue, 31 Dec 2013 00:28:06 +0000 Subject: [PATCH 37/43] Added a more meaningful description to the twitter sharer --- result.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result.php b/result.php index eff584d..ae9fc4a 100644 --- a/result.php +++ b/result.php @@ -51,7 +51,7 @@ if (!$resp->is_valid) {

    '; } ?> -
    '; } ?> +'; } ?> '; } ?> '; } ?> From 06f475d075906d1a916fd7169cfa83c2c2f7843c Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Tue, 31 Dec 2013 00:49:52 +0000 Subject: [PATCH 38/43] Have a Tumblr button. I cannot deal with any more social sharing button pain :( But the Tumblr one is relatively easy to use, unlike *cough*Facebook*cough*. --- public/config-sample.php | 3 ++- public/img/tumblr.png | Bin 0 -> 700 bytes result.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 public/img/tumblr.png diff --git a/public/config-sample.php b/public/config-sample.php index e0b527a..bf64523 100644 --- a/public/config-sample.php +++ b/public/config-sample.php @@ -41,7 +41,8 @@ ISQ::$social = array( 'facebook' => 1, 'twitter' => 1, 'plus' => 1, - 'linkedin' => 1 + 'linkedin' => 1, + 'tumblr' => 1 ); // reCAPTCHA API keys diff --git a/public/img/tumblr.png b/public/img/tumblr.png new file mode 100644 index 0000000000000000000000000000000000000000..2468c870cd496ee427a91fd021f16d6d12ee8700 GIT binary patch literal 700 zcmV;t0z>_YP)0!c|k zK~!ko?b+W;Q(+ju@$Zh?Y3s~o4$0Dtwnhq#DGj!oc~MNOLEU9ii>?ZiFuE@aFY2y{ zxtkzJ=&HX!Z-QM63l)O}B1k5Rfd(nUR{mI58JXbFX=g9bb9v75ob!Ho-}AojImZ%e zjRW)mcTgviK&Mqf7{5K5g0MB9hQc8@!3j=qf)kwJN;IrHeS$#I;|FVzXJ*!v!0BT)%c%y+yp~ zxR)p0_tjd&9lDJxv2)zM)q$p2Oo6k6TI2ccUgYYfXf<4jG>6qH+2Q%xii#P6@iFbn`<=UdD>ESFbSdHL$?mg_^IMry0v z=3NT<(?j(2rM6t(5^gdtE}zfyH1V2L>cf`mFSMQ6b{ooSy@5wN1zcWP=3szGxQRfZo{IhZ*3RW}KNuYyXW;!u21h=T z`8)|lXw|Oa{=O?X?RFfx&d;SK=Cj$NVAjX~`GJ;)#cYnnY)&@Lf)kwJ1SdGbZ3CB7 i)RxqMP6dHUpz{|mL4{m3Wu_|t0000is_valid) { '; } ?> '; } ?> '; } ?> - +Share on Tumblr'; } ?> From 14f293a2e1ff6522a4b9f22657dcda6f6b0a7c17 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Tue, 31 Dec 2013 00:54:22 +0000 Subject: [PATCH 39/43] Final corrections to the goddamn sharing buttons... --- index.php | 2 +- result.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 6dc0c0b..de1f534 100644 --- a/index.php +++ b/index.php @@ -11,7 +11,7 @@ $title = isset( $_REQUEST['title'] ) ? yourls_sanitize_title( $_REQUEST['title

    -

    +

    diff --git a/result.php b/result.php index 7d901aa..01875b6 100644 --- a/result.php +++ b/result.php @@ -54,5 +54,5 @@ if (!$resp->is_valid) { '; } ?> '; } ?> '; } ?> -Share on Tumblr'; } ?> +Share on Tumblr'; } ?> From 94bcee59ecb4558e64c8388a6ca995bc5ff13ad3 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Tue, 31 Dec 2013 00:56:00 +0000 Subject: [PATCH 40/43] Giving the results a heading --- result.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/result.php b/result.php index 01875b6..c1dee16 100644 --- a/result.php +++ b/result.php @@ -37,6 +37,8 @@ if (!$resp->is_valid) { +

    +

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    ' . yourls__( 'Copy to Clipboard', 'isq-translation' ) . ''; } ?>

    From 16d0500cc59b9698a3a4e072c87b55b5946957e7 Mon Sep 17 00:00:00 2001 From: Tom Slominski Date: Tue, 31 Dec 2013 01:00:00 +0000 Subject: [PATCH 41/43] Reducing the amount of PHP if's. --- header.php | 36 ------------------------------------ public/style.css | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 36 deletions(-) diff --git a/header.php b/header.php index 5a089c7..432f0e2 100644 --- a/header.php +++ b/header.php @@ -23,25 +23,6 @@ require_once('public/recaptchalib.php'); <?php echo ISQ::$general['name']; ?> - - - @@ -87,23 +68,6 @@ $(document).ready(function(){ }); }); -