YOURLS / YOURLS

user/config-sample.php

Indentation +5 added lines, -5 removed lines

@@ -60,10 +60,10 @@ 
  ** YOURLS will auto encrypt plain text passwords in this file
  ** Read http://yourls.org/userpassword for more information */
 $yourls_user_passwords = array(
-	'username' => 'password',
-	// 'username2' => 'password2',
-	// You can have one or more 'login'=>'password' lines
-	);
+    'username' => 'password',
+    // 'username2' => 'password2',
+    // You can have one or more 'login'=>'password' lines
+    );
 
 /** URL shortening method: 36 or 62
  ** 36: generates all lowercase keywords (ie: 13jkm)
@@ -79,7 +79,7 @@ 
 * Define here negative, unwanted or potentially misleading keywords.
 */
 $yourls_reserved_URL = array(
-	'porn', 'faggot', 'sex', 'nigger', 'fuck', 'cunt', 'dick',
+    'porn', 'faggot', 'sex', 'nigger', 'fuck', 'cunt', 'dick',
 );
 
 /*

Spacing +12 added lines, -12 removed lines

@@ -11,23 +11,23 @@ 
  */
 
 /** MySQL database username */
-define( 'YOURLS_DB_USER', 'your db user name' );
+define('YOURLS_DB_USER', 'your db user name');
 
 /** MySQL database password */
-define( 'YOURLS_DB_PASS', 'your db password' );
+define('YOURLS_DB_PASS', 'your db password');
 
 /** The name of the database for YOURLS
  ** Use lower case letters [a-z], digits [0-9] and underscores [_] only */
-define( 'YOURLS_DB_NAME', 'yourls' );
+define('YOURLS_DB_NAME', 'yourls');
 
 /** MySQL hostname.
  ** If using a non standard port, specify it like 'hostname:port', eg. 'localhost:9999' or '127.0.0.1:666' */
-define( 'YOURLS_DB_HOST', 'localhost' );
+define('YOURLS_DB_HOST', 'localhost');
 
 /** MySQL tables prefix
  ** YOURLS will create tables using this prefix (eg `yourls_url`, `yourls_options`, ...)
  ** Use lower case letters [a-z], digits [0-9] and underscores [_] only */
-define( 'YOURLS_DB_PREFIX', 'yourls_' );
+define('YOURLS_DB_PREFIX', 'yourls_');
 
 /*
  ** Site options
@@ -37,27 +37,27 @@ 
  ** All lowercase, no trailing slash at the end.
  ** If you define it to "http://sho.rt", don't use "http://www.sho.rt" in your browser (and vice-versa)
  ** To use an IDN domain (eg http://héhé.com), write its ascii form here (eg http://xn--hh-bjab.com) */
-define( 'YOURLS_SITE', 'http://your-own-domain-here.com' );
+define('YOURLS_SITE', 'http://your-own-domain-here.com');
 
 /** YOURLS language
  ** Change this setting to use a translation file for your language, instead of the default English.
  ** That translation file (a .mo file) must be installed in the user/language directory.
  ** See http://yourls.org/translations for more information */
-define( 'YOURLS_LANG', '' );
+define('YOURLS_LANG', '');
 
 /** 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 );
+define('YOURLS_UNIQUE_URLS', true);
 
 /** Private means the Admin area will be protected with login/pass as defined below.
  ** Set to false for public usage (eg on a restricted intranet or for test setups)
  ** Read http://yourls.org/privatepublic for more details if you're unsure */
-define( 'YOURLS_PRIVATE', true );
+define('YOURLS_PRIVATE', true);
 
 /** A random secret hash used to encrypt cookies. You don't have to remember it, make it long and complicated
  ** Hint: copy from http://yourls.org/cookie */
-define( 'YOURLS_COOKIEKEY', 'modify this text with something random' );
+define('YOURLS_COOKIEKEY', 'modify this text with something random');
 
 /** Username(s) and password(s) allowed to access the site. Passwords either in plain text or as encrypted hashes
  ** YOURLS will auto encrypt plain text passwords in this file
@@ -71,11 +71,11 @@ 
 /** URL shortening method: 36 or 62
  ** 36: generates all lowercase keywords (ie: 13jkm)
  ** 62: generates mixed case keywords (ie: 13jKm or 13JKm) */
-define( 'YOURLS_URL_CONVERT', 36 );
+define('YOURLS_URL_CONVERT', 36);
 
 /** Debug mode to output some internal information
  ** Default is false for live site. Enable when coding or before submitting a new issue */
-define( 'YOURLS_DEBUG', false );
+define('YOURLS_DEBUG', false);
 
 /**
 * Reserved keywords (so that generated URLs won't match them)

yourls-loader.php

Indentation +9 added lines, -9 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 // Handle inexistent root favicon requests and exit
 if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
-	header( 'Content-Type: image/gif' );
-	echo base64_decode( "R0lGODlhEAAQAJECAAAAzFZWzP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0PUQAgSGoNQFt0LWTVOE6GuX1H6onTVHaW2tEHnJ1YxPc+UwAAOw==" );
-	exit;
+    header( 'Content-Type: image/gif' );
+    echo base64_decode( "R0lGODlhEAAQAJECAAAAzFZWzP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0PUQAgSGoNQFt0LWTVOE6GuX1H6onTVHaW2tEHnJ1YxPc+UwAAOw==" );
+    exit;
 }
 
 // Handle inexistent root robots.txt requests and exit
 if ( '/robots.txt' == $_SERVER['REQUEST_URI'] ) {
-	header( 'Content-Type: text/plain; charset=utf-8' );
-	echo "User-agent: *\n";
-	echo "Disallow:\n";
-	exit;
+    header( 'Content-Type: text/plain; charset=utf-8' );
+    echo "User-agent: *\n";
+    echo "Disallow:\n";
+    exit;
 }
 
 // Load YOURLS
@@ -32,8 +32,8 @@ 
 
 // if request has a scheme (eg scheme://uri) : "Prefix-n-Shorten" sends to bookmarklet (doesn't work on Windows)
 if ( yourls_get_protocol($keyword) ) {
-	$url = yourls_sanitize_url_safe($keyword);
-	$parse = yourls_get_protocol_slashes_and_rest( $url, [ 'up', 'us', 'ur' ] );
+    $url = yourls_sanitize_url_safe($keyword);
+    $parse = yourls_get_protocol_slashes_and_rest( $url, [ 'up', 'us', 'ur' ] );
     yourls_do_action( 'load_template_redirect_admin', $url );
     yourls_do_action( 'pre_redirect_bookmarklet', $url );
 

Spacing +23 added lines, -23 removed lines

@@ -1,69 +1,69 @@
 <?php
 // Handle inexistent root favicon requests and exit
-if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
-	header( 'Content-Type: image/gif' );
-	echo base64_decode( "R0lGODlhEAAQAJECAAAAzFZWzP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0PUQAgSGoNQFt0LWTVOE6GuX1H6onTVHaW2tEHnJ1YxPc+UwAAOw==" );
+if ('/favicon.ico' == $_SERVER['REQUEST_URI']) {
+	header('Content-Type: image/gif');
+	echo base64_decode("R0lGODlhEAAQAJECAAAAzFZWzP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0PUQAgSGoNQFt0LWTVOE6GuX1H6onTVHaW2tEHnJ1YxPc+UwAAOw==");
 	exit;
 }
 
 // Handle inexistent root robots.txt requests and exit
-if ( '/robots.txt' == $_SERVER['REQUEST_URI'] ) {
-	header( 'Content-Type: text/plain; charset=utf-8' );
+if ('/robots.txt' == $_SERVER['REQUEST_URI']) {
+	header('Content-Type: text/plain; charset=utf-8');
 	echo "User-agent: *\n";
 	echo "Disallow:\n";
 	exit;
 }
 
 // Load YOURLS
-require_once __DIR__ . '/includes/load-yourls.php';
+require_once __DIR__.'/includes/load-yourls.php';
 
 // Get request in YOURLS base (eg in 'http://sho.rt/yourls/abcd' get 'abdc')
 // At this point, $request is NOT sanitized.
 $request = yourls_get_request();
 
 // Now load required template and exit
-yourls_do_action( 'pre_load_template', $request );
+yourls_do_action('pre_load_template', $request);
 
 // Let's look at the request : what we want to catch here is "anything", or "anything+" / "anything+all" (stat page)
-preg_match( "@^(.+?)(\+(all)?)?/?$@", $request, $matches );
+preg_match("@^(.+?)(\+(all)?)?/?$@", $request, $matches);
 $keyword   = isset($matches[1]) ? $matches[1] : null; // 'anything' whatever the request is (keyword, bookmarklet URL...)
 $stats     = isset($matches[2]) ? $matches[2] : null; // null, or '+' if request is 'anything+', '+all' if request is 'anything+all'
 $stats_all = isset($matches[3]) ? $matches[3] : null; // null, or 'all' if request is 'anything+all'
 
 // if request has a scheme (eg scheme://uri) : "Prefix-n-Shorten" sends to bookmarklet (doesn't work on Windows)
-if ( yourls_get_protocol($keyword) ) {
+if (yourls_get_protocol($keyword)) {
 	$url = yourls_sanitize_url_safe($keyword);
-	$parse = yourls_get_protocol_slashes_and_rest( $url, [ 'up', 'us', 'ur' ] );
-    yourls_do_action( 'load_template_redirect_admin', $url );
-    yourls_do_action( 'pre_redirect_bookmarklet', $url );
+	$parse = yourls_get_protocol_slashes_and_rest($url, ['up', 'us', 'ur']);
+    yourls_do_action('load_template_redirect_admin', $url);
+    yourls_do_action('pre_redirect_bookmarklet', $url);
 
     // Redirect to /admin/index.php?up=<url protocol>&us=<url slashes>&ur=<url rest>
-    yourls_redirect( yourls_add_query_arg( $parse , yourls_admin_url( 'index.php' ) ), 302 );
+    yourls_redirect(yourls_add_query_arg($parse, yourls_admin_url('index.php')), 302);
     exit;
 }
 
 // if request is an existing short URL keyword ('abc') or stat page ('abc+') or an existing page :
-if ( yourls_keyword_is_taken($keyword) or yourls_is_page($keyword) ) {
+if (yourls_keyword_is_taken($keyword) or yourls_is_page($keyword)) {
 
     // we have a short URL or a page
-    if( $keyword && !$stats ) {
-        yourls_do_action( 'load_template_go', $keyword );
-        require_once( YOURLS_ABSPATH.'/yourls-go.php' );
+    if ($keyword && !$stats) {
+        yourls_do_action('load_template_go', $keyword);
+        require_once(YOURLS_ABSPATH.'/yourls-go.php');
         exit;
     }
 
     // we have a stat page
-    if( $keyword && $stats ) {
+    if ($keyword && $stats) {
         $aggregate = $stats_all && yourls_allow_duplicate_longurls();
-        yourls_do_action( 'load_template_infos', $keyword );
-        require_once( YOURLS_ABSPATH.'/yourls-infos.php' );
+        yourls_do_action('load_template_infos', $keyword);
+        require_once(YOURLS_ABSPATH.'/yourls-infos.php');
         exit;
     }
 
 }
 
 // Past this point this is a request the loader could not understand : not a valid shorturl, not a bookmarklet
-yourls_do_action( 'redirect_keyword_not_found', $keyword );
-yourls_do_action( 'loader_failed', $request );
-yourls_redirect( YOURLS_SITE, 302 );
+yourls_do_action('redirect_keyword_not_found', $keyword);
+yourls_do_action('loader_failed', $request);
+yourls_redirect(YOURLS_SITE, 302);
 exit;

includes/functions-formatting.php

Indentation +224 added lines, -224 removed lines

@@ -9,18 +9,18 @@ 
  *
  */
 function yourls_int2string( $num, $chars = null ) {
-	if( $chars == null )
-		$chars = yourls_get_shorturl_charset();
-	$string = '';
-	$len = strlen( $chars );
-	while( $num >= $len ) {
-		$mod = bcmod( $num, $len );
-		$num = bcdiv( $num, $len );
-		$string = $chars[ $mod ] . $string;
-	}
-	$string = $chars[ intval( $num ) ] . $string;
+    if( $chars == null )
+        $chars = yourls_get_shorturl_charset();
+    $string = '';
+    $len = strlen( $chars );
+    while( $num >= $len ) {
+        $mod = bcmod( $num, $len );
+        $num = bcdiv( $num, $len );
+        $string = $chars[ $mod ] . $string;
+    }
+    $string = $chars[ intval( $num ) ] . $string;
 
-	return yourls_apply_filter( 'int2string', $string, $num, $chars );
+    return yourls_apply_filter( 'int2string', $string, $num, $chars );
 }
 
 /**
@@ -28,18 +28,18 @@ 
  *
  */
 function yourls_string2int( $string, $chars = null ) {
-	if( $chars == null )
-		$chars = yourls_get_shorturl_charset();
-	$integer = 0;
-	$string = strrev( $string  );
-	$baselen = strlen( $chars );
-	$inputlen = strlen( $string );
-	for ($i = 0; $i < $inputlen; $i++) {
-		$index = strpos( $chars, $string[$i] );
-		$integer = bcadd( $integer, bcmul( $index, bcpow( $baselen, $i ) ) );
-	}
+    if( $chars == null )
+        $chars = yourls_get_shorturl_charset();
+    $integer = 0;
+    $string = strrev( $string  );
+    $baselen = strlen( $chars );
+    $inputlen = strlen( $string );
+    for ($i = 0; $i < $inputlen; $i++) {
+        $index = strpos( $chars, $string[$i] );
+        $integer = bcadd( $integer, bcmul( $index, bcpow( $baselen, $i ) ) );
+    }
 
-	return yourls_apply_filter( 'string2int', $integer, $string, $chars );
+    return yourls_apply_filter( 'string2int', $integer, $string, $chars );
 }
 
 /**
@@ -47,7 +47,7 @@ 
  *
  */
 function yourls_string2htmlid( $string ) {
-	return yourls_apply_filter( 'string2htmlid', 'y'.abs( crc32( $string ) ) );
+    return yourls_apply_filter( 'string2htmlid', 'y'.abs( crc32( $string ) ) );
 }
 
 /**
@@ -72,7 +72,7 @@ 
         $valid = yourls_sanitize_url( $keyword );
     }
 
-	return yourls_apply_filter( 'sanitize_string', $valid, $keyword, $restrict_to_shorturl_charset );
+    return yourls_apply_filter( 'sanitize_string', $valid, $keyword, $restrict_to_shorturl_charset );
 }
 
 /**
@@ -85,15 +85,15 @@ 
  * @return string               Safe title
  */
 function yourls_sanitize_title( $unsafe_title, $fallback = '' ) {
-	$title = $unsafe_title;
-	$title = strip_tags( $title );
-	$title = preg_replace( "/\s+/", ' ', trim( $title ) );
+    $title = $unsafe_title;
+    $title = strip_tags( $title );
+    $title = preg_replace( "/\s+/", ' ', trim( $title ) );
 
     if ( '' === $title || false === $title ) {
         $title = $fallback;
     }
 
-	return yourls_apply_filter( 'sanitize_title', $title, $unsafe_title, $fallback );
+    return yourls_apply_filter( 'sanitize_title', $title, $unsafe_title, $fallback );
 }
 
 /**
@@ -106,8 +106,8 @@ 
  * @return string Safe URL
  */
 function yourls_sanitize_url( $unsafe_url, $protocols = array() ) {
-	$url = yourls_esc_url( $unsafe_url, 'redirection', $protocols );
-	return yourls_apply_filter( 'sanitize_url', $url, $unsafe_url );
+    $url = yourls_esc_url( $unsafe_url, 'redirection', $protocols );
+    return yourls_apply_filter( 'sanitize_url', $url, $unsafe_url );
 }
 
 /**
@@ -125,8 +125,8 @@ 
  * @return string Safe URL
  */
 function yourls_sanitize_url_safe( $unsafe_url, $protocols = array() ) {
-	$url = yourls_esc_url( $unsafe_url, 'safe', $protocols );
-	return yourls_apply_filter( 'sanitize_url_safe', $url, $unsafe_url );
+    $url = yourls_esc_url( $unsafe_url, 'safe', $protocols );
+    return yourls_apply_filter( 'sanitize_url_safe', $url, $unsafe_url );
 }
 
 /**
@@ -136,18 +136,18 @@ 
  *
  */
 function yourls_deep_replace( $search, $subject ){
-	$found = true;
-	while($found) {
-		$found = false;
-		foreach( (array) $search as $val ) {
-			while( strpos( $subject, $val ) !== false ) {
-				$found = true;
-				$subject = str_replace( $val, '', $subject );
-			}
-		}
-	}
+    $found = true;
+    while($found) {
+        $found = false;
+        foreach( (array) $search as $val ) {
+            while( strpos( $subject, $val ) !== false ) {
+                $found = true;
+                $subject = str_replace( $val, '', $subject );
+            }
+        }
+    }
 
-	return $subject;
+    return $subject;
 }
 
 /**
@@ -155,7 +155,7 @@ 
  *
  */
 function yourls_sanitize_int( $int ) {
-	return ( substr( preg_replace( '/[^0-9]/', '', strval( $int ) ), 0, 20 ) );
+    return ( substr( preg_replace( '/[^0-9]/', '', strval( $int ) ), 0, 20 ) );
 }
 
 /**
@@ -163,7 +163,7 @@ 
  *
  */
 function yourls_sanitize_ip( $ip ) {
-	return preg_replace( '/[^0-9a-fA-F:., ]/', '', $ip );
+    return preg_replace( '/[^0-9a-fA-F:., ]/', '', $ip );
 }
 
 /**
@@ -171,10 +171,10 @@ 
  *
  */
 function yourls_sanitize_date( $date ) {
-	if( !preg_match( '!^\d{1,2}/\d{1,2}/\d{4}$!' , $date ) ) {
-		return false;
-	}
-	return $date;
+    if( !preg_match( '!^\d{1,2}/\d{1,2}/\d{4}$!' , $date ) ) {
+        return false;
+    }
+    return $date;
 }
 
 /**
@@ -182,9 +182,9 @@ 
  *
  */
 function yourls_sanitize_date_for_sql( $date ) {
-	if( !yourls_sanitize_date( $date ) )
-		return false;
-	return date( 'Y-m-d', strtotime( $date ) );
+    if( !yourls_sanitize_date( $date ) )
+        return false;
+    return date( 'Y-m-d', strtotime( $date ) );
 }
 
 /**
@@ -192,11 +192,11 @@ 
  *
  */
 function yourls_trim_long_string( $string, $length = 60, $append = '[...]' ) {
-	$newstring = $string;
+    $newstring = $string;
     if ( mb_strlen( $newstring ) > $length ) {
         $newstring = mb_substr( $newstring, 0, $length - mb_strlen( $append ), 'UTF-8' ) . $append;
     }
-	return yourls_apply_filter( 'trim_long_string', $newstring, $string, $length, $append );
+    return yourls_apply_filter( 'trim_long_string', $newstring, $string, $length, $append );
 }
 
 /**
@@ -222,9 +222,9 @@ 
  *
  */
 function yourls_sanitize_filename( $file ) {
-	$file = str_replace( '\\', '/', $file ); // sanitize for Win32 installs
-	$file = preg_replace( '|/+|' ,'/', $file ); // remove any duplicate slash
-	return $file;
+    $file = str_replace( '\\', '/', $file ); // sanitize for Win32 installs
+    $file = preg_replace( '|/+|' ,'/', $file ); // remove any duplicate slash
+    return $file;
 }
 
 /**
@@ -232,22 +232,22 @@ 
  *
  */
 function yourls_seems_utf8( $str ) {
-	$length = strlen( $str );
-	for ( $i=0; $i < $length; $i++ ) {
-		$c = ord( $str[ $i ] );
-		if ( $c < 0x80 ) $n = 0; # 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; # 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; # 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; # 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; # 1111110b
-		else return false; # Does not match any model
-		for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
-			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
-				return false;
-		}
-	}
-	return true;
+    $length = strlen( $str );
+    for ( $i=0; $i < $length; $i++ ) {
+        $c = ord( $str[ $i ] );
+        if ( $c < 0x80 ) $n = 0; # 0bbbbbbb
+        elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb
+        elseif (($c & 0xF0) == 0xE0) $n=2; # 1110bbbb
+        elseif (($c & 0xF8) == 0xF0) $n=3; # 11110bbb
+        elseif (($c & 0xFC) == 0xF8) $n=4; # 111110bb
+        elseif (($c & 0xFE) == 0xFC) $n=5; # 1111110b
+        else return false; # Does not match any model
+        for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+            if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
+                return false;
+        }
+    }
+    return true;
 }
 
 
@@ -279,28 +279,28 @@ 
  * @return string The checked text.
  */
 function yourls_check_invalid_utf8( $string, $strip = false ) {
-	$string = (string) $string;
+    $string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
-		return '';
-	}
+    if ( 0 === strlen( $string ) ) {
+        return '';
+    }
 
-	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( ! yourls_supports_pcre_u() ) {
-		return $string;
-	}
+    // We can't demand utf8 in the PCRE installation, so just return the string in those cases
+    if ( ! yourls_supports_pcre_u() ) {
+        return $string;
+    }
 
-	// preg_match fails when it encounters invalid UTF8 in $string
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
-		return $string;
-	}
+    // preg_match fails when it encounters invalid UTF8 in $string
+    if ( 1 === @preg_match( '/^./us', $string ) ) {
+        return $string;
+    }
 
-	// Attempt to strip the bad chars if requested (not recommended)
-	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
-	}
+    // Attempt to strip the bad chars if requested (not recommended)
+    if ( $strip && function_exists( 'iconv' ) ) {
+        return iconv( 'utf-8', 'utf-8', $string );
+    }
 
-	return '';
+    return '';
 }
 
 /**
@@ -319,56 +319,56 @@ 
  * @return string The encoded text with HTML entities.
  */
 function yourls_specialchars( $string, $quote_style = ENT_NOQUOTES, $double_encode = false ) {
-	$string = (string) $string;
+    $string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
-		return '';
+    if ( 0 === strlen( $string ) )
+        return '';
 
-	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
-		return $string;
+    // Don't bother if there are no specialchars - saves some processing
+    if ( ! preg_match( '/[&<>"\']/', $string ) )
+        return $string;
 
-	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
-		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
-		$quote_style = ENT_QUOTES;
+    // Account for the previous behaviour of the function when the $quote_style is not an accepted value
+    if ( empty( $quote_style ) )
+        $quote_style = ENT_NOQUOTES;
+    elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+        $quote_style = ENT_QUOTES;
 
-	$charset = 'UTF-8';
+    $charset = 'UTF-8';
 
-	$_quote_style = $quote_style;
+    $_quote_style = $quote_style;
 
-	if ( $quote_style === 'double' ) {
-		$quote_style = ENT_COMPAT;
-		$_quote_style = ENT_COMPAT;
-	} elseif ( $quote_style === 'single' ) {
-		$quote_style = ENT_NOQUOTES;
-	}
+    if ( $quote_style === 'double' ) {
+        $quote_style = ENT_COMPAT;
+        $_quote_style = ENT_COMPAT;
+    } elseif ( $quote_style === 'single' ) {
+        $quote_style = ENT_NOQUOTES;
+    }
 
-	// Handle double encoding ourselves
-	if ( $double_encode ) {
-		$string = @htmlspecialchars( $string, $quote_style, $charset );
-	} else {
-		// Decode &amp; into &
-		$string = yourls_specialchars_decode( $string, $_quote_style );
+    // Handle double encoding ourselves
+    if ( $double_encode ) {
+        $string = @htmlspecialchars( $string, $quote_style, $charset );
+    } else {
+        // Decode &amp; into &
+        $string = yourls_specialchars_decode( $string, $_quote_style );
 
-		// Guarantee every &entity; is valid or re-encode the &
-		$string = yourls_kses_normalize_entities( $string );
+        // Guarantee every &entity; is valid or re-encode the &
+        $string = yourls_kses_normalize_entities( $string );
 
-		// Now re-encode everything except &entity;
-		$string = preg_split( '/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
+        // Now re-encode everything except &entity;
+        $string = preg_split( '/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
 
-		for ( $i = 0; $i < count( $string ); $i += 2 )
-			$string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
+        for ( $i = 0; $i < count( $string ); $i += 2 )
+            $string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
 
-		$string = implode( '', $string );
-	}
+        $string = implode( '', $string );
+    }
 
-	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+    // Backwards compatibility
+    if ( 'single' === $_quote_style )
+        $string = str_replace( "'", '&#039;', $string );
 
-	return $string;
+    return $string;
 }
 
 /**
@@ -386,51 +386,51 @@ 
  * @return string The decoded text without HTML entities.
  */
 function yourls_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
-	$string = (string) $string;
-
-	if ( 0 === strlen( $string ) ) {
-		return '';
-	}
-
-	// Don't bother if there are no entities - saves a lot of processing
-	if ( strpos( $string, '&' ) === false ) {
-		return $string;
-	}
-
-	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) ) {
-		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
-		$quote_style = ENT_QUOTES;
-	}
-
-	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
-
-	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
-		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
-	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
-		$translation_preg = array_merge( $double_preg, $others_preg );
-	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
-		$translation_preg = array_merge( $single_preg, $others_preg );
-	} elseif ( $quote_style === ENT_NOQUOTES ) {
-		$translation = $others;
-		$translation_preg = $others_preg;
-	}
-
-	// Remove zero padding on numeric entities
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
-
-	// Replace characters according to translation table
-	return strtr( $string, $translation );
+    $string = (string) $string;
+
+    if ( 0 === strlen( $string ) ) {
+        return '';
+    }
+
+    // Don't bother if there are no entities - saves a lot of processing
+    if ( strpos( $string, '&' ) === false ) {
+        return $string;
+    }
+
+    // Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
+    if ( empty( $quote_style ) ) {
+        $quote_style = ENT_NOQUOTES;
+    } elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+        $quote_style = ENT_QUOTES;
+    }
+
+    // More complete than get_html_translation_table( HTML_SPECIALCHARS )
+    $single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
+    $single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
+    $double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
+    $double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
+    $others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
+    $others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
+
+    if ( $quote_style === ENT_QUOTES ) {
+        $translation = array_merge( $single, $double, $others );
+        $translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
+    } elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
+        $translation = array_merge( $double, $others );
+        $translation_preg = array_merge( $double_preg, $others_preg );
+    } elseif ( $quote_style === 'single' ) {
+        $translation = array_merge( $single, $others );
+        $translation_preg = array_merge( $single_preg, $others_preg );
+    } elseif ( $quote_style === ENT_NOQUOTES ) {
+        $translation = $others;
+        $translation_preg = $others_preg;
+    }
+
+    // Remove zero padding on numeric entities
+    $string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+
+    // Replace characters according to translation table
+    return strtr( $string, $translation );
 }
 
 
@@ -443,9 +443,9 @@ 
  * @return string
  */
 function yourls_esc_html( $text ) {
-	$safe_text = yourls_check_invalid_utf8( $text );
-	$safe_text = yourls_specialchars( $safe_text, ENT_QUOTES );
-	return yourls_apply_filter( 'esc_html', $safe_text, $text );
+    $safe_text = yourls_check_invalid_utf8( $text );
+    $safe_text = yourls_specialchars( $safe_text, ENT_QUOTES );
+    return yourls_apply_filter( 'esc_html', $safe_text, $text );
 }
 
 /**
@@ -457,9 +457,9 @@ 
  * @return string
  */
 function yourls_esc_attr( $text ) {
-	$safe_text = yourls_check_invalid_utf8( $text );
-	$safe_text = yourls_specialchars( $safe_text, ENT_QUOTES );
-	return yourls_apply_filter( 'esc_attr', $safe_text, $text );
+    $safe_text = yourls_check_invalid_utf8( $text );
+    $safe_text = yourls_specialchars( $safe_text, ENT_QUOTES );
+    return yourls_apply_filter( 'esc_attr', $safe_text, $text );
 }
 
 /**
@@ -482,38 +482,38 @@ 
     // trim first -- see #1931
     $url = trim( $url );
 
-	// make sure there's only one 'http://' at the beginning (prevents pasting a URL right after the default 'http://')
-	$url = str_replace(
-		array( 'http://http://', 'http://https://' ),
-		array( 'http://',        'https://'        ),
-		$url
-	);
+    // make sure there's only one 'http://' at the beginning (prevents pasting a URL right after the default 'http://')
+    $url = str_replace(
+        array( 'http://http://', 'http://https://' ),
+        array( 'http://',        'https://'        ),
+        $url
+    );
 
-	if ( '' == $url )
-		return $url;
+    if ( '' == $url )
+        return $url;
 
-	$original_url = $url;
+    $original_url = $url;
 
-	// force scheme and domain to lowercase - see issues 591 and 1630
+    // force scheme and domain to lowercase - see issues 591 and 1630
     $url = yourls_normalize_uri( $url );
 
-	$url = preg_replace( '|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url );
-	// Previous regexp in YOURLS was '|[^a-z0-9-~+_.?\[\]\^#=!&;,/:%@$\|*`\'<>"()\\x80-\\xff\{\}]|i'
-	// TODO: check if that was it too destructive
+    $url = preg_replace( '|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url );
+    // Previous regexp in YOURLS was '|[^a-z0-9-~+_.?\[\]\^#=!&;,/:%@$\|*`\'<>"()\\x80-\\xff\{\}]|i'
+    // TODO: check if that was it too destructive
 
     // If $context is 'safe', an extra step is taken to make sure no CRLF injection is possible.
     // To be used when $url can be forged by evil user (eg it's from a $_SERVER variable, a query string, etc..)
-	if ( 'safe' == $context ) {
+    if ( 'safe' == $context ) {
         $strip = array( '%0d', '%0a', '%0D', '%0A' );
         $url = yourls_deep_replace( $strip, $url );
     }
 
-	// Replace ampersands and single quotes only when displaying.
-	if ( 'display' == $context ) {
-		$url = yourls_kses_normalize_entities( $url );
-		$url = str_replace( '&amp;', '&#038;', $url );
-		$url = str_replace( "'", '&#039;', $url );
-	}
+    // Replace ampersands and single quotes only when displaying.
+    if ( 'display' == $context ) {
+        $url = yourls_kses_normalize_entities( $url );
+        $url = str_replace( '&amp;', '&#038;', $url );
+        $url = str_replace( "'", '&#039;', $url );
+    }
 
     // If there's a protocol, make sure it's OK
     if( yourls_get_protocol($url) !== '' ) {
@@ -529,7 +529,7 @@ 
         // I didn't use KSES function kses_bad_protocol() because it doesn't work the way I liked (returns //blah from illegal://blah)
     }
 
-	return yourls_apply_filter( 'esc_url', $url, $original_url, $context );
+    return yourls_apply_filter( 'esc_url', $url, $original_url, $context );
 }
 
 
@@ -606,7 +606,7 @@ 
          * are considered the same. Explicitely mention option and variant to avoid notice
          * on PHP 7.2 and 7.3
          */
-         $lower['host'] = idn_to_utf8($lower['host'], IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
+            $lower['host'] = idn_to_utf8($lower['host'], IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
     }
 
     $url = http_build_url($url, $lower);
@@ -628,12 +628,12 @@ 
  * @return string Escaped text.
  */
 function yourls_esc_js( $text ) {
-	$safe_text = yourls_check_invalid_utf8( $text );
-	$safe_text = yourls_specialchars( $safe_text, ENT_COMPAT );
-	$safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-	$safe_text = str_replace( "\r", '', $safe_text );
-	$safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
-	return yourls_apply_filter( 'esc_js', $safe_text, $text );
+    $safe_text = yourls_check_invalid_utf8( $text );
+    $safe_text = yourls_specialchars( $safe_text, ENT_COMPAT );
+    $safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
+    $safe_text = str_replace( "\r", '', $safe_text );
+    $safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
+    return yourls_apply_filter( 'esc_js', $safe_text, $text );
 }
 
 /**
@@ -645,8 +645,8 @@ 
  * @return string
  */
 function yourls_esc_textarea( $text ) {
-	$safe_text = htmlspecialchars( $text, ENT_QUOTES );
-	return yourls_apply_filter( 'esc_textarea', $safe_text, $text );
+    $safe_text = htmlspecialchars( $text, ENT_QUOTES );
+    return yourls_apply_filter( 'esc_textarea', $safe_text, $text );
 }
 
 
@@ -658,18 +658,18 @@ 
 * @return string
 */
 function yourls_encodeURI( $url ) {
-	// Decode URL all the way
-	$result = yourls_rawurldecode_while_encoded( $url );
-	// Encode once
-	$result = strtr( rawurlencode( $result ), array (
+    // Decode URL all the way
+    $result = yourls_rawurldecode_while_encoded( $url );
+    // Encode once
+    $result = strtr( rawurlencode( $result ), array (
         '%3B' => ';', '%2C' => ',', '%2F' => '/', '%3F' => '?', '%3A' => ':', '%40' => '@',
-		'%26' => '&', '%3D' => '=', '%2B' => '+', '%24' => '$', '%21' => '!', '%2A' => '*',
-		'%27' => '\'', '%28' => '(', '%29' => ')', '%23' => '#',
+        '%26' => '&', '%3D' => '=', '%2B' => '+', '%24' => '$', '%21' => '!', '%2A' => '*',
+        '%27' => '\'', '%28' => '(', '%29' => ')', '%23' => '#',
     ) );
-	// @TODO:
-	// Known limit: this will most likely break IDN URLs such as http://www.académie-française.fr/
-	// To fully support IDN URLs, advocate use of a plugin.
-	return yourls_apply_filter( 'encodeURI', $result, $url );
+    // @TODO:
+    // Known limit: this will most likely break IDN URLs such as http://www.académie-française.fr/
+    // To fully support IDN URLs, advocate use of a plugin.
+    return yourls_apply_filter( 'encodeURI', $result, $url );
 }
 
 /**
@@ -696,7 +696,7 @@ 
  * @return bool
  */
 function yourls_is_rawurlencoded( $string ) {
-	return rawurldecode( $string ) != $string;
+    return rawurldecode( $string ) != $string;
 }
 
 /**
@@ -710,11 +710,11 @@ 
  * @return string
  */
 function yourls_rawurldecode_while_encoded( $string ) {
-	$string = rawurldecode( $string );
-	if( yourls_is_rawurlencoded( $string ) ) {
-		$string = yourls_rawurldecode_while_encoded( $string );
-	}
-	return $string;
+    $string = rawurldecode( $string );
+    if( yourls_is_rawurlencoded( $string ) ) {
+        $string = yourls_rawurldecode_while_encoded( $string );
+    }
+    return $string;
 }
 
 /**

Spacing +185 added lines, -185 removed lines

@@ -8,46 +8,46 @@ 
  * Convert an integer (1337) to a string (3jk).
  *
  */
-function yourls_int2string( $num, $chars = null ) {
-	if( $chars == null )
+function yourls_int2string($num, $chars = null) {
+	if ($chars == null)
 		$chars = yourls_get_shorturl_charset();
 	$string = '';
-	$len = strlen( $chars );
-	while( $num >= $len ) {
-		$mod = bcmod( $num, $len );
-		$num = bcdiv( $num, $len );
-		$string = $chars[ $mod ] . $string;
+	$len = strlen($chars);
+	while ($num >= $len) {
+		$mod = bcmod($num, $len);
+		$num = bcdiv($num, $len);
+		$string = $chars[$mod].$string;
 	}
-	$string = $chars[ intval( $num ) ] . $string;
+	$string = $chars[intval($num)].$string;
 
-	return yourls_apply_filter( 'int2string', $string, $num, $chars );
+	return yourls_apply_filter('int2string', $string, $num, $chars);
 }
 
 /**
  * Convert a string (3jk) to an integer (1337)
  *
  */
-function yourls_string2int( $string, $chars = null ) {
-	if( $chars == null )
+function yourls_string2int($string, $chars = null) {
+	if ($chars == null)
 		$chars = yourls_get_shorturl_charset();
 	$integer = 0;
-	$string = strrev( $string  );
-	$baselen = strlen( $chars );
-	$inputlen = strlen( $string );
+	$string = strrev($string);
+	$baselen = strlen($chars);
+	$inputlen = strlen($string);
 	for ($i = 0; $i < $inputlen; $i++) {
-		$index = strpos( $chars, $string[$i] );
-		$integer = bcadd( $integer, bcmul( $index, bcpow( $baselen, $i ) ) );
+		$index = strpos($chars, $string[$i]);
+		$integer = bcadd($integer, bcmul($index, bcpow($baselen, $i)));
 	}
 
-	return yourls_apply_filter( 'string2int', $integer, $string, $chars );
+	return yourls_apply_filter('string2int', $integer, $string, $chars);
 }
 
 /**
  * Return a unique(ish) hash for a string to be used as a valid HTML id
  *
  */
-function yourls_string2htmlid( $string ) {
-	return yourls_apply_filter( 'string2htmlid', 'y'.abs( crc32( $string ) ) );
+function yourls_string2htmlid($string) {
+	return yourls_apply_filter('string2htmlid', 'y'.abs(crc32($string)));
 }
 
 /**
@@ -63,16 +63,16 @@ 
  * @param  bool   $restrict_to_shorturl_charset   Optional, default false. True if we want the keyword to comply to short URL charset
  * @return string                                 The sanitized keyword
  */
-function yourls_sanitize_keyword( $keyword, $restrict_to_shorturl_charset = false ) {
-    if( $restrict_to_shorturl_charset === true ) {
+function yourls_sanitize_keyword($keyword, $restrict_to_shorturl_charset = false) {
+    if ($restrict_to_shorturl_charset === true) {
         // make a regexp pattern with the shorturl charset, and remove everything but this
-        $pattern = yourls_make_regexp_pattern( yourls_get_shorturl_charset() );
-        $valid = (string) substr( preg_replace( '![^'.$pattern.']!', '', $keyword ), 0, 199 );
+        $pattern = yourls_make_regexp_pattern(yourls_get_shorturl_charset());
+        $valid = (string) substr(preg_replace('![^'.$pattern.']!', '', $keyword), 0, 199);
     } else {
-        $valid = yourls_sanitize_url( $keyword );
+        $valid = yourls_sanitize_url($keyword);
     }
 
-	return yourls_apply_filter( 'sanitize_string', $valid, $keyword, $restrict_to_shorturl_charset );
+	return yourls_apply_filter('sanitize_string', $valid, $keyword, $restrict_to_shorturl_charset);
 }
 
 /**
@@ -84,16 +84,16 @@ 
  * @param string $fallback      Optional fallback if after sanitization nothing remains
  * @return string               Safe title
  */
-function yourls_sanitize_title( $unsafe_title, $fallback = '' ) {
+function yourls_sanitize_title($unsafe_title, $fallback = '') {
 	$title = $unsafe_title;
-	$title = strip_tags( $title );
-	$title = preg_replace( "/\s+/", ' ', trim( $title ) );
+	$title = strip_tags($title);
+	$title = preg_replace("/\s+/", ' ', trim($title));
 
-    if ( '' === $title || false === $title ) {
+    if ('' === $title || false === $title) {
         $title = $fallback;
     }
 
-	return yourls_apply_filter( 'sanitize_title', $title, $unsafe_title, $fallback );
+	return yourls_apply_filter('sanitize_title', $title, $unsafe_title, $fallback);
 }
 
 /**
@@ -105,9 +105,9 @@ 
  * @param array $protocols Optional allowed protocols, default to global $yourls_allowedprotocols
  * @return string Safe URL
  */
-function yourls_sanitize_url( $unsafe_url, $protocols = array() ) {
-	$url = yourls_esc_url( $unsafe_url, 'redirection', $protocols );
-	return yourls_apply_filter( 'sanitize_url', $url, $unsafe_url );
+function yourls_sanitize_url($unsafe_url, $protocols = array()) {
+	$url = yourls_esc_url($unsafe_url, 'redirection', $protocols);
+	return yourls_apply_filter('sanitize_url', $url, $unsafe_url);
 }
 
 /**
@@ -124,9 +124,9 @@ 
  * @param array $protocols Optional allowed protocols, default to global $yourls_allowedprotocols
  * @return string Safe URL
  */
-function yourls_sanitize_url_safe( $unsafe_url, $protocols = array() ) {
-	$url = yourls_esc_url( $unsafe_url, 'safe', $protocols );
-	return yourls_apply_filter( 'sanitize_url_safe', $url, $unsafe_url );
+function yourls_sanitize_url_safe($unsafe_url, $protocols = array()) {
+	$url = yourls_esc_url($unsafe_url, 'safe', $protocols);
+	return yourls_apply_filter('sanitize_url_safe', $url, $unsafe_url);
 }
 
 /**
@@ -135,14 +135,14 @@ 
  * Stolen from WP's _deep_replace
  *
  */
-function yourls_deep_replace( $search, $subject ){
+function yourls_deep_replace($search, $subject) {
 	$found = true;
-	while($found) {
+	while ($found) {
 		$found = false;
-		foreach( (array) $search as $val ) {
-			while( strpos( $subject, $val ) !== false ) {
+		foreach ((array) $search as $val) {
+			while (strpos($subject, $val) !== false) {
 				$found = true;
-				$subject = str_replace( $val, '', $subject );
+				$subject = str_replace($val, '', $subject);
 			}
 		}
 	}
@@ -154,24 +154,24 @@ 
  * Make sure an integer is a valid integer (PHP's intval() limits to too small numbers)
  *
  */
-function yourls_sanitize_int( $int ) {
-	return ( substr( preg_replace( '/[^0-9]/', '', strval( $int ) ), 0, 20 ) );
+function yourls_sanitize_int($int) {
+	return (substr(preg_replace('/[^0-9]/', '', strval($int)), 0, 20));
 }
 
 /**
  * Sanitize an IP address
  *
  */
-function yourls_sanitize_ip( $ip ) {
-	return preg_replace( '/[^0-9a-fA-F:., ]/', '', $ip );
+function yourls_sanitize_ip($ip) {
+	return preg_replace('/[^0-9a-fA-F:., ]/', '', $ip);
 }
 
 /**
  * Make sure a date is m(m)/d(d)/yyyy, return false otherwise
  *
  */
-function yourls_sanitize_date( $date ) {
-	if( !preg_match( '!^\d{1,2}/\d{1,2}/\d{4}$!' , $date ) ) {
+function yourls_sanitize_date($date) {
+	if (!preg_match('!^\d{1,2}/\d{1,2}/\d{4}$!', $date)) {
 		return false;
 	}
 	return $date;
@@ -181,22 +181,22 @@ 
  * Sanitize a date for SQL search. Return false if malformed input.
  *
  */
-function yourls_sanitize_date_for_sql( $date ) {
-	if( !yourls_sanitize_date( $date ) )
+function yourls_sanitize_date_for_sql($date) {
+	if (!yourls_sanitize_date($date))
 		return false;
-	return date( 'Y-m-d', strtotime( $date ) );
+	return date('Y-m-d', strtotime($date));
 }
 
 /**
  * Return trimmed string
  *
  */
-function yourls_trim_long_string( $string, $length = 60, $append = '[...]' ) {
+function yourls_trim_long_string($string, $length = 60, $append = '[...]') {
 	$newstring = $string;
-    if ( mb_strlen( $newstring ) > $length ) {
-        $newstring = mb_substr( $newstring, 0, $length - mb_strlen( $append ), 'UTF-8' ) . $append;
+    if (mb_strlen($newstring) > $length) {
+        $newstring = mb_substr($newstring, 0, $length - mb_strlen($append), 'UTF-8').$append;
     }
-	return yourls_apply_filter( 'trim_long_string', $newstring, $string, $length, $append );
+	return yourls_apply_filter('trim_long_string', $newstring, $string, $length, $append);
 }
 
 /**
@@ -210,8 +210,8 @@ 
  * @param  string $version  Version number
  * @return string           Sanitized version number
  */
-function yourls_sanitize_version( $version ) {
-    preg_match( '/([0-9]+\.[0-9.]+).*$/', $version, $matches );
+function yourls_sanitize_version($version) {
+    preg_match('/([0-9]+\.[0-9.]+).*$/', $version, $matches);
     $version = isset($matches[1]) ? trim($matches[1], '.') : '';
 
     return $version;
@@ -221,9 +221,9 @@ 
  * Sanitize a filename (no Win32 stuff)
  *
  */
-function yourls_sanitize_filename( $file ) {
-	$file = str_replace( '\\', '/', $file ); // sanitize for Win32 installs
-	$file = preg_replace( '|/+|' ,'/', $file ); // remove any duplicate slash
+function yourls_sanitize_filename($file) {
+	$file = str_replace('\\', '/', $file); // sanitize for Win32 installs
+	$file = preg_replace('|/+|', '/', $file); // remove any duplicate slash
 	return $file;
 }
 
@@ -231,18 +231,18 @@ 
  * Check if a string seems to be UTF-8. Stolen from WP.
  *
  */
-function yourls_seems_utf8( $str ) {
-	$length = strlen( $str );
-	for ( $i=0; $i < $length; $i++ ) {
-		$c = ord( $str[ $i ] );
-		if ( $c < 0x80 ) $n = 0; # 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; # 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; # 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; # 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; # 1111110b
+function yourls_seems_utf8($str) {
+	$length = strlen($str);
+	for ($i = 0; $i < $length; $i++) {
+		$c = ord($str[$i]);
+		if ($c < 0x80) $n = 0; # 0bbbbbbb
+		elseif (($c & 0xE0) == 0xC0) $n = 1; # 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) $n = 2; # 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) $n = 3; # 11110bbb
+		elseif (($c & 0xFC) == 0xF8) $n = 4; # 111110bb
+		elseif (($c & 0xFE) == 0xFC) $n = 5; # 1111110b
 		else return false; # Does not match any model
-		for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+		for ($j = 0; $j < $n; $j++) { # n bytes matching 10bbbbbb follow ?
 			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
 				return false;
 		}
@@ -263,8 +263,8 @@ 
  */
 function yourls_supports_pcre_u() {
     static $utf8_pcre;
-    if( !isset( $utf8_pcre ) ) {
-        $utf8_pcre = (bool) @preg_match( '/^./u', 'a' );
+    if (!isset($utf8_pcre)) {
+        $utf8_pcre = (bool) @preg_match('/^./u', 'a');
     }
     return $utf8_pcre;
 }
@@ -278,26 +278,26 @@ 
  * @param boolean $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
  * @return string The checked text.
  */
-function yourls_check_invalid_utf8( $string, $strip = false ) {
+function yourls_check_invalid_utf8($string, $strip = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( ! yourls_supports_pcre_u() ) {
+	if (!yourls_supports_pcre_u()) {
 		return $string;
 	}
 
 	// preg_match fails when it encounters invalid UTF8 in $string
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
+	if (1 === @preg_match('/^./us', $string)) {
 		return $string;
 	}
 
 	// Attempt to strip the bad chars if requested (not recommended)
-	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
+	if ($strip && function_exists('iconv')) {
+		return iconv('utf-8', 'utf-8', $string);
 	}
 
 	return '';
@@ -318,55 +318,55 @@ 
  * @param boolean $double_encode Optional. Whether to encode existing html entities. Default is false.
  * @return string The encoded text with HTML entities.
  */
-function yourls_specialchars( $string, $quote_style = ENT_NOQUOTES, $double_encode = false ) {
+function yourls_specialchars($string, $quote_style = ENT_NOQUOTES, $double_encode = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
+	if (0 === strlen($string))
 		return '';
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
+	if (!preg_match('/[&<>"\']/', $string))
 		return $string;
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
+	if (empty($quote_style))
 		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+	elseif (!in_array($quote_style, array(0, 2, 3, 'single', 'double'), true))
 		$quote_style = ENT_QUOTES;
 
 	$charset = 'UTF-8';
 
 	$_quote_style = $quote_style;
 
-	if ( $quote_style === 'double' ) {
+	if ($quote_style === 'double') {
 		$quote_style = ENT_COMPAT;
 		$_quote_style = ENT_COMPAT;
-	} elseif ( $quote_style === 'single' ) {
+	} elseif ($quote_style === 'single') {
 		$quote_style = ENT_NOQUOTES;
 	}
 
 	// Handle double encoding ourselves
-	if ( $double_encode ) {
-		$string = @htmlspecialchars( $string, $quote_style, $charset );
+	if ($double_encode) {
+		$string = @htmlspecialchars($string, $quote_style, $charset);
 	} else {
 		// Decode &amp; into &
-		$string = yourls_specialchars_decode( $string, $_quote_style );
+		$string = yourls_specialchars_decode($string, $_quote_style);
 
 		// Guarantee every &entity; is valid or re-encode the &
-		$string = yourls_kses_normalize_entities( $string );
+		$string = yourls_kses_normalize_entities($string);
 
 		// Now re-encode everything except &entity;
-		$string = preg_split( '/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
+		$string = preg_split('/(&#?x?[0-9a-z]+;)/i', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-		for ( $i = 0; $i < count( $string ); $i += 2 )
-			$string[$i] = @htmlspecialchars( $string[$i], $quote_style, $charset );
+		for ($i = 0; $i < count($string); $i += 2)
+			$string[$i] = @htmlspecialchars($string[$i], $quote_style, $charset);
 
-		$string = implode( '', $string );
+		$string = implode('', $string);
 	}
 
 	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ('single' === $_quote_style)
+		$string = str_replace("'", '&#039;', $string);
 
 	return $string;
 }
@@ -385,52 +385,52 @@ 
  * @param mixed $quote_style Optional. Converts double quotes if set to ENT_COMPAT, both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES. Also compatible with old _wp_specialchars() values; converting single quotes if set to 'single', double if set to 'double' or both if otherwise set. Default is ENT_NOQUOTES.
  * @return string The decoded text without HTML entities.
  */
-function yourls_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
+function yourls_specialchars_decode($string, $quote_style = ENT_NOQUOTES) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Don't bother if there are no entities - saves a lot of processing
-	if ( strpos( $string, '&' ) === false ) {
+	if (strpos($string, '&') === false) {
 		return $string;
 	}
 
 	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) ) {
+	if (empty($quote_style)) {
 		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+	} elseif (!in_array($quote_style, array(0, 2, 3, 'single', 'double'), true)) {
 		$quote_style = ENT_QUOTES;
 	}
 
 	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
-
-	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
-		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
-	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
-		$translation_preg = array_merge( $double_preg, $others_preg );
-	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
-		$translation_preg = array_merge( $single_preg, $others_preg );
-	} elseif ( $quote_style === ENT_NOQUOTES ) {
+	$single = array('&#039;'  => '\'', '&#x27;' => '\'');
+	$single_preg = array('/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;');
+	$double = array('&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"');
+	$double_preg = array('/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;');
+	$others = array('&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&');
+	$others_preg = array('/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;');
+
+	if ($quote_style === ENT_QUOTES) {
+		$translation = array_merge($single, $double, $others);
+		$translation_preg = array_merge($single_preg, $double_preg, $others_preg);
+	} elseif ($quote_style === ENT_COMPAT || $quote_style === 'double') {
+		$translation = array_merge($double, $others);
+		$translation_preg = array_merge($double_preg, $others_preg);
+	} elseif ($quote_style === 'single') {
+		$translation = array_merge($single, $others);
+		$translation_preg = array_merge($single_preg, $others_preg);
+	} elseif ($quote_style === ENT_NOQUOTES) {
 		$translation = $others;
 		$translation_preg = $others_preg;
 	}
 
 	// Remove zero padding on numeric entities
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+	$string = preg_replace(array_keys($translation_preg), array_values($translation_preg), $string);
 
 	// Replace characters according to translation table
-	return strtr( $string, $translation );
+	return strtr($string, $translation);
 }
 
 
@@ -442,10 +442,10 @@ 
  * @param string $text
  * @return string
  */
-function yourls_esc_html( $text ) {
-	$safe_text = yourls_check_invalid_utf8( $text );
-	$safe_text = yourls_specialchars( $safe_text, ENT_QUOTES );
-	return yourls_apply_filter( 'esc_html', $safe_text, $text );
+function yourls_esc_html($text) {
+	$safe_text = yourls_check_invalid_utf8($text);
+	$safe_text = yourls_specialchars($safe_text, ENT_QUOTES);
+	return yourls_apply_filter('esc_html', $safe_text, $text);
 }
 
 /**
@@ -456,10 +456,10 @@ 
  * @param string $text
  * @return string
  */
-function yourls_esc_attr( $text ) {
-	$safe_text = yourls_check_invalid_utf8( $text );
-	$safe_text = yourls_specialchars( $safe_text, ENT_QUOTES );
-	return yourls_apply_filter( 'esc_attr', $safe_text, $text );
+function yourls_esc_attr($text) {
+	$safe_text = yourls_check_invalid_utf8($text);
+	$safe_text = yourls_specialchars($safe_text, ENT_QUOTES);
+	return yourls_apply_filter('esc_attr', $safe_text, $text);
 }
 
 /**
@@ -478,58 +478,58 @@ 
  * @param array $protocols Optional. Array of allowed protocols, defaults to global $yourls_allowedprotocols
  * @return string The cleaned $url
  */
-function yourls_esc_url( $url, $context = 'display', $protocols = array() ) {
+function yourls_esc_url($url, $context = 'display', $protocols = array()) {
     // trim first -- see #1931
-    $url = trim( $url );
+    $url = trim($url);
 
 	// make sure there's only one 'http://' at the beginning (prevents pasting a URL right after the default 'http://')
 	$url = str_replace(
-		array( 'http://http://', 'http://https://' ),
-		array( 'http://',        'https://'        ),
+		array('http://http://', 'http://https://'),
+		array('http://', 'https://'),
 		$url
 	);
 
-	if ( '' == $url )
+	if ('' == $url)
 		return $url;
 
 	$original_url = $url;
 
 	// force scheme and domain to lowercase - see issues 591 and 1630
-    $url = yourls_normalize_uri( $url );
+    $url = yourls_normalize_uri($url);
 
-	$url = preg_replace( '|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url );
+	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 	// Previous regexp in YOURLS was '|[^a-z0-9-~+_.?\[\]\^#=!&;,/:%@$\|*`\'<>"()\\x80-\\xff\{\}]|i'
 	// TODO: check if that was it too destructive
 
     // If $context is 'safe', an extra step is taken to make sure no CRLF injection is possible.
     // To be used when $url can be forged by evil user (eg it's from a $_SERVER variable, a query string, etc..)
-	if ( 'safe' == $context ) {
-        $strip = array( '%0d', '%0a', '%0D', '%0A' );
-        $url = yourls_deep_replace( $strip, $url );
+	if ('safe' == $context) {
+        $strip = array('%0d', '%0a', '%0D', '%0A');
+        $url = yourls_deep_replace($strip, $url);
     }
 
 	// Replace ampersands and single quotes only when displaying.
-	if ( 'display' == $context ) {
-		$url = yourls_kses_normalize_entities( $url );
-		$url = str_replace( '&amp;', '&#038;', $url );
-		$url = str_replace( "'", '&#039;', $url );
+	if ('display' == $context) {
+		$url = yourls_kses_normalize_entities($url);
+		$url = str_replace('&amp;', '&#038;', $url);
+		$url = str_replace("'", '&#039;', $url);
 	}
 
     // If there's a protocol, make sure it's OK
-    if( yourls_get_protocol($url) !== '' ) {
-        if ( ! is_array( $protocols ) or ! $protocols ) {
+    if (yourls_get_protocol($url) !== '') {
+        if (!is_array($protocols) or !$protocols) {
             global $yourls_allowedprotocols;
-            $protocols = yourls_apply_filter( 'esc_url_protocols', $yourls_allowedprotocols );
+            $protocols = yourls_apply_filter('esc_url_protocols', $yourls_allowedprotocols);
             // Note: $yourls_allowedprotocols is also globally filterable in functions-kses.php/yourls_kses_init()
         }
 
-        if ( !yourls_is_allowed_protocol( $url, $protocols ) )
+        if (!yourls_is_allowed_protocol($url, $protocols))
             return '';
 
         // I didn't use KSES function kses_bad_protocol() because it doesn't work the way I liked (returns //blah from illegal://blah)
     }
 
-	return yourls_apply_filter( 'esc_url', $url, $original_url, $context );
+	return yourls_apply_filter('esc_url', $url, $original_url, $context);
 }
 
 
@@ -565,8 +565,8 @@ 
  * @param string $url URL
  * @return string URL with lowercase scheme and protocol
  */
-function yourls_normalize_uri( $url ) {
-    $scheme = yourls_get_protocol( $url );
+function yourls_normalize_uri($url) {
+    $scheme = yourls_get_protocol($url);
 
     if ('' == $scheme) {
         // Scheme not found, malformed URL? Something else? Not sure.
@@ -579,7 +579,7 @@ 
      * In this case, we only lowercase the scheme, because depending on it, things after should or should not be lowercased
      */
     if (substr($scheme, -2, 2) != '//') {
-        $url = str_replace( $scheme, strtolower( $scheme ), $url );
+        $url = str_replace($scheme, strtolower($scheme), $url);
         return $url;
     }
 
@@ -591,14 +591,14 @@ 
 
     // Most likely malformed stuff, could not parse : we'll just lowercase the scheme and leave the rest untouched
     if (false == $parts) {
-        $url = str_replace( $scheme, strtolower( $scheme ), $url );
+        $url = str_replace($scheme, strtolower($scheme), $url);
         return $url;
     }
 
     // URL seems parsable, let's do the best we can
     $lower = array();
-    $lower['scheme'] = strtolower( $parts['scheme'] );
-    if( isset( $parts['host'] ) ) {
+    $lower['scheme'] = strtolower($parts['scheme']);
+    if (isset($parts['host'])) {
         // Convert domain to lowercase, with mb_ to preserve UTF8
         $lower['host'] = mb_strtolower($parts['host']);
         /**
@@ -627,13 +627,13 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function yourls_esc_js( $text ) {
-	$safe_text = yourls_check_invalid_utf8( $text );
-	$safe_text = yourls_specialchars( $safe_text, ENT_COMPAT );
-	$safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-	$safe_text = str_replace( "\r", '', $safe_text );
-	$safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
-	return yourls_apply_filter( 'esc_js', $safe_text, $text );
+function yourls_esc_js($text) {
+	$safe_text = yourls_check_invalid_utf8($text);
+	$safe_text = yourls_specialchars($safe_text, ENT_COMPAT);
+	$safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text));
+	$safe_text = str_replace("\r", '', $safe_text);
+	$safe_text = str_replace("\n", '\\n', addslashes($safe_text));
+	return yourls_apply_filter('esc_js', $safe_text, $text);
 }
 
 /**
@@ -644,9 +644,9 @@ 
  * @param string $text
  * @return string
  */
-function yourls_esc_textarea( $text ) {
-	$safe_text = htmlspecialchars( $text, ENT_QUOTES );
-	return yourls_apply_filter( 'esc_textarea', $safe_text, $text );
+function yourls_esc_textarea($text) {
+	$safe_text = htmlspecialchars($text, ENT_QUOTES);
+	return yourls_apply_filter('esc_textarea', $safe_text, $text);
 }
 
 
@@ -657,19 +657,19 @@ 
 * @param $url
 * @return string
 */
-function yourls_encodeURI( $url ) {
+function yourls_encodeURI($url) {
 	// Decode URL all the way
-	$result = yourls_rawurldecode_while_encoded( $url );
+	$result = yourls_rawurldecode_while_encoded($url);
 	// Encode once
-	$result = strtr( rawurlencode( $result ), array (
+	$result = strtr(rawurlencode($result), array(
         '%3B' => ';', '%2C' => ',', '%2F' => '/', '%3F' => '?', '%3A' => ':', '%40' => '@',
 		'%26' => '&', '%3D' => '=', '%2B' => '+', '%24' => '$', '%21' => '!', '%2A' => '*',
 		'%27' => '\'', '%28' => '(', '%29' => ')', '%23' => '#',
-    ) );
+    ));
 	// @TODO:
 	// Known limit: this will most likely break IDN URLs such as http://www.académie-française.fr/
 	// To fully support IDN URLs, advocate use of a plugin.
-	return yourls_apply_filter( 'encodeURI', $result, $url );
+	return yourls_apply_filter('encodeURI', $result, $url);
 }
 
 /**
@@ -695,8 +695,8 @@ 
  * @param string $string
  * @return bool
  */
-function yourls_is_rawurlencoded( $string ) {
-	return rawurldecode( $string ) != $string;
+function yourls_is_rawurlencoded($string) {
+	return rawurldecode($string) != $string;
 }
 
 /**
@@ -709,10 +709,10 @@ 
  * @param string $string
  * @return string
  */
-function yourls_rawurldecode_while_encoded( $string ) {
-	$string = rawurldecode( $string );
-	if( yourls_is_rawurlencoded( $string ) ) {
-		$string = yourls_rawurldecode_while_encoded( $string );
+function yourls_rawurldecode_while_encoded($string) {
+	$string = rawurldecode($string);
+	if (yourls_is_rawurlencoded($string)) {
+		$string = yourls_rawurldecode_while_encoded($string);
 	}
 	return $string;
 }
@@ -726,9 +726,9 @@ 
  * @param  string $code  Javascript code
  * @return string        Bookmarklet link
  */
-function yourls_make_bookmarklet( $code ) {
+function yourls_make_bookmarklet($code) {
     $book = new \Ozh\Bookmarkletgen\Bookmarkletgen;
-    return $book->crunch( $code );
+    return $book->crunch($code);
 }
 
 /**
@@ -738,11 +738,11 @@ 
  * @param  string|int $timestamp  a timestamp
  * @return int                    a timestamp, plus or minus offset if defined
  */
-function yourls_get_timestamp( $timestamp ) {
+function yourls_get_timestamp($timestamp) {
     $offset = yourls_get_time_offset();
     $timestamp_offset = $timestamp + ($offset * 3600);
 
-    return yourls_apply_filter( 'get_timestamp', $timestamp_offset, $timestamp, $offset );
+    return yourls_apply_filter('get_timestamp', $timestamp_offset, $timestamp, $offset);
 }
 
 /**
@@ -752,8 +752,8 @@ 
  * @return int       Time offset
  */
 function yourls_get_time_offset() {
-    $offset = defined('YOURLS_HOURS_OFFSET') ? (int)YOURLS_HOURS_OFFSET : 0;
-    return yourls_apply_filter( 'get_time_offset', $offset );
+    $offset = defined('YOURLS_HOURS_OFFSET') ? (int) YOURLS_HOURS_OFFSET : 0;
+    return yourls_apply_filter('get_time_offset', $offset);
 }
 
 /**
@@ -763,8 +763,8 @@ 
  * @param  string $format  Date format string
  * @return string          Date format string
  */
-function yourls_get_datetime_format( $format ) {
-    return yourls_apply_filter( 'get_datetime_format', (string)$format );
+function yourls_get_datetime_format($format) {
+    return yourls_apply_filter('get_datetime_format', (string) $format);
 }
 
 /**
@@ -774,8 +774,8 @@ 
  * @param  string $format  Date format string
  * @return string          Date format string
  */
-function yourls_get_date_format( $format ) {
-    return yourls_apply_filter( 'get_date_format', (string)$format );
+function yourls_get_date_format($format) {
+    return yourls_apply_filter('get_date_format', (string) $format);
 }
 
 /**
@@ -785,7 +785,7 @@ 
  * @param  string $format  Date format string
  * @return string          Date format string
  */
-function yourls_get_time_format( $format ) {
-    return yourls_apply_filter( 'get_time_format', (string)$format );
+function yourls_get_time_format($format) {
+    return yourls_apply_filter('get_time_format', (string) $format);
 }
 

includes/functions-shorturls.php

Spacing +136 added lines, -136 removed lines

@@ -25,124 +25,124 @@ 
  * @param  string $title    option title
  * @return array            array with error/success state and short URL information
  */
-function yourls_add_new_link( $url, $keyword = '', $title = '' ) {
+function yourls_add_new_link($url, $keyword = '', $title = '') {
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_add_new_link', false, $url, $keyword, $title );
-    if ( false !== $pre )
+    $pre = yourls_apply_filter('shunt_add_new_link', false, $url, $keyword, $title);
+    if (false !== $pre)
         return $pre;
 
-    $url = yourls_sanitize_url( $url );
-    if ( !$url || $url == 'http://' || $url == 'https://' ) {
+    $url = yourls_sanitize_url($url);
+    if (!$url || $url == 'http://' || $url == 'https://') {
         $return['status']    = 'fail';
         $return['code']      = 'error:nourl';
-        $return['message']   = yourls__( 'Missing or malformed URL' );
+        $return['message']   = yourls__('Missing or malformed URL');
         $return['errorCode'] = '400';
-        return yourls_apply_filter( 'add_new_link_fail_nourl', $return, $url, $keyword, $title );
+        return yourls_apply_filter('add_new_link_fail_nourl', $return, $url, $keyword, $title);
     }
 
     // Prevent DB flood
     $ip = yourls_get_IP();
-    yourls_check_IP_flood( $ip );
+    yourls_check_IP_flood($ip);
 
     // Prevent internal redirection loops: cannot shorten a shortened URL
-    if( yourls_get_relative_url( $url ) ) {
-        if( yourls_is_shorturl( $url ) ) {
+    if (yourls_get_relative_url($url)) {
+        if (yourls_is_shorturl($url)) {
             $return['status']    = 'fail';
             $return['code']      = 'error:noloop';
-            $return['message']   = yourls__( 'URL is a short URL' );
+            $return['message']   = yourls__('URL is a short URL');
             $return['errorCode'] = '400';
-            return yourls_apply_filter( 'add_new_link_fail_noloop', $return, $url, $keyword, $title );
+            return yourls_apply_filter('add_new_link_fail_noloop', $return, $url, $keyword, $title);
         }
     }
 
-    yourls_do_action( 'pre_add_new_link', $url, $keyword, $title );
+    yourls_do_action('pre_add_new_link', $url, $keyword, $title);
 
     $return = array();
 
     // duplicates allowed or new URL => store it
-    if( yourls_allow_duplicate_longurls() || !( $url_exists = yourls_long_url_exists( $url ) ) ) {
+    if (yourls_allow_duplicate_longurls() || !($url_exists = yourls_long_url_exists($url))) {
 
-        if( isset( $title ) && !empty( $title ) ) {
-            $title = yourls_sanitize_title( $title );
+        if (isset($title) && !empty($title)) {
+            $title = yourls_sanitize_title($title);
         } else {
-            $title = yourls_get_remote_title( $url );
+            $title = yourls_get_remote_title($url);
         }
-        $title = yourls_apply_filter( 'add_new_title', $title, $url, $keyword );
+        $title = yourls_apply_filter('add_new_title', $title, $url, $keyword);
 
         // Custom keyword provided
-        if ( $keyword ) {
+        if ($keyword) {
 
-            yourls_do_action( 'add_new_link_custom_keyword', $url, $keyword, $title );
+            yourls_do_action('add_new_link_custom_keyword', $url, $keyword, $title);
 
-            $keyword = yourls_sanitize_keyword( $keyword, true );
-            $keyword = yourls_apply_filter( 'custom_keyword', $keyword, $url, $title );
+            $keyword = yourls_sanitize_keyword($keyword, true);
+            $keyword = yourls_apply_filter('custom_keyword', $keyword, $url, $title);
 
-            if ( !yourls_keyword_is_free( $keyword ) ) {
+            if (!yourls_keyword_is_free($keyword)) {
                 // This shorturl either reserved or taken already
                 $return['status']  = 'fail';
                 $return['code']    = 'error:keyword';
-                $return['message'] = yourls_s( 'Short URL %s already exists in database or is reserved', $keyword );
+                $return['message'] = yourls_s('Short URL %s already exists in database or is reserved', $keyword);
             } else {
                 // all clear, store !
-                yourls_insert_link_in_db( $url, $keyword, $title );
-                $return['url']      = array('keyword' => $keyword, 'url' => $url, 'title' => $title, 'date' => date('Y-m-d H:i:s'), 'ip' => $ip );
+                yourls_insert_link_in_db($url, $keyword, $title);
+                $return['url']      = array('keyword' => $keyword, 'url' => $url, 'title' => $title, 'date' => date('Y-m-d H:i:s'), 'ip' => $ip);
                 $return['status']   = 'success';
-                $return['message']  = /* //translators: eg "http://someurl/ added to DB" */ yourls_s( '%s added to database', yourls_trim_long_string( $url ) );
+                $return['message']  = /* //translators: eg "http://someurl/ added to DB" */ yourls_s('%s added to database', yourls_trim_long_string($url));
                 $return['title']    = $title;
-                $return['html']     = yourls_table_add_row( $keyword, $url, $title, $ip, 0, time() );
+                $return['html']     = yourls_table_add_row($keyword, $url, $title, $ip, 0, time());
                 $return['shorturl'] = yourls_link($keyword);
             }
 
         // Create random keyword
         } else {
 
-            yourls_do_action( 'add_new_link_create_keyword', $url, $keyword, $title );
+            yourls_do_action('add_new_link_create_keyword', $url, $keyword, $title);
 
-            $timestamp = date( 'Y-m-d H:i:s' );
+            $timestamp = date('Y-m-d H:i:s');
             $id = yourls_get_next_decimal();
             $ok = false;
             do {
-                $keyword = yourls_int2string( $id );
-                $keyword = yourls_apply_filter( 'random_keyword', $keyword, $url, $title );
-                if ( yourls_keyword_is_free($keyword) ) {
-                    if (yourls_insert_link_in_db( $url, $keyword, $title )){
+                $keyword = yourls_int2string($id);
+                $keyword = yourls_apply_filter('random_keyword', $keyword, $url, $title);
+                if (yourls_keyword_is_free($keyword)) {
+                    if (yourls_insert_link_in_db($url, $keyword, $title)) {
                         // everything ok, populate needed vars
-                        $return['url']      = array('keyword' => $keyword, 'url' => $url, 'title' => $title, 'date' => $timestamp, 'ip' => $ip );
+                        $return['url']      = array('keyword' => $keyword, 'url' => $url, 'title' => $title, 'date' => $timestamp, 'ip' => $ip);
                         $return['status']   = 'success';
-                        $return['message']  = /* //translators: eg "http://someurl/ added to DB" */ yourls_s( '%s added to database', yourls_trim_long_string( $url ) );
+                        $return['message']  = /* //translators: eg "http://someurl/ added to DB" */ yourls_s('%s added to database', yourls_trim_long_string($url));
                         $return['title']    = $title;
-                        $return['html']     = yourls_table_add_row( $keyword, $url, $title, $ip, 0, time() );
+                        $return['html']     = yourls_table_add_row($keyword, $url, $title, $ip, 0, time());
                         $return['shorturl'] = yourls_link($keyword);
                     } else {
                         // database error, couldnt store result
                         $return['status']   = 'fail';
                         $return['code']     = 'error:db';
-                        $return['message']  = yourls_s( 'Error saving url to database' );
+                        $return['message']  = yourls_s('Error saving url to database');
                     }
                     $ok = true;
                 }
                 $id++;
-            } while ( !$ok );
-            @yourls_update_next_decimal( $id );
+            } while (!$ok);
+            @yourls_update_next_decimal($id);
         }
 
     // URL was already stored
     } else {
 
-        yourls_do_action( 'add_new_link_already_stored', $url, $keyword, $title );
+        yourls_do_action('add_new_link_already_stored', $url, $keyword, $title);
 
         $return['status']   = 'fail';
         $return['code']     = 'error:url';
-        $return['url']      = array( 'keyword' => $url_exists->keyword, 'url' => $url, 'title' => $url_exists->title, 'date' => $url_exists->timestamp, 'ip' => $url_exists->ip, 'clicks' => $url_exists->clicks );
-        $return['message']  = /* //translators: eg "http://someurl/ already exists" */ yourls_s( '%s already exists in database', yourls_trim_long_string( $url ) );
+        $return['url']      = array('keyword' => $url_exists->keyword, 'url' => $url, 'title' => $url_exists->title, 'date' => $url_exists->timestamp, 'ip' => $url_exists->ip, 'clicks' => $url_exists->clicks);
+        $return['message']  = /* //translators: eg "http://someurl/ already exists" */ yourls_s('%s already exists in database', yourls_trim_long_string($url));
         $return['title']    = $url_exists->title;
         $return['shorturl'] = yourls_link($url_exists->keyword);
     }
 
-    yourls_do_action( 'post_add_new_link', $url, $keyword, $title, $return );
+    yourls_do_action('post_add_new_link', $url, $keyword, $title, $return);
 
     $return['statusCode'] = 200; // regardless of result, this is still a valid request
-    return yourls_apply_filter( 'add_new_link', $return, $url, $keyword, $title );
+    return yourls_apply_filter('add_new_link', $return, $url, $keyword, $title);
 }
 
 /**
@@ -152,11 +152,11 @@ 
  */
 function yourls_get_shorturl_charset() {
     static $charset = null;
-    if ( $charset !== null ) {
+    if ($charset !== null) {
         return $charset;
     }
 
-    if ( defined( 'YOURLS_URL_CONVERT' ) && in_array( YOURLS_URL_CONVERT, [ 62, 64 ] ) ) {
+    if (defined('YOURLS_URL_CONVERT') && in_array(YOURLS_URL_CONVERT, [62, 64])) {
         $charset = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     }
     else {
@@ -164,7 +164,7 @@ 
         $charset = '0123456789abcdefghijklmnopqrstuvwxyz';
     }
 
-    return yourls_apply_filter( 'get_shorturl_charset', $charset );
+    return yourls_apply_filter('get_shorturl_charset', $charset);
 }
 
 /**
@@ -173,24 +173,24 @@ 
  * @param  string $shorturl   short URL
  * @return bool               true if registered short URL, false otherwise
  */
-function yourls_is_shorturl( $shorturl ) {
+function yourls_is_shorturl($shorturl) {
     // TODO: make sure this function evolves with the feature set.
 
     $is_short = false;
 
     // Is $shorturl a URL (http://sho.rt/abc) or a keyword (abc) ?
-    if( yourls_get_protocol( $shorturl ) ) {
-        $keyword = yourls_get_relative_url( $shorturl );
+    if (yourls_get_protocol($shorturl)) {
+        $keyword = yourls_get_relative_url($shorturl);
     } else {
         $keyword = $shorturl;
     }
 
     // Check if it's a valid && used keyword
-    if( $keyword && $keyword == yourls_sanitize_keyword( $keyword ) && yourls_keyword_is_taken( $keyword ) ) {
+    if ($keyword && $keyword == yourls_sanitize_keyword($keyword) && yourls_keyword_is_taken($keyword)) {
         $is_short = true;
     }
 
-    return yourls_apply_filter( 'is_shorturl', $is_short, $shorturl );
+    return yourls_apply_filter('is_shorturl', $is_short, $shorturl);
 }
 
 /**
@@ -199,28 +199,28 @@ 
  * @param  string $keyword   Short URL keyword
  * @return bool              True if keyword reserved, false if free to be used
  */
-function yourls_keyword_is_reserved( $keyword ) {
+function yourls_keyword_is_reserved($keyword) {
     global $yourls_reserved_URL;
-    $keyword = yourls_sanitize_keyword( $keyword );
+    $keyword = yourls_sanitize_keyword($keyword);
     $reserved = false;
 
-    if ( in_array( $keyword, $yourls_reserved_URL)
+    if (in_array($keyword, $yourls_reserved_URL)
         or yourls_is_page($keyword)
-        or is_dir( YOURLS_ABSPATH ."/$keyword" )
+        or is_dir(YOURLS_ABSPATH."/$keyword")
     )
         $reserved = true;
 
-    return yourls_apply_filter( 'keyword_is_reserved', $reserved, $keyword );
+    return yourls_apply_filter('keyword_is_reserved', $reserved, $keyword);
 }
 
 /**
  * Delete a link in the DB
  *
  */
-function yourls_delete_link_by_keyword( $keyword ) {
+function yourls_delete_link_by_keyword($keyword) {
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_delete_link_by_keyword', null, $keyword );
-    if ( null !== $pre )
+    $pre = yourls_apply_filter('shunt_delete_link_by_keyword', null, $keyword);
+    if (null !== $pre)
         return $pre;
 
     global $ydb;
@@ -228,7 +228,7 @@ 
     $table = YOURLS_DB_TABLE_URL;
     $keyword = yourls_sanitize_keyword($keyword);
     $delete = $ydb->fetchAffected("DELETE FROM `$table` WHERE `keyword` = :keyword", array('keyword' => $keyword));
-    yourls_do_action( 'delete_link', $keyword, $delete );
+    yourls_do_action('delete_link', $keyword, $delete);
     return $delete;
 }
 
@@ -236,7 +236,7 @@ 
  * SQL query to insert a new link in the DB. Returns boolean for success or failure of the inserting
  *
  */
-function yourls_insert_link_in_db( $url, $keyword, $title = '' ) {
+function yourls_insert_link_in_db($url, $keyword, $title = '') {
     global $ydb;
 
     $url       = yourls_sanitize_url($url);
@@ -255,9 +255,9 @@ 
     );
     $insert = $ydb->fetchAffected("INSERT INTO `$table` (`keyword`, `url`, `title`, `timestamp`, `ip`, `clicks`) VALUES(:keyword, :url, :title, :timestamp, :ip, 0);", $binds);
 
-    yourls_do_action( 'insert_link', (bool)$insert, $url, $keyword, $title, $timestamp, $ip );
+    yourls_do_action('insert_link', (bool) $insert, $url, $keyword, $title, $timestamp, $ip);
 
-    return (bool)$insert;
+    return (bool) $insert;
 }
 
 /**
@@ -269,10 +269,10 @@ 
  * @param  string $url  URL to check if already shortened
  * @return mixed        NULL if does not already exist in DB, or object with URL information as properties (eg keyword, url, title, ...)
  */
-function yourls_long_url_exists( $url ) {
+function yourls_long_url_exists($url) {
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_url_exists', false, $url );
-    if ( false !== $pre )
+    $pre = yourls_apply_filter('shunt_url_exists', false, $url);
+    if (false !== $pre)
         return $pre;
 
     global $ydb;
@@ -284,17 +284,17 @@ 
         $url_exists = NULL;
     }
 
-    return yourls_apply_filter( 'url_exists', $url_exists, $url );
+    return yourls_apply_filter('url_exists', $url_exists, $url);
 }
 
 /**
  * Edit a link
  *
  */
-function yourls_edit_link( $url, $keyword, $newkeyword='', $title='' ) {
+function yourls_edit_link($url, $keyword, $newkeyword = '', $title = '') {
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_edit_link', null, $keyword, $url, $keyword, $newkeyword, $title );
-    if ( null !== $pre )
+    $pre = yourls_apply_filter('shunt_edit_link', null, $keyword, $url, $keyword, $newkeyword, $title);
+    if (null !== $pre)
         return $pre;
 
     global $ydb;
@@ -304,70 +304,70 @@ 
     $keyword = yourls_sanitize_keyword($keyword);
     $title = yourls_sanitize_title($title);
     $newkeyword = yourls_sanitize_keyword($newkeyword, true);
-    $strip_url = stripslashes( $url );
-    $strip_title = stripslashes( $title );
+    $strip_url = stripslashes($url);
+    $strip_title = stripslashes($title);
 
-    if(!$url OR !$newkeyword) {
+    if (!$url OR !$newkeyword) {
         $return['status']  = 'fail';
-        $return['message'] = yourls__( 'Long URL or Short URL cannot be blank' );
-        return yourls_apply_filter( 'edit_link', $return, $url, $keyword, $newkeyword, $title );
+        $return['message'] = yourls__('Long URL or Short URL cannot be blank');
+        return yourls_apply_filter('edit_link', $return, $url, $keyword, $newkeyword, $title);
     }
 
     $old_url = $ydb->fetchValue("SELECT `url` FROM `$table` WHERE `keyword` = :keyword", array('keyword' => $keyword));
 
     // Check if new URL is not here already
-    if ( $old_url != $url && !yourls_allow_duplicate_longurls() ) {
+    if ($old_url != $url && !yourls_allow_duplicate_longurls()) {
         $new_url_already_there = intval($ydb->fetchValue("SELECT COUNT(keyword) FROM `$table` WHERE `url` = :url;", array('url' => $url)));
     } else {
         $new_url_already_there = false;
     }
 
     // Check if the new keyword is not here already
-    if ( $newkeyword != $keyword ) {
-        $keyword_is_ok = yourls_keyword_is_free( $newkeyword );
+    if ($newkeyword != $keyword) {
+        $keyword_is_ok = yourls_keyword_is_free($newkeyword);
     } else {
         $keyword_is_ok = true;
     }
 
-    yourls_do_action( 'pre_edit_link', $url, $keyword, $newkeyword, $new_url_already_there, $keyword_is_ok );
+    yourls_do_action('pre_edit_link', $url, $keyword, $newkeyword, $new_url_already_there, $keyword_is_ok);
 
     // All clear, update
-    if ( ( !$new_url_already_there || yourls_allow_duplicate_longurls() ) && $keyword_is_ok ) {
+    if ((!$new_url_already_there || yourls_allow_duplicate_longurls()) && $keyword_is_ok) {
             $sql   = "UPDATE `$table` SET `url` = :url, `keyword` = :newkeyword, `title` = :title WHERE `keyword` = :keyword";
             $binds = array('url' => $url, 'newkeyword' => $newkeyword, 'title' => $title, 'keyword' => $keyword);
             $update_url = $ydb->fetchAffected($sql, $binds);
-        if( $update_url ) {
-            $return['url']     = array( 'keyword' => $newkeyword, 'shorturl' => yourls_link($newkeyword), 'url' => $strip_url, 'display_url' => yourls_trim_long_string( $strip_url ), 'title' => $strip_title, 'display_title' => yourls_trim_long_string( $strip_title ) );
+        if ($update_url) {
+            $return['url']     = array('keyword' => $newkeyword, 'shorturl' => yourls_link($newkeyword), 'url' => $strip_url, 'display_url' => yourls_trim_long_string($strip_url), 'title' => $strip_title, 'display_title' => yourls_trim_long_string($strip_title));
             $return['status']  = 'success';
-            $return['message'] = yourls__( 'Link updated in database' );
+            $return['message'] = yourls__('Link updated in database');
         } else {
             $return['status']  = 'fail';
-            $return['message'] = /* //translators: "Error updating http://someurl/ (Shorturl: http://sho.rt/blah)" */ yourls_s( 'Error updating %s (Short URL: %s)', yourls_trim_long_string( $strip_url ), $keyword ) ;
+            $return['message'] = /* //translators: "Error updating http://someurl/ (Shorturl: http://sho.rt/blah)" */ yourls_s('Error updating %s (Short URL: %s)', yourls_trim_long_string($strip_url), $keyword);
         }
 
     // Nope
     } else {
         $return['status']  = 'fail';
-        $return['message'] = yourls__( 'URL or keyword already exists in database' );
+        $return['message'] = yourls__('URL or keyword already exists in database');
     }
 
-    return yourls_apply_filter( 'edit_link', $return, $url, $keyword, $newkeyword, $title, $new_url_already_there, $keyword_is_ok );
+    return yourls_apply_filter('edit_link', $return, $url, $keyword, $newkeyword, $title, $new_url_already_there, $keyword_is_ok);
 }
 
 /**
  * Update a title link (no checks for duplicates etc..)
  *
  */
-function yourls_edit_link_title( $keyword, $title ) {
+function yourls_edit_link_title($keyword, $title) {
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_edit_link_title', null, $keyword, $title );
-    if ( null !== $pre )
+    $pre = yourls_apply_filter('shunt_edit_link_title', null, $keyword, $title);
+    if (null !== $pre)
         return $pre;
 
     global $ydb;
 
-    $keyword = yourls_sanitize_keyword( $keyword );
-    $title = yourls_sanitize_title( $title );
+    $keyword = yourls_sanitize_keyword($keyword);
+    $title = yourls_sanitize_title($title);
 
     $table = YOURLS_DB_TABLE_URL;
     $update = $ydb->fetchAffected("UPDATE `$table` SET `title` = :title WHERE `keyword` = :keyword;", array('title' => $title, 'keyword' => $keyword));
@@ -381,13 +381,13 @@ 
  * @param  string $keyword    short URL keyword
  * @return bool               true if keyword is taken (ie there is a short URL for it), false otherwise
  */
-function yourls_keyword_is_free( $keyword  ) {
+function yourls_keyword_is_free($keyword) {
     $free = true;
-    if ( yourls_keyword_is_reserved( $keyword ) or yourls_keyword_is_taken( $keyword, false ) ) {
+    if (yourls_keyword_is_reserved($keyword) or yourls_keyword_is_taken($keyword, false)) {
         $free = false;
     }
 
-    return yourls_apply_filter( 'keyword_is_free', $free, $keyword );
+    return yourls_apply_filter('keyword_is_free', $free, $keyword);
 }
 
 /**
@@ -399,7 +399,7 @@ 
  * @return bool             true if is page, false otherwise
  */
 function yourls_is_page($keyword) {
-    return yourls_apply_filter( 'is_page', file_exists( YOURLS_PAGEDIR . "/$keyword.php" ) );
+    return yourls_apply_filter('is_page', file_exists(YOURLS_PAGEDIR."/$keyword.php"));
 }
 
 /**
@@ -413,11 +413,11 @@ 
  * @param  bool   $use_cache  optional, default true: do we want to use what is cached in memory, if any, or force a new SQL query
  * @return bool               true if keyword is taken (ie there is a short URL for it), false otherwise
  */
-function yourls_keyword_is_taken( $keyword, $use_cache = true ) {
+function yourls_keyword_is_taken($keyword, $use_cache = true) {
 
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_keyword_is_taken', false, $keyword );
-    if ( false !== $pre )
+    $pre = yourls_apply_filter('shunt_keyword_is_taken', false, $keyword);
+    if (false !== $pre)
         return $pre;
 
     global $ydb;
@@ -425,11 +425,11 @@ 
 
     // To check if a keyword is already associated with a short URL, we fetch all info matching that keyword. This
     // will save a query in case of a redirection in yourls-go.php because info will be cached
-    if ( yourls_get_keyword_infos($keyword, $use_cache) ) {
+    if (yourls_get_keyword_infos($keyword, $use_cache)) {
         $taken = true;
     }
 
-    return yourls_apply_filter( 'keyword_is_taken', $taken, $keyword );
+    return yourls_apply_filter('keyword_is_taken', $taken, $keyword);
 }
 
 /**
@@ -444,23 +444,23 @@ 
  * @param  bool   $use_cache  Default true, set to false to force fetching from DB
  * @return false|object       false if not found, object with URL properties if found
  */
-function yourls_get_keyword_infos( $keyword, $use_cache = true ) {
+function yourls_get_keyword_infos($keyword, $use_cache = true) {
     global $ydb;
-    $keyword = yourls_sanitize_keyword( $keyword );
+    $keyword = yourls_sanitize_keyword($keyword);
 
-    yourls_do_action( 'pre_get_keyword', $keyword, $use_cache );
+    yourls_do_action('pre_get_keyword', $keyword, $use_cache);
 
-    if( $ydb->has_infos($keyword) && $use_cache === true ) {
-        return yourls_apply_filter( 'get_keyword_infos', $ydb->get_infos($keyword), $keyword );
+    if ($ydb->has_infos($keyword) && $use_cache === true) {
+        return yourls_apply_filter('get_keyword_infos', $ydb->get_infos($keyword), $keyword);
     }
 
-    yourls_do_action( 'get_keyword_not_cached', $keyword );
+    yourls_do_action('get_keyword_not_cached', $keyword);
 
     $table = YOURLS_DB_TABLE_URL;
     $infos = $ydb->fetchObject("SELECT * FROM `$table` WHERE `keyword` = :keyword", array('keyword' => $keyword));
 
-    if( $infos ) {
-        $infos = (array)$infos;
+    if ($infos) {
+        $infos = (array) $infos;
         $ydb->set_infos($keyword, $infos);
     } else {
         // is NULL if not found
@@ -468,68 +468,68 @@ 
         $ydb->set_infos($keyword, false);
     }
 
-    return yourls_apply_filter( 'get_keyword_infos', $infos, $keyword );
+    return yourls_apply_filter('get_keyword_infos', $infos, $keyword);
 }
 
 /**
  * Return (string) selected information associated with a keyword. Optional $notfound = string default message if nothing found
  *
  */
-function yourls_get_keyword_info( $keyword, $field, $notfound = false ) {
+function yourls_get_keyword_info($keyword, $field, $notfound = false) {
 
     // Allow plugins to short-circuit the whole function
-    $pre = yourls_apply_filter( 'shunt_get_keyword_info', false, $keyword, $field, $notfound );
-    if ( false !== $pre )
+    $pre = yourls_apply_filter('shunt_get_keyword_info', false, $keyword, $field, $notfound);
+    if (false !== $pre)
         return $pre;
 
-    $keyword = yourls_sanitize_keyword( $keyword );
-    $infos = yourls_get_keyword_infos( $keyword );
+    $keyword = yourls_sanitize_keyword($keyword);
+    $infos = yourls_get_keyword_infos($keyword);
 
     $return = $notfound;
-    if ( isset( $infos[ $field ] ) && $infos[ $field ] !== false )
-        $return = $infos[ $field ];
+    if (isset($infos[$field]) && $infos[$field] !== false)
+        $return = $infos[$field];
 
-    return yourls_apply_filter( 'get_keyword_info', $return, $keyword, $field, $notfound );
+    return yourls_apply_filter('get_keyword_info', $return, $keyword, $field, $notfound);
 }
 
 /**
  * Return title associated with keyword. Optional $notfound = string default message if nothing found
  *
  */
-function yourls_get_keyword_title( $keyword, $notfound = false ) {
-    return yourls_get_keyword_info( $keyword, 'title', $notfound );
+function yourls_get_keyword_title($keyword, $notfound = false) {
+    return yourls_get_keyword_info($keyword, 'title', $notfound);
 }
 
 /**
  * Return long URL associated with keyword. Optional $notfound = string default message if nothing found
  *
  */
-function yourls_get_keyword_longurl( $keyword, $notfound = false ) {
-    return yourls_get_keyword_info( $keyword, 'url', $notfound );
+function yourls_get_keyword_longurl($keyword, $notfound = false) {
+    return yourls_get_keyword_info($keyword, 'url', $notfound);
 }
 
 /**
  * Return number of clicks on a keyword. Optional $notfound = string default message if nothing found
  *
  */
-function yourls_get_keyword_clicks( $keyword, $notfound = false ) {
-    return yourls_get_keyword_info( $keyword, 'clicks', $notfound );
+function yourls_get_keyword_clicks($keyword, $notfound = false) {
+    return yourls_get_keyword_info($keyword, 'clicks', $notfound);
 }
 
 /**
  * Return IP that added a keyword. Optional $notfound = string default message if nothing found
  *
  */
-function yourls_get_keyword_IP( $keyword, $notfound = false ) {
-    return yourls_get_keyword_info( $keyword, 'ip', $notfound );
+function yourls_get_keyword_IP($keyword, $notfound = false) {
+    return yourls_get_keyword_info($keyword, 'ip', $notfound);
 }
 
 /**
  * Return timestamp associated with a keyword. Optional $notfound = string default message if nothing found
  *
  */
-function yourls_get_keyword_timestamp( $keyword, $notfound = false ) {
-    return yourls_get_keyword_info( $keyword, 'timestamp', $notfound );
+function yourls_get_keyword_timestamp($keyword, $notfound = false) {
+    return yourls_get_keyword_info($keyword, 'timestamp', $notfound);
 }
 
 /**
@@ -541,16 +541,16 @@ 
  * @param  string $shorturl short URL keyword
  * @return array            stats
  */
-function yourls_get_keyword_stats( $shorturl ) {
+function yourls_get_keyword_stats($shorturl) {
     global $ydb;
 
     $table_url = YOURLS_DB_TABLE_URL;
-    $shorturl  = yourls_sanitize_keyword( $shorturl );
+    $shorturl  = yourls_sanitize_keyword($shorturl);
 
     $res = $ydb->fetchObject("SELECT * FROM `$table_url` WHERE `keyword` = :keyword", array('keyword' => $shorturl));
     $return = array();
 
-    if( !$res ) {
+    if (!$res) {
         // non existent link
         $return = array(
             'statusCode' => 404,
@@ -571,7 +571,7 @@ 
         );
     }
 
-    return yourls_apply_filter( 'get_link_stats', $return, $shorturl );
+    return yourls_apply_filter('get_link_stats', $return, $shorturl);
 }
 
 /**
@@ -582,15 +582,15 @@ 
  * @param string $order Optional SORT order (can be 'ASC' or 'DESC')
  * @return array array of keywords
  */
-function yourls_get_longurl_keywords( $longurl, $order = 'ASC' ) {
+function yourls_get_longurl_keywords($longurl, $order = 'ASC') {
     global $ydb;
     $longurl = yourls_sanitize_url($longurl);
     $table   = YOURLS_DB_TABLE_URL;
     $sql     = "SELECT `keyword` FROM `$table` WHERE `url` = :url";
 
-    if (in_array($order, array('ASC','DESC'))) {
+    if (in_array($order, array('ASC', 'DESC'))) {
         $sql .= " ORDER BY `keyword` ".$order;
     }
 
-    return yourls_apply_filter( 'get_longurl_keywords', $ydb->fetchCol($sql, array('url'=>$longurl)), $longurl );
+    return yourls_apply_filter('get_longurl_keywords', $ydb->fetchCol($sql, array('url'=>$longurl)), $longurl);
 }

Braces +29 added lines, -21 removed lines

@@ -28,8 +28,9 @@ 
 function yourls_add_new_link( $url, $keyword = '', $title = '' ) {
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_add_new_link', false, $url, $keyword, $title );
-    if ( false !== $pre )
-        return $pre;
+    if ( false !== $pre ) {
+            return $pre;
+    }
 
     $url = yourls_sanitize_url( $url );
     if ( !$url || $url == 'http://' || $url == 'https://' ) {
@@ -105,7 +106,7 @@ 
                 $keyword = yourls_int2string( $id );
                 $keyword = yourls_apply_filter( 'random_keyword', $keyword, $url, $title );
                 if ( yourls_keyword_is_free($keyword) ) {
-                    if (yourls_insert_link_in_db( $url, $keyword, $title )){
+                    if (yourls_insert_link_in_db( $url, $keyword, $title )) {
                         // everything ok, populate needed vars
                         $return['url']      = array('keyword' => $keyword, 'url' => $url, 'title' => $title, 'date' => $timestamp, 'ip' => $ip );
                         $return['status']   = 'success';
@@ -158,8 +159,7 @@ 
 
     if ( defined( 'YOURLS_URL_CONVERT' ) && in_array( YOURLS_URL_CONVERT, [ 62, 64 ] ) ) {
         $charset = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    }
-    else {
+    } else {
         // defined to 36, or wrongly defined
         $charset = '0123456789abcdefghijklmnopqrstuvwxyz';
     }
@@ -207,8 +207,9 @@ 
     if ( in_array( $keyword, $yourls_reserved_URL)
         or yourls_is_page($keyword)
         or is_dir( YOURLS_ABSPATH ."/$keyword" )
-    )
-        $reserved = true;
+    ) {
+            $reserved = true;
+    }
 
     return yourls_apply_filter( 'keyword_is_reserved', $reserved, $keyword );
 }
@@ -220,8 +221,9 @@ 
 function yourls_delete_link_by_keyword( $keyword ) {
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_delete_link_by_keyword', null, $keyword );
-    if ( null !== $pre )
-        return $pre;
+    if ( null !== $pre ) {
+            return $pre;
+    }
 
     global $ydb;
 
@@ -272,8 +274,9 @@ 
 function yourls_long_url_exists( $url ) {
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_url_exists', false, $url );
-    if ( false !== $pre )
-        return $pre;
+    if ( false !== $pre ) {
+            return $pre;
+    }
 
     global $ydb;
     $table = YOURLS_DB_TABLE_URL;
@@ -294,8 +297,9 @@ 
 function yourls_edit_link( $url, $keyword, $newkeyword='', $title='' ) {
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_edit_link', null, $keyword, $url, $keyword, $newkeyword, $title );
-    if ( null !== $pre )
-        return $pre;
+    if ( null !== $pre ) {
+            return $pre;
+    }
 
     global $ydb;
 
@@ -361,8 +365,9 @@ 
 function yourls_edit_link_title( $keyword, $title ) {
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_edit_link_title', null, $keyword, $title );
-    if ( null !== $pre )
-        return $pre;
+    if ( null !== $pre ) {
+            return $pre;
+    }
 
     global $ydb;
 
@@ -417,8 +422,9 @@ 
 
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_keyword_is_taken', false, $keyword );
-    if ( false !== $pre )
-        return $pre;
+    if ( false !== $pre ) {
+            return $pre;
+    }
 
     global $ydb;
     $taken = false;
@@ -479,15 +485,17 @@ 
 
     // Allow plugins to short-circuit the whole function
     $pre = yourls_apply_filter( 'shunt_get_keyword_info', false, $keyword, $field, $notfound );
-    if ( false !== $pre )
-        return $pre;
+    if ( false !== $pre ) {
+            return $pre;
+    }
 
     $keyword = yourls_sanitize_keyword( $keyword );
     $infos = yourls_get_keyword_infos( $keyword );
 
     $return = $notfound;
-    if ( isset( $infos[ $field ] ) && $infos[ $field ] !== false )
-        $return = $infos[ $field ];
+    if ( isset( $infos[ $field ] ) && $infos[ $field ] !== false ) {
+            $return = $infos[ $field ];
+    }
 
     return yourls_apply_filter( 'get_keyword_info', $return, $keyword, $field, $notfound );
 }

includes/functions-api.php

Indentation +80 added lines, -80 removed lines

@@ -15,13 +15,13 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_shorturl() {
-	$url = ( isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : '' );
-	$keyword = ( isset( $_REQUEST['keyword'] ) ? $_REQUEST['keyword'] : '' );
-	$title = ( isset( $_REQUEST['title'] ) ? $_REQUEST['title'] : '' );
-	$return = yourls_add_new_link( $url, $keyword, $title );
-	$return['simple'] = ( isset( $return['shorturl'] ) ? $return['shorturl'] : '' ); // This one will be used in case output mode is 'simple'
-	unset( $return['html'] ); // in API mode, no need for our internal HTML output
-	return yourls_apply_filter( 'api_result_shorturl', $return );
+    $url = ( isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : '' );
+    $keyword = ( isset( $_REQUEST['keyword'] ) ? $_REQUEST['keyword'] : '' );
+    $title = ( isset( $_REQUEST['title'] ) ? $_REQUEST['title'] : '' );
+    $return = yourls_add_new_link( $url, $keyword, $title );
+    $return['simple'] = ( isset( $return['shorturl'] ) ? $return['shorturl'] : '' ); // This one will be used in case output mode is 'simple'
+    unset( $return['html'] ); // in API mode, no need for our internal HTML output
+    return yourls_apply_filter( 'api_result_shorturl', $return );
 }
 
 /**
@@ -31,10 +31,10 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_stats() {
-	$filter = ( isset( $_REQUEST['filter'] ) ? $_REQUEST['filter'] : '' );
-	$limit = ( isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : '' );
-	$start = ( isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : '' );
-	return yourls_apply_filter( 'api_result_stats', yourls_api_stats( $filter, $limit, $start ) );
+    $filter = ( isset( $_REQUEST['filter'] ) ? $_REQUEST['filter'] : '' );
+    $limit = ( isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : '' );
+    $start = ( isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : '' );
+    return yourls_apply_filter( 'api_result_stats', yourls_api_stats( $filter, $limit, $start ) );
 }
 
 /**
@@ -44,7 +44,7 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_db_stats() {
-	return yourls_apply_filter( 'api_result_db_stats', yourls_api_db_stats() );
+    return yourls_apply_filter( 'api_result_db_stats', yourls_api_db_stats() );
 }
 
 /**
@@ -54,8 +54,8 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_url_stats() {
-	$shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' );
-	return yourls_apply_filter( 'api_result_url_stats', yourls_api_url_stats( $shorturl ) );
+    $shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' );
+    return yourls_apply_filter( 'api_result_url_stats', yourls_api_url_stats( $shorturl ) );
 }
 
 /**
@@ -65,8 +65,8 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_expand() {
-	$shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' );
-	return yourls_apply_filter( 'api_result_expand', yourls_api_expand( $shorturl ) );
+    $shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' );
+    return yourls_apply_filter( 'api_result_expand', yourls_api_expand( $shorturl ) );
 }
 
 /**
@@ -76,10 +76,10 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_version() {
-	$return['version'] = $return['simple'] = YOURLS_VERSION;
-	if( isset( $_REQUEST['db'] ) && $_REQUEST['db'] == 1 )
-		$return['db_version'] = YOURLS_DB_VERSION;
-	return yourls_apply_filter( 'api_result_version', $return );
+    $return['version'] = $return['simple'] = YOURLS_VERSION;
+    if( isset( $_REQUEST['db'] ) && $_REQUEST['db'] == 1 )
+        $return['db_version'] = YOURLS_DB_VERSION;
+    return yourls_apply_filter( 'api_result_version', $return );
 }
 
 /**
@@ -99,12 +99,12 @@ 
  * @return string                API output, as an XML / JSON / JSONP / raw text string
  */
 function yourls_api_output( $mode, $output, $send_headers = true, $echo = true ) {
-	if( isset( $output['simple'] ) ) {
-		$simple = $output['simple'];
-		unset( $output['simple'] );
-	}
+    if( isset( $output['simple'] ) ) {
+        $simple = $output['simple'];
+        unset( $output['simple'] );
+    }
 
-	yourls_do_action( 'pre_api_output', $mode, $output, $send_headers, $echo );
+    yourls_do_action( 'pre_api_output', $mode, $output, $send_headers, $echo );
 
     if( $send_headers ) {
         if( isset( $output['statusCode'] ) ) {
@@ -119,43 +119,43 @@ 
 
     $result = '';
 
-	switch ( $mode ) {
-		case 'jsonp':
+    switch ( $mode ) {
+        case 'jsonp':
             if( $send_headers )
                 yourls_content_type_header( 'application/javascript' );
 
             $callback = isset( $output['callback'] ) ? $output['callback'] : '';
-			$result =  $callback . '(' . json_encode( $output ) . ')';
-			break;
+            $result =  $callback . '(' . json_encode( $output ) . ')';
+            break;
 
-		case 'json':
+        case 'json':
             if( $send_headers )
                 yourls_content_type_header( 'application/json' );
 
-			$result = json_encode( $output );
-			break;
+            $result = json_encode( $output );
+            break;
 
-		case 'xml':
+        case 'xml':
             if( $send_headers )
                 yourls_content_type_header( 'application/xml' );
 
-			$result = yourls_xml_encode( $output );
-			break;
+            $result = yourls_xml_encode( $output );
+            break;
 
-		case 'simple':
-		default:
+        case 'simple':
+        default:
             if( $send_headers )
                 yourls_content_type_header( 'text/plain' );
 
-			$result = isset( $simple ) ? $simple : '';
-			break;
-	}
+            $result = isset( $simple ) ? $simple : '';
+            break;
+    }
 
     if( $echo ) {
         echo $result;
     }
 
-	yourls_do_action( 'api_output', $mode, $output, $send_headers, $echo );
+    yourls_do_action( 'api_output', $mode, $output, $send_headers, $echo );
 
     return $result;
 }
@@ -165,10 +165,10 @@ 
  *
  */
 function yourls_api_stats( $filter = 'top', $limit = 10, $start = 0 ) {
-	$return = yourls_get_stats( $filter, $limit, $start );
-	$return['simple']  = 'Need either XML or JSON format for stats';
-	$return['message'] = 'success';
-	return yourls_apply_filter( 'api_stats', $return, $filter, $limit, $start );
+    $return = yourls_get_stats( $filter, $limit, $start );
+    $return['simple']  = 'Need either XML or JSON format for stats';
+    $return['message'] = 'success';
+    return yourls_apply_filter( 'api_stats', $return, $filter, $limit, $start );
 }
 
 /**
@@ -176,14 +176,14 @@ 
  *
  */
 function yourls_api_db_stats() {
-	$return = array(
-		'db-stats'   => yourls_get_db_stats(),
-		'statusCode' => 200,
-		'simple'     => 'Need either XML or JSON format for stats',
-		'message'    => 'success',
-	);
-
-	return yourls_apply_filter( 'api_db_stats', $return );
+    $return = array(
+        'db-stats'   => yourls_get_db_stats(),
+        'statusCode' => 200,
+        'simple'     => 'Need either XML or JSON format for stats',
+        'message'    => 'success',
+    );
+
+    return yourls_apply_filter( 'api_db_stats', $return );
 }
 
 /**
@@ -191,12 +191,12 @@ 
  *
  */
 function yourls_api_url_stats( $shorturl ) {
-	$keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc'
-	$keyword = yourls_sanitize_keyword( $keyword );
+    $keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc'
+    $keyword = yourls_sanitize_keyword( $keyword );
 
-	$return = yourls_get_keyword_stats( $keyword );
-	$return['simple']  = 'Need either XML or JSON format for stats';
-	return yourls_apply_filter( 'api_url_stats', $return, $shorturl );
+    $return = yourls_get_keyword_stats( $keyword );
+    $return['simple']  = 'Need either XML or JSON format for stats';
+    return yourls_apply_filter( 'api_url_stats', $return, $shorturl );
 }
 
 /**
@@ -204,29 +204,29 @@ 
  *
  */
 function yourls_api_expand( $shorturl ) {
-	$keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc'
-	$keyword = yourls_sanitize_keyword( $keyword );
+    $keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc'
+    $keyword = yourls_sanitize_keyword( $keyword );
 
-	$longurl = yourls_get_keyword_longurl( $keyword );
+    $longurl = yourls_get_keyword_longurl( $keyword );
 
-	if( $longurl ) {
-		$return = array(
-			'keyword'   => $keyword,
-			'shorturl'  => yourls_link($keyword),
-			'longurl'   => $longurl,
+    if( $longurl ) {
+        $return = array(
+            'keyword'   => $keyword,
+            'shorturl'  => yourls_link($keyword),
+            'longurl'   => $longurl,
             'title'     => yourls_get_keyword_title( $keyword ),
-			'simple'    => $longurl,
-			'message'   => 'success',
-			'statusCode' => 200,
-		);
-	} else {
-		$return = array(
-			'keyword'   => $keyword,
-			'simple'    => 'not found',
-			'message'   => 'Error: short URL not found',
-			'errorCode' => 404,
-		);
-	}
-
-	return yourls_apply_filter( 'api_expand', $return, $shorturl );
+            'simple'    => $longurl,
+            'message'   => 'success',
+            'statusCode' => 200,
+        );
+    } else {
+        $return = array(
+            'keyword'   => $keyword,
+            'simple'    => 'not found',
+            'message'   => 'Error: short URL not found',
+            'errorCode' => 404,
+        );
+    }
+
+    return yourls_apply_filter( 'api_expand', $return, $shorturl );
 }

Spacing +59 added lines, -59 removed lines

@@ -15,13 +15,13 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_shorturl() {
-	$url = ( isset( $_REQUEST['url'] ) ? $_REQUEST['url'] : '' );
-	$keyword = ( isset( $_REQUEST['keyword'] ) ? $_REQUEST['keyword'] : '' );
-	$title = ( isset( $_REQUEST['title'] ) ? $_REQUEST['title'] : '' );
-	$return = yourls_add_new_link( $url, $keyword, $title );
-	$return['simple'] = ( isset( $return['shorturl'] ) ? $return['shorturl'] : '' ); // This one will be used in case output mode is 'simple'
-	unset( $return['html'] ); // in API mode, no need for our internal HTML output
-	return yourls_apply_filter( 'api_result_shorturl', $return );
+	$url = (isset($_REQUEST['url']) ? $_REQUEST['url'] : '');
+	$keyword = (isset($_REQUEST['keyword']) ? $_REQUEST['keyword'] : '');
+	$title = (isset($_REQUEST['title']) ? $_REQUEST['title'] : '');
+	$return = yourls_add_new_link($url, $keyword, $title);
+	$return['simple'] = (isset($return['shorturl']) ? $return['shorturl'] : ''); // This one will be used in case output mode is 'simple'
+	unset($return['html']); // in API mode, no need for our internal HTML output
+	return yourls_apply_filter('api_result_shorturl', $return);
 }
 
 /**
@@ -31,10 +31,10 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_stats() {
-	$filter = ( isset( $_REQUEST['filter'] ) ? $_REQUEST['filter'] : '' );
-	$limit = ( isset( $_REQUEST['limit'] ) ? $_REQUEST['limit'] : '' );
-	$start = ( isset( $_REQUEST['start'] ) ? $_REQUEST['start'] : '' );
-	return yourls_apply_filter( 'api_result_stats', yourls_api_stats( $filter, $limit, $start ) );
+	$filter = (isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '');
+	$limit = (isset($_REQUEST['limit']) ? $_REQUEST['limit'] : '');
+	$start = (isset($_REQUEST['start']) ? $_REQUEST['start'] : '');
+	return yourls_apply_filter('api_result_stats', yourls_api_stats($filter, $limit, $start));
 }
 
 /**
@@ -44,7 +44,7 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_db_stats() {
-	return yourls_apply_filter( 'api_result_db_stats', yourls_api_db_stats() );
+	return yourls_apply_filter('api_result_db_stats', yourls_api_db_stats());
 }
 
 /**
@@ -54,8 +54,8 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_url_stats() {
-	$shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' );
-	return yourls_apply_filter( 'api_result_url_stats', yourls_api_url_stats( $shorturl ) );
+	$shorturl = (isset($_REQUEST['shorturl']) ? $_REQUEST['shorturl'] : '');
+	return yourls_apply_filter('api_result_url_stats', yourls_api_url_stats($shorturl));
 }
 
 /**
@@ -65,8 +65,8 @@ 
  * @return array Result of API call
  */
 function yourls_api_action_expand() {
-	$shorturl = ( isset( $_REQUEST['shorturl'] ) ? $_REQUEST['shorturl'] : '' );
-	return yourls_apply_filter( 'api_result_expand', yourls_api_expand( $shorturl ) );
+	$shorturl = (isset($_REQUEST['shorturl']) ? $_REQUEST['shorturl'] : '');
+	return yourls_apply_filter('api_result_expand', yourls_api_expand($shorturl));
 }
 
 /**
@@ -77,9 +77,9 @@ 
  */
 function yourls_api_action_version() {
 	$return['version'] = $return['simple'] = YOURLS_VERSION;
-	if( isset( $_REQUEST['db'] ) && $_REQUEST['db'] == 1 )
+	if (isset($_REQUEST['db']) && $_REQUEST['db'] == 1)
 		$return['db_version'] = YOURLS_DB_VERSION;
-	return yourls_apply_filter( 'api_result_version', $return );
+	return yourls_apply_filter('api_result_version', $return);
 }
 
 /**
@@ -98,64 +98,64 @@ 
  * @param  bool   $echo          Optional, default true: Whether the output should be outputted or just returned
  * @return string                API output, as an XML / JSON / JSONP / raw text string
  */
-function yourls_api_output( $mode, $output, $send_headers = true, $echo = true ) {
-	if( isset( $output['simple'] ) ) {
+function yourls_api_output($mode, $output, $send_headers = true, $echo = true) {
+	if (isset($output['simple'])) {
 		$simple = $output['simple'];
-		unset( $output['simple'] );
+		unset($output['simple']);
 	}
 
-	yourls_do_action( 'pre_api_output', $mode, $output, $send_headers, $echo );
+	yourls_do_action('pre_api_output', $mode, $output, $send_headers, $echo);
 
-    if( $send_headers ) {
-        if( isset( $output['statusCode'] ) ) {
+    if ($send_headers) {
+        if (isset($output['statusCode'])) {
             $code = $output['statusCode'];
-        } elseif ( isset( $output['errorCode'] ) ) {
+        } elseif (isset($output['errorCode'])) {
             $code = $output['errorCode'];
         } else {
             $code = 200;
         }
-        yourls_status_header( $code );
+        yourls_status_header($code);
     }
 
     $result = '';
 
-	switch ( $mode ) {
+	switch ($mode) {
 		case 'jsonp':
-            if( $send_headers )
-                yourls_content_type_header( 'application/javascript' );
+            if ($send_headers)
+                yourls_content_type_header('application/javascript');
 
-            $callback = isset( $output['callback'] ) ? $output['callback'] : '';
-			$result =  $callback . '(' . json_encode( $output ) . ')';
+            $callback = isset($output['callback']) ? $output['callback'] : '';
+			$result = $callback.'('.json_encode($output).')';
 			break;
 
 		case 'json':
-            if( $send_headers )
-                yourls_content_type_header( 'application/json' );
+            if ($send_headers)
+                yourls_content_type_header('application/json');
 
-			$result = json_encode( $output );
+			$result = json_encode($output);
 			break;
 
 		case 'xml':
-            if( $send_headers )
-                yourls_content_type_header( 'application/xml' );
+            if ($send_headers)
+                yourls_content_type_header('application/xml');
 
-			$result = yourls_xml_encode( $output );
+			$result = yourls_xml_encode($output);
 			break;
 
 		case 'simple':
 		default:
-            if( $send_headers )
-                yourls_content_type_header( 'text/plain' );
+            if ($send_headers)
+                yourls_content_type_header('text/plain');
 
-			$result = isset( $simple ) ? $simple : '';
+			$result = isset($simple) ? $simple : '';
 			break;
 	}
 
-    if( $echo ) {
+    if ($echo) {
         echo $result;
     }
 
-	yourls_do_action( 'api_output', $mode, $output, $send_headers, $echo );
+	yourls_do_action('api_output', $mode, $output, $send_headers, $echo);
 
     return $result;
 }
@@ -164,11 +164,11 @@ 
  * Return array for API stat requests
  *
  */
-function yourls_api_stats( $filter = 'top', $limit = 10, $start = 0 ) {
-	$return = yourls_get_stats( $filter, $limit, $start );
+function yourls_api_stats($filter = 'top', $limit = 10, $start = 0) {
+	$return = yourls_get_stats($filter, $limit, $start);
 	$return['simple']  = 'Need either XML or JSON format for stats';
 	$return['message'] = 'success';
-	return yourls_apply_filter( 'api_stats', $return, $filter, $limit, $start );
+	return yourls_apply_filter('api_stats', $return, $filter, $limit, $start);
 }
 
 /**
@@ -183,38 +183,38 @@ 
 		'message'    => 'success',
 	);
 
-	return yourls_apply_filter( 'api_db_stats', $return );
+	return yourls_apply_filter('api_db_stats', $return);
 }
 
 /**
  * Return array for API stat requests
  *
  */
-function yourls_api_url_stats( $shorturl ) {
-	$keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc'
-	$keyword = yourls_sanitize_keyword( $keyword );
+function yourls_api_url_stats($shorturl) {
+	$keyword = str_replace(yourls_get_yourls_site().'/', '', $shorturl); // accept either 'http://ozh.in/abc' or 'abc'
+	$keyword = yourls_sanitize_keyword($keyword);
 
-	$return = yourls_get_keyword_stats( $keyword );
-	$return['simple']  = 'Need either XML or JSON format for stats';
-	return yourls_apply_filter( 'api_url_stats', $return, $shorturl );
+	$return = yourls_get_keyword_stats($keyword);
+	$return['simple'] = 'Need either XML or JSON format for stats';
+	return yourls_apply_filter('api_url_stats', $return, $shorturl);
 }
 
 /**
  * Expand short url to long url
  *
  */
-function yourls_api_expand( $shorturl ) {
-	$keyword = str_replace( yourls_get_yourls_site() . '/' , '', $shorturl ); // accept either 'http://ozh.in/abc' or 'abc'
-	$keyword = yourls_sanitize_keyword( $keyword );
+function yourls_api_expand($shorturl) {
+	$keyword = str_replace(yourls_get_yourls_site().'/', '', $shorturl); // accept either 'http://ozh.in/abc' or 'abc'
+	$keyword = yourls_sanitize_keyword($keyword);
 
-	$longurl = yourls_get_keyword_longurl( $keyword );
+	$longurl = yourls_get_keyword_longurl($keyword);
 
-	if( $longurl ) {
+	if ($longurl) {
 		$return = array(
 			'keyword'   => $keyword,
 			'shorturl'  => yourls_link($keyword),
 			'longurl'   => $longurl,
-            'title'     => yourls_get_keyword_title( $keyword ),
+            'title'     => yourls_get_keyword_title($keyword),
 			'simple'    => $longurl,
 			'message'   => 'success',
 			'statusCode' => 200,
@@ -228,5 +228,5 @@ 
 		);
 	}
 
-	return yourls_apply_filter( 'api_expand', $return, $shorturl );
+	return yourls_apply_filter('api_expand', $return, $shorturl);
 }

includes/Config/Init.php

Spacing +11 added lines, -11 removed lines

@@ -29,7 +29,7 @@ 
 
         // Enforce UTC timezone. Date/time can be adjusted with a plugin.
         if ($actions->default_timezone === true) {
-            date_default_timezone_set( 'UTC' );
+            date_default_timezone_set('UTC');
         }
 
         // Load locale
@@ -63,7 +63,7 @@ 
         }
 
         // Abort initialization here if fast init wanted (for tests/debug/do not use)
-        if ($actions->return_if_fast_init === true && defined('YOURLS_FAST_INIT') && YOURLS_FAST_INIT){
+        if ($actions->return_if_fast_init === true && defined('YOURLS_FAST_INIT') && YOURLS_FAST_INIT) {
             return;
         }
 
@@ -74,19 +74,19 @@ 
 
         // Register shutdown function
         if ($actions->register_shutdown === true) {
-            register_shutdown_function( 'yourls_shutdown' );
+            register_shutdown_function('yourls_shutdown');
         }
 
         // Core now loaded
         if ($actions->core_loaded === true) {
-            yourls_do_action( 'init' ); // plugins can't see this, not loaded yet
+            yourls_do_action('init'); // plugins can't see this, not loaded yet
         }
 
         // Check if need to redirect to install procedure
         if ($actions->redirect_to_install === true) {
             if (!yourls_is_installed() && !yourls_is_installing()) {
                 yourls_no_cache_headers();
-                yourls_redirect( yourls_admin_url('install.php'), 307 );
+                yourls_redirect(yourls_admin_url('install.php'), 307);
             }
         }
 
@@ -94,7 +94,7 @@ 
         if ($actions->check_if_upgrade_needed === true) {
             if (!yourls_is_upgrading() && !yourls_is_installing() && yourls_upgrade_is_needed()) {
                 yourls_no_cache_headers();
-                yourls_redirect( yourls_admin_url('upgrade.php'), 307 );
+                yourls_redirect(yourls_admin_url('upgrade.php'), 307);
             }
         }
 
@@ -105,7 +105,7 @@ 
 
         // Trigger plugin loaded action
         if ($actions->plugins_loaded_action === true) {
-            yourls_do_action( 'plugins_loaded' );
+            yourls_do_action('plugins_loaded');
         }
 
         // Is there a new version of YOURLS ?
@@ -117,7 +117,7 @@ 
 
         if ($actions->init_admin === true) {
             if (yourls_is_admin()) {
-                yourls_do_action( 'admin_init' );
+                yourls_do_action('admin_init');
             }
         }
 
@@ -129,10 +129,10 @@ 
      */
     public function redirect_ssl_if_needed() {
         if (yourls_is_admin() && yourls_needs_ssl() && !yourls_is_ssl()) {
-            if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
-                yourls_redirect( preg_replace( '|^http://|', 'https://', $_SERVER['REQUEST_URI'] ) );
+            if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
+                yourls_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
             } else {
-                yourls_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+                yourls_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
             }
             exit();
         }

includes/functions-install.php

Indentation +205 added lines, -205 removed lines

@@ -25,14 +25,14 @@ 
  * @return string sanitized DB version
  */
 function yourls_get_database_version() {
-	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_get_database_version', false );
-	if ( false !== $pre )
-		return $pre;
+    // Allow plugins to short-circuit the whole function
+    $pre = yourls_apply_filter( 'shunt_get_database_version', false );
+    if ( false !== $pre )
+        return $pre;
 
-	global $ydb;
+    global $ydb;
 
-	return yourls_sanitize_version($ydb->mysql_version());
+    return yourls_sanitize_version($ydb->mysql_version());
 }
 
 /**
@@ -48,12 +48,12 @@ 
  *
  */
 function yourls_is_apache() {
-	if( !array_key_exists( 'SERVER_SOFTWARE', $_SERVER ) )
-		return false;
-	return (
-	   strpos( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) !== false
-	|| strpos( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) !== false
-	);
+    if( !array_key_exists( 'SERVER_SOFTWARE', $_SERVER ) )
+        return false;
+    return (
+        strpos( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) !== false
+    || strpos( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) !== false
+    );
 }
 
 /**
@@ -61,7 +61,7 @@ 
  *
  */
 function yourls_is_iis() {
-	return ( array_key_exists( 'SERVER_SOFTWARE', $_SERVER ) ? ( strpos( $_SERVER['SERVER_SOFTWARE'], 'IIS' ) !== false ) : false );
+    return ( array_key_exists( 'SERVER_SOFTWARE', $_SERVER ) ? ( strpos( $_SERVER['SERVER_SOFTWARE'], 'IIS' ) !== false ) : false );
 }
 
 
@@ -70,55 +70,55 @@ 
  *
  */
 function yourls_create_htaccess() {
-	$host = parse_url( yourls_get_yourls_site() );
-	$path = ( isset( $host['path'] ) ? $host['path'] : '' );
-
-	if ( yourls_is_iis() ) {
-		// Prepare content for a web.config file
-		$content = array(
-			'<?'.'xml version="1.0" encoding="UTF-8"?>',
-			'<configuration>',
-			'    <system.webServer>',
-			'        <security>',
-			'            <requestFiltering allowDoubleEscaping="true" />',
-			'        </security>',
-			'        <rewrite>',
-			'            <rules>',
-			'                <rule name="YOURLS" stopProcessing="true">',
-			'                    <match url="^(.*)$" ignoreCase="false" />',
-			'                    <conditions>',
-			'                        <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />',
-			'                        <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />',
-			'                    </conditions>',
-			'                    <action type="Rewrite" url="'.$path.'/yourls-loader.php" appendQueryString="true" />',
-			'                </rule>',
-			'            </rules>',
-			'        </rewrite>',
-			'    </system.webServer>',
-			'</configuration>',
-		);
-
-		$filename = YOURLS_ABSPATH.'/web.config';
-		$marker = 'none';
-
-	} else {
-		// Prepare content for a .htaccess file
-		$content = array(
-			'<IfModule mod_rewrite.c>',
-			'RewriteEngine On',
-			'RewriteBase '.$path.'/',
-			'RewriteCond %{REQUEST_FILENAME} !-f',
-			'RewriteCond %{REQUEST_FILENAME} !-d',
-			'RewriteRule ^.*$ '.$path.'/yourls-loader.php [L]',
-			'</IfModule>',
-		);
-
-		$filename = YOURLS_ABSPATH.'/.htaccess';
-		$marker = 'YOURLS';
-
-	}
-
-	return ( yourls_insert_with_markers( $filename, $marker, $content ) );
+    $host = parse_url( yourls_get_yourls_site() );
+    $path = ( isset( $host['path'] ) ? $host['path'] : '' );
+
+    if ( yourls_is_iis() ) {
+        // Prepare content for a web.config file
+        $content = array(
+            '<?'.'xml version="1.0" encoding="UTF-8"?>',
+            '<configuration>',
+            '    <system.webServer>',
+            '        <security>',
+            '            <requestFiltering allowDoubleEscaping="true" />',
+            '        </security>',
+            '        <rewrite>',
+            '            <rules>',
+            '                <rule name="YOURLS" stopProcessing="true">',
+            '                    <match url="^(.*)$" ignoreCase="false" />',
+            '                    <conditions>',
+            '                        <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />',
+            '                        <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />',
+            '                    </conditions>',
+            '                    <action type="Rewrite" url="'.$path.'/yourls-loader.php" appendQueryString="true" />',
+            '                </rule>',
+            '            </rules>',
+            '        </rewrite>',
+            '    </system.webServer>',
+            '</configuration>',
+        );
+
+        $filename = YOURLS_ABSPATH.'/web.config';
+        $marker = 'none';
+
+    } else {
+        // Prepare content for a .htaccess file
+        $content = array(
+            '<IfModule mod_rewrite.c>',
+            'RewriteEngine On',
+            'RewriteBase '.$path.'/',
+            'RewriteCond %{REQUEST_FILENAME} !-f',
+            'RewriteCond %{REQUEST_FILENAME} !-d',
+            'RewriteRule ^.*$ '.$path.'/yourls-loader.php [L]',
+            '</IfModule>',
+        );
+
+        $filename = YOURLS_ABSPATH.'/.htaccess';
+        $marker = 'YOURLS';
+
+    }
+
+    return ( yourls_insert_with_markers( $filename, $marker, $content ) );
 }
 
 /**
@@ -136,54 +136,54 @@ 
  * @return bool True on write success, false on failure.
  */
 function yourls_insert_with_markers( $filename, $marker, $insertion ) {
-	if ( !file_exists( $filename ) || is_writeable( $filename ) ) {
-		if ( !file_exists( $filename ) ) {
-			$markerdata = '';
-		} else {
-			$markerdata = explode( "\n", implode( '', file( $filename ) ) );
-		}
-
-		if ( !$f = @fopen( $filename, 'w' ) )
-			return false;
-
-		$foundit = false;
-		if ( $markerdata ) {
-			$state = true;
-			foreach ( $markerdata as $n => $markerline ) {
-				if ( strpos( $markerline, '# BEGIN ' . $marker ) !== false )
-					$state = false;
-				if ( $state ) {
-					if ( $n + 1 < count( $markerdata ) )
-						fwrite( $f, "{$markerline}\n" );
-					else
-						fwrite( $f, "{$markerline}" );
-				}
-				if ( strpos( $markerline, '# END ' . $marker ) !== false ) {
-					if ( $marker != 'none' )
-						fwrite( $f, "# BEGIN {$marker}\n" );
-					if ( is_array( $insertion ) )
-						foreach ( $insertion as $insertline )
-							fwrite( $f, "{$insertline}\n" );
-					if ( $marker != 'none' )
-						fwrite( $f, "# END {$marker}\n" );
-					$state = true;
-					$foundit = true;
-				}
-			}
-		}
-		if ( !$foundit ) {
-			if ( $marker != 'none' )
-				fwrite( $f, "\n\n# BEGIN {$marker}\n" );
-			foreach ( $insertion as $insertline )
-				fwrite( $f, "{$insertline}\n" );
-			if ( $marker != 'none' )
-				fwrite( $f, "# END {$marker}\n\n" );
-		}
-		fclose( $f );
-		return true;
-	} else {
-		return false;
-	}
+    if ( !file_exists( $filename ) || is_writeable( $filename ) ) {
+        if ( !file_exists( $filename ) ) {
+            $markerdata = '';
+        } else {
+            $markerdata = explode( "\n", implode( '', file( $filename ) ) );
+        }
+
+        if ( !$f = @fopen( $filename, 'w' ) )
+            return false;
+
+        $foundit = false;
+        if ( $markerdata ) {
+            $state = true;
+            foreach ( $markerdata as $n => $markerline ) {
+                if ( strpos( $markerline, '# BEGIN ' . $marker ) !== false )
+                    $state = false;
+                if ( $state ) {
+                    if ( $n + 1 < count( $markerdata ) )
+                        fwrite( $f, "{$markerline}\n" );
+                    else
+                        fwrite( $f, "{$markerline}" );
+                }
+                if ( strpos( $markerline, '# END ' . $marker ) !== false ) {
+                    if ( $marker != 'none' )
+                        fwrite( $f, "# BEGIN {$marker}\n" );
+                    if ( is_array( $insertion ) )
+                        foreach ( $insertion as $insertline )
+                            fwrite( $f, "{$insertline}\n" );
+                    if ( $marker != 'none' )
+                        fwrite( $f, "# END {$marker}\n" );
+                    $state = true;
+                    $foundit = true;
+                }
+            }
+        }
+        if ( !$foundit ) {
+            if ( $marker != 'none' )
+                fwrite( $f, "\n\n# BEGIN {$marker}\n" );
+            foreach ( $insertion as $insertline )
+                fwrite( $f, "{$insertline}\n" );
+            if ( $marker != 'none' )
+                fwrite( $f, "# END {$marker}\n\n" );
+        }
+        fclose( $f );
+        return true;
+    } else {
+        return false;
+    }
 }
 
 /**
@@ -200,81 +200,81 @@ 
         return $pre;
     }
 
-	global $ydb;
+    global $ydb;
 
-	$error_msg = array();
-	$success_msg = array();
+    $error_msg = array();
+    $success_msg = array();
 
-	// Create Table Query
-	$create_tables = array();
-	$create_tables[YOURLS_DB_TABLE_URL] =
+    // Create Table Query
+    $create_tables = array();
+    $create_tables[YOURLS_DB_TABLE_URL] =
         'CREATE TABLE IF NOT EXISTS `'.YOURLS_DB_TABLE_URL.'` ('.
-         '`keyword` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT "",'.
-         '`url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,'.
-         '`title` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,'.
-         '`timestamp` timestamp NOT NULL DEFAULT current_timestamp(),'.
-         '`ip` varchar(41) COLLATE utf8mb4_unicode_ci NOT NULL,'.
-         '`clicks` int(10) unsigned NOT NULL,'.
-         'PRIMARY KEY (`keyword`),'.
-         'KEY `ip` (`ip`),'.
-         'KEY `timestamp` (`timestamp`)'.
+            '`keyword` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT "",'.
+            '`url` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,'.
+            '`title` text COLLATE utf8mb4_unicode_ci DEFAULT NULL,'.
+            '`timestamp` timestamp NOT NULL DEFAULT current_timestamp(),'.
+            '`ip` varchar(41) COLLATE utf8mb4_unicode_ci NOT NULL,'.
+            '`clicks` int(10) unsigned NOT NULL,'.
+            'PRIMARY KEY (`keyword`),'.
+            'KEY `ip` (`ip`),'.
+            'KEY `timestamp` (`timestamp`)'.
         ') DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
 
-	$create_tables[YOURLS_DB_TABLE_OPTIONS] =
-		'CREATE TABLE IF NOT EXISTS `'.YOURLS_DB_TABLE_OPTIONS.'` ('.
-		'`option_id` bigint(20) unsigned NOT NULL auto_increment,'.
-		'`option_name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL default "",'.
-		'`option_value` longtext COLLATE utf8mb4_unicode_ci NOT NULL,'.
-		'PRIMARY KEY  (`option_id`,`option_name`),'.
-		'KEY `option_name` (`option_name`)'.
-		') AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
-
-	$create_tables[YOURLS_DB_TABLE_LOG] =
-		'CREATE TABLE IF NOT EXISTS `'.YOURLS_DB_TABLE_LOG.'` ('.
-		'`click_id` int(11) NOT NULL auto_increment,'.
-		'`click_time` datetime NOT NULL,'.
-		'`shorturl` varchar(100) BINARY NOT NULL,'.
-		'`referrer` varchar(200) NOT NULL,'.
-		'`user_agent` varchar(255) NOT NULL,'.
-		'`ip_address` varchar(41) NOT NULL,'.
-		'`country_code` char(2) NOT NULL,'.
-		'PRIMARY KEY  (`click_id`),'.
-		'KEY `shorturl` (`shorturl`)'.
-		') AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
-
-
-	$create_table_count = 0;
+    $create_tables[YOURLS_DB_TABLE_OPTIONS] =
+        'CREATE TABLE IF NOT EXISTS `'.YOURLS_DB_TABLE_OPTIONS.'` ('.
+        '`option_id` bigint(20) unsigned NOT NULL auto_increment,'.
+        '`option_name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL default "",'.
+        '`option_value` longtext COLLATE utf8mb4_unicode_ci NOT NULL,'.
+        'PRIMARY KEY  (`option_id`,`option_name`),'.
+        'KEY `option_name` (`option_name`)'.
+        ') AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
+
+    $create_tables[YOURLS_DB_TABLE_LOG] =
+        'CREATE TABLE IF NOT EXISTS `'.YOURLS_DB_TABLE_LOG.'` ('.
+        '`click_id` int(11) NOT NULL auto_increment,'.
+        '`click_time` datetime NOT NULL,'.
+        '`shorturl` varchar(100) BINARY NOT NULL,'.
+        '`referrer` varchar(200) NOT NULL,'.
+        '`user_agent` varchar(255) NOT NULL,'.
+        '`ip_address` varchar(41) NOT NULL,'.
+        '`country_code` char(2) NOT NULL,'.
+        'PRIMARY KEY  (`click_id`),'.
+        'KEY `shorturl` (`shorturl`)'.
+        ') AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;';
+
+
+    $create_table_count = 0;
 
     yourls_debug_mode(true);
 
-	// Create tables
-	foreach ( $create_tables as $table_name => $table_query ) {
-		$ydb->perform( $table_query );
-		$create_success = $ydb->fetchAffected( "SHOW TABLES LIKE '$table_name'" );
-		if( $create_success ) {
-			$create_table_count++;
-			$success_msg[] = yourls_s( "Table '%s' created.", $table_name );
-		} else {
-			$error_msg[] = yourls_s( "Error creating table '%s'.", $table_name );
-		}
-	}
-
-	// Initializes the option table
-	if( !yourls_initialize_options() )
-		$error_msg[] = yourls__( 'Could not initialize options' );
-
-	// Insert sample links
-	if( !yourls_insert_sample_links() )
-		$error_msg[] = yourls__( 'Could not insert sample short URLs' );
-
-	// Check results of operations
-	if ( sizeof( $create_tables ) == $create_table_count ) {
-		$success_msg[] = yourls__( 'YOURLS tables successfully created.' );
-	} else {
-		$error_msg[] = yourls__( 'Error creating YOURLS tables.' );
-	}
-
-	return array( 'success' => $success_msg, 'error' => $error_msg );
+    // Create tables
+    foreach ( $create_tables as $table_name => $table_query ) {
+        $ydb->perform( $table_query );
+        $create_success = $ydb->fetchAffected( "SHOW TABLES LIKE '$table_name'" );
+        if( $create_success ) {
+            $create_table_count++;
+            $success_msg[] = yourls_s( "Table '%s' created.", $table_name );
+        } else {
+            $error_msg[] = yourls_s( "Error creating table '%s'.", $table_name );
+        }
+    }
+
+    // Initializes the option table
+    if( !yourls_initialize_options() )
+        $error_msg[] = yourls__( 'Could not initialize options' );
+
+    // Insert sample links
+    if( !yourls_insert_sample_links() )
+        $error_msg[] = yourls__( 'Could not insert sample short URLs' );
+
+    // Check results of operations
+    if ( sizeof( $create_tables ) == $create_table_count ) {
+        $success_msg[] = yourls__( 'YOURLS tables successfully created.' );
+    } else {
+        $error_msg[] = yourls__( 'Error creating YOURLS tables.' );
+    }
+
+    return array( 'success' => $success_msg, 'error' => $error_msg );
 }
 
 /**
@@ -288,12 +288,12 @@ 
  * @return bool
  */
 function yourls_initialize_options() {
-	return ( bool ) (
-		  yourls_update_option( 'version', YOURLS_VERSION )
-		& yourls_update_option( 'db_version', YOURLS_DB_VERSION )
-		& yourls_update_option( 'next_id', 1 )
+    return ( bool ) (
+            yourls_update_option( 'version', YOURLS_VERSION )
+        & yourls_update_option( 'db_version', YOURLS_DB_VERSION )
+        & yourls_update_option( 'next_id', 1 )
         & yourls_update_option( 'active_plugins', array() )
-	);
+    );
 }
 
 /**
@@ -303,14 +303,14 @@ 
  * @return bool
  */
 function yourls_insert_sample_links() {
-	$link1 = yourls_add_new_link( 'http://blog.yourls.org/', 'yourlsblog', 'YOURLS\' Blog' );
-	$link2 = yourls_add_new_link( 'http://yourls.org/',      'yourls',     'YOURLS: Your Own URL Shortener' );
-	$link3 = yourls_add_new_link( 'http://ozh.org/',         'ozh',        'ozh.org' );
-	return ( bool ) (
-		  $link1['status'] == 'success'
-		& $link2['status'] == 'success'
-		& $link3['status'] == 'success'
-	);
+    $link1 = yourls_add_new_link( 'http://blog.yourls.org/', 'yourlsblog', 'YOURLS\' Blog' );
+    $link2 = yourls_add_new_link( 'http://yourls.org/',      'yourls',     'YOURLS: Your Own URL Shortener' );
+    $link3 = yourls_add_new_link( 'http://ozh.org/',         'ozh',        'ozh.org' );
+    return ( bool ) (
+            $link1['status'] == 'success'
+        & $link2['status'] == 'success'
+        & $link3['status'] == 'success'
+    );
 }
 
 
@@ -320,24 +320,24 @@ 
  */
 function yourls_maintenance_mode( $maintenance = true ) {
 
-	$file = YOURLS_ABSPATH . '/.maintenance' ;
+    $file = YOURLS_ABSPATH . '/.maintenance' ;
 
-	// Turn maintenance mode on : create .maintenance file
-	if ( (bool)$maintenance ) {
-		if ( ! ( $fp = @fopen( $file, 'w' ) ) )
-			return false;
+    // Turn maintenance mode on : create .maintenance file
+    if ( (bool)$maintenance ) {
+        if ( ! ( $fp = @fopen( $file, 'w' ) ) )
+            return false;
 
-		$maintenance_string = '<?php $maintenance_start = ' . time() . '; ?>';
-		@fwrite( $fp, $maintenance_string );
-		@fclose( $fp );
-		@chmod( $file, 0644 ); // Read and write for owner, read for everybody else
+        $maintenance_string = '<?php $maintenance_start = ' . time() . '; ?>';
+        @fwrite( $fp, $maintenance_string );
+        @fclose( $fp );
+        @chmod( $file, 0644 ); // Read and write for owner, read for everybody else
 
-		// Not sure why the fwrite would fail if the fopen worked... Just in case
-		return( is_readable( $file ) );
+        // Not sure why the fwrite would fail if the fopen worked... Just in case
+        return( is_readable( $file ) );
 
-	// Turn maintenance mode off : delete the .maintenance file
-	} else {
-		return @unlink($file);
-	}
+    // Turn maintenance mode off : delete the .maintenance file
+    } else {
+        return @unlink($file);
+    }
 }
 

includes/functions-html.php

Braces +42 added lines, -28 removed lines

@@ -376,8 +376,9 @@ 
 	}
 	$html .= "</select>\n";
 	$html  = yourls_apply_filter( 'html_select', $html, $name, $options, $selected, $display );
-	if( $display )
-		echo $html;
+	if( $display ) {
+			echo $html;
+	}
 	return $html;
 }
 
@@ -386,15 +387,18 @@ 
  *
  */
 function yourls_share_box( $longurl, $shorturl, $title = '', $text='', $shortlink_title = '', $share_title = '', $hidden = false ) {
-	if ( $shortlink_title == '' )
-		$shortlink_title = '<h2>' . yourls__( 'Your short link' ) . '</h2>';
-	if ( $share_title == '' )
-		$share_title = '<h2>' . yourls__( 'Quick Share' ) . '</h2>';
+	if ( $shortlink_title == '' ) {
+			$shortlink_title = '<h2>' . yourls__( 'Your short link' ) . '</h2>';
+	}
+	if ( $share_title == '' ) {
+			$share_title = '<h2>' . yourls__( 'Quick Share' ) . '</h2>';
+	}
 
 	// Allow plugins to short-circuit the whole function
 	$pre = yourls_apply_filter( 'shunt_share_box', false );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
     // Make sure IDN domains are in their UTF8 form
     $shorturl = yourls_normalize_uri($shorturl);
@@ -576,12 +580,14 @@ 
 	}
 	$action_links = yourls_apply_filter( 'action_links', $action_links, $keyword, $url, $ip, $clicks, $timestamp );
 
-	if( ! $title )
-		$title = $url;
+	if( ! $title ) {
+			$title = $url;
+	}
 
 	$protocol_warning = '';
-	if( ! in_array( yourls_get_protocol( $url ) , array( 'http://', 'https://' ) ) )
-		$protocol_warning = yourls_apply_filter( 'add_row_protocol_warning', '<span class="warning" title="' . yourls__( 'Not a common link' ) . '">&#9733;</span>' );
+	if( ! in_array( yourls_get_protocol( $url ) , array( 'http://', 'https://' ) ) ) {
+			$protocol_warning = yourls_apply_filter( 'add_row_protocol_warning', '<span class="warning" title="' . yourls__( 'Not a common link' ) . '">&#9733;</span>' );
+	}
 
 	// Row cells: the array
 	$cells = array(
@@ -686,10 +692,12 @@ 
  *
  */
 function yourls_html_link( $href, $title = '', $element = '' ) {
-	if( !$title )
-		$title = $href;
-	if( $element )
-		$element = sprintf( 'id="%s"', yourls_esc_attr( $element ) );
+	if( !$title ) {
+			$title = $href;
+	}
+	if( $element ) {
+			$element = sprintf( 'id="%s"', yourls_esc_attr( $element ) );
+	}
 	$link = sprintf( '<a href="%s" %s>%s</a>', yourls_esc_url( $href ), $element, yourls_esc_html( $title ) );
 	echo yourls_apply_filter( 'html_link', $link );
 }
@@ -778,8 +786,9 @@ 
 
 	// Now output menu
 	echo '<nav role="navigation"><ul id="admin_menu">'."\n";
-	if ( yourls_is_private() && !empty( $logout_link ) )
-		echo '<li id="admin_menu_logout_link">' . $logout_link .'</li>';
+	if ( yourls_is_private() && !empty( $logout_link ) ) {
+			echo '<li id="admin_menu_logout_link">' . $logout_link .'</li>';
+	}
 
 	foreach( (array)$admin_links as $link => $ar ) {
 		if( isset( $ar['url'] ) ) {
@@ -801,8 +810,9 @@ 
 		}
 	}
 
-	if ( isset( $help_link ) )
-		echo '<li id="admin_menu_help_link">' . $help_link .'</li>';
+	if ( isset( $help_link ) ) {
+			echo '<li id="admin_menu_help_link">' . $help_link .'</li>';
+	}
 
 	yourls_do_action( 'admin_menu' );
 	echo "</ul></nav>\n";
@@ -933,12 +943,15 @@ 
  */
 function yourls_get_search_text() {
 	$search = '';
-	if( isset( $_GET['search_protocol'] ) )
-		$search .= $_GET['search_protocol'];
-	if( isset( $_GET['search_slashes'] ) )
-		$search .= $_GET['search_slashes'];
-	if( isset( $_GET['search'] ) )
-		$search .= $_GET['search'];
+	if( isset( $_GET['search_protocol'] ) ) {
+			$search .= $_GET['search_protocol'];
+	}
+	if( isset( $_GET['search_slashes'] ) ) {
+			$search .= $_GET['search_slashes'];
+	}
+	if( isset( $_GET['search'] ) ) {
+			$search .= $_GET['search'];
+	}
 
 	return htmlspecialchars( trim( $search ) );
 }
@@ -958,8 +971,9 @@ 
     <a href="$href" class="bookmarklet" onclick="alert('$alert');return false;">$anchor</a>
 LINK;
 
-    if( $echo )
-        echo $link;
+    if( $echo ) {
+            echo $link;
+    }
     return $link;
 }
 

Indentation +473 added lines, -473 removed lines

@@ -5,8 +5,8 @@ 
  *
  */
 function yourls_html_logo() {
-	yourls_do_action( 'pre_html_logo' );
-	?>
+    yourls_do_action( 'pre_html_logo' );
+    ?>
 	<header role="banner">
 	<h1>
 		<a href="<?php echo yourls_admin_url( 'index.php' ) ?>" title="YOURLS"><span>YOURLS</span>: <span>Y</span>our <span>O</span>wn <span>URL</span> <span>S</span>hortener<br/>
@@ -14,7 +14,7 @@ 
 	</h1>
 	</header>
 	<?php
-	yourls_do_action( 'html_logo' );
+    yourls_do_action( 'html_logo' );
 }
 
 /**
@@ -25,57 +25,57 @@ 
  */
 function yourls_html_head( $context = 'index', $title = '' ) {
 
-	yourls_do_action( 'pre_html_head', $context, $title );
+    yourls_do_action( 'pre_html_head', $context, $title );
 
-	// All components to false, except when specified true
-	$share = $insert = $tablesorter = $tabs = $cal = $charts = false;
+    // All components to false, except when specified true
+    $share = $insert = $tablesorter = $tabs = $cal = $charts = false;
 
-	// Load components as needed
-	switch ( $context ) {
-		case 'infos':
-			$share = $tabs = $charts = true;
-			break;
+    // Load components as needed
+    switch ( $context ) {
+        case 'infos':
+            $share = $tabs = $charts = true;
+            break;
 
-		case 'bookmark':
-			$share = $insert = $tablesorter = true;
-			break;
+        case 'bookmark':
+            $share = $insert = $tablesorter = true;
+            break;
 
-		case 'index':
-			$insert = $tablesorter = $cal = $share = true;
-			break;
+        case 'index':
+            $insert = $tablesorter = $cal = $share = true;
+            break;
 
-		case 'plugins':
-		case 'tools':
-			$tablesorter = true;
-			break;
+        case 'plugins':
+        case 'tools':
+            $tablesorter = true;
+            break;
 
-		case 'install':
-		case 'login':
-		case 'new':
-		case 'upgrade':
-			break;
-	}
+        case 'install':
+        case 'login':
+        case 'new':
+        case 'upgrade':
+            break;
+    }
 
-	// Force no cache for all admin pages
-	if( yourls_is_admin() && !headers_sent() ) {
+    // Force no cache for all admin pages
+    if( yourls_is_admin() && !headers_sent() ) {
         yourls_no_cache_headers();
-		yourls_content_type_header( yourls_apply_filter( 'html_head_content-type', 'text/html' ) );
-		yourls_do_action( 'admin_headers', $context, $title );
-	}
+        yourls_content_type_header( yourls_apply_filter( 'html_head_content-type', 'text/html' ) );
+        yourls_do_action( 'admin_headers', $context, $title );
+    }
 
-	// Store page context
-	yourls_set_html_context($context);
+    // Store page context
+    yourls_set_html_context($context);
 
-	// Body class
-	$bodyclass = yourls_apply_filter( 'bodyclass', '' );
-	$bodyclass .= ( yourls_is_mobile_device() ? 'mobile' : 'desktop' );
+    // Body class
+    $bodyclass = yourls_apply_filter( 'bodyclass', '' );
+    $bodyclass .= ( yourls_is_mobile_device() ? 'mobile' : 'desktop' );
 
-	// Page title
-	$_title = 'YOURLS &mdash; Your Own URL Shortener | ' . yourls_link();
-	$title = $title ? $title . " &laquo; " . $_title : $_title;
-	$title = yourls_apply_filter( 'html_title', $title, $context );
+    // Page title
+    $_title = 'YOURLS &mdash; Your Own URL Shortener | ' . yourls_link();
+    $title = $title ? $title . " &laquo; " . $_title : $_title;
+    $title = yourls_apply_filter( 'html_title', $title, $context );
 
-	?>
+    ?>
 <!DOCTYPE html>
 <html <?php yourls_html_language_attributes(); ?>>
 <head>
@@ -146,20 +146,20 @@ 
         $num_queries = '';
     }
 
-	?>
+    ?>
 	</div><?php // wrap ?>
 	<footer id="footer" role="contentinfo"><p>
 		<?php
-		$footer  = yourls_s( 'Powered by %s', '<a href="http://yourls.org/" title="YOURLS">YOURLS</a> v ' . YOURLS_VERSION );
-		$footer .= $num_queries;
-		echo yourls_apply_filter( 'html_footer_text', $footer );
-		?>
+        $footer  = yourls_s( 'Powered by %s', '<a href="http://yourls.org/" title="YOURLS">YOURLS</a> v ' . YOURLS_VERSION );
+        $footer .= $num_queries;
+        echo yourls_apply_filter( 'html_footer_text', $footer );
+        ?>
 	</p></footer>
 	<?php if( yourls_get_debug_mode() ) {
-		echo '<div style="text-align:left"><pre>';
-		echo join( "\n", yourls_get_debug_log() );
-		echo '</pre></div>';
-	} ?>
+        echo '<div style="text-align:left"><pre>';
+        echo join( "\n", yourls_get_debug_log() );
+        echo '</pre></div>';
+    } ?>
 	<?php yourls_do_action( 'html_footer', yourls_get_html_context() ); ?>
 	</body>
 	</html>
@@ -177,7 +177,7 @@ 
     if ( false !== $pre ) {
         return $pre;
     }
-	?>
+    ?>
 	<main role="main">
 	<div id="new_url">
 		<div>
@@ -223,7 +223,7 @@ 
     $date_first   = $params['date_first'];
     $date_second  = $params['date_second'];
 
-	?>
+    ?>
 	<tfoot>
 		<tr>
 			<th colspan="6">
@@ -232,70 +232,70 @@ 
 					<div id="filter_options">
 						<?php
 
-						// First search control: text to search
-						$_input = '<input aria-label="' .yourls__( 'Search for' ). '" type="text" name="search" class="text" size="12" value="' . yourls_esc_attr( $search_text ) . '" />';
-						$_options = array(
+                        // First search control: text to search
+                        $_input = '<input aria-label="' .yourls__( 'Search for' ). '" type="text" name="search" class="text" size="12" value="' . yourls_esc_attr( $search_text ) . '" />';
+                        $_options = array(
                             'all'     => yourls__( 'All fields' ),
-							'keyword' => yourls__( 'Short URL' ),
-							'url'     => yourls__( 'URL' ),
-							'title'   => yourls__( 'Title' ),
-							'ip'      => yourls__( 'IP' ),
-						);
-						$_select = yourls_html_select( 'search_in', $_options, $search_in, false, yourls__( 'Search in' ) );
-						/* //translators: "Search for <input field with text to search> in <select dropdown with URL, title...>" */
-						yourls_se( 'Search for %1$s in %2$s', $_input , $_select );
-						echo "&ndash;\n";
-
-						// Second search control: order by
-						$_options = array(
-							'keyword'      => yourls__( 'Short URL' ),
-							'url'          => yourls__( 'URL' ),
-							'title'        => yourls__( 'Title' ),
-							'timestamp'    => yourls__( 'Date' ),
-							'ip'           => yourls__( 'IP' ),
-							'clicks'       => yourls__( 'Clicks' ),
-						);
-						$_select = yourls_html_select( 'sort_by', $_options, $sort_by, false,  yourls__( 'Sort by' ) );
-						$sort_order = isset( $sort_order ) ? $sort_order : 'desc' ;
-						$_options = array(
-							'asc'  => yourls__( 'Ascending' ),
-							'desc' => yourls__( 'Descending' ),
-						);
-						$_select2 = yourls_html_select( 'sort_order', $_options, $sort_order, false,  yourls__( 'Sort order' ) );
-						/* //translators: "Order by <criteria dropdown (date, clicks...)> in <order dropdown (Descending or Ascending)>" */
-						yourls_se( 'Order by %1$s %2$s', $_select , $_select2 );
-						echo "&ndash;\n";
-
-						// Third search control: Show XX rows
-						/* //translators: "Show <text field> rows" */
+                            'keyword' => yourls__( 'Short URL' ),
+                            'url'     => yourls__( 'URL' ),
+                            'title'   => yourls__( 'Title' ),
+                            'ip'      => yourls__( 'IP' ),
+                        );
+                        $_select = yourls_html_select( 'search_in', $_options, $search_in, false, yourls__( 'Search in' ) );
+                        /* //translators: "Search for <input field with text to search> in <select dropdown with URL, title...>" */
+                        yourls_se( 'Search for %1$s in %2$s', $_input , $_select );
+                        echo "&ndash;\n";
+
+                        // Second search control: order by
+                        $_options = array(
+                            'keyword'      => yourls__( 'Short URL' ),
+                            'url'          => yourls__( 'URL' ),
+                            'title'        => yourls__( 'Title' ),
+                            'timestamp'    => yourls__( 'Date' ),
+                            'ip'           => yourls__( 'IP' ),
+                            'clicks'       => yourls__( 'Clicks' ),
+                        );
+                        $_select = yourls_html_select( 'sort_by', $_options, $sort_by, false,  yourls__( 'Sort by' ) );
+                        $sort_order = isset( $sort_order ) ? $sort_order : 'desc' ;
+                        $_options = array(
+                            'asc'  => yourls__( 'Ascending' ),
+                            'desc' => yourls__( 'Descending' ),
+                        );
+                        $_select2 = yourls_html_select( 'sort_order', $_options, $sort_order, false,  yourls__( 'Sort order' ) );
+                        /* //translators: "Order by <criteria dropdown (date, clicks...)> in <order dropdown (Descending or Ascending)>" */
+                        yourls_se( 'Order by %1$s %2$s', $_select , $_select2 );
+                        echo "&ndash;\n";
+
+                        // Third search control: Show XX rows
+                        /* //translators: "Show <text field> rows" */
                         $_input = '<input aria-label="' .yourls__( 'Number of rows to show' ). '" type="text" name="perpage" class="text" size="2" value="' . $perpage . '" />';
-						yourls_se( 'Show %s rows',  $_input );
-						echo "<br/>\n";
-
-						// Fourth search control: Show links with more than XX clicks
-						$_options = array(
-							'more' => yourls__( 'more' ),
-							'less' => yourls__( 'less' ),
-						);
-						$_select = yourls_html_select( 'click_filter', $_options, $click_filter, false, yourls__( 'Show links with' ) );
-						$_input  = '<input aria-label="' .yourls__( 'Number of clicks' ). '" type="text" name="click_limit" class="text" size="4" value="' . $click_limit . '" /> ';
-						/* //translators: "Show links with <more/less> than <text field> clicks" */
-						yourls_se( 'Show links with %1$s than %2$s clicks', $_select, $_input );
-						echo "<br/>\n";
-
-						// Fifth search control: Show links created before/after/between ...
-						$_options = array(
-							'before'  => yourls__('before'),
-							'after'   => yourls__('after'),
-							'between' => yourls__('between'),
-						);
-						$_select = yourls_html_select( 'date_filter', $_options, $date_filter, false, yourls__('Show links created') );
-						$_input  = '<input aria-label="' .yourls__('Select a date') . '" type="text" name="date_first" id="date_first" class="text" size="12" value="' . $date_first . '" />';
-						$_and    = '<span id="date_and"' . ( $date_filter === 'between' ? ' style="display:inline"' : '' ) . '> &amp; </span>';
-						$_input2 = '<input aria-label="' .yourls__('Select an end date') . '" type="text" name="date_second" id="date_second" class="text" size="12" value="' . $date_second . '"' . ( $date_filter === 'between' ? ' style="display:inline"' : '' ) . '/>';
-						/* //translators: "Show links created <before/after/between> <date input> <"and" if applicable> <date input if applicable>" */
-						yourls_se( 'Show links created %1$s %2$s %3$s %4$s', $_select, $_input, $_and, $_input2 );
-						?>
+                        yourls_se( 'Show %s rows',  $_input );
+                        echo "<br/>\n";
+
+                        // Fourth search control: Show links with more than XX clicks
+                        $_options = array(
+                            'more' => yourls__( 'more' ),
+                            'less' => yourls__( 'less' ),
+                        );
+                        $_select = yourls_html_select( 'click_filter', $_options, $click_filter, false, yourls__( 'Show links with' ) );
+                        $_input  = '<input aria-label="' .yourls__( 'Number of clicks' ). '" type="text" name="click_limit" class="text" size="4" value="' . $click_limit . '" /> ';
+                        /* //translators: "Show links with <more/less> than <text field> clicks" */
+                        yourls_se( 'Show links with %1$s than %2$s clicks', $_select, $_input );
+                        echo "<br/>\n";
+
+                        // Fifth search control: Show links created before/after/between ...
+                        $_options = array(
+                            'before'  => yourls__('before'),
+                            'after'   => yourls__('after'),
+                            'between' => yourls__('between'),
+                        );
+                        $_select = yourls_html_select( 'date_filter', $_options, $date_filter, false, yourls__('Show links created') );
+                        $_input  = '<input aria-label="' .yourls__('Select a date') . '" type="text" name="date_first" id="date_first" class="text" size="12" value="' . $date_first . '" />';
+                        $_and    = '<span id="date_and"' . ( $date_filter === 'between' ? ' style="display:inline"' : '' ) . '> &amp; </span>';
+                        $_input2 = '<input aria-label="' .yourls__('Select an end date') . '" type="text" name="date_second" id="date_second" class="text" size="12" value="' . $date_second . '"' . ( $date_filter === 'between' ? ' style="display:inline"' : '' ) . '/>';
+                        /* //translators: "Show links created <before/after/between> <date input> <"and" if applicable> <date input if applicable>" */
+                        yourls_se( 'Show links created %1$s %2$s %3$s %4$s', $_select, $_input, $_and, $_input2 );
+                        ?>
 
 						<div id="filter_buttons">
 							<input type="submit" id="submit-sort" value="<?php yourls_e('Search'); ?>" class="button primary" />
@@ -308,43 +308,43 @@ 
 			</div>
 
 			<?php
-			// Remove empty keys from the $params array so it doesn't clutter the pagination links
-			$params = array_filter( $params, 'yourls_return_if_not_empty_string' ); // remove empty keys
+            // Remove empty keys from the $params array so it doesn't clutter the pagination links
+            $params = array_filter( $params, 'yourls_return_if_not_empty_string' ); // remove empty keys
 
-			if( isset( $search_text ) ) {
-				$params['search'] = $search_text;
-				unset( $params['search_text'] );
-			}
-			?>
+            if( isset( $search_text ) ) {
+                $params['search'] = $search_text;
+                unset( $params['search_text'] );
+            }
+            ?>
 
 			<div id="pagination">
 				<span class="navigation">
 				<?php if( $total_pages > 1 ) { ?>
 					<span class="nav_total"><?php echo sprintf( yourls_n( '1 page', '%s pages', $total_pages ), $total_pages ); ?></span>
 					<?php
-					$base_page = yourls_admin_url( 'index.php' );
-					// Pagination offsets: min( max ( zomg! ) );
-					$p_start = max(  min( $total_pages - 4, $page - 2 ), 1 );
-					$p_end = min( max( 5, $page + 2 ), $total_pages );
-					if( $p_start >= 2 ) {
-						$link = yourls_add_query_arg( array_merge( $params, array( 'page' => 1 ) ), $base_page );
-						echo '<span class="nav_link nav_first"><a href="' . $link . '" title="' . yourls_esc_attr__('Go to First Page') . '">' . yourls__( '&laquo; First' ) . '</a></span>';
-						echo '<span class="nav_link nav_prev"></span>';
-					}
-					for( $i = $p_start ; $i <= $p_end; $i++ ) {
-						if( $i == $page ) {
-							echo "<span class='nav_link nav_current'>$i</span>";
-						} else {
-							$link = yourls_add_query_arg( array_merge( $params, array( 'page' => $i ) ), $base_page );
-							echo '<span class="nav_link nav_goto"><a href="' . $link . '" title="' . sprintf( yourls_esc_attr( 'Page %s' ), $i ) .'">'.$i.'</a></span>';
-						}
-					}
-					if( ( $p_end ) < $total_pages ) {
-						$link = yourls_add_query_arg( array_merge( $params, array( 'page' => $total_pages ) ), $base_page );
-						echo '<span class="nav_link nav_next"></span>';
-						echo '<span class="nav_link nav_last"><a href="' . $link . '" title="' . yourls_esc_attr__('Go to Last Page') . '">' . yourls__( 'Last &raquo;' ) . '</a></span>';
-					}
-					?>
+                    $base_page = yourls_admin_url( 'index.php' );
+                    // Pagination offsets: min( max ( zomg! ) );
+                    $p_start = max(  min( $total_pages - 4, $page - 2 ), 1 );
+                    $p_end = min( max( 5, $page + 2 ), $total_pages );
+                    if( $p_start >= 2 ) {
+                        $link = yourls_add_query_arg( array_merge( $params, array( 'page' => 1 ) ), $base_page );
+                        echo '<span class="nav_link nav_first"><a href="' . $link . '" title="' . yourls_esc_attr__('Go to First Page') . '">' . yourls__( '&laquo; First' ) . '</a></span>';
+                        echo '<span class="nav_link nav_prev"></span>';
+                    }
+                    for( $i = $p_start ; $i <= $p_end; $i++ ) {
+                        if( $i == $page ) {
+                            echo "<span class='nav_link nav_current'>$i</span>";
+                        } else {
+                            $link = yourls_add_query_arg( array_merge( $params, array( 'page' => $i ) ), $base_page );
+                            echo '<span class="nav_link nav_goto"><a href="' . $link . '" title="' . sprintf( yourls_esc_attr( 'Page %s' ), $i ) .'">'.$i.'</a></span>';
+                        }
+                    }
+                    if( ( $p_end ) < $total_pages ) {
+                        $link = yourls_add_query_arg( array_merge( $params, array( 'page' => $total_pages ) ), $base_page );
+                        echo '<span class="nav_link nav_next"></span>';
+                        echo '<span class="nav_link nav_last"><a href="' . $link . '" title="' . yourls_esc_attr__('Go to Last Page') . '">' . yourls__( 'Last &raquo;' ) . '</a></span>';
+                    }
+                    ?>
 				<?php } ?>
 				</span>
 			</div>
@@ -368,17 +368,17 @@ 
  * @return string HTML content of the select element
  */
 function yourls_html_select( $name, $options, $selected = '', $display = false, $label = '' ) {
-	$html = "<select aria-label='$label' name='$name' id='$name' size='1'>\n";
-	foreach( $options as $value => $text ) {
-		$html .= "<option value='$value' ";
-		$html .= $selected == $value ? ' selected="selected"' : '';
-		$html .= ">$text</option>\n";
-	}
-	$html .= "</select>\n";
-	$html  = yourls_apply_filter( 'html_select', $html, $name, $options, $selected, $display );
-	if( $display )
-		echo $html;
-	return $html;
+    $html = "<select aria-label='$label' name='$name' id='$name' size='1'>\n";
+    foreach( $options as $value => $text ) {
+        $html .= "<option value='$value' ";
+        $html .= $selected == $value ? ' selected="selected"' : '';
+        $html .= ">$text</option>\n";
+    }
+    $html .= "</select>\n";
+    $html  = yourls_apply_filter( 'html_select', $html, $name, $options, $selected, $display );
+    if( $display )
+        echo $html;
+    return $html;
 }
 
 /**
@@ -386,33 +386,33 @@ 
  *
  */
 function yourls_share_box( $longurl, $shorturl, $title = '', $text='', $shortlink_title = '', $share_title = '', $hidden = false ) {
-	if ( $shortlink_title == '' )
-		$shortlink_title = '<h2>' . yourls__( 'Your short link' ) . '</h2>';
-	if ( $share_title == '' )
-		$share_title = '<h2>' . yourls__( 'Quick Share' ) . '</h2>';
-
-	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_share_box', false );
-	if ( false !== $pre )
-		return $pre;
+    if ( $shortlink_title == '' )
+        $shortlink_title = '<h2>' . yourls__( 'Your short link' ) . '</h2>';
+    if ( $share_title == '' )
+        $share_title = '<h2>' . yourls__( 'Quick Share' ) . '</h2>';
+
+    // Allow plugins to short-circuit the whole function
+    $pre = yourls_apply_filter( 'shunt_share_box', false );
+    if ( false !== $pre )
+        return $pre;
 
     // Make sure IDN domains are in their UTF8 form
     $shorturl = yourls_normalize_uri($shorturl);
 
-	$text   = ( $text ? '"'.$text.'" ' : '' );
-	$title  = ( $title ? "$title " : '' );
-	$share  = yourls_esc_textarea( $title.$text.$shorturl );
-	$count  = 280 - strlen( $share );
-	$hidden = ( $hidden ? 'style="display:none;"' : '' );
+    $text   = ( $text ? '"'.$text.'" ' : '' );
+    $title  = ( $title ? "$title " : '' );
+    $share  = yourls_esc_textarea( $title.$text.$shorturl );
+    $count  = 280 - strlen( $share );
+    $hidden = ( $hidden ? 'style="display:none;"' : '' );
 
-	// Allow plugins to filter all data
-	$data = compact( 'longurl', 'shorturl', 'title', 'text', 'shortlink_title', 'share_title', 'share', 'count', 'hidden' );
-	$data = yourls_apply_filter( 'share_box_data', $data );
-	extract( $data );
+    // Allow plugins to filter all data
+    $data = compact( 'longurl', 'shorturl', 'title', 'text', 'shortlink_title', 'share_title', 'share', 'count', 'hidden' );
+    $data = yourls_apply_filter( 'share_box_data', $data );
+    extract( $data );
 
-	$_share = rawurlencode( $share );
-	$_url   = rawurlencode( $shorturl );
-	?>
+    $_share = rawurlencode( $share );
+    $_url   = rawurlencode( $shorturl );
+    ?>
 
 	<div id="shareboxes" <?php echo $hidden; ?>>
 
@@ -441,9 +441,9 @@ 
 				<a id="share_tw" href="https://twitter.com/intent/tweet?text=<?php echo $_share; ?>" title="<?php yourls_e( 'Tweet this!' ); ?>" onclick="share('tw');return false">Twitter</a>
 				<a id="share_fb" href="https://www.facebook.com/share.php?u=<?php echo $_url; ?>" title="<?php yourls_e( 'Share on Facebook' ); ?>" onclick="share('fb');return false;">Facebook</a>
 				<?php
-				yourls_do_action( 'share_links', $longurl, $shorturl, $title, $text );
-				// Note: on the main admin page, there are no parameters passed to the sharebox when it's drawn.
-				?>
+                yourls_do_action( 'share_links', $longurl, $shorturl, $title, $text );
+                // Note: on the main admin page, there are no parameters passed to the sharebox when it's drawn.
+                ?>
 			</p>
 		</div>
 
@@ -461,20 +461,20 @@ 
 function yourls_die( $message = '', $title = '', $header_code = 200 ) {
     yourls_do_action( 'pre_yourls_die', $message, $title, $header_code );
 
-	yourls_status_header( $header_code );
+    yourls_status_header( $header_code );
 
-	if( !yourls_did_action( 'html_head' ) ) {
-		yourls_html_head();
-		yourls_html_logo();
-	}
-	echo yourls_apply_filter( 'die_title', "<h2>$title</h2>" );
-	echo yourls_apply_filter( 'die_message', "<p>$message</p>" );
+    if( !yourls_did_action( 'html_head' ) ) {
+        yourls_html_head();
+        yourls_html_logo();
+    }
+    echo yourls_apply_filter( 'die_title', "<h2>$title</h2>" );
+    echo yourls_apply_filter( 'die_message', "<p>$message</p>" );
     // Hook into 'yourls_die' to add more elements or messages to that page
-	yourls_do_action( 'yourls_die' );
-	if( !yourls_did_action( 'html_footer' ) ) {
-		yourls_html_footer(false);
-	}
-	die();
+    yourls_do_action( 'yourls_die' );
+    if( !yourls_did_action( 'html_footer' ) ) {
+        yourls_html_footer(false);
+    }
+    die();
 }
 
 /**
@@ -485,33 +485,33 @@ 
  */
 function yourls_table_edit_row( $keyword ) {
     $keyword = yourls_sanitize_keyword($keyword);
-	$id = yourls_string2htmlid( $keyword ); // used as HTML #id
-	$url = yourls_get_keyword_longurl( $keyword );
-	$title = htmlspecialchars( yourls_get_keyword_title( $keyword ) );
-	$safe_url = yourls_esc_attr( $url );
-	$safe_title = yourls_esc_attr( $title );
-	$safe_keyword = yourls_esc_attr( $keyword );
+    $id = yourls_string2htmlid( $keyword ); // used as HTML #id
+    $url = yourls_get_keyword_longurl( $keyword );
+    $title = htmlspecialchars( yourls_get_keyword_title( $keyword ) );
+    $safe_url = yourls_esc_attr( $url );
+    $safe_title = yourls_esc_attr( $title );
+    $safe_keyword = yourls_esc_attr( $keyword );
 
     // Make strings sprintf() safe: '%' -> '%%'
     $safe_url = str_replace( '%', '%%', $safe_url );
     $safe_title = str_replace( '%', '%%', $safe_title );
 
-	$www = yourls_link();
+    $www = yourls_link();
 
-	$nonce = yourls_create_nonce( 'edit-save_'.$id );
+    $nonce = yourls_create_nonce( 'edit-save_'.$id );
 
-	if( $url ) {
-		$return = <<<RETURN
+    if( $url ) {
+        $return = <<<RETURN
 <tr id="edit-$id" class="edit-row"><td colspan="5" class="edit-row"><strong>%s</strong>:<input type="text" id="edit-url-$id" name="edit-url-$id" value="$safe_url" class="text" size="70" /><br/><strong>%s</strong>: $www<input type="text" id="edit-keyword-$id" name="edit-keyword-$id" value="$safe_keyword" class="text" size="10" /><br/><strong>%s</strong>: <input type="text" id="edit-title-$id" name="edit-title-$id" value="$safe_title" class="text" size="60" /></td><td colspan="1"><input type="button" id="edit-submit-$id" name="edit-submit-$id" value="%s" title="%s" class="button" onclick="edit_link_save('$id');" />&nbsp;<input type="button" id="edit-close-$id" name="edit-close-$id" value="%s" title="%s" class="button" onclick="edit_link_hide('$id');" /><input type="hidden" id="old_keyword_$id" value="$safe_keyword"/><input type="hidden" id="nonce_$id" value="$nonce"/></td></tr>
 RETURN;
-		$return = sprintf( $return, yourls__( 'Long URL' ), yourls__( 'Short URL' ), yourls__( 'Title' ), yourls__( 'Save' ), yourls__( 'Save new values' ), yourls__( 'Cancel' ), yourls__( 'Cancel editing' ) );
-	} else {
-		$return = '<tr class="edit-row notfound"><td colspan="6" class="edit-row notfound">' . yourls__( 'Error, URL not found' ) . '</td></tr>';
-	}
+        $return = sprintf( $return, yourls__( 'Long URL' ), yourls__( 'Short URL' ), yourls__( 'Title' ), yourls__( 'Save' ), yourls__( 'Save new values' ), yourls__( 'Cancel' ), yourls__( 'Cancel editing' ) );
+    } else {
+        $return = '<tr class="edit-row notfound"><td colspan="6" class="edit-row notfound">' . yourls__( 'Error, URL not found' ) . '</td></tr>';
+    }
 
-	$return = yourls_apply_filter( 'table_edit_row', $return, $keyword, $url, $title );
+    $return = yourls_apply_filter( 'table_edit_row', $return, $keyword, $url, $title );
 
-	return $return;
+    return $return;
 }
 
 /**
@@ -521,116 +521,116 @@ 
  */
 function yourls_table_add_row( $keyword, $url, $title = '', $ip, $clicks, $timestamp ) {
     $keyword  = yourls_sanitize_keyword($keyword);
-	$id       = yourls_string2htmlid( $keyword ); // used as HTML #id
-	$shorturl = yourls_link( $keyword );
-
-	$statlink = yourls_statlink( $keyword );
-
-	$delete_link = yourls_nonce_url( 'delete-link_'.$id,
-		yourls_add_query_arg( array( 'id' => $id, 'action' => 'delete', 'keyword' => $keyword ), yourls_admin_url( 'admin-ajax.php' ) )
-	);
-
-	$edit_link = yourls_nonce_url( 'edit-link_'.$id,
-		yourls_add_query_arg( array( 'id' => $id, 'action' => 'edit', 'keyword' => $keyword ), yourls_admin_url( 'admin-ajax.php' ) )
-	);
-
-	// Action link buttons: the array
-	$actions = array(
-		'stats' => array(
-			'href'    => $statlink,
-			'id'      => "statlink-$id",
-			'title'   => yourls_esc_attr__( 'Stats' ),
-			'anchor'  => yourls__( 'Stats' ),
-		),
-		'share' => array(
-			'href'    => '',
-			'id'      => "share-button-$id",
-			'title'   => yourls_esc_attr__( 'Share' ),
-			'anchor'  => yourls__( 'Share' ),
-			'onclick' => "toggle_share('$id');return false;",
-		),
-		'edit' => array(
-			'href'    => $edit_link,
-			'id'      => "edit-button-$id",
-			'title'   => yourls_esc_attr__( 'Edit' ),
-			'anchor'  => yourls__( 'Edit' ),
-			'onclick' => "edit_link_display('$id');return false;",
-		),
-		'delete' => array(
-			'href'    => $delete_link,
-			'id'      => "delete-button-$id",
-			'title'   => yourls_esc_attr__( 'Delete' ),
-			'anchor'  => yourls__( 'Delete' ),
-			'onclick' => "remove_link('$id');return false;",
-		)
-	);
-	$actions = yourls_apply_filter( 'table_add_row_action_array', $actions, $keyword );
-
-	// Action link buttons: the HTML
-	$action_links = '';
-	foreach( $actions as $key => $action ) {
-		$onclick = isset( $action['onclick'] ) ? 'onclick="' . $action['onclick'] . '"' : '' ;
-		$action_links .= sprintf( '<a href="%s" id="%s" title="%s" class="%s" %s>%s</a>',
-			$action['href'], $action['id'], $action['title'], 'button button_'.$key, $onclick, $action['anchor']
-		);
-	}
-	$action_links = yourls_apply_filter( 'action_links', $action_links, $keyword, $url, $ip, $clicks, $timestamp );
-
-	if( ! $title )
-		$title = $url;
-
-	$protocol_warning = '';
-	if( ! in_array( yourls_get_protocol( $url ) , array( 'http://', 'https://' ) ) )
-		$protocol_warning = yourls_apply_filter( 'add_row_protocol_warning', '<span class="warning" title="' . yourls__( 'Not a common link' ) . '">&#9733;</span>' );
-
-	// Row cells: the array
-	$cells = array(
-		'keyword' => array(
-			'template'      => '<a href="%shorturl%">%keyword_html%</a>',
-			'shorturl'      => yourls_esc_url( $shorturl ),
-			'keyword_html'  => yourls_esc_html( $keyword ),
-		),
-		'url' => array(
-			'template'      => '<a href="%long_url%" title="%title_attr%">%title_html%</a><br/><small>%warning%<a href="%long_url%">%long_url_html%</a></small>',
-			'long_url'      => yourls_esc_url( $url ),
-			'title_attr'    => yourls_esc_attr( $title ),
-			'title_html'    => yourls_esc_html( yourls_trim_long_string( $title ) ),
-			'long_url_html' => yourls_esc_html( yourls_trim_long_string( urldecode( $url ) ) ),
-			'warning'       => $protocol_warning,
-		),
-		'timestamp' => array(
-			'template' => '<span class="timestamp" aria-hidden="true">%timestamp%</span> %date%',
+    $id       = yourls_string2htmlid( $keyword ); // used as HTML #id
+    $shorturl = yourls_link( $keyword );
+
+    $statlink = yourls_statlink( $keyword );
+
+    $delete_link = yourls_nonce_url( 'delete-link_'.$id,
+        yourls_add_query_arg( array( 'id' => $id, 'action' => 'delete', 'keyword' => $keyword ), yourls_admin_url( 'admin-ajax.php' ) )
+    );
+
+    $edit_link = yourls_nonce_url( 'edit-link_'.$id,
+        yourls_add_query_arg( array( 'id' => $id, 'action' => 'edit', 'keyword' => $keyword ), yourls_admin_url( 'admin-ajax.php' ) )
+    );
+
+    // Action link buttons: the array
+    $actions = array(
+        'stats' => array(
+            'href'    => $statlink,
+            'id'      => "statlink-$id",
+            'title'   => yourls_esc_attr__( 'Stats' ),
+            'anchor'  => yourls__( 'Stats' ),
+        ),
+        'share' => array(
+            'href'    => '',
+            'id'      => "share-button-$id",
+            'title'   => yourls_esc_attr__( 'Share' ),
+            'anchor'  => yourls__( 'Share' ),
+            'onclick' => "toggle_share('$id');return false;",
+        ),
+        'edit' => array(
+            'href'    => $edit_link,
+            'id'      => "edit-button-$id",
+            'title'   => yourls_esc_attr__( 'Edit' ),
+            'anchor'  => yourls__( 'Edit' ),
+            'onclick' => "edit_link_display('$id');return false;",
+        ),
+        'delete' => array(
+            'href'    => $delete_link,
+            'id'      => "delete-button-$id",
+            'title'   => yourls_esc_attr__( 'Delete' ),
+            'anchor'  => yourls__( 'Delete' ),
+            'onclick' => "remove_link('$id');return false;",
+        )
+    );
+    $actions = yourls_apply_filter( 'table_add_row_action_array', $actions, $keyword );
+
+    // Action link buttons: the HTML
+    $action_links = '';
+    foreach( $actions as $key => $action ) {
+        $onclick = isset( $action['onclick'] ) ? 'onclick="' . $action['onclick'] . '"' : '' ;
+        $action_links .= sprintf( '<a href="%s" id="%s" title="%s" class="%s" %s>%s</a>',
+            $action['href'], $action['id'], $action['title'], 'button button_'.$key, $onclick, $action['anchor']
+        );
+    }
+    $action_links = yourls_apply_filter( 'action_links', $action_links, $keyword, $url, $ip, $clicks, $timestamp );
+
+    if( ! $title )
+        $title = $url;
+
+    $protocol_warning = '';
+    if( ! in_array( yourls_get_protocol( $url ) , array( 'http://', 'https://' ) ) )
+        $protocol_warning = yourls_apply_filter( 'add_row_protocol_warning', '<span class="warning" title="' . yourls__( 'Not a common link' ) . '">&#9733;</span>' );
+
+    // Row cells: the array
+    $cells = array(
+        'keyword' => array(
+            'template'      => '<a href="%shorturl%">%keyword_html%</a>',
+            'shorturl'      => yourls_esc_url( $shorturl ),
+            'keyword_html'  => yourls_esc_html( $keyword ),
+        ),
+        'url' => array(
+            'template'      => '<a href="%long_url%" title="%title_attr%">%title_html%</a><br/><small>%warning%<a href="%long_url%">%long_url_html%</a></small>',
+            'long_url'      => yourls_esc_url( $url ),
+            'title_attr'    => yourls_esc_attr( $title ),
+            'title_html'    => yourls_esc_html( yourls_trim_long_string( $title ) ),
+            'long_url_html' => yourls_esc_html( yourls_trim_long_string( urldecode( $url ) ) ),
+            'warning'       => $protocol_warning,
+        ),
+        'timestamp' => array(
+            'template' => '<span class="timestamp" aria-hidden="true">%timestamp%</span> %date%',
             'timestamp' => $timestamp,
-			'date'     => yourls_date_i18n( yourls_get_datetime_format('M d, Y H:i'), yourls_get_timestamp( $timestamp )),
-		),
-		'ip' => array(
-			'template' => '%ip%',
-			'ip'       => $ip,
-		),
-		'clicks' => array(
-			'template' => '%clicks%',
-			'clicks'   => yourls_number_format_i18n( $clicks, 0, '', '' ),
-		),
-		'actions' => array(
-			'template' => '%actions% <input type="hidden" id="keyword_%id%" value="%keyword%"/>',
-			'actions'  => $action_links,
-			'id'       => $id,
-			'keyword'  => $keyword,
-		),
-	);
-	$cells = yourls_apply_filter( 'table_add_row_cell_array', $cells, $keyword, $url, $title, $ip, $clicks, $timestamp );
-
-	// Row cells: the HTML. Replace every %stuff% in 'template' with 'stuff' value.
-	$row = "<tr id=\"id-$id\">";
-	foreach( $cells as $cell_id => $elements ) {
-		$row .= sprintf( '<td class="%s" id="%s">', $cell_id, $cell_id . '-' . $id );
-		$row .= preg_replace_callback( '/%([^%]+)?%/', function( $match ) use ( $elements ) { return $elements[ $match[1] ]; }, $elements['template'] );
-		$row .= '</td>';
-	}
-	$row .= "</tr>";
-	$row  = yourls_apply_filter( 'table_add_row', $row, $keyword, $url, $title, $ip, $clicks, $timestamp );
-
-	return $row;
+            'date'     => yourls_date_i18n( yourls_get_datetime_format('M d, Y H:i'), yourls_get_timestamp( $timestamp )),
+        ),
+        'ip' => array(
+            'template' => '%ip%',
+            'ip'       => $ip,
+        ),
+        'clicks' => array(
+            'template' => '%clicks%',
+            'clicks'   => yourls_number_format_i18n( $clicks, 0, '', '' ),
+        ),
+        'actions' => array(
+            'template' => '%actions% <input type="hidden" id="keyword_%id%" value="%keyword%"/>',
+            'actions'  => $action_links,
+            'id'       => $id,
+            'keyword'  => $keyword,
+        ),
+    );
+    $cells = yourls_apply_filter( 'table_add_row_cell_array', $cells, $keyword, $url, $title, $ip, $clicks, $timestamp );
+
+    // Row cells: the HTML. Replace every %stuff% in 'template' with 'stuff' value.
+    $row = "<tr id=\"id-$id\">";
+    foreach( $cells as $cell_id => $elements ) {
+        $row .= sprintf( '<td class="%s" id="%s">', $cell_id, $cell_id . '-' . $id );
+        $row .= preg_replace_callback( '/%([^%]+)?%/', function( $match ) use ( $elements ) { return $elements[ $match[1] ]; }, $elements['template'] );
+        $row .= '</td>';
+    }
+    $row .= "</tr>";
+    $row  = yourls_apply_filter( 'table_add_row', $row, $keyword, $url, $title, $ip, $clicks, $timestamp );
+
+    return $row;
 }
 
 /**
@@ -638,23 +638,23 @@ 
  *
  */
 function yourls_table_head() {
-	$start = '<table id="main_table" class="tblSorter" cellpadding="0" cellspacing="1"><thead><tr>'."\n";
-	echo yourls_apply_filter( 'table_head_start', $start );
-
-	$cells = yourls_apply_filter( 'table_head_cells', array(
-		'shorturl' => yourls__( 'Short URL' ),
-		'longurl'  => yourls__( 'Original URL' ),
-		'date'     => yourls__( 'Date' ),
-		'ip'       => yourls__( 'IP' ),
-		'clicks'   => yourls__( 'Clicks' ),
-		'actions'  => yourls__( 'Actions' )
-	) );
-	foreach( $cells as $k => $v ) {
-		echo "<th id='main_table_head_$k'>$v</th>\n";
-	}
-
-	$end = "</tr></thead>\n";
-	echo yourls_apply_filter( 'table_head_end', $end );
+    $start = '<table id="main_table" class="tblSorter" cellpadding="0" cellspacing="1"><thead><tr>'."\n";
+    echo yourls_apply_filter( 'table_head_start', $start );
+
+    $cells = yourls_apply_filter( 'table_head_cells', array(
+        'shorturl' => yourls__( 'Short URL' ),
+        'longurl'  => yourls__( 'Original URL' ),
+        'date'     => yourls__( 'Date' ),
+        'ip'       => yourls__( 'IP' ),
+        'clicks'   => yourls__( 'Clicks' ),
+        'actions'  => yourls__( 'Actions' )
+    ) );
+    foreach( $cells as $k => $v ) {
+        echo "<th id='main_table_head_$k'>$v</th>\n";
+    }
+
+    $end = "</tr></thead>\n";
+    echo yourls_apply_filter( 'table_head_end', $end );
 }
 
 /**
@@ -662,7 +662,7 @@ 
  *
  */
 function yourls_table_tbody_start() {
-	echo yourls_apply_filter( 'table_tbody_start', '<tbody>' );
+    echo yourls_apply_filter( 'table_tbody_start', '<tbody>' );
 }
 
 /**
@@ -670,7 +670,7 @@ 
  *
  */
 function yourls_table_tbody_end() {
-	echo yourls_apply_filter( 'table_tbody_end', '</tbody>' );
+    echo yourls_apply_filter( 'table_tbody_end', '</tbody>' );
 }
 
 /**
@@ -678,7 +678,7 @@ 
  *
  */
 function yourls_table_end() {
-	echo yourls_apply_filter( 'table_end', '</table></main>' );
+    echo yourls_apply_filter( 'table_end', '</table></main>' );
 }
 
 /**
@@ -686,12 +686,12 @@ 
  *
  */
 function yourls_html_link( $href, $title = '', $element = '' ) {
-	if( !$title )
-		$title = $href;
-	if( $element )
-		$element = sprintf( 'id="%s"', yourls_esc_attr( $element ) );
-	$link = sprintf( '<a href="%s" %s>%s</a>', yourls_esc_url( $href ), $element, yourls_esc_html( $title ) );
-	echo yourls_apply_filter( 'html_link', $link );
+    if( !$title )
+        $title = $href;
+    if( $element )
+        $element = sprintf( 'id="%s"', yourls_esc_attr( $element ) );
+    $link = sprintf( '<a href="%s" %s>%s</a>', yourls_esc_url( $href ), $element, yourls_esc_html( $title ) );
+    echo yourls_apply_filter( 'html_link', $link );
 }
 
 /**
@@ -699,20 +699,20 @@ 
  *
  */
 function yourls_login_screen( $error_msg = '' ) {
-	yourls_html_head( 'login' );
+    yourls_html_head( 'login' );
 
-	$action = ( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ? '?' : '' );
+    $action = ( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ? '?' : '' );
 
-	yourls_html_logo();
-	?>
+    yourls_html_logo();
+    ?>
 	<div id="login">
 		<form method="post" action="<?php echo $action; ?>"> <?php // reset any QUERY parameters ?>
 			<?php
-				if( !empty( $error_msg ) ) {
-					echo '<p class="error">'.$error_msg.'</p>';
-				}
-				yourls_do_action( 'login_form_top' );
-			?>
+                if( !empty( $error_msg ) ) {
+                    echo '<p class="error">'.$error_msg.'</p>';
+                }
+                yourls_do_action( 'login_form_top' );
+            ?>
 			<p>
 				<label for="username"><?php yourls_e( 'Username' ); ?></label><br />
 				<input type="text" id="username" name="username" size="30" class="text" />
@@ -722,20 +722,20 @@ 
 				<input type="password" id="password" name="password" size="30" class="text" />
 			</p>
 			<?php
-				yourls_do_action( 'login_form_bottom' );
-			?>
+                yourls_do_action( 'login_form_bottom' );
+            ?>
 			<p style="text-align: right;">
 				<input type="submit" id="submit" name="submit" value="<?php yourls_e( 'Login' ); ?>" class="button" />
 			</p>
 			<?php
-				yourls_do_action( 'login_form_end' );
-			?>
+                yourls_do_action( 'login_form_end' );
+            ?>
 		</form>
 		<script type="text/javascript">$('#username').focus();</script>
 	</div>
 	<?php
-	yourls_html_footer();
-	die();
+    yourls_html_footer();
+    die();
 }
 
 /**
@@ -744,71 +744,71 @@ 
  */
 function yourls_html_menu() {
 
-	// Build menu links
-	if( defined( 'YOURLS_USER' ) ) {
-		$logout_link = yourls_apply_filter( 'logout_link', sprintf( yourls__('Hello <strong>%s</strong>'), YOURLS_USER ) . ' (<a href="' . yourls_admin_url() . '?action=logout" title="' . yourls_esc_attr__( 'Logout' ) . '">' . yourls__( 'Logout' ) . '</a>)' );
-	} else {
-		$logout_link = yourls_apply_filter( 'logout_link', '' );
-	}
-	$help_link   = yourls_apply_filter( 'help_link',   '<a href="' . yourls_site_url( false ) .'/readme.html">' . yourls__( 'Help' ) . '</a>' );
-
-	$admin_links    = array();
-	$admin_sublinks = array();
-
-	$admin_links['admin'] = array(
-		'url'    => yourls_admin_url( 'index.php' ),
-		'title'  => yourls__( 'Go to the admin interface' ),
-		'anchor' => yourls__( 'Admin interface' )
-	);
-
-	if( yourls_is_admin() ) {
-		$admin_links['tools'] = array(
-			'url'    => yourls_admin_url( 'tools.php' ),
-			'anchor' => yourls__( 'Tools' )
-		);
-		$admin_links['plugins'] = array(
-			'url'    => yourls_admin_url( 'plugins.php' ),
-			'anchor' => yourls__( 'Manage Plugins' )
-		);
-		$admin_sublinks['plugins'] = yourls_list_plugin_admin_pages();
-	}
-
-	$admin_links    = yourls_apply_filter( 'admin_links',    $admin_links );
-	$admin_sublinks = yourls_apply_filter( 'admin_sublinks', $admin_sublinks );
-
-	// Now output menu
-	echo '<nav role="navigation"><ul id="admin_menu">'."\n";
-	if ( yourls_is_private() && !empty( $logout_link ) )
-		echo '<li id="admin_menu_logout_link">' . $logout_link .'</li>';
-
-	foreach( (array)$admin_links as $link => $ar ) {
-		if( isset( $ar['url'] ) ) {
-			$anchor = isset( $ar['anchor'] ) ? $ar['anchor'] : $link;
-			$title  = isset( $ar['title'] ) ? 'title="' . $ar['title'] . '"' : '';
-			printf( '<li id="admin_menu_%s_link" class="admin_menu_toplevel"><a href="%s" %s>%s</a>', $link, $ar['url'], $title, $anchor );
-		}
-		// Output submenu if any. TODO: clean up, too many code duplicated here
-		if( isset( $admin_sublinks[$link] ) ) {
-			echo "<ul>\n";
-			foreach( $admin_sublinks[$link] as $link => $ar ) {
-				if( isset( $ar['url'] ) ) {
-					$anchor = isset( $ar['anchor'] ) ? $ar['anchor'] : $link;
-					$title  = isset( $ar['title'] ) ? 'title="' . $ar['title'] . '"' : '';
-					printf( '<li id="admin_menu_%s_link" class="admin_menu_sublevel admin_menu_sublevel_%s"><a href="%s" %s>%s</a>', $link, $link, $ar['url'], $title, $anchor );
-				}
-			}
-			echo "</ul>\n";
-		}
-	}
-
-	if ( isset( $help_link ) )
-		echo '<li id="admin_menu_help_link">' . $help_link .'</li>';
-
-	yourls_do_action( 'admin_menu' );
-	echo "</ul></nav>\n";
-	yourls_do_action( 'admin_notices' );
-	yourls_do_action( 'admin_notice' ); // because I never remember if it's 'notices' or 'notice'
-	/*
+    // Build menu links
+    if( defined( 'YOURLS_USER' ) ) {
+        $logout_link = yourls_apply_filter( 'logout_link', sprintf( yourls__('Hello <strong>%s</strong>'), YOURLS_USER ) . ' (<a href="' . yourls_admin_url() . '?action=logout" title="' . yourls_esc_attr__( 'Logout' ) . '">' . yourls__( 'Logout' ) . '</a>)' );
+    } else {
+        $logout_link = yourls_apply_filter( 'logout_link', '' );
+    }
+    $help_link   = yourls_apply_filter( 'help_link',   '<a href="' . yourls_site_url( false ) .'/readme.html">' . yourls__( 'Help' ) . '</a>' );
+
+    $admin_links    = array();
+    $admin_sublinks = array();
+
+    $admin_links['admin'] = array(
+        'url'    => yourls_admin_url( 'index.php' ),
+        'title'  => yourls__( 'Go to the admin interface' ),
+        'anchor' => yourls__( 'Admin interface' )
+    );
+
+    if( yourls_is_admin() ) {
+        $admin_links['tools'] = array(
+            'url'    => yourls_admin_url( 'tools.php' ),
+            'anchor' => yourls__( 'Tools' )
+        );
+        $admin_links['plugins'] = array(
+            'url'    => yourls_admin_url( 'plugins.php' ),
+            'anchor' => yourls__( 'Manage Plugins' )
+        );
+        $admin_sublinks['plugins'] = yourls_list_plugin_admin_pages();
+    }
+
+    $admin_links    = yourls_apply_filter( 'admin_links',    $admin_links );
+    $admin_sublinks = yourls_apply_filter( 'admin_sublinks', $admin_sublinks );
+
+    // Now output menu
+    echo '<nav role="navigation"><ul id="admin_menu">'."\n";
+    if ( yourls_is_private() && !empty( $logout_link ) )
+        echo '<li id="admin_menu_logout_link">' . $logout_link .'</li>';
+
+    foreach( (array)$admin_links as $link => $ar ) {
+        if( isset( $ar['url'] ) ) {
+            $anchor = isset( $ar['anchor'] ) ? $ar['anchor'] : $link;
+            $title  = isset( $ar['title'] ) ? 'title="' . $ar['title'] . '"' : '';
+            printf( '<li id="admin_menu_%s_link" class="admin_menu_toplevel"><a href="%s" %s>%s</a>', $link, $ar['url'], $title, $anchor );
+        }
+        // Output submenu if any. TODO: clean up, too many code duplicated here
+        if( isset( $admin_sublinks[$link] ) ) {
+            echo "<ul>\n";
+            foreach( $admin_sublinks[$link] as $link => $ar ) {
+                if( isset( $ar['url'] ) ) {
+                    $anchor = isset( $ar['anchor'] ) ? $ar['anchor'] : $link;
+                    $title  = isset( $ar['title'] ) ? 'title="' . $ar['title'] . '"' : '';
+                    printf( '<li id="admin_menu_%s_link" class="admin_menu_sublevel admin_menu_sublevel_%s"><a href="%s" %s>%s</a>', $link, $link, $ar['url'], $title, $anchor );
+                }
+            }
+            echo "</ul>\n";
+        }
+    }
+
+    if ( isset( $help_link ) )
+        echo '<li id="admin_menu_help_link">' . $help_link .'</li>';
+
+    yourls_do_action( 'admin_menu' );
+    echo "</ul></nav>\n";
+    yourls_do_action( 'admin_notices' );
+    yourls_do_action( 'admin_notice' ); // because I never remember if it's 'notices' or 'notice'
+    /*
 	To display a notice:
 	$message = "<div>OMG, dude, I mean!</div>" );
 	yourls_add_action( 'admin_notices', function() use ( $message ) { echo (string) $message; } );
@@ -820,9 +820,9 @@ 
  *
  */
 function yourls_add_notice( $message, $style = 'notice' ) {
-	// Escape single quotes in $message to avoid breaking the anonymous function
-	$message = yourls_notice_box( strtr( $message, array( "'" => "\'" ) ), $style );
-	yourls_add_action( 'admin_notices', function() use ( $message ) { echo (string) $message; } );
+    // Escape single quotes in $message to avoid breaking the anonymous function
+    $message = yourls_notice_box( strtr( $message, array( "'" => "\'" ) ), $style );
+    yourls_add_action( 'admin_notices', function() use ( $message ) { echo (string) $message; } );
 }
 
 /**
@@ -830,7 +830,7 @@ 
  *
  */
 function yourls_notice_box( $message, $style = 'notice' ) {
-	return <<<HTML
+    return <<<HTML
 	<div class="$style">
 	<p>$message</p>
 	</div>
@@ -848,12 +848,12 @@ 
  */
 function yourls_page( $page ) {
     if( !yourls_is_page($page)) {
-		yourls_die( yourls_s('Page "%1$s" not found', $page), yourls__('Not found'), 404 );
+        yourls_die( yourls_s('Page "%1$s" not found', $page), yourls__('Not found'), 404 );
     }
 
-	yourls_do_action( 'pre_page', $page );
-	include_once( YOURLS_PAGEDIR . "/$page.php" );
-	yourls_do_action( 'post_page', $page );
+    yourls_do_action( 'pre_page', $page );
+    include_once( YOURLS_PAGEDIR . "/$page.php" );
+    yourls_do_action( 'post_page', $page );
 }
 
 /**
@@ -865,24 +865,24 @@ 
  * @since 1.6
  */
 function yourls_html_language_attributes() {
-	$attributes = array();
-	$output = '';
-
-	$attributes[] = ( yourls_is_rtl() ? 'dir="rtl"' : 'dir="ltr"' );
-
-	$doctype = yourls_apply_filter( 'html_language_attributes_doctype', 'html' );
-	// Experimental: get HTML lang from locale. Should work. Convert fr_FR -> fr-FR
-	if ( $lang = str_replace( '_', '-', yourls_get_locale() ) ) {
-		if( $doctype == 'xhtml' ) {
-			$attributes[] = "xml:lang=\"$lang\"";
-		} else {
-			$attributes[] = "lang=\"$lang\"";
-		}
-	}
-
-	$output = implode( ' ', $attributes );
-	$output = yourls_apply_filter( 'html_language_attributes', $output );
-	echo $output;
+    $attributes = array();
+    $output = '';
+
+    $attributes[] = ( yourls_is_rtl() ? 'dir="rtl"' : 'dir="ltr"' );
+
+    $doctype = yourls_apply_filter( 'html_language_attributes_doctype', 'html' );
+    // Experimental: get HTML lang from locale. Should work. Convert fr_FR -> fr-FR
+    if ( $lang = str_replace( '_', '-', yourls_get_locale() ) ) {
+        if( $doctype == 'xhtml' ) {
+            $attributes[] = "xml:lang=\"$lang\"";
+        } else {
+            $attributes[] = "lang=\"$lang\"";
+        }
+    }
+
+    $output = implode( ' ', $attributes );
+    $output = yourls_apply_filter( 'html_language_attributes', $output );
+    echo $output;
 }
 
 /**
@@ -891,16 +891,16 @@ 
  * @since 1.6
  */
 function yourls_l10n_calendar_strings() {
-	echo "\n<script>\n";
-	echo "var l10n_cal_month = " . json_encode( array_values( yourls_l10n_months() ) ) . ";\n";
-	echo "var l10n_cal_days = " . json_encode( array_values( yourls_l10n_weekday_initial() ) ) . ";\n";
-	echo "var l10n_cal_today = \"" . yourls_esc_js( yourls__( 'Today' ) ) . "\";\n";
-	echo "var l10n_cal_close = \"" . yourls_esc_js( yourls__( 'Close' ) ) . "\";\n";
-	echo "</script>\n";
-
-	// Dummy returns, to initialize l10n strings used in the calendar
-	yourls__( 'Today' );
-	yourls__( 'Close' );
+    echo "\n<script>\n";
+    echo "var l10n_cal_month = " . json_encode( array_values( yourls_l10n_months() ) ) . ";\n";
+    echo "var l10n_cal_days = " . json_encode( array_values( yourls_l10n_weekday_initial() ) ) . ";\n";
+    echo "var l10n_cal_today = \"" . yourls_esc_js( yourls__( 'Today' ) ) . "\";\n";
+    echo "var l10n_cal_close = \"" . yourls_esc_js( yourls__( 'Close' ) ) . "\";\n";
+    echo "</script>\n";
+
+    // Dummy returns, to initialize l10n strings used in the calendar
+    yourls__( 'Today' );
+    yourls__( 'Close' );
 }
 
 
@@ -911,13 +911,13 @@ 
  */
 function yourls_new_core_version_notice() {
 
-	$checks = yourls_get_option( 'core_version_checks' );
+    $checks = yourls_get_option( 'core_version_checks' );
     $latest = isset($checks->last_result->latest) ? yourls_sanitize_version($checks->last_result->latest) : false;
 
-	if( $latest AND version_compare( $latest, YOURLS_VERSION, '>' ) ) {
-		$msg = yourls_s( '<a href="%s">YOURLS version %s</a> is available. Please update!', 'http://yourls.org/download', $latest );
-		yourls_add_notice( $msg );
-	}
+    if( $latest AND version_compare( $latest, YOURLS_VERSION, '>' ) ) {
+        $msg = yourls_s( '<a href="%s">YOURLS version %s</a> is available. Please update!', 'http://yourls.org/download', $latest );
+        yourls_add_notice( $msg );
+    }
 }
 
 /**
@@ -932,15 +932,15 @@ 
  * @return string Search string
  */
 function yourls_get_search_text() {
-	$search = '';
-	if( isset( $_GET['search_protocol'] ) )
-		$search .= $_GET['search_protocol'];
-	if( isset( $_GET['search_slashes'] ) )
-		$search .= $_GET['search_slashes'];
-	if( isset( $_GET['search'] ) )
-		$search .= $_GET['search'];
-
-	return htmlspecialchars( trim( $search ) );
+    $search = '';
+    if( isset( $_GET['search_protocol'] ) )
+        $search .= $_GET['search_protocol'];
+    if( isset( $_GET['search_slashes'] ) )
+        $search .= $_GET['search_slashes'];
+    if( isset( $_GET['search'] ) )
+        $search .= $_GET['search'];
+
+    return htmlspecialchars( trim( $search ) );
 }
 
 /**

Spacing +280 added lines, -280 removed lines

@@ -5,16 +5,16 @@ 
  *
  */
 function yourls_html_logo() {
-	yourls_do_action( 'pre_html_logo' );
+	yourls_do_action('pre_html_logo');
 	?>
 	<header role="banner">
 	<h1>
-		<a href="<?php echo yourls_admin_url( 'index.php' ) ?>" title="YOURLS"><span>YOURLS</span>: <span>Y</span>our <span>O</span>wn <span>URL</span> <span>S</span>hortener<br/>
+		<a href="<?php echo yourls_admin_url('index.php') ?>" title="YOURLS"><span>YOURLS</span>: <span>Y</span>our <span>O</span>wn <span>URL</span> <span>S</span>hortener<br/>
 		<img src="<?php yourls_site_url(); ?>/images/yourls-logo.svg" id="yourls-logo" alt="YOURLS" title="YOURLS" /></a>
 	</h1>
 	</header>
 	<?php
-	yourls_do_action( 'html_logo' );
+	yourls_do_action('html_logo');
 }
 
 /**
@@ -23,15 +23,15 @@ 
  * @param string $context Context of the page (stats, index, infos, ...)
  * @param string $title HTML title of the page
  */
-function yourls_html_head( $context = 'index', $title = '' ) {
+function yourls_html_head($context = 'index', $title = '') {
 
-	yourls_do_action( 'pre_html_head', $context, $title );
+	yourls_do_action('pre_html_head', $context, $title);
 
 	// All components to false, except when specified true
 	$share = $insert = $tablesorter = $tabs = $cal = $charts = false;
 
 	// Load components as needed
-	switch ( $context ) {
+	switch ($context) {
 		case 'infos':
 			$share = $tabs = $charts = true;
 			break;
@@ -57,30 +57,30 @@ 
 	}
 
 	// Force no cache for all admin pages
-	if( yourls_is_admin() && !headers_sent() ) {
+	if (yourls_is_admin() && !headers_sent()) {
         yourls_no_cache_headers();
-		yourls_content_type_header( yourls_apply_filter( 'html_head_content-type', 'text/html' ) );
-		yourls_do_action( 'admin_headers', $context, $title );
+		yourls_content_type_header(yourls_apply_filter('html_head_content-type', 'text/html'));
+		yourls_do_action('admin_headers', $context, $title);
 	}
 
 	// Store page context
 	yourls_set_html_context($context);
 
 	// Body class
-	$bodyclass = yourls_apply_filter( 'bodyclass', '' );
-	$bodyclass .= ( yourls_is_mobile_device() ? 'mobile' : 'desktop' );
+	$bodyclass = yourls_apply_filter('bodyclass', '');
+	$bodyclass .= (yourls_is_mobile_device() ? 'mobile' : 'desktop');
 
 	// Page title
-	$_title = 'YOURLS &mdash; Your Own URL Shortener | ' . yourls_link();
-	$title = $title ? $title . " &laquo; " . $_title : $_title;
-	$title = yourls_apply_filter( 'html_title', $title, $context );
+	$_title = 'YOURLS &mdash; Your Own URL Shortener | '.yourls_link();
+	$title = $title ? $title." &laquo; ".$_title : $_title;
+	$title = yourls_apply_filter('html_title', $title, $context);
 
 	?>
 <!DOCTYPE html>
 <html <?php yourls_html_language_attributes(); ?>>
 <head>
 	<title><?php echo $title ?></title>
-	<meta http-equiv="Content-Type" content="<?php echo yourls_apply_filter( 'html_head_meta_content-type', 'text/html; charset=utf-8' ); ?>" />
+	<meta http-equiv="Content-Type" content="<?php echo yourls_apply_filter('html_head_meta_content-type', 'text/html; charset=utf-8'); ?>" />
 	<meta name="generator" content="YOURLS <?php echo YOURLS_VERSION ?>" />
 	<meta name="description" content="YOURLS &raquo; Your Own URL Shortener' | <?php yourls_site_url(); ?>" />
 	<?php yourls_do_action('html_head_meta', $context); ?>
@@ -89,29 +89,29 @@ 
 	<script src="<?php yourls_site_url(); ?>/js/common.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<script src="<?php yourls_site_url(); ?>/js/jquery.notifybar.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/style.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
-	<?php if ( $tabs ) { ?>
+	<?php if ($tabs) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/infos.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
 		<script src="<?php yourls_site_url(); ?>/js/infos.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
-	<?php if ( $tablesorter ) { ?>
+	<?php if ($tablesorter) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/tablesorter.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
 		<script src="<?php yourls_site_url(); ?>/js/jquery-3.tablesorter.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 		<script src="<?php yourls_site_url(); ?>/js/tablesorte.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
-	<?php if ( $insert ) { ?>
+	<?php if ($insert) { ?>
 		<script src="<?php yourls_site_url(); ?>/js/insert.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
-	<?php if ( $share ) { ?>
+	<?php if ($share) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/share.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
 		<script src="<?php yourls_site_url(); ?>/js/share.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 		<script src="<?php yourls_site_url(); ?>/js/clipboard.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
-	<?php if ( $cal ) { ?>
+	<?php if ($cal) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/cal.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
 		<?php yourls_l10n_calendar_strings(); ?>
 		<script src="<?php yourls_site_url(); ?>/js/jquery.cal.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
-	<?php if ( $charts ) { ?>
+	<?php if ($charts) { ?>
 			<script type="text/javascript" src="https://www.google.com/jsapi"></script>
 			<script type="text/javascript">
 					 google.load('visualization', '1.0', {'packages':['corechart', 'geochart']});
@@ -119,10 +119,10 @@ 
 	<?php } ?>
 	<script type="text/javascript">
 	//<![CDATA[
-		var ajaxurl  = '<?php echo yourls_admin_url( 'admin-ajax.php' ); ?>';
+		var ajaxurl  = '<?php echo yourls_admin_url('admin-ajax.php'); ?>';
 	//]]>
 	</script>
-	<?php yourls_do_action( 'html_head', $context ); ?>
+	<?php yourls_do_action('html_head', $context); ?>
 </head>
 <body class="<?php echo $context; ?> <?php echo $bodyclass; ?>">
 <div id="wrap">
@@ -139,9 +139,9 @@ 
  * @return void
  */
 function yourls_html_footer($can_query = true) {
-    if($can_query & yourls_get_debug_mode()) {
+    if ($can_query & yourls_get_debug_mode()) {
         $num_queries = yourls_get_num_queries();
-        $num_queries = ' &ndash; '. sprintf( yourls_n( '1 query', '%s queries', $num_queries ), $num_queries );
+        $num_queries = ' &ndash; '.sprintf(yourls_n('1 query', '%s queries', $num_queries), $num_queries);
     } else {
         $num_queries = '';
     }
@@ -150,17 +150,17 @@ 
 	</div><?php // wrap ?>
 	<footer id="footer" role="contentinfo"><p>
 		<?php
-		$footer  = yourls_s( 'Powered by %s', '<a href="http://yourls.org/" title="YOURLS">YOURLS</a> v ' . YOURLS_VERSION );
+		$footer  = yourls_s('Powered by %s', '<a href="http://yourls.org/" title="YOURLS">YOURLS</a> v '.YOURLS_VERSION);
 		$footer .= $num_queries;
-		echo yourls_apply_filter( 'html_footer_text', $footer );
+		echo yourls_apply_filter('html_footer_text', $footer);
 		?>
 	</p></footer>
-	<?php if( yourls_get_debug_mode() ) {
+	<?php if (yourls_get_debug_mode()) {
 		echo '<div style="text-align:left"><pre>';
-		echo join( "\n", yourls_get_debug_log() );
+		echo join("\n", yourls_get_debug_log());
 		echo '</pre></div>';
 	} ?>
-	<?php yourls_do_action( 'html_footer', yourls_get_html_context() ); ?>
+	<?php yourls_do_action('html_footer', yourls_get_html_context()); ?>
 	</body>
 	</html>
 	<?php
@@ -172,9 +172,9 @@ 
  * @param string $url URL to prefill the input with
  * @param string $keyword Keyword to prefill the input with
  */
-function yourls_html_addnew( $url = '', $keyword = '' ) {
-    $pre = yourls_apply_filter( 'shunt_html_addnew', false, $url, $keyword );
-    if ( false !== $pre ) {
+function yourls_html_addnew($url = '', $keyword = '') {
+    $pre = yourls_apply_filter('shunt_html_addnew', false, $url, $keyword);
+    if (false !== $pre) {
         return $pre;
     }
 	?>
@@ -183,17 +183,17 @@ 
 		<div>
 			<form id="new_url_form" action="" method="get">
 				<div>
-                    <label for="add-url"><strong><?php yourls_e( 'Enter the URL' ); ?></strong></label>:
+                    <label for="add-url"><strong><?php yourls_e('Enter the URL'); ?></strong></label>:
                     <input type="text" id="add-url" name="url" value="<?php echo $url; ?>" class="text" size="80" placeholder="https://" />
-                    <label for="add-keyword"><?php yourls_e( 'Optional '); ?> : <strong><?php yourls_e('Custom short URL'); ?></strong></label>:
+                    <label for="add-keyword"><?php yourls_e('Optional '); ?> : <strong><?php yourls_e('Custom short URL'); ?></strong></label>:
                     <input type="text" id="add-keyword" name="keyword" value="<?php echo $keyword; ?>" class="text" size="8" />
-                    <?php yourls_nonce_field( 'add_url', 'nonce-add' ); ?>
-                    <input type="button" id="add-button" name="add-button" value="<?php yourls_e( 'Shorten The URL' ); ?>" class="button" onclick="add_link();" />
+                    <?php yourls_nonce_field('add_url', 'nonce-add'); ?>
+                    <input type="button" id="add-button" name="add-button" value="<?php yourls_e('Shorten The URL'); ?>" class="button" onclick="add_link();" />
                 </div>
 			</form>
 			<div id="feedback" style="display:none"></div>
 		</div>
-		<?php yourls_do_action( 'html_addnew' ); ?>
+		<?php yourls_do_action('html_addnew'); ?>
 	</div>
 	<?php
 }
@@ -206,7 +206,7 @@ 
  * @param array $params Array of all required parameters
  * @return string Result
  */
-function yourls_html_tfooter( $params = array() ) {
+function yourls_html_tfooter($params = array()) {
     // Manually extract all parameters from the array. We prefer doing it this way, over using extract(),
     // to make things clearer and more explicit about what var is used.
     $search       = $params['search'];
@@ -233,54 +233,54 @@ 
 						<?php
 
 						// First search control: text to search
-						$_input = '<input aria-label="' .yourls__( 'Search for' ). '" type="text" name="search" class="text" size="12" value="' . yourls_esc_attr( $search_text ) . '" />';
+						$_input = '<input aria-label="'.yourls__('Search for').'" type="text" name="search" class="text" size="12" value="'.yourls_esc_attr($search_text).'" />';
 						$_options = array(
-                            'all'     => yourls__( 'All fields' ),
-							'keyword' => yourls__( 'Short URL' ),
-							'url'     => yourls__( 'URL' ),
-							'title'   => yourls__( 'Title' ),
-							'ip'      => yourls__( 'IP' ),
+                            'all'     => yourls__('All fields'),
+							'keyword' => yourls__('Short URL'),
+							'url'     => yourls__('URL'),
+							'title'   => yourls__('Title'),
+							'ip'      => yourls__('IP'),
 						);
-						$_select = yourls_html_select( 'search_in', $_options, $search_in, false, yourls__( 'Search in' ) );
+						$_select = yourls_html_select('search_in', $_options, $search_in, false, yourls__('Search in'));
 						/* //translators: "Search for <input field with text to search> in <select dropdown with URL, title...>" */
-						yourls_se( 'Search for %1$s in %2$s', $_input , $_select );
+						yourls_se('Search for %1$s in %2$s', $_input, $_select);
 						echo "&ndash;\n";
 
 						// Second search control: order by
 						$_options = array(
-							'keyword'      => yourls__( 'Short URL' ),
-							'url'          => yourls__( 'URL' ),
-							'title'        => yourls__( 'Title' ),
-							'timestamp'    => yourls__( 'Date' ),
-							'ip'           => yourls__( 'IP' ),
-							'clicks'       => yourls__( 'Clicks' ),
+							'keyword'      => yourls__('Short URL'),
+							'url'          => yourls__('URL'),
+							'title'        => yourls__('Title'),
+							'timestamp'    => yourls__('Date'),
+							'ip'           => yourls__('IP'),
+							'clicks'       => yourls__('Clicks'),
 						);
-						$_select = yourls_html_select( 'sort_by', $_options, $sort_by, false,  yourls__( 'Sort by' ) );
-						$sort_order = isset( $sort_order ) ? $sort_order : 'desc' ;
+						$_select = yourls_html_select('sort_by', $_options, $sort_by, false, yourls__('Sort by'));
+						$sort_order = isset($sort_order) ? $sort_order : 'desc';
 						$_options = array(
-							'asc'  => yourls__( 'Ascending' ),
-							'desc' => yourls__( 'Descending' ),
+							'asc'  => yourls__('Ascending'),
+							'desc' => yourls__('Descending'),
 						);
-						$_select2 = yourls_html_select( 'sort_order', $_options, $sort_order, false,  yourls__( 'Sort order' ) );
+						$_select2 = yourls_html_select('sort_order', $_options, $sort_order, false, yourls__('Sort order'));
 						/* //translators: "Order by <criteria dropdown (date, clicks...)> in <order dropdown (Descending or Ascending)>" */
-						yourls_se( 'Order by %1$s %2$s', $_select , $_select2 );
+						yourls_se('Order by %1$s %2$s', $_select, $_select2);
 						echo "&ndash;\n";
 
 						// Third search control: Show XX rows
 						/* //translators: "Show <text field> rows" */
-                        $_input = '<input aria-label="' .yourls__( 'Number of rows to show' ). '" type="text" name="perpage" class="text" size="2" value="' . $perpage . '" />';
-						yourls_se( 'Show %s rows',  $_input );
+                        $_input = '<input aria-label="'.yourls__('Number of rows to show').'" type="text" name="perpage" class="text" size="2" value="'.$perpage.'" />';
+						yourls_se('Show %s rows', $_input);
 						echo "<br/>\n";
 
 						// Fourth search control: Show links with more than XX clicks
 						$_options = array(
-							'more' => yourls__( 'more' ),
-							'less' => yourls__( 'less' ),
+							'more' => yourls__('more'),
+							'less' => yourls__('less'),
 						);
-						$_select = yourls_html_select( 'click_filter', $_options, $click_filter, false, yourls__( 'Show links with' ) );
-						$_input  = '<input aria-label="' .yourls__( 'Number of clicks' ). '" type="text" name="click_limit" class="text" size="4" value="' . $click_limit . '" /> ';
+						$_select = yourls_html_select('click_filter', $_options, $click_filter, false, yourls__('Show links with'));
+						$_input  = '<input aria-label="'.yourls__('Number of clicks').'" type="text" name="click_limit" class="text" size="4" value="'.$click_limit.'" /> ';
 						/* //translators: "Show links with <more/less> than <text field> clicks" */
-						yourls_se( 'Show links with %1$s than %2$s clicks', $_select, $_input );
+						yourls_se('Show links with %1$s than %2$s clicks', $_select, $_input);
 						echo "<br/>\n";
 
 						// Fifth search control: Show links created before/after/between ...
@@ -289,12 +289,12 @@ 
 							'after'   => yourls__('after'),
 							'between' => yourls__('between'),
 						);
-						$_select = yourls_html_select( 'date_filter', $_options, $date_filter, false, yourls__('Show links created') );
-						$_input  = '<input aria-label="' .yourls__('Select a date') . '" type="text" name="date_first" id="date_first" class="text" size="12" value="' . $date_first . '" />';
-						$_and    = '<span id="date_and"' . ( $date_filter === 'between' ? ' style="display:inline"' : '' ) . '> &amp; </span>';
-						$_input2 = '<input aria-label="' .yourls__('Select an end date') . '" type="text" name="date_second" id="date_second" class="text" size="12" value="' . $date_second . '"' . ( $date_filter === 'between' ? ' style="display:inline"' : '' ) . '/>';
+						$_select = yourls_html_select('date_filter', $_options, $date_filter, false, yourls__('Show links created'));
+						$_input  = '<input aria-label="'.yourls__('Select a date').'" type="text" name="date_first" id="date_first" class="text" size="12" value="'.$date_first.'" />';
+						$_and    = '<span id="date_and"'.($date_filter === 'between' ? ' style="display:inline"' : '').'> &amp; </span>';
+						$_input2 = '<input aria-label="'.yourls__('Select an end date').'" type="text" name="date_second" id="date_second" class="text" size="12" value="'.$date_second.'"'.($date_filter === 'between' ? ' style="display:inline"' : '').'/>';
 						/* //translators: "Show links created <before/after/between> <date input> <"and" if applicable> <date input if applicable>" */
-						yourls_se( 'Show links created %1$s %2$s %3$s %4$s', $_select, $_input, $_and, $_input2 );
+						yourls_se('Show links created %1$s %2$s %3$s %4$s', $_select, $_input, $_and, $_input2);
 						?>
 
 						<div id="filter_buttons">
@@ -309,40 +309,40 @@ 
 
 			<?php
 			// Remove empty keys from the $params array so it doesn't clutter the pagination links
-			$params = array_filter( $params, 'yourls_return_if_not_empty_string' ); // remove empty keys
+			$params = array_filter($params, 'yourls_return_if_not_empty_string'); // remove empty keys
 
-			if( isset( $search_text ) ) {
+			if (isset($search_text)) {
 				$params['search'] = $search_text;
-				unset( $params['search_text'] );
+				unset($params['search_text']);
 			}
 			?>
 
 			<div id="pagination">
 				<span class="navigation">
-				<?php if( $total_pages > 1 ) { ?>
-					<span class="nav_total"><?php echo sprintf( yourls_n( '1 page', '%s pages', $total_pages ), $total_pages ); ?></span>
+				<?php if ($total_pages > 1) { ?>
+					<span class="nav_total"><?php echo sprintf(yourls_n('1 page', '%s pages', $total_pages), $total_pages); ?></span>
 					<?php
-					$base_page = yourls_admin_url( 'index.php' );
+					$base_page = yourls_admin_url('index.php');
 					// Pagination offsets: min( max ( zomg! ) );
-					$p_start = max(  min( $total_pages - 4, $page - 2 ), 1 );
-					$p_end = min( max( 5, $page + 2 ), $total_pages );
-					if( $p_start >= 2 ) {
-						$link = yourls_add_query_arg( array_merge( $params, array( 'page' => 1 ) ), $base_page );
-						echo '<span class="nav_link nav_first"><a href="' . $link . '" title="' . yourls_esc_attr__('Go to First Page') . '">' . yourls__( '&laquo; First' ) . '</a></span>';
+					$p_start = max(min($total_pages - 4, $page - 2), 1);
+					$p_end = min(max(5, $page + 2), $total_pages);
+					if ($p_start >= 2) {
+						$link = yourls_add_query_arg(array_merge($params, array('page' => 1)), $base_page);
+						echo '<span class="nav_link nav_first"><a href="'.$link.'" title="'.yourls_esc_attr__('Go to First Page').'">'.yourls__('&laquo; First').'</a></span>';
 						echo '<span class="nav_link nav_prev"></span>';
 					}
-					for( $i = $p_start ; $i <= $p_end; $i++ ) {
-						if( $i == $page ) {
+					for ($i = $p_start; $i <= $p_end; $i++) {
+						if ($i == $page) {
 							echo "<span class='nav_link nav_current'>$i</span>";
 						} else {
-							$link = yourls_add_query_arg( array_merge( $params, array( 'page' => $i ) ), $base_page );
-							echo '<span class="nav_link nav_goto"><a href="' . $link . '" title="' . sprintf( yourls_esc_attr( 'Page %s' ), $i ) .'">'.$i.'</a></span>';
+							$link = yourls_add_query_arg(array_merge($params, array('page' => $i)), $base_page);
+							echo '<span class="nav_link nav_goto"><a href="'.$link.'" title="'.sprintf(yourls_esc_attr('Page %s'), $i).'">'.$i.'</a></span>';
 						}
 					}
-					if( ( $p_end ) < $total_pages ) {
-						$link = yourls_add_query_arg( array_merge( $params, array( 'page' => $total_pages ) ), $base_page );
+					if (($p_end) < $total_pages) {
+						$link = yourls_add_query_arg(array_merge($params, array('page' => $total_pages)), $base_page);
 						echo '<span class="nav_link nav_next"></span>';
-						echo '<span class="nav_link nav_last"><a href="' . $link . '" title="' . yourls_esc_attr__('Go to Last Page') . '">' . yourls__( 'Last &raquo;' ) . '</a></span>';
+						echo '<span class="nav_link nav_last"><a href="'.$link.'" title="'.yourls_esc_attr__('Go to Last Page').'">'.yourls__('Last &raquo;').'</a></span>';
 					}
 					?>
 				<?php } ?>
@@ -350,7 +350,7 @@ 
 			</div>
 			</th>
 		</tr>
-		<?php yourls_do_action( 'html_tfooter' ); ?>
+		<?php yourls_do_action('html_tfooter'); ?>
 	</tfoot>
 	<?php
 }
@@ -367,16 +367,16 @@ 
  * @param  string  $label     ARIA label of the element
  * @return string HTML content of the select element
  */
-function yourls_html_select( $name, $options, $selected = '', $display = false, $label = '' ) {
+function yourls_html_select($name, $options, $selected = '', $display = false, $label = '') {
 	$html = "<select aria-label='$label' name='$name' id='$name' size='1'>\n";
-	foreach( $options as $value => $text ) {
+	foreach ($options as $value => $text) {
 		$html .= "<option value='$value' ";
 		$html .= $selected == $value ? ' selected="selected"' : '';
 		$html .= ">$text</option>\n";
 	}
 	$html .= "</select>\n";
-	$html  = yourls_apply_filter( 'html_select', $html, $name, $options, $selected, $display );
-	if( $display )
+	$html  = yourls_apply_filter('html_select', $html, $name, $options, $selected, $display);
+	if ($display)
 		echo $html;
 	return $html;
 }
@@ -385,51 +385,51 @@ 
  * Display the Quick Share box
  *
  */
-function yourls_share_box( $longurl, $shorturl, $title = '', $text='', $shortlink_title = '', $share_title = '', $hidden = false ) {
-	if ( $shortlink_title == '' )
-		$shortlink_title = '<h2>' . yourls__( 'Your short link' ) . '</h2>';
-	if ( $share_title == '' )
-		$share_title = '<h2>' . yourls__( 'Quick Share' ) . '</h2>';
+function yourls_share_box($longurl, $shorturl, $title = '', $text = '', $shortlink_title = '', $share_title = '', $hidden = false) {
+	if ($shortlink_title == '')
+		$shortlink_title = '<h2>'.yourls__('Your short link').'</h2>';
+	if ($share_title == '')
+		$share_title = '<h2>'.yourls__('Quick Share').'</h2>';
 
 	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_share_box', false );
-	if ( false !== $pre )
+	$pre = yourls_apply_filter('shunt_share_box', false);
+	if (false !== $pre)
 		return $pre;
 
     // Make sure IDN domains are in their UTF8 form
     $shorturl = yourls_normalize_uri($shorturl);
 
-	$text   = ( $text ? '"'.$text.'" ' : '' );
-	$title  = ( $title ? "$title " : '' );
-	$share  = yourls_esc_textarea( $title.$text.$shorturl );
-	$count  = 280 - strlen( $share );
-	$hidden = ( $hidden ? 'style="display:none;"' : '' );
+	$text   = ($text ? '"'.$text.'" ' : '');
+	$title  = ($title ? "$title " : '');
+	$share  = yourls_esc_textarea($title.$text.$shorturl);
+	$count  = 280 - strlen($share);
+	$hidden = ($hidden ? 'style="display:none;"' : '');
 
 	// Allow plugins to filter all data
-	$data = compact( 'longurl', 'shorturl', 'title', 'text', 'shortlink_title', 'share_title', 'share', 'count', 'hidden' );
-	$data = yourls_apply_filter( 'share_box_data', $data );
-	extract( $data );
+	$data = compact('longurl', 'shorturl', 'title', 'text', 'shortlink_title', 'share_title', 'share', 'count', 'hidden');
+	$data = yourls_apply_filter('share_box_data', $data);
+	extract($data);
 
-	$_share = rawurlencode( $share );
-	$_url   = rawurlencode( $shorturl );
+	$_share = rawurlencode($share);
+	$_url   = rawurlencode($shorturl);
 	?>
 
 	<div id="shareboxes" <?php echo $hidden; ?>>
 
-		<?php yourls_do_action( 'shareboxes_before', $longurl, $shorturl, $title, $text ); ?>
+		<?php yourls_do_action('shareboxes_before', $longurl, $shorturl, $title, $text); ?>
 
 		<div id="copybox" class="share">
 		<?php echo $shortlink_title; ?>
-			<p><input id="copylink" class="text" size="32" value="<?php echo yourls_esc_url( $shorturl ); ?>" /></p>
-			<p><small><?php yourls_e( 'Long link' ); ?>: <a id="origlink" href="<?php echo yourls_esc_url( $longurl ); ?>"><?php echo yourls_esc_url( $longurl ); ?></a></small>
-			<?php if( yourls_do_log_redirect() ) { ?>
-			<br/><small><?php yourls_e( 'Stats' ); ?>: <a id="statlink" href="<?php echo yourls_esc_url( $shorturl ); ?>+"><?php echo yourls_esc_url( $shorturl ); ?>+</a></small>
-			<input type="hidden" id="titlelink" value="<?php echo yourls_esc_attr( $title ); ?>" />
+			<p><input id="copylink" class="text" size="32" value="<?php echo yourls_esc_url($shorturl); ?>" /></p>
+			<p><small><?php yourls_e('Long link'); ?>: <a id="origlink" href="<?php echo yourls_esc_url($longurl); ?>"><?php echo yourls_esc_url($longurl); ?></a></small>
+			<?php if (yourls_do_log_redirect()) { ?>
+			<br/><small><?php yourls_e('Stats'); ?>: <a id="statlink" href="<?php echo yourls_esc_url($shorturl); ?>+"><?php echo yourls_esc_url($shorturl); ?>+</a></small>
+			<input type="hidden" id="titlelink" value="<?php echo yourls_esc_attr($title); ?>" />
 			<?php } ?>
 			</p>
 		</div>
 
-		<?php yourls_do_action( 'shareboxes_middle', $longurl, $shorturl, $title, $text ); ?>
+		<?php yourls_do_action('shareboxes_middle', $longurl, $shorturl, $title, $text); ?>
 
 		<div id="sharebox" class="share">
 			<?php echo $share_title; ?>
@@ -437,17 +437,17 @@ 
 				<span id="charcount" class="hide-if-no-js"><?php echo $count; ?></span>
 				<textarea id="tweet_body"><?php echo $share; ?></textarea>
 			</div>
-			<p id="share_links"><?php yourls_e( 'Share with' ); ?>
-				<a id="share_tw" href="https://twitter.com/intent/tweet?text=<?php echo $_share; ?>" title="<?php yourls_e( 'Tweet this!' ); ?>" onclick="share('tw');return false">Twitter</a>
-				<a id="share_fb" href="https://www.facebook.com/share.php?u=<?php echo $_url; ?>" title="<?php yourls_e( 'Share on Facebook' ); ?>" onclick="share('fb');return false;">Facebook</a>
+			<p id="share_links"><?php yourls_e('Share with'); ?>
+				<a id="share_tw" href="https://twitter.com/intent/tweet?text=<?php echo $_share; ?>" title="<?php yourls_e('Tweet this!'); ?>" onclick="share('tw');return false">Twitter</a>
+				<a id="share_fb" href="https://www.facebook.com/share.php?u=<?php echo $_url; ?>" title="<?php yourls_e('Share on Facebook'); ?>" onclick="share('fb');return false;">Facebook</a>
 				<?php
-				yourls_do_action( 'share_links', $longurl, $shorturl, $title, $text );
+				yourls_do_action('share_links', $longurl, $shorturl, $title, $text);
 				// Note: on the main admin page, there are no parameters passed to the sharebox when it's drawn.
 				?>
 			</p>
 		</div>
 
-		<?php yourls_do_action( 'shareboxes_after', $longurl, $shorturl, $title, $text ); ?>
+		<?php yourls_do_action('shareboxes_after', $longurl, $shorturl, $title, $text); ?>
 
 	</div>
 
@@ -458,20 +458,20 @@ 
  * Die die die
  *
  */
-function yourls_die( $message = '', $title = '', $header_code = 200 ) {
-    yourls_do_action( 'pre_yourls_die', $message, $title, $header_code );
+function yourls_die($message = '', $title = '', $header_code = 200) {
+    yourls_do_action('pre_yourls_die', $message, $title, $header_code);
 
-	yourls_status_header( $header_code );
+	yourls_status_header($header_code);
 
-	if( !yourls_did_action( 'html_head' ) ) {
+	if (!yourls_did_action('html_head')) {
 		yourls_html_head();
 		yourls_html_logo();
 	}
-	echo yourls_apply_filter( 'die_title', "<h2>$title</h2>" );
-	echo yourls_apply_filter( 'die_message', "<p>$message</p>" );
+	echo yourls_apply_filter('die_title', "<h2>$title</h2>");
+	echo yourls_apply_filter('die_message', "<p>$message</p>");
     // Hook into 'yourls_die' to add more elements or messages to that page
-	yourls_do_action( 'yourls_die' );
-	if( !yourls_did_action( 'html_footer' ) ) {
+	yourls_do_action('yourls_die');
+	if (!yourls_did_action('html_footer')) {
 		yourls_html_footer(false);
 	}
 	die();
@@ -483,33 +483,33 @@ 
  * @param string $keyword Keyword to edit
  * @return string HTML of the edit row
  */
-function yourls_table_edit_row( $keyword ) {
+function yourls_table_edit_row($keyword) {
     $keyword = yourls_sanitize_keyword($keyword);
-	$id = yourls_string2htmlid( $keyword ); // used as HTML #id
-	$url = yourls_get_keyword_longurl( $keyword );
-	$title = htmlspecialchars( yourls_get_keyword_title( $keyword ) );
-	$safe_url = yourls_esc_attr( $url );
-	$safe_title = yourls_esc_attr( $title );
-	$safe_keyword = yourls_esc_attr( $keyword );
+	$id = yourls_string2htmlid($keyword); // used as HTML #id
+	$url = yourls_get_keyword_longurl($keyword);
+	$title = htmlspecialchars(yourls_get_keyword_title($keyword));
+	$safe_url = yourls_esc_attr($url);
+	$safe_title = yourls_esc_attr($title);
+	$safe_keyword = yourls_esc_attr($keyword);
 
     // Make strings sprintf() safe: '%' -> '%%'
-    $safe_url = str_replace( '%', '%%', $safe_url );
-    $safe_title = str_replace( '%', '%%', $safe_title );
+    $safe_url = str_replace('%', '%%', $safe_url);
+    $safe_title = str_replace('%', '%%', $safe_title);
 
 	$www = yourls_link();
 
-	$nonce = yourls_create_nonce( 'edit-save_'.$id );
+	$nonce = yourls_create_nonce('edit-save_'.$id);
 
-	if( $url ) {
+	if ($url) {
 		$return = <<<RETURN
 <tr id="edit-$id" class="edit-row"><td colspan="5" class="edit-row"><strong>%s</strong>:<input type="text" id="edit-url-$id" name="edit-url-$id" value="$safe_url" class="text" size="70" /><br/><strong>%s</strong>: $www<input type="text" id="edit-keyword-$id" name="edit-keyword-$id" value="$safe_keyword" class="text" size="10" /><br/><strong>%s</strong>: <input type="text" id="edit-title-$id" name="edit-title-$id" value="$safe_title" class="text" size="60" /></td><td colspan="1"><input type="button" id="edit-submit-$id" name="edit-submit-$id" value="%s" title="%s" class="button" onclick="edit_link_save('$id');" />&nbsp;<input type="button" id="edit-close-$id" name="edit-close-$id" value="%s" title="%s" class="button" onclick="edit_link_hide('$id');" /><input type="hidden" id="old_keyword_$id" value="$safe_keyword"/><input type="hidden" id="nonce_$id" value="$nonce"/></td></tr>
 RETURN;
-		$return = sprintf( $return, yourls__( 'Long URL' ), yourls__( 'Short URL' ), yourls__( 'Title' ), yourls__( 'Save' ), yourls__( 'Save new values' ), yourls__( 'Cancel' ), yourls__( 'Cancel editing' ) );
+		$return = sprintf($return, yourls__('Long URL'), yourls__('Short URL'), yourls__('Title'), yourls__('Save'), yourls__('Save new values'), yourls__('Cancel'), yourls__('Cancel editing'));
 	} else {
-		$return = '<tr class="edit-row notfound"><td colspan="6" class="edit-row notfound">' . yourls__( 'Error, URL not found' ) . '</td></tr>';
+		$return = '<tr class="edit-row notfound"><td colspan="6" class="edit-row notfound">'.yourls__('Error, URL not found').'</td></tr>';
 	}
 
-	$return = yourls_apply_filter( 'table_edit_row', $return, $keyword, $url, $title );
+	$return = yourls_apply_filter('table_edit_row', $return, $keyword, $url, $title);
 
 	return $return;
 }
@@ -519,19 +519,19 @@ 
  *
  * @return string HTML of the edit row
  */
-function yourls_table_add_row( $keyword, $url, $title = '', $ip, $clicks, $timestamp ) {
-    $keyword  = yourls_sanitize_keyword($keyword);
-	$id       = yourls_string2htmlid( $keyword ); // used as HTML #id
-	$shorturl = yourls_link( $keyword );
+function yourls_table_add_row($keyword, $url, $title = '', $ip, $clicks, $timestamp) {
+    $keyword = yourls_sanitize_keyword($keyword);
+	$id       = yourls_string2htmlid($keyword); // used as HTML #id
+	$shorturl = yourls_link($keyword);
 
-	$statlink = yourls_statlink( $keyword );
+	$statlink = yourls_statlink($keyword);
 
-	$delete_link = yourls_nonce_url( 'delete-link_'.$id,
-		yourls_add_query_arg( array( 'id' => $id, 'action' => 'delete', 'keyword' => $keyword ), yourls_admin_url( 'admin-ajax.php' ) )
+	$delete_link = yourls_nonce_url('delete-link_'.$id,
+		yourls_add_query_arg(array('id' => $id, 'action' => 'delete', 'keyword' => $keyword), yourls_admin_url('admin-ajax.php'))
 	);
 
-	$edit_link = yourls_nonce_url( 'edit-link_'.$id,
-		yourls_add_query_arg( array( 'id' => $id, 'action' => 'edit', 'keyword' => $keyword ), yourls_admin_url( 'admin-ajax.php' ) )
+	$edit_link = yourls_nonce_url('edit-link_'.$id,
+		yourls_add_query_arg(array('id' => $id, 'action' => 'edit', 'keyword' => $keyword), yourls_admin_url('admin-ajax.php'))
 	);
 
 	// Action link buttons: the array
@@ -539,69 +539,69 @@ 
 		'stats' => array(
 			'href'    => $statlink,
 			'id'      => "statlink-$id",
-			'title'   => yourls_esc_attr__( 'Stats' ),
-			'anchor'  => yourls__( 'Stats' ),
+			'title'   => yourls_esc_attr__('Stats'),
+			'anchor'  => yourls__('Stats'),
 		),
 		'share' => array(
 			'href'    => '',
 			'id'      => "share-button-$id",
-			'title'   => yourls_esc_attr__( 'Share' ),
-			'anchor'  => yourls__( 'Share' ),
+			'title'   => yourls_esc_attr__('Share'),
+			'anchor'  => yourls__('Share'),
 			'onclick' => "toggle_share('$id');return false;",
 		),
 		'edit' => array(
 			'href'    => $edit_link,
 			'id'      => "edit-button-$id",
-			'title'   => yourls_esc_attr__( 'Edit' ),
-			'anchor'  => yourls__( 'Edit' ),
+			'title'   => yourls_esc_attr__('Edit'),
+			'anchor'  => yourls__('Edit'),
 			'onclick' => "edit_link_display('$id');return false;",
 		),
 		'delete' => array(
 			'href'    => $delete_link,
 			'id'      => "delete-button-$id",
-			'title'   => yourls_esc_attr__( 'Delete' ),
-			'anchor'  => yourls__( 'Delete' ),
+			'title'   => yourls_esc_attr__('Delete'),
+			'anchor'  => yourls__('Delete'),
 			'onclick' => "remove_link('$id');return false;",
 		)
 	);
-	$actions = yourls_apply_filter( 'table_add_row_action_array', $actions, $keyword );
+	$actions = yourls_apply_filter('table_add_row_action_array', $actions, $keyword);
 
 	// Action link buttons: the HTML
 	$action_links = '';
-	foreach( $actions as $key => $action ) {
-		$onclick = isset( $action['onclick'] ) ? 'onclick="' . $action['onclick'] . '"' : '' ;
-		$action_links .= sprintf( '<a href="%s" id="%s" title="%s" class="%s" %s>%s</a>',
+	foreach ($actions as $key => $action) {
+		$onclick = isset($action['onclick']) ? 'onclick="'.$action['onclick'].'"' : '';
+		$action_links .= sprintf('<a href="%s" id="%s" title="%s" class="%s" %s>%s</a>',
 			$action['href'], $action['id'], $action['title'], 'button button_'.$key, $onclick, $action['anchor']
 		);
 	}
-	$action_links = yourls_apply_filter( 'action_links', $action_links, $keyword, $url, $ip, $clicks, $timestamp );
+	$action_links = yourls_apply_filter('action_links', $action_links, $keyword, $url, $ip, $clicks, $timestamp);
 
-	if( ! $title )
+	if (!$title)
 		$title = $url;
 
 	$protocol_warning = '';
-	if( ! in_array( yourls_get_protocol( $url ) , array( 'http://', 'https://' ) ) )
-		$protocol_warning = yourls_apply_filter( 'add_row_protocol_warning', '<span class="warning" title="' . yourls__( 'Not a common link' ) . '">&#9733;</span>' );
+	if (!in_array(yourls_get_protocol($url), array('http://', 'https://')))
+		$protocol_warning = yourls_apply_filter('add_row_protocol_warning', '<span class="warning" title="'.yourls__('Not a common link').'">&#9733;</span>');
 
 	// Row cells: the array
 	$cells = array(
 		'keyword' => array(
 			'template'      => '<a href="%shorturl%">%keyword_html%</a>',
-			'shorturl'      => yourls_esc_url( $shorturl ),
-			'keyword_html'  => yourls_esc_html( $keyword ),
+			'shorturl'      => yourls_esc_url($shorturl),
+			'keyword_html'  => yourls_esc_html($keyword),
 		),
 		'url' => array(
 			'template'      => '<a href="%long_url%" title="%title_attr%">%title_html%</a><br/><small>%warning%<a href="%long_url%">%long_url_html%</a></small>',
-			'long_url'      => yourls_esc_url( $url ),
-			'title_attr'    => yourls_esc_attr( $title ),
-			'title_html'    => yourls_esc_html( yourls_trim_long_string( $title ) ),
-			'long_url_html' => yourls_esc_html( yourls_trim_long_string( urldecode( $url ) ) ),
+			'long_url'      => yourls_esc_url($url),
+			'title_attr'    => yourls_esc_attr($title),
+			'title_html'    => yourls_esc_html(yourls_trim_long_string($title)),
+			'long_url_html' => yourls_esc_html(yourls_trim_long_string(urldecode($url))),
 			'warning'       => $protocol_warning,
 		),
 		'timestamp' => array(
 			'template' => '<span class="timestamp" aria-hidden="true">%timestamp%</span> %date%',
             'timestamp' => $timestamp,
-			'date'     => yourls_date_i18n( yourls_get_datetime_format('M d, Y H:i'), yourls_get_timestamp( $timestamp )),
+			'date'     => yourls_date_i18n(yourls_get_datetime_format('M d, Y H:i'), yourls_get_timestamp($timestamp)),
 		),
 		'ip' => array(
 			'template' => '%ip%',
@@ -609,7 +609,7 @@ 
 		),
 		'clicks' => array(
 			'template' => '%clicks%',
-			'clicks'   => yourls_number_format_i18n( $clicks, 0, '', '' ),
+			'clicks'   => yourls_number_format_i18n($clicks, 0, '', ''),
 		),
 		'actions' => array(
 			'template' => '%actions% <input type="hidden" id="keyword_%id%" value="%keyword%"/>',
@@ -618,17 +618,17 @@ 
 			'keyword'  => $keyword,
 		),
 	);
-	$cells = yourls_apply_filter( 'table_add_row_cell_array', $cells, $keyword, $url, $title, $ip, $clicks, $timestamp );
+	$cells = yourls_apply_filter('table_add_row_cell_array', $cells, $keyword, $url, $title, $ip, $clicks, $timestamp);
 
 	// Row cells: the HTML. Replace every %stuff% in 'template' with 'stuff' value.
 	$row = "<tr id=\"id-$id\">";
-	foreach( $cells as $cell_id => $elements ) {
-		$row .= sprintf( '<td class="%s" id="%s">', $cell_id, $cell_id . '-' . $id );
-		$row .= preg_replace_callback( '/%([^%]+)?%/', function( $match ) use ( $elements ) { return $elements[ $match[1] ]; }, $elements['template'] );
+	foreach ($cells as $cell_id => $elements) {
+		$row .= sprintf('<td class="%s" id="%s">', $cell_id, $cell_id.'-'.$id);
+		$row .= preg_replace_callback('/%([^%]+)?%/', function($match) use ($elements) { return $elements[$match[1]]; }, $elements['template']);
 		$row .= '</td>';
 	}
 	$row .= "</tr>";
-	$row  = yourls_apply_filter( 'table_add_row', $row, $keyword, $url, $title, $ip, $clicks, $timestamp );
+	$row  = yourls_apply_filter('table_add_row', $row, $keyword, $url, $title, $ip, $clicks, $timestamp);
 
 	return $row;
 }
@@ -639,22 +639,22 @@ 
  */
 function yourls_table_head() {
 	$start = '<table id="main_table" class="tblSorter" cellpadding="0" cellspacing="1"><thead><tr>'."\n";
-	echo yourls_apply_filter( 'table_head_start', $start );
-
-	$cells = yourls_apply_filter( 'table_head_cells', array(
-		'shorturl' => yourls__( 'Short URL' ),
-		'longurl'  => yourls__( 'Original URL' ),
-		'date'     => yourls__( 'Date' ),
-		'ip'       => yourls__( 'IP' ),
-		'clicks'   => yourls__( 'Clicks' ),
-		'actions'  => yourls__( 'Actions' )
-	) );
-	foreach( $cells as $k => $v ) {
+	echo yourls_apply_filter('table_head_start', $start);
+
+	$cells = yourls_apply_filter('table_head_cells', array(
+		'shorturl' => yourls__('Short URL'),
+		'longurl'  => yourls__('Original URL'),
+		'date'     => yourls__('Date'),
+		'ip'       => yourls__('IP'),
+		'clicks'   => yourls__('Clicks'),
+		'actions'  => yourls__('Actions')
+	));
+	foreach ($cells as $k => $v) {
 		echo "<th id='main_table_head_$k'>$v</th>\n";
 	}
 
 	$end = "</tr></thead>\n";
-	echo yourls_apply_filter( 'table_head_end', $end );
+	echo yourls_apply_filter('table_head_end', $end);
 }
 
 /**
@@ -662,7 +662,7 @@ 
  *
  */
 function yourls_table_tbody_start() {
-	echo yourls_apply_filter( 'table_tbody_start', '<tbody>' );
+	echo yourls_apply_filter('table_tbody_start', '<tbody>');
 }
 
 /**
@@ -670,7 +670,7 @@ 
  *
  */
 function yourls_table_tbody_end() {
-	echo yourls_apply_filter( 'table_tbody_end', '</tbody>' );
+	echo yourls_apply_filter('table_tbody_end', '</tbody>');
 }
 
 /**
@@ -678,57 +678,57 @@ 
  *
  */
 function yourls_table_end() {
-	echo yourls_apply_filter( 'table_end', '</table></main>' );
+	echo yourls_apply_filter('table_end', '</table></main>');
 }
 
 /**
  * Echo HTML tag for a link
  *
  */
-function yourls_html_link( $href, $title = '', $element = '' ) {
-	if( !$title )
+function yourls_html_link($href, $title = '', $element = '') {
+	if (!$title)
 		$title = $href;
-	if( $element )
-		$element = sprintf( 'id="%s"', yourls_esc_attr( $element ) );
-	$link = sprintf( '<a href="%s" %s>%s</a>', yourls_esc_url( $href ), $element, yourls_esc_html( $title ) );
-	echo yourls_apply_filter( 'html_link', $link );
+	if ($element)
+		$element = sprintf('id="%s"', yourls_esc_attr($element));
+	$link = sprintf('<a href="%s" %s>%s</a>', yourls_esc_url($href), $element, yourls_esc_html($title));
+	echo yourls_apply_filter('html_link', $link);
 }
 
 /**
  * Display the login screen. Nothing past this point.
  *
  */
-function yourls_login_screen( $error_msg = '' ) {
-	yourls_html_head( 'login' );
+function yourls_login_screen($error_msg = '') {
+	yourls_html_head('login');
 
-	$action = ( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ? '?' : '' );
+	$action = (isset($_GET['action']) && $_GET['action'] == 'logout' ? '?' : '');
 
 	yourls_html_logo();
 	?>
 	<div id="login">
 		<form method="post" action="<?php echo $action; ?>"> <?php // reset any QUERY parameters ?>
 			<?php
-				if( !empty( $error_msg ) ) {
+				if (!empty($error_msg)) {
 					echo '<p class="error">'.$error_msg.'</p>';
 				}
-				yourls_do_action( 'login_form_top' );
+				yourls_do_action('login_form_top');
 			?>
 			<p>
-				<label for="username"><?php yourls_e( 'Username' ); ?></label><br />
+				<label for="username"><?php yourls_e('Username'); ?></label><br />
 				<input type="text" id="username" name="username" size="30" class="text" />
 			</p>
 			<p>
-				<label for="password"><?php yourls_e( 'Password' ); ?></label><br />
+				<label for="password"><?php yourls_e('Password'); ?></label><br />
 				<input type="password" id="password" name="password" size="30" class="text" />
 			</p>
 			<?php
-				yourls_do_action( 'login_form_bottom' );
+				yourls_do_action('login_form_bottom');
 			?>
 			<p style="text-align: right;">
-				<input type="submit" id="submit" name="submit" value="<?php yourls_e( 'Login' ); ?>" class="button" />
+				<input type="submit" id="submit" name="submit" value="<?php yourls_e('Login'); ?>" class="button" />
 			</p>
 			<?php
-				yourls_do_action( 'login_form_end' );
+				yourls_do_action('login_form_end');
 			?>
 		</form>
 		<script type="text/javascript">$('#username').focus();</script>
@@ -745,69 +745,69 @@ 
 function yourls_html_menu() {
 
 	// Build menu links
-	if( defined( 'YOURLS_USER' ) ) {
-		$logout_link = yourls_apply_filter( 'logout_link', sprintf( yourls__('Hello <strong>%s</strong>'), YOURLS_USER ) . ' (<a href="' . yourls_admin_url() . '?action=logout" title="' . yourls_esc_attr__( 'Logout' ) . '">' . yourls__( 'Logout' ) . '</a>)' );
+	if (defined('YOURLS_USER')) {
+		$logout_link = yourls_apply_filter('logout_link', sprintf(yourls__('Hello <strong>%s</strong>'), YOURLS_USER).' (<a href="'.yourls_admin_url().'?action=logout" title="'.yourls_esc_attr__('Logout').'">'.yourls__('Logout').'</a>)');
 	} else {
-		$logout_link = yourls_apply_filter( 'logout_link', '' );
+		$logout_link = yourls_apply_filter('logout_link', '');
 	}
-	$help_link   = yourls_apply_filter( 'help_link',   '<a href="' . yourls_site_url( false ) .'/readme.html">' . yourls__( 'Help' ) . '</a>' );
+	$help_link = yourls_apply_filter('help_link', '<a href="'.yourls_site_url(false).'/readme.html">'.yourls__('Help').'</a>');
 
 	$admin_links    = array();
 	$admin_sublinks = array();
 
 	$admin_links['admin'] = array(
-		'url'    => yourls_admin_url( 'index.php' ),
-		'title'  => yourls__( 'Go to the admin interface' ),
-		'anchor' => yourls__( 'Admin interface' )
+		'url'    => yourls_admin_url('index.php'),
+		'title'  => yourls__('Go to the admin interface'),
+		'anchor' => yourls__('Admin interface')
 	);
 
-	if( yourls_is_admin() ) {
+	if (yourls_is_admin()) {
 		$admin_links['tools'] = array(
-			'url'    => yourls_admin_url( 'tools.php' ),
-			'anchor' => yourls__( 'Tools' )
+			'url'    => yourls_admin_url('tools.php'),
+			'anchor' => yourls__('Tools')
 		);
 		$admin_links['plugins'] = array(
-			'url'    => yourls_admin_url( 'plugins.php' ),
-			'anchor' => yourls__( 'Manage Plugins' )
+			'url'    => yourls_admin_url('plugins.php'),
+			'anchor' => yourls__('Manage Plugins')
 		);
 		$admin_sublinks['plugins'] = yourls_list_plugin_admin_pages();
 	}
 
-	$admin_links    = yourls_apply_filter( 'admin_links',    $admin_links );
-	$admin_sublinks = yourls_apply_filter( 'admin_sublinks', $admin_sublinks );
+	$admin_links    = yourls_apply_filter('admin_links', $admin_links);
+	$admin_sublinks = yourls_apply_filter('admin_sublinks', $admin_sublinks);
 
 	// Now output menu
 	echo '<nav role="navigation"><ul id="admin_menu">'."\n";
-	if ( yourls_is_private() && !empty( $logout_link ) )
-		echo '<li id="admin_menu_logout_link">' . $logout_link .'</li>';
-
-	foreach( (array)$admin_links as $link => $ar ) {
-		if( isset( $ar['url'] ) ) {
-			$anchor = isset( $ar['anchor'] ) ? $ar['anchor'] : $link;
-			$title  = isset( $ar['title'] ) ? 'title="' . $ar['title'] . '"' : '';
-			printf( '<li id="admin_menu_%s_link" class="admin_menu_toplevel"><a href="%s" %s>%s</a>', $link, $ar['url'], $title, $anchor );
+	if (yourls_is_private() && !empty($logout_link))
+		echo '<li id="admin_menu_logout_link">'.$logout_link.'</li>';
+
+	foreach ((array) $admin_links as $link => $ar) {
+		if (isset($ar['url'])) {
+			$anchor = isset($ar['anchor']) ? $ar['anchor'] : $link;
+			$title  = isset($ar['title']) ? 'title="'.$ar['title'].'"' : '';
+			printf('<li id="admin_menu_%s_link" class="admin_menu_toplevel"><a href="%s" %s>%s</a>', $link, $ar['url'], $title, $anchor);
 		}
 		// Output submenu if any. TODO: clean up, too many code duplicated here
-		if( isset( $admin_sublinks[$link] ) ) {
+		if (isset($admin_sublinks[$link])) {
 			echo "<ul>\n";
-			foreach( $admin_sublinks[$link] as $link => $ar ) {
-				if( isset( $ar['url'] ) ) {
-					$anchor = isset( $ar['anchor'] ) ? $ar['anchor'] : $link;
-					$title  = isset( $ar['title'] ) ? 'title="' . $ar['title'] . '"' : '';
-					printf( '<li id="admin_menu_%s_link" class="admin_menu_sublevel admin_menu_sublevel_%s"><a href="%s" %s>%s</a>', $link, $link, $ar['url'], $title, $anchor );
+			foreach ($admin_sublinks[$link] as $link => $ar) {
+				if (isset($ar['url'])) {
+					$anchor = isset($ar['anchor']) ? $ar['anchor'] : $link;
+					$title  = isset($ar['title']) ? 'title="'.$ar['title'].'"' : '';
+					printf('<li id="admin_menu_%s_link" class="admin_menu_sublevel admin_menu_sublevel_%s"><a href="%s" %s>%s</a>', $link, $link, $ar['url'], $title, $anchor);
 				}
 			}
 			echo "</ul>\n";
 		}
 	}
 
-	if ( isset( $help_link ) )
-		echo '<li id="admin_menu_help_link">' . $help_link .'</li>';
+	if (isset($help_link))
+		echo '<li id="admin_menu_help_link">'.$help_link.'</li>';
 
-	yourls_do_action( 'admin_menu' );
+	yourls_do_action('admin_menu');
 	echo "</ul></nav>\n";
-	yourls_do_action( 'admin_notices' );
-	yourls_do_action( 'admin_notice' ); // because I never remember if it's 'notices' or 'notice'
+	yourls_do_action('admin_notices');
+	yourls_do_action('admin_notice'); // because I never remember if it's 'notices' or 'notice'
 	/*
 	To display a notice:
 	$message = "<div>OMG, dude, I mean!</div>" );
@@ -819,17 +819,17 @@ 
  * Wrapper function to display admin notices
  *
  */
-function yourls_add_notice( $message, $style = 'notice' ) {
+function yourls_add_notice($message, $style = 'notice') {
 	// Escape single quotes in $message to avoid breaking the anonymous function
-	$message = yourls_notice_box( strtr( $message, array( "'" => "\'" ) ), $style );
-	yourls_add_action( 'admin_notices', function() use ( $message ) { echo (string) $message; } );
+	$message = yourls_notice_box(strtr($message, array("'" => "\'")), $style);
+	yourls_add_action('admin_notices', function() use ($message) { echo (string) $message; } );
 }
 
 /**
  * Return a formatted notice
  *
  */
-function yourls_notice_box( $message, $style = 'notice' ) {
+function yourls_notice_box($message, $style = 'notice') {
 	return <<<HTML
 	<div class="$style">
 	<p>$message</p>
@@ -846,14 +846,14 @@ 
  *  @since 1.0
  *  @param $page      PHP file to display
  */
-function yourls_page( $page ) {
-    if( !yourls_is_page($page)) {
-		yourls_die( yourls_s('Page "%1$s" not found', $page), yourls__('Not found'), 404 );
+function yourls_page($page) {
+    if (!yourls_is_page($page)) {
+		yourls_die(yourls_s('Page "%1$s" not found', $page), yourls__('Not found'), 404);
     }
 
-	yourls_do_action( 'pre_page', $page );
-	include_once( YOURLS_PAGEDIR . "/$page.php" );
-	yourls_do_action( 'post_page', $page );
+	yourls_do_action('pre_page', $page);
+	include_once(YOURLS_PAGEDIR."/$page.php");
+	yourls_do_action('post_page', $page);
 }
 
 /**
@@ -868,20 +868,20 @@ 
 	$attributes = array();
 	$output = '';
 
-	$attributes[] = ( yourls_is_rtl() ? 'dir="rtl"' : 'dir="ltr"' );
+	$attributes[] = (yourls_is_rtl() ? 'dir="rtl"' : 'dir="ltr"');
 
-	$doctype = yourls_apply_filter( 'html_language_attributes_doctype', 'html' );
+	$doctype = yourls_apply_filter('html_language_attributes_doctype', 'html');
 	// Experimental: get HTML lang from locale. Should work. Convert fr_FR -> fr-FR
-	if ( $lang = str_replace( '_', '-', yourls_get_locale() ) ) {
-		if( $doctype == 'xhtml' ) {
+	if ($lang = str_replace('_', '-', yourls_get_locale())) {
+		if ($doctype == 'xhtml') {
 			$attributes[] = "xml:lang=\"$lang\"";
 		} else {
 			$attributes[] = "lang=\"$lang\"";
 		}
 	}
 
-	$output = implode( ' ', $attributes );
-	$output = yourls_apply_filter( 'html_language_attributes', $output );
+	$output = implode(' ', $attributes);
+	$output = yourls_apply_filter('html_language_attributes', $output);
 	echo $output;
 }
 
@@ -892,15 +892,15 @@ 
  */
 function yourls_l10n_calendar_strings() {
 	echo "\n<script>\n";
-	echo "var l10n_cal_month = " . json_encode( array_values( yourls_l10n_months() ) ) . ";\n";
-	echo "var l10n_cal_days = " . json_encode( array_values( yourls_l10n_weekday_initial() ) ) . ";\n";
-	echo "var l10n_cal_today = \"" . yourls_esc_js( yourls__( 'Today' ) ) . "\";\n";
-	echo "var l10n_cal_close = \"" . yourls_esc_js( yourls__( 'Close' ) ) . "\";\n";
+	echo "var l10n_cal_month = ".json_encode(array_values(yourls_l10n_months())).";\n";
+	echo "var l10n_cal_days = ".json_encode(array_values(yourls_l10n_weekday_initial())).";\n";
+	echo "var l10n_cal_today = \"".yourls_esc_js(yourls__('Today'))."\";\n";
+	echo "var l10n_cal_close = \"".yourls_esc_js(yourls__('Close'))."\";\n";
 	echo "</script>\n";
 
 	// Dummy returns, to initialize l10n strings used in the calendar
-	yourls__( 'Today' );
-	yourls__( 'Close' );
+	yourls__('Today');
+	yourls__('Close');
 }
 
 
@@ -911,12 +911,12 @@ 
  */
 function yourls_new_core_version_notice() {
 
-	$checks = yourls_get_option( 'core_version_checks' );
+	$checks = yourls_get_option('core_version_checks');
     $latest = isset($checks->last_result->latest) ? yourls_sanitize_version($checks->last_result->latest) : false;
 
-	if( $latest AND version_compare( $latest, YOURLS_VERSION, '>' ) ) {
-		$msg = yourls_s( '<a href="%s">YOURLS version %s</a> is available. Please update!', 'http://yourls.org/download', $latest );
-		yourls_add_notice( $msg );
+	if ($latest AND version_compare($latest, YOURLS_VERSION, '>')) {
+		$msg = yourls_s('<a href="%s">YOURLS version %s</a> is available. Please update!', 'http://yourls.org/download', $latest);
+		yourls_add_notice($msg);
 	}
 }
 
@@ -933,14 +933,14 @@ 
  */
 function yourls_get_search_text() {
 	$search = '';
-	if( isset( $_GET['search_protocol'] ) )
+	if (isset($_GET['search_protocol']))
 		$search .= $_GET['search_protocol'];
-	if( isset( $_GET['search_slashes'] ) )
+	if (isset($_GET['search_slashes']))
 		$search .= $_GET['search_slashes'];
-	if( isset( $_GET['search'] ) )
+	if (isset($_GET['search']))
 		$search .= $_GET['search'];
 
-	return htmlspecialchars( trim( $search ) );
+	return htmlspecialchars(trim($search));
 }
 
 /**
@@ -952,13 +952,13 @@ 
  * @param bool   $echo    true to display, false to return the HTML
  * @return string         the HTML for a bookmarklet link
  */
-function yourls_bookmarklet_link( $href, $anchor, $echo = true ) {
-    $alert = yourls_esc_attr__( 'Drag to your toolbar!' );
+function yourls_bookmarklet_link($href, $anchor, $echo = true) {
+    $alert = yourls_esc_attr__('Drag to your toolbar!');
     $link = <<<LINK
     <a href="$href" class="bookmarklet" onclick="alert('$alert');return false;">$anchor</a>
 LINK;
 
-    if( $echo )
+    if ($echo)
         echo $link;
     return $link;
 }

includes/class-mysql.php

Spacing +18 added lines, -18 removed lines

@@ -8,12 +8,12 @@ 
 function yourls_db_connect() {
     global $ydb;
 
-    if ( !defined( 'YOURLS_DB_USER' )
-         or !defined( 'YOURLS_DB_PASS' )
-         or !defined( 'YOURLS_DB_NAME' )
-         or !defined( 'YOURLS_DB_HOST' )
+    if (!defined('YOURLS_DB_USER')
+         or !defined('YOURLS_DB_PASS')
+         or !defined('YOURLS_DB_NAME')
+         or !defined('YOURLS_DB_HOST')
     ) {
-        yourls_die( yourls__( 'Incorrect DB config, please refer to documentation' ), yourls__( 'Fatal error' ), 503 );
+        yourls_die(yourls__('Incorrect DB config, please refer to documentation'), yourls__('Fatal error'), 503);
     }
 
     $dbhost = YOURLS_DB_HOST;
@@ -22,15 +22,15 @@ 
     $dbname = YOURLS_DB_NAME;
 
     // This action is deprecated
-    yourls_do_action( 'set_DB_driver', 'deprecated' );
+    yourls_do_action('set_DB_driver', 'deprecated');
 
     // Get custom port if any
-    if ( false !== strpos( $dbhost, ':' ) ) {
-        list( $dbhost, $dbport ) = explode( ':', $dbhost );
-        $dbhost = sprintf( '%1$s;port=%2$d', $dbhost, $dbport );
+    if (false !== strpos($dbhost, ':')) {
+        list($dbhost, $dbport) = explode(':', $dbhost);
+        $dbhost = sprintf('%1$s;port=%2$d', $dbhost, $dbport);
     }
 
-    $charset = yourls_apply_filter( 'db_connect_charset', 'utf8mb4' );
+    $charset = yourls_apply_filter('db_connect_charset', 'utf8mb4');
 
     /**
      * Data Source Name (dsn) used to connect the DB
@@ -40,8 +40,8 @@ 
      * 'sqlite:/opt/databases/mydb.sq3'
      * 'pgsql:host=192.168.13.37;port=5432;dbname=omgwtf'
      */
-    $dsn = sprintf( 'mysql:host=%s;dbname=%s;charset=%s', $dbhost, $dbname, $charset );
-    $dsn = yourls_apply_filter( 'db_connect_custom_dsn', $dsn );
+    $dsn = sprintf('mysql:host=%s;dbname=%s;charset=%s', $dbhost, $dbname, $charset);
+    $dsn = yourls_apply_filter('db_connect_custom_dsn', $dsn);
 
     /**
      * PDO driver options and attributes
@@ -51,16 +51,16 @@ 
      * The driver options are passed to the PDO constructor, eg array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)
      * The attribute options are then set in a foreach($attr as $k=>$v){$db->setAttribute($k, $v)} loop
      */
-    $driver_options = yourls_apply_filter( 'db_connect_driver_option', [] ); // driver options as key-value pairs
-    $attributes = yourls_apply_filter( 'db_connect_attributes', [] ); // attributes as key-value pairs
+    $driver_options = yourls_apply_filter('db_connect_driver_option', []); // driver options as key-value pairs
+    $attributes = yourls_apply_filter('db_connect_attributes', []); // attributes as key-value pairs
 
-    $ydb = new \YOURLS\Database\YDB( $dsn, $user, $pass, $driver_options, $attributes );
+    $ydb = new \YOURLS\Database\YDB($dsn, $user, $pass, $driver_options, $attributes);
     $ydb->init();
 
     // Past this point, we're connected
-    yourls_debug_log( sprintf( 'Connected to database %s on %s ', $dbname, $dbhost ) );
+    yourls_debug_log(sprintf('Connected to database %s on %s ', $dbname, $dbhost));
 
-    yourls_debug_mode( YOURLS_DEBUG );
+    yourls_debug_mode(YOURLS_DEBUG);
 
     return $ydb;
 }
@@ -70,5 +70,5 @@ 
  */
 function yourls_get_db() {
     global $ydb;
-    return ( $ydb instanceof \YOURLS\Database\YDB ) ? $ydb : yourls_db_connect();
+    return ($ydb instanceof \YOURLS\Database\YDB) ? $ydb : yourls_db_connect();
 }