YOURLS / YOURLS

includes/functions-options.php

Indentation +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
     if ( ! is_string( $data ) )
         return false;
     $data = trim( $data );
-     if ( 'N;' == $data )
+        if ( 'N;' == $data )
         return true;
     $length = strlen( $data );
     if ( $length < 4 )

Spacing +38 added lines, -38 removed lines

@@ -14,17 +14,17 @@ 
  * @param mixed $default Optional value to return if option doesn't exist. Default false.
  * @return mixed Value set for the option.
  */
-function yourls_get_option( $option_name, $default = false ) {
+function yourls_get_option($option_name, $default = false) {
     // Allow plugins to short-circuit options
-    $pre = yourls_apply_filter( 'shunt_option_'.$option_name, false );
-    if ( false !== $pre ) {
+    $pre = yourls_apply_filter('shunt_option_'.$option_name, false);
+    if (false !== $pre) {
         return $pre;
     }
 
     $option = new \YOURLS\Database\Options(yourls_get_db());
     $value  = $option->get($option_name, $default);
 
-    return yourls_apply_filter( 'get_option_'.$option_name, $value );
+    return yourls_apply_filter('get_option_'.$option_name, $value);
 }
 
 /**
@@ -39,8 +39,8 @@ 
  */
 function yourls_get_all_options() {
     // Allow plugins to short-circuit all options. (Note: regular plugins are loaded after all options)
-    $pre = yourls_apply_filter( 'shunt_all_options', false );
-    if ( false !== $pre ) {
+    $pre = yourls_apply_filter('shunt_all_options', false);
+    if (false !== $pre) {
         return $pre;
     }
 
@@ -65,7 +65,7 @@ 
  * @param mixed $newvalue Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
  * @return bool False if value was not updated, true otherwise.
  */
-function yourls_update_option( $option_name, $newvalue ) {
+function yourls_update_option($option_name, $newvalue) {
     $option = new \YOURLS\Database\Options(yourls_get_db());
     $update = $option->update($option_name, $newvalue);
 
@@ -82,7 +82,7 @@ 
  * @param mixed $value Optional option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true otherwise.
  */
-function yourls_add_option( $name, $value = '' ) {
+function yourls_add_option($name, $value = '') {
     $option = new \YOURLS\Database\Options(yourls_get_db());
     $add    = $option->add($name, $value);
 
@@ -98,7 +98,7 @@ 
  * @param string $name Option name to delete. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function yourls_delete_option( $name ) {
+function yourls_delete_option($name) {
     $option = new \YOURLS\Database\Options(yourls_get_db());
     $delete = $option->delete($name);
 
@@ -112,12 +112,12 @@ 
  * @param mixed $data Data that might be serialized.
  * @return mixed A scalar data
  */
-function yourls_maybe_serialize( $data ) {
-    if ( is_array( $data ) || is_object( $data ) )
-        return serialize( $data );
+function yourls_maybe_serialize($data) {
+    if (is_array($data) || is_object($data))
+        return serialize($data);
 
-    if ( yourls_is_serialized( $data, false ) )
-        return serialize( $data );
+    if (yourls_is_serialized($data, false))
+        return serialize($data);
 
     return $data;
 }
@@ -129,9 +129,9 @@ 
  * @param string $original Maybe unserialized original, if is needed.
  * @return mixed Unserialized data can be any type.
  */
-function yourls_maybe_unserialize( $original ) {
-    if ( yourls_is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
-        return @unserialize( $original );
+function yourls_maybe_unserialize($original) {
+    if (yourls_is_serialized($original)) // don't attempt to unserialize data that wasn't serialized going in
+        return @unserialize($original);
     return $original;
 }
 
@@ -143,52 +143,52 @@ 
  * @param bool $strict Optional. Whether to be strict about the end of the string. Defaults true.
  * @return bool False if not serialized and true if it was.
  */
-function yourls_is_serialized( $data, $strict = true ) {
+function yourls_is_serialized($data, $strict = true) {
     // if it isn't a string, it isn't serialized
-    if ( ! is_string( $data ) )
+    if (!is_string($data))
         return false;
-    $data = trim( $data );
-     if ( 'N;' == $data )
+    $data = trim($data);
+     if ('N;' == $data)
         return true;
-    $length = strlen( $data );
-    if ( $length < 4 )
+    $length = strlen($data);
+    if ($length < 4)
         return false;
-    if ( ':' !== $data[1] )
+    if (':' !== $data[1])
         return false;
-    if ( $strict ) {
-        $lastc = $data[ $length - 1 ];
-        if ( ';' !== $lastc && '}' !== $lastc )
+    if ($strict) {
+        $lastc = $data[$length - 1];
+        if (';' !== $lastc && '}' !== $lastc)
             return false;
     } else {
-        $semicolon = strpos( $data, ';' );
-        $brace     = strpos( $data, '}' );
+        $semicolon = strpos($data, ';');
+        $brace     = strpos($data, '}');
         // Either ; or } must exist.
-        if ( false === $semicolon && false === $brace )
+        if (false === $semicolon && false === $brace)
             return false;
         // But neither must be in the first X characters.
-        if ( false !== $semicolon && $semicolon < 3 )
+        if (false !== $semicolon && $semicolon < 3)
             return false;
-        if ( false !== $brace && $brace < 4 )
+        if (false !== $brace && $brace < 4)
             return false;
     }
     $token = $data[0];
-    switch ( $token ) {
+    switch ($token) {
         case 's' :
-            if ( $strict ) {
-                if ( '"' !== $data[ $length - 2 ] )
+            if ($strict) {
+                if ('"' !== $data[$length - 2])
                     return false;
-            } elseif ( false === strpos( $data, '"' ) ) {
+            } elseif (false === strpos($data, '"')) {
                 return false;
             }
             // or else fall through
         case 'a' :
         case 'O' :
-            return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
+            return (bool) preg_match("/^{$token}:[0-9]+:/s", $data);
         case 'b' :
         case 'i' :
         case 'd' :
             $end = $strict ? '$' : '';
-            return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
+            return (bool) preg_match("/^{$token}:[0-9.E-]+;$end/", $data);
     }
     return false;
 }

Braces +36 added lines, -23 removed lines

@@ -113,11 +113,13 @@ 
  * @return mixed A scalar data
  */
 function yourls_maybe_serialize( $data ) {
-    if ( is_array( $data ) || is_object( $data ) )
-        return serialize( $data );
+    if ( is_array( $data ) || is_object( $data ) ) {
+            return serialize( $data );
+    }
 
-    if ( yourls_is_serialized( $data, false ) )
-        return serialize( $data );
+    if ( yourls_is_serialized( $data, false ) ) {
+            return serialize( $data );
+    }
 
     return $data;
 }
@@ -130,8 +132,10 @@ 
  * @return mixed Unserialized data can be any type.
  */
 function yourls_maybe_unserialize( $original ) {
-    if ( yourls_is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
+    if ( yourls_is_serialized( $original ) ) {
+        // don't attempt to unserialize data that wasn't serialized going in
         return @unserialize( $original );
+    }
     return $original;
 }
 
@@ -145,38 +149,47 @@ 
  */
 function yourls_is_serialized( $data, $strict = true ) {
     // if it isn't a string, it isn't serialized
-    if ( ! is_string( $data ) )
-        return false;
+    if ( ! is_string( $data ) ) {
+            return false;
+    }
     $data = trim( $data );
-     if ( 'N;' == $data )
-        return true;
+     if ( 'N;' == $data ) {
+             return true;
+     }
     $length = strlen( $data );
-    if ( $length < 4 )
-        return false;
-    if ( ':' !== $data[1] )
-        return false;
+    if ( $length < 4 ) {
+            return false;
+    }
+    if ( ':' !== $data[1] ) {
+            return false;
+    }
     if ( $strict ) {
         $lastc = $data[ $length - 1 ];
-        if ( ';' !== $lastc && '}' !== $lastc )
-            return false;
+        if ( ';' !== $lastc && '}' !== $lastc ) {
+                    return false;
+        }
     } else {
         $semicolon = strpos( $data, ';' );
         $brace     = strpos( $data, '}' );
         // Either ; or } must exist.
-        if ( false === $semicolon && false === $brace )
-            return false;
+        if ( false === $semicolon && false === $brace ) {
+                    return false;
+        }
         // But neither must be in the first X characters.
-        if ( false !== $semicolon && $semicolon < 3 )
-            return false;
-        if ( false !== $brace && $brace < 4 )
-            return false;
+        if ( false !== $semicolon && $semicolon < 3 ) {
+                    return false;
+        }
+        if ( false !== $brace && $brace < 4 ) {
+                    return false;
+        }
     }
     $token = $data[0];
     switch ( $token ) {
         case 's' :
             if ( $strict ) {
-                if ( '"' !== $data[ $length - 2 ] )
-                    return false;
+                if ( '"' !== $data[ $length - 2 ] ) {
+                                    return false;
+                }
             } elseif ( false === strpos( $data, '"' ) ) {
                 return false;
             }

includes/functions-http.php

Braces +36 added lines, -25 removed lines

@@ -138,8 +138,9 @@ 
 
 	// Allow plugins to short-circuit the whole function
 	$pre = yourls_apply_filter( 'shunt_send_through_proxy', null, $url );
-	if ( null !== $pre )
-		return $pre;
+	if ( null !== $pre ) {
+			return $pre;
+	}
 
 	$check = @parse_url( $url );
 
@@ -148,15 +149,17 @@ 
     }
 
 	// Malformed URL, can not process, but this could mean ssl, so let through anyway.
-	if ( $check === false )
-		return true;
+	if ( $check === false ) {
+			return true;
+	}
 
 	// Self and loopback URLs are considered local (':' is parse_url() host on '::1')
 	$home = parse_url( yourls_get_yourls_site() );
 	$local = array( 'localhost', '127.0.0.1', '127.1', '[::1]', ':', $home['host'] );
 
-	if( in_array( $check['host'], $local ) )
-		return false;
+	if( in_array( $check['host'], $local ) ) {
+			return false;
+	}
 
     $bypass = yourls_http_get_proxy_bypass_host();
 
@@ -182,11 +185,12 @@ 
         }
 	}
 
-	if ( !empty( $wildcard_regex ) )
-		return !preg_match( $wildcard_regex, $check['host'] );
-	else
-		return !in_array( $check['host'], $bypass_hosts );
-}
+	if ( !empty( $wildcard_regex ) ) {
+			return !preg_match( $wildcard_regex, $check['host'] );
+	} else {
+			return !in_array( $check['host'], $bypass_hosts );
+	}
+	}
 
 /**
  * Perform a HTTP request, return response object
@@ -203,8 +207,9 @@ 
 
 	// Allow plugins to short-circuit the whole function
 	$pre = yourls_apply_filter( 'shunt_yourls_http_request', null, $type, $url, $headers, $data, $options );
-	if ( null !== $pre )
-		return $pre;
+	if ( null !== $pre ) {
+			return $pre;
+	}
 
 	yourls_http_load_library();
 
@@ -319,8 +324,9 @@ 
 
 	// Send it in
 	$url = 'http://api.yourls.org/core/version/1.0/';
-    if( yourls_can_http_over_ssl() )
-        $url = yourls_set_url_scheme( $url, 'https' );
+    if( yourls_can_http_over_ssl() ) {
+            $url = yourls_set_url_scheme( $url, 'https' );
+    }
 	$req = yourls_http_post( $url, array(), $stuff );
 
 	$checks->last_attempt = time();
@@ -386,14 +392,17 @@ 
 
 	// Allow plugins to short-circuit the whole function
 	$pre = yourls_apply_filter( 'shunt_maybe_check_core_version', null );
-	if ( null !== $pre )
-		return $pre;
+	if ( null !== $pre ) {
+			return $pre;
+	}
 
-	if( defined( 'YOURLS_NO_VERSION_CHECK' ) && YOURLS_NO_VERSION_CHECK )
-		return false;
+	if( defined( 'YOURLS_NO_VERSION_CHECK' ) && YOURLS_NO_VERSION_CHECK ) {
+			return false;
+	}
 
-	if( !yourls_is_admin() )
-		return false;
+	if( !yourls_is_admin() ) {
+			return false;
+	}
 
 	$checks = yourls_get_option( 'core_version_checks' );
 
@@ -411,15 +420,17 @@ 
 			( $checks->failed_attempts > 0  && ( ( time() - $checks->last_attempt ) <  2 * 3600 ) )
 		)
 		AND ( $checks->version_checked == YOURLS_VERSION )
-	)
-		return false;
+	) {
+			return false;
+	}
 
 	// We want to check if there's a new version
 	$new_check = yourls_check_core_version();
 
 	// Could not check for a new version, and we don't have ancient data
-	if( false == $new_check && !isset( $checks->last_result->latest ) )
-		return false;
+	if( false == $new_check && !isset( $checks->last_result->latest ) ) {
+			return false;
+	}
 
 	return true;
 }

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
 
     $bypass = yourls_http_get_proxy_bypass_host();
 
-    if( $bypass === false OR $bypass === '' ) {
+    if( $bypass === false or $bypass === '' ) {
         return true;
     }
 
@@ -404,13 +404,13 @@ 
 	 Otherwise, we want to check.
 	*/
 	if( !empty( $checks->last_result )
-		AND
+		and
 		(
 			( $checks->failed_attempts == 0 && ( ( time() - $checks->last_attempt ) < 24 * 3600 ) )
-			OR
+			or
 			( $checks->failed_attempts > 0  && ( ( time() - $checks->last_attempt ) <  2 * 3600 ) )
 		)
-		AND ( $checks->version_checked == YOURLS_VERSION )
+		and ( $checks->version_checked == YOURLS_VERSION )
 	)
 		return false;
 
@@ -442,6 +442,6 @@ 
         $ssl_socket = extension_loaded( 'openssl' ) && function_exists( 'openssl_x509_parse' );
     }
 
-    return ( $ssl_curl OR $ssl_socket );
+    return ( $ssl_curl or $ssl_socket );
 }
 

Indentation +157 added lines, -157 removed lines

@@ -24,7 +24,7 @@ 
  * @return mixed Response object, or error string
  */
 function yourls_http_get( $url, $headers = array(), $data = array(), $options = array() ) {
-	return yourls_http_request( 'GET', $url, $headers, $data, $options );
+    return yourls_http_request( 'GET', $url, $headers, $data, $options );
 }
 
 /**
@@ -35,8 +35,8 @@ 
  * @return mixed String (page body) or null if error
  */
 function yourls_http_get_body( $url, $headers = array(), $data = array(), $options = array() ) {
-	$return = yourls_http_get( $url, $headers, $data, $options );
-	return isset( $return->body ) ? $return->body : null;
+    $return = yourls_http_get( $url, $headers, $data, $options );
+    return isset( $return->body ) ? $return->body : null;
 }
 
 /**
@@ -49,7 +49,7 @@ 
  * @return mixed Response object, or error string
  */
 function yourls_http_post( $url, $headers = array(), $data = array(), $options = array() ) {
-	return yourls_http_request( 'POST', $url, $headers, $data, $options );
+    return yourls_http_request( 'POST', $url, $headers, $data, $options );
 }
 
 /**
@@ -62,8 +62,8 @@ 
  * @return mixed String (page body) or null if error
  */
 function yourls_http_post_body( $url, $headers = array(), $data = array(), $options = array() ) {
-	$return = yourls_http_post( $url, $headers, $data, $options );
-	return isset( $return->body ) ? $return->body : null;
+    $return = yourls_http_post( $url, $headers, $data, $options );
+    return isset( $return->body ) ? $return->body : null;
 }
 
 /**
@@ -108,18 +108,18 @@ 
  * @return array Options
  */
 function yourls_http_default_options() {
-	$options = array(
-		'timeout'          => yourls_apply_filter( 'http_default_options_timeout', 3 ),
-		'useragent'        => yourls_http_user_agent(),
-		'follow_redirects' => true,
-		'redirects'        => 3,
-	);
-
-	if( yourls_http_get_proxy() ) {
+    $options = array(
+        'timeout'          => yourls_apply_filter( 'http_default_options_timeout', 3 ),
+        'useragent'        => yourls_http_user_agent(),
+        'follow_redirects' => true,
+        'redirects'        => 3,
+    );
+
+    if( yourls_http_get_proxy() ) {
         $options['proxy'] = yourls_http_get_proxy();
-	}
+    }
 
-	return yourls_apply_filter( 'http_default_options', $options );
+    return yourls_apply_filter( 'http_default_options', $options );
 }
 
 /**
@@ -136,27 +136,27 @@ 
  */
 function yourls_send_through_proxy( $url ) {
 
-	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_send_through_proxy', null, $url );
-	if ( null !== $pre )
-		return $pre;
+    // Allow plugins to short-circuit the whole function
+    $pre = yourls_apply_filter( 'shunt_send_through_proxy', null, $url );
+    if ( null !== $pre )
+        return $pre;
 
-	$check = @parse_url( $url );
+    $check = @parse_url( $url );
 
     if( !isset( $check['host'] ) ) {
         return false;
     }
 
-	// Malformed URL, can not process, but this could mean ssl, so let through anyway.
-	if ( $check === false )
-		return true;
+    // Malformed URL, can not process, but this could mean ssl, so let through anyway.
+    if ( $check === false )
+        return true;
 
-	// Self and loopback URLs are considered local (':' is parse_url() host on '::1')
-	$home = parse_url( yourls_get_yourls_site() );
-	$local = array( 'localhost', '127.0.0.1', '127.1', '[::1]', ':', $home['host'] );
+    // Self and loopback URLs are considered local (':' is parse_url() host on '::1')
+    $home = parse_url( yourls_get_yourls_site() );
+    $local = array( 'localhost', '127.0.0.1', '127.1', '[::1]', ':', $home['host'] );
 
-	if( in_array( $check['host'], $local ) )
-		return false;
+    if( in_array( $check['host'], $local ) )
+        return false;
 
     $bypass = yourls_http_get_proxy_bypass_host();
 
@@ -164,10 +164,10 @@ 
         return true;
     }
 
-	// Build array of hosts to bypass
-	static $bypass_hosts;
-	static $wildcard_regex = false;
-	if ( null == $bypass_hosts ) {
+    // Build array of hosts to bypass
+    static $bypass_hosts;
+    static $wildcard_regex = false;
+    if ( null == $bypass_hosts ) {
         $bypass_hosts = preg_split( '|\s*,\s*|', $bypass );
 
         if ( false !== strpos( $bypass, '*' ) ) {
@@ -180,12 +180,12 @@ 
             }
             $wildcard_regex = '/^(' . implode( '|', $wildcard_regex ) . ')$/i';
         }
-	}
+    }
 
-	if ( !empty( $wildcard_regex ) )
-		return !preg_match( $wildcard_regex, $check['host'] );
-	else
-		return !in_array( $check['host'], $bypass_hosts );
+    if ( !empty( $wildcard_regex ) )
+        return !preg_match( $wildcard_regex, $check['host'] );
+    else
+        return !in_array( $check['host'], $bypass_hosts );
 }
 
 /**
@@ -201,26 +201,26 @@ 
  */
 function yourls_http_request( $type, $url, $headers, $data, $options ) {
 
-	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_yourls_http_request', null, $type, $url, $headers, $data, $options );
-	if ( null !== $pre )
-		return $pre;
+    // Allow plugins to short-circuit the whole function
+    $pre = yourls_apply_filter( 'shunt_yourls_http_request', null, $type, $url, $headers, $data, $options );
+    if ( null !== $pre )
+        return $pre;
 
-	yourls_http_load_library();
+    yourls_http_load_library();
 
-	$options = array_merge( yourls_http_default_options(), $options );
+    $options = array_merge( yourls_http_default_options(), $options );
 
-	if( yourls_http_get_proxy() && !yourls_send_through_proxy( $url ) ) {
-		unset( $options['proxy'] );
-	}
+    if( yourls_http_get_proxy() && !yourls_send_through_proxy( $url ) ) {
+        unset( $options['proxy'] );
+    }
 
-	try {
-		$result = Requests::request( $url, $headers, $data, $type, $options );
-	} catch( Requests_Exception $e ) {
-		$result = yourls_debug_log( $e->getMessage() . ' (' . $type . ' on ' . $url . ')' );
-	};
+    try {
+        $result = Requests::request( $url, $headers, $data, $type, $options );
+    } catch( Requests_Exception $e ) {
+        $result = yourls_debug_log( $e->getMessage() . ' (' . $type . ' on ' . $url . ')' );
+    };
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -242,7 +242,7 @@ 
  * @return string UA string
  */
 function yourls_http_user_agent() {
-	return yourls_apply_filter( 'http_user_agent', 'YOURLS v'.YOURLS_VERSION.' +http://yourls.org/ (running on '.yourls_get_yourls_site().')' );
+    return yourls_apply_filter( 'http_user_agent', 'YOURLS v'.YOURLS_VERSION.' +http://yourls.org/ (running on '.yourls_get_yourls_site().')' );
 }
 
 /**
@@ -262,91 +262,91 @@ 
  */
 function yourls_check_core_version() {
 
-	global $yourls_user_passwords;
+    global $yourls_user_passwords;
 
-	$checks = yourls_get_option( 'core_version_checks' );
+    $checks = yourls_get_option( 'core_version_checks' );
 
-	// Invalidate check data when YOURLS version changes
-	if ( is_object( $checks ) && YOURLS_VERSION != $checks->version_checked ) {
-		$checks = false;
-	}
+    // Invalidate check data when YOURLS version changes
+    if ( is_object( $checks ) && YOURLS_VERSION != $checks->version_checked ) {
+        $checks = false;
+    }
 
-	if( !is_object( $checks ) ) {
-		$checks = new stdClass;
-		$checks->failed_attempts = 0;
-		$checks->last_attempt    = 0;
-		$checks->last_result     = '';
-		$checks->version_checked = YOURLS_VERSION;
-	}
+    if( !is_object( $checks ) ) {
+        $checks = new stdClass;
+        $checks->failed_attempts = 0;
+        $checks->last_attempt    = 0;
+        $checks->last_result     = '';
+        $checks->version_checked = YOURLS_VERSION;
+    }
 
-	// Config file location ('u' for '/user' or 'i' for '/includes')
-	$conf_loc = str_replace( YOURLS_ABSPATH, '', YOURLS_CONFIGFILE );
-	$conf_loc = str_replace( '/config.php', '', $conf_loc );
-	$conf_loc = ( $conf_loc == '/user' ? 'u' : 'i' );
+    // Config file location ('u' for '/user' or 'i' for '/includes')
+    $conf_loc = str_replace( YOURLS_ABSPATH, '', YOURLS_CONFIGFILE );
+    $conf_loc = str_replace( '/config.php', '', $conf_loc );
+    $conf_loc = ( $conf_loc == '/user' ? 'u' : 'i' );
 
-	// The collection of stuff to report
-	$stuff = array(
-		// Globally uniquish site identifier
+    // The collection of stuff to report
+    $stuff = array(
+        // Globally uniquish site identifier
         // This uses const YOURLS_SITE and not yourls_get_yourls_site() to prevent creating another id for an already known install
-		'md5'                => md5( YOURLS_SITE . YOURLS_ABSPATH ),
-
-		// Install information
-		'failed_attempts'    => $checks->failed_attempts,
-		'yourls_site'        => defined( 'YOURLS_SITE' ) ? yourls_get_yourls_site() : 'unknown',
-		'yourls_version'     => defined( 'YOURLS_VERSION' ) ? YOURLS_VERSION : 'unknown',
-		'php_version'        => PHP_VERSION,
-		'mysql_version'      => yourls_get_db()->mysql_version(),
-		'locale'             => yourls_get_locale(),
-
-		// custom DB driver if any, and useful common PHP extensions
-		'db_driver'          => defined( 'YOURLS_DB_DRIVER' ) ? YOURLS_DB_DRIVER : 'unset',
-		'db_ext_pdo'         => extension_loaded( 'PDO' )     ? 1 : 0,
-		'db_ext_mysql'       => extension_loaded( 'mysql' )   ? 1 : 0,
-		'db_ext_mysqli'      => extension_loaded( 'mysqli' )  ? 1 : 0,
-		'ext_curl'           => extension_loaded( 'curl' )    ? 1 : 0,
-
-		// Config information
-		'num_users'          => count( $yourls_user_passwords ),
-		'config_location'    => $conf_loc,
-		'yourls_private'     => defined( 'YOURLS_PRIVATE' ) && YOURLS_PRIVATE ? 1 : 0,
-		'yourls_unique'      => defined( 'YOURLS_UNIQUE_URLS' ) && YOURLS_UNIQUE_URLS ? 1 : 0,
-		'yourls_url_convert' => defined( 'YOURLS_URL_CONVERT' ) ? YOURLS_URL_CONVERT : 'unknown',
-		'num_active_plugins' => yourls_has_active_plugins(),
-		'num_pages'          => defined( 'YOURLS_PAGEDIR' ) ? count( (array) glob( YOURLS_PAGEDIR .'/*.php') ) : 0,
-	);
-
-	$stuff = yourls_apply_filter( 'version_check_stuff', $stuff );
-
-	// Send it in
-	$url = 'http://api.yourls.org/core/version/1.0/';
+        'md5'                => md5( YOURLS_SITE . YOURLS_ABSPATH ),
+
+        // Install information
+        'failed_attempts'    => $checks->failed_attempts,
+        'yourls_site'        => defined( 'YOURLS_SITE' ) ? yourls_get_yourls_site() : 'unknown',
+        'yourls_version'     => defined( 'YOURLS_VERSION' ) ? YOURLS_VERSION : 'unknown',
+        'php_version'        => PHP_VERSION,
+        'mysql_version'      => yourls_get_db()->mysql_version(),
+        'locale'             => yourls_get_locale(),
+
+        // custom DB driver if any, and useful common PHP extensions
+        'db_driver'          => defined( 'YOURLS_DB_DRIVER' ) ? YOURLS_DB_DRIVER : 'unset',
+        'db_ext_pdo'         => extension_loaded( 'PDO' )     ? 1 : 0,
+        'db_ext_mysql'       => extension_loaded( 'mysql' )   ? 1 : 0,
+        'db_ext_mysqli'      => extension_loaded( 'mysqli' )  ? 1 : 0,
+        'ext_curl'           => extension_loaded( 'curl' )    ? 1 : 0,
+
+        // Config information
+        'num_users'          => count( $yourls_user_passwords ),
+        'config_location'    => $conf_loc,
+        'yourls_private'     => defined( 'YOURLS_PRIVATE' ) && YOURLS_PRIVATE ? 1 : 0,
+        'yourls_unique'      => defined( 'YOURLS_UNIQUE_URLS' ) && YOURLS_UNIQUE_URLS ? 1 : 0,
+        'yourls_url_convert' => defined( 'YOURLS_URL_CONVERT' ) ? YOURLS_URL_CONVERT : 'unknown',
+        'num_active_plugins' => yourls_has_active_plugins(),
+        'num_pages'          => defined( 'YOURLS_PAGEDIR' ) ? count( (array) glob( YOURLS_PAGEDIR .'/*.php') ) : 0,
+    );
+
+    $stuff = yourls_apply_filter( 'version_check_stuff', $stuff );
+
+    // Send it in
+    $url = 'http://api.yourls.org/core/version/1.0/';
     if( yourls_can_http_over_ssl() )
         $url = yourls_set_url_scheme( $url, 'https' );
-	$req = yourls_http_post( $url, array(), $stuff );
+    $req = yourls_http_post( $url, array(), $stuff );
 
-	$checks->last_attempt = time();
-	$checks->version_checked = YOURLS_VERSION;
+    $checks->last_attempt = time();
+    $checks->version_checked = YOURLS_VERSION;
 
-	// Unexpected results ?
-	if( is_string( $req ) or !$req->success ) {
-		$checks->failed_attempts = $checks->failed_attempts + 1;
-		yourls_update_option( 'core_version_checks', $checks );
-		return false;
-	}
+    // Unexpected results ?
+    if( is_string( $req ) or !$req->success ) {
+        $checks->failed_attempts = $checks->failed_attempts + 1;
+        yourls_update_option( 'core_version_checks', $checks );
+        return false;
+    }
 
-	// Parse response
-	$json = json_decode( trim( $req->body ) );
+    // Parse response
+    $json = json_decode( trim( $req->body ) );
 
-	if( yourls_validate_core_version_response($json) ) {
-		// All went OK - mark this down
-		$checks->failed_attempts = 0;
-		$checks->last_result     = $json;
-		yourls_update_option( 'core_version_checks', $checks );
+    if( yourls_validate_core_version_response($json) ) {
+        // All went OK - mark this down
+        $checks->failed_attempts = 0;
+        $checks->last_result     = $json;
+        yourls_update_option( 'core_version_checks', $checks );
 
-		return $json;
-	}
+        return $json;
+    }
 
-	// Request returned actual result, but not what we expected
-	return false;
+    // Request returned actual result, but not what we expected
+    return false;
 }
 
 /**
@@ -367,9 +367,9 @@ 
      && $json->latest === yourls_sanitize_version($json->latest)
      && $json->zipurl === yourls_sanitize_url($json->zipurl)
      && join('.',array_slice(explode('.',parse_url($json->zipurl, PHP_URL_HOST)), -2, 2)) === 'github.com'
-     // this last bit get the host ('api.github.com'), explodes on '.' (['api','github','com']) and keeps the last two elements
-     // to make sure domain is either github.com or one of its subdomain (api.github.com for instance)
-     // TODO: keep an eye on Github API to make sure it doesn't change some day to another domain (githubapi.com, ...)
+        // this last bit get the host ('api.github.com'), explodes on '.' (['api','github','com']) and keeps the last two elements
+        // to make sure domain is either github.com or one of its subdomain (api.github.com for instance)
+        // TODO: keep an eye on Github API to make sure it doesn't change some day to another domain (githubapi.com, ...)
     );
 }
 
@@ -384,44 +384,44 @@ 
  */
 function yourls_maybe_check_core_version() {
 
-	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_maybe_check_core_version', null );
-	if ( null !== $pre )
-		return $pre;
+    // Allow plugins to short-circuit the whole function
+    $pre = yourls_apply_filter( 'shunt_maybe_check_core_version', null );
+    if ( null !== $pre )
+        return $pre;
 
-	if( defined( 'YOURLS_NO_VERSION_CHECK' ) && YOURLS_NO_VERSION_CHECK )
-		return false;
+    if( defined( 'YOURLS_NO_VERSION_CHECK' ) && YOURLS_NO_VERSION_CHECK )
+        return false;
 
-	if( !yourls_is_admin() )
-		return false;
+    if( !yourls_is_admin() )
+        return false;
 
-	$checks = yourls_get_option( 'core_version_checks' );
+    $checks = yourls_get_option( 'core_version_checks' );
 
-	/* We don't want to check if :
+    /* We don't want to check if :
 	 - last_result is set (a previous check was performed)
 	 - and it was less than 24h ago (or less than 2h ago if it wasn't successful)
 	 - and version checked matched version running
 	 Otherwise, we want to check.
 	*/
-	if( !empty( $checks->last_result )
-		AND
-		(
-			( $checks->failed_attempts == 0 && ( ( time() - $checks->last_attempt ) < 24 * 3600 ) )
-			OR
-			( $checks->failed_attempts > 0  && ( ( time() - $checks->last_attempt ) <  2 * 3600 ) )
-		)
-		AND ( $checks->version_checked == YOURLS_VERSION )
-	)
-		return false;
-
-	// We want to check if there's a new version
-	$new_check = yourls_check_core_version();
-
-	// Could not check for a new version, and we don't have ancient data
-	if( false == $new_check && !isset( $checks->last_result->latest ) )
-		return false;
-
-	return true;
+    if( !empty( $checks->last_result )
+        AND
+        (
+            ( $checks->failed_attempts == 0 && ( ( time() - $checks->last_attempt ) < 24 * 3600 ) )
+            OR
+            ( $checks->failed_attempts > 0  && ( ( time() - $checks->last_attempt ) <  2 * 3600 ) )
+        )
+        AND ( $checks->version_checked == YOURLS_VERSION )
+    )
+        return false;
+
+    // We want to check if there's a new version
+    $new_check = yourls_check_core_version();
+
+    // Could not check for a new version, and we don't have ancient data
+    if( false == $new_check && !isset( $checks->last_result->latest ) )
+        return false;
+
+    return true;
 }
 
 /**

Spacing +95 added lines, -95 removed lines

@@ -23,8 +23,8 @@ 
  * @see yourls_http_request
  * @return mixed Response object, or error string
  */
-function yourls_http_get( $url, $headers = array(), $data = array(), $options = array() ) {
-	return yourls_http_request( 'GET', $url, $headers, $data, $options );
+function yourls_http_get($url, $headers = array(), $data = array(), $options = array()) {
+	return yourls_http_request('GET', $url, $headers, $data, $options);
 }
 
 /**
@@ -34,9 +34,9 @@ 
  * @see yourls_http_request
  * @return mixed String (page body) or null if error
  */
-function yourls_http_get_body( $url, $headers = array(), $data = array(), $options = array() ) {
-	$return = yourls_http_get( $url, $headers, $data, $options );
-	return isset( $return->body ) ? $return->body : null;
+function yourls_http_get_body($url, $headers = array(), $data = array(), $options = array()) {
+	$return = yourls_http_get($url, $headers, $data, $options);
+	return isset($return->body) ? $return->body : null;
 }
 
 /**
@@ -48,8 +48,8 @@ 
  * @see yourls_http_request
  * @return mixed Response object, or error string
  */
-function yourls_http_post( $url, $headers = array(), $data = array(), $options = array() ) {
-	return yourls_http_request( 'POST', $url, $headers, $data, $options );
+function yourls_http_post($url, $headers = array(), $data = array(), $options = array()) {
+	return yourls_http_request('POST', $url, $headers, $data, $options);
 }
 
 /**
@@ -61,9 +61,9 @@ 
  * @see yourls_http_request
  * @return mixed String (page body) or null if error
  */
-function yourls_http_post_body( $url, $headers = array(), $data = array(), $options = array() ) {
-	$return = yourls_http_post( $url, $headers, $data, $options );
-	return isset( $return->body ) ? $return->body : null;
+function yourls_http_post_body($url, $headers = array(), $data = array(), $options = array()) {
+	$return = yourls_http_post($url, $headers, $data, $options);
+	return isset($return->body) ? $return->body : null;
 }
 
 /**
@@ -76,14 +76,14 @@ 
 function yourls_http_get_proxy() {
     $proxy = false;
 
-    if( defined( 'YOURLS_PROXY' ) ) {
+    if (defined('YOURLS_PROXY')) {
         $proxy = YOURLS_PROXY;
-        if( defined( 'YOURLS_PROXY_USERNAME' ) && defined( 'YOURLS_PROXY_PASSWORD' ) ) {
-            $proxy = array( YOURLS_PROXY, YOURLS_PROXY_USERNAME, YOURLS_PROXY_PASSWORD );
+        if (defined('YOURLS_PROXY_USERNAME') && defined('YOURLS_PROXY_PASSWORD')) {
+            $proxy = array(YOURLS_PROXY, YOURLS_PROXY_USERNAME, YOURLS_PROXY_PASSWORD);
         }
     }
 
-    return yourls_apply_filter( 'http_get_proxy', $proxy );
+    return yourls_apply_filter('http_get_proxy', $proxy);
 }
 
 /**
@@ -94,9 +94,9 @@ 
  * @return mixed false if no host defined, or string like "example.com, *.mycorp.com"
  */
 function yourls_http_get_proxy_bypass_host() {
-    $hosts = defined( 'YOURLS_PROXY_BYPASS_HOSTS' ) ? YOURLS_PROXY_BYPASS_HOSTS : false;
+    $hosts = defined('YOURLS_PROXY_BYPASS_HOSTS') ? YOURLS_PROXY_BYPASS_HOSTS : false;
 
-    return yourls_apply_filter( 'http_get_proxy_bypass_host', $hosts );
+    return yourls_apply_filter('http_get_proxy_bypass_host', $hosts);
 }
 
 /**
@@ -109,17 +109,17 @@ 
  */
 function yourls_http_default_options() {
 	$options = array(
-		'timeout'          => yourls_apply_filter( 'http_default_options_timeout', 3 ),
+		'timeout'          => yourls_apply_filter('http_default_options_timeout', 3),
 		'useragent'        => yourls_http_user_agent(),
 		'follow_redirects' => true,
 		'redirects'        => 3,
 	);
 
-	if( yourls_http_get_proxy() ) {
+	if (yourls_http_get_proxy()) {
         $options['proxy'] = yourls_http_get_proxy();
 	}
 
-	return yourls_apply_filter( 'http_default_options', $options );
+	return yourls_apply_filter('http_default_options', $options);
 }
 
 /**
@@ -134,58 +134,58 @@ 
  * @param string $url URL to check
  * @return bool true to request through proxy, false to request directly
  */
-function yourls_send_through_proxy( $url ) {
+function yourls_send_through_proxy($url) {
 
 	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_send_through_proxy', null, $url );
-	if ( null !== $pre )
+	$pre = yourls_apply_filter('shunt_send_through_proxy', null, $url);
+	if (null !== $pre)
 		return $pre;
 
-	$check = @parse_url( $url );
+	$check = @parse_url($url);
 
-    if( !isset( $check['host'] ) ) {
+    if (!isset($check['host'])) {
         return false;
     }
 
 	// Malformed URL, can not process, but this could mean ssl, so let through anyway.
-	if ( $check === false )
+	if ($check === false)
 		return true;
 
 	// Self and loopback URLs are considered local (':' is parse_url() host on '::1')
-	$home = parse_url( yourls_get_yourls_site() );
-	$local = array( 'localhost', '127.0.0.1', '127.1', '[::1]', ':', $home['host'] );
+	$home = parse_url(yourls_get_yourls_site());
+	$local = array('localhost', '127.0.0.1', '127.1', '[::1]', ':', $home['host']);
 
-	if( in_array( $check['host'], $local ) )
+	if (in_array($check['host'], $local))
 		return false;
 
     $bypass = yourls_http_get_proxy_bypass_host();
 
-    if( $bypass === false OR $bypass === '' ) {
+    if ($bypass === false OR $bypass === '') {
         return true;
     }
 
 	// Build array of hosts to bypass
 	static $bypass_hosts;
 	static $wildcard_regex = false;
-	if ( null == $bypass_hosts ) {
-        $bypass_hosts = preg_split( '|\s*,\s*|', $bypass );
+	if (null == $bypass_hosts) {
+        $bypass_hosts = preg_split('|\s*,\s*|', $bypass);
 
-        if ( false !== strpos( $bypass, '*' ) ) {
+        if (false !== strpos($bypass, '*')) {
             $wildcard_regex = array();
-            foreach ( $bypass_hosts as $host ) {
-                $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-                if ( false !== strpos( $host, '*' ) ) {
-                    $wildcard_regex[] = str_replace( '\*\.', '', preg_quote( $host, '/' ) );
+            foreach ($bypass_hosts as $host) {
+                $wildcard_regex[] = str_replace('\*', '.+', preg_quote($host, '/'));
+                if (false !== strpos($host, '*')) {
+                    $wildcard_regex[] = str_replace('\*\.', '', preg_quote($host, '/'));
                 }
             }
-            $wildcard_regex = '/^(' . implode( '|', $wildcard_regex ) . ')$/i';
+            $wildcard_regex = '/^('.implode('|', $wildcard_regex).')$/i';
         }
 	}
 
-	if ( !empty( $wildcard_regex ) )
-		return !preg_match( $wildcard_regex, $check['host'] );
+	if (!empty($wildcard_regex))
+		return !preg_match($wildcard_regex, $check['host']);
 	else
-		return !in_array( $check['host'], $bypass_hosts );
+		return !in_array($check['host'], $bypass_hosts);
 }
 
 /**
@@ -199,25 +199,25 @@ 
  * @param array $options Options for the request (see /includes/Requests/Requests.php:request())
  * @return object Requests_Response object
  */
-function yourls_http_request( $type, $url, $headers, $data, $options ) {
+function yourls_http_request($type, $url, $headers, $data, $options) {
 
 	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_yourls_http_request', null, $type, $url, $headers, $data, $options );
-	if ( null !== $pre )
+	$pre = yourls_apply_filter('shunt_yourls_http_request', null, $type, $url, $headers, $data, $options);
+	if (null !== $pre)
 		return $pre;
 
 	yourls_http_load_library();
 
-	$options = array_merge( yourls_http_default_options(), $options );
+	$options = array_merge(yourls_http_default_options(), $options);
 
-	if( yourls_http_get_proxy() && !yourls_send_through_proxy( $url ) ) {
-		unset( $options['proxy'] );
+	if (yourls_http_get_proxy() && !yourls_send_through_proxy($url)) {
+		unset($options['proxy']);
 	}
 
 	try {
-		$result = Requests::request( $url, $headers, $data, $type, $options );
-	} catch( Requests_Exception $e ) {
-		$result = yourls_debug_log( $e->getMessage() . ' (' . $type . ' on ' . $url . ')' );
+		$result = Requests::request($url, $headers, $data, $type, $options);
+	} catch (Requests_Exception $e) {
+		$result = yourls_debug_log($e->getMessage().' ('.$type.' on '.$url.')');
 	};
 
 	return $result;
@@ -242,7 +242,7 @@ 
  * @return string UA string
  */
 function yourls_http_user_agent() {
-	return yourls_apply_filter( 'http_user_agent', 'YOURLS v'.YOURLS_VERSION.' +http://yourls.org/ (running on '.yourls_get_yourls_site().')' );
+	return yourls_apply_filter('http_user_agent', 'YOURLS v'.YOURLS_VERSION.' +http://yourls.org/ (running on '.yourls_get_yourls_site().')');
 }
 
 /**
@@ -264,14 +264,14 @@ 
 
 	global $yourls_user_passwords;
 
-	$checks = yourls_get_option( 'core_version_checks' );
+	$checks = yourls_get_option('core_version_checks');
 
 	// Invalidate check data when YOURLS version changes
-	if ( is_object( $checks ) && YOURLS_VERSION != $checks->version_checked ) {
+	if (is_object($checks) && YOURLS_VERSION != $checks->version_checked) {
 		$checks = false;
 	}
 
-	if( !is_object( $checks ) ) {
+	if (!is_object($checks)) {
 		$checks = new stdClass;
 		$checks->failed_attempts = 0;
 		$checks->last_attempt    = 0;
@@ -280,67 +280,67 @@ 
 	}
 
 	// Config file location ('u' for '/user' or 'i' for '/includes')
-	$conf_loc = str_replace( YOURLS_ABSPATH, '', YOURLS_CONFIGFILE );
-	$conf_loc = str_replace( '/config.php', '', $conf_loc );
-	$conf_loc = ( $conf_loc == '/user' ? 'u' : 'i' );
+	$conf_loc = str_replace(YOURLS_ABSPATH, '', YOURLS_CONFIGFILE);
+	$conf_loc = str_replace('/config.php', '', $conf_loc);
+	$conf_loc = ($conf_loc == '/user' ? 'u' : 'i');
 
 	// The collection of stuff to report
 	$stuff = array(
 		// Globally uniquish site identifier
         // This uses const YOURLS_SITE and not yourls_get_yourls_site() to prevent creating another id for an already known install
-		'md5'                => md5( YOURLS_SITE . YOURLS_ABSPATH ),
+		'md5'                => md5(YOURLS_SITE.YOURLS_ABSPATH),
 
 		// Install information
 		'failed_attempts'    => $checks->failed_attempts,
-		'yourls_site'        => defined( 'YOURLS_SITE' ) ? yourls_get_yourls_site() : 'unknown',
-		'yourls_version'     => defined( 'YOURLS_VERSION' ) ? YOURLS_VERSION : 'unknown',
+		'yourls_site'        => defined('YOURLS_SITE') ? yourls_get_yourls_site() : 'unknown',
+		'yourls_version'     => defined('YOURLS_VERSION') ? YOURLS_VERSION : 'unknown',
 		'php_version'        => PHP_VERSION,
 		'mysql_version'      => yourls_get_db()->mysql_version(),
 		'locale'             => yourls_get_locale(),
 
 		// custom DB driver if any, and useful common PHP extensions
-		'db_driver'          => defined( 'YOURLS_DB_DRIVER' ) ? YOURLS_DB_DRIVER : 'unset',
-		'db_ext_pdo'         => extension_loaded( 'PDO' )     ? 1 : 0,
-		'db_ext_mysql'       => extension_loaded( 'mysql' )   ? 1 : 0,
-		'db_ext_mysqli'      => extension_loaded( 'mysqli' )  ? 1 : 0,
-		'ext_curl'           => extension_loaded( 'curl' )    ? 1 : 0,
+		'db_driver'          => defined('YOURLS_DB_DRIVER') ? YOURLS_DB_DRIVER : 'unset',
+		'db_ext_pdo'         => extension_loaded('PDO') ? 1 : 0,
+		'db_ext_mysql'       => extension_loaded('mysql') ? 1 : 0,
+		'db_ext_mysqli'      => extension_loaded('mysqli') ? 1 : 0,
+		'ext_curl'           => extension_loaded('curl') ? 1 : 0,
 
 		// Config information
-		'num_users'          => count( $yourls_user_passwords ),
+		'num_users'          => count($yourls_user_passwords),
 		'config_location'    => $conf_loc,
-		'yourls_private'     => defined( 'YOURLS_PRIVATE' ) && YOURLS_PRIVATE ? 1 : 0,
-		'yourls_unique'      => defined( 'YOURLS_UNIQUE_URLS' ) && YOURLS_UNIQUE_URLS ? 1 : 0,
-		'yourls_url_convert' => defined( 'YOURLS_URL_CONVERT' ) ? YOURLS_URL_CONVERT : 'unknown',
+		'yourls_private'     => defined('YOURLS_PRIVATE') && YOURLS_PRIVATE ? 1 : 0,
+		'yourls_unique'      => defined('YOURLS_UNIQUE_URLS') && YOURLS_UNIQUE_URLS ? 1 : 0,
+		'yourls_url_convert' => defined('YOURLS_URL_CONVERT') ? YOURLS_URL_CONVERT : 'unknown',
 		'num_active_plugins' => yourls_has_active_plugins(),
-		'num_pages'          => defined( 'YOURLS_PAGEDIR' ) ? count( (array) glob( YOURLS_PAGEDIR .'/*.php') ) : 0,
+		'num_pages'          => defined('YOURLS_PAGEDIR') ? count((array) glob(YOURLS_PAGEDIR.'/*.php')) : 0,
 	);
 
-	$stuff = yourls_apply_filter( 'version_check_stuff', $stuff );
+	$stuff = yourls_apply_filter('version_check_stuff', $stuff);
 
 	// Send it in
 	$url = 'http://api.yourls.org/core/version/1.0/';
-    if( yourls_can_http_over_ssl() )
-        $url = yourls_set_url_scheme( $url, 'https' );
-	$req = yourls_http_post( $url, array(), $stuff );
+    if (yourls_can_http_over_ssl())
+        $url = yourls_set_url_scheme($url, 'https');
+	$req = yourls_http_post($url, array(), $stuff);
 
 	$checks->last_attempt = time();
 	$checks->version_checked = YOURLS_VERSION;
 
 	// Unexpected results ?
-	if( is_string( $req ) or !$req->success ) {
+	if (is_string($req) or !$req->success) {
 		$checks->failed_attempts = $checks->failed_attempts + 1;
-		yourls_update_option( 'core_version_checks', $checks );
+		yourls_update_option('core_version_checks', $checks);
 		return false;
 	}
 
 	// Parse response
-	$json = json_decode( trim( $req->body ) );
+	$json = json_decode(trim($req->body));
 
-	if( yourls_validate_core_version_response($json) ) {
+	if (yourls_validate_core_version_response($json)) {
 		// All went OK - mark this down
 		$checks->failed_attempts = 0;
 		$checks->last_result     = $json;
-		yourls_update_option( 'core_version_checks', $checks );
+		yourls_update_option('core_version_checks', $checks);
 
 		return $json;
 	}
@@ -366,7 +366,7 @@ 
      && isset($json->zipurl)
      && $json->latest === yourls_sanitize_version($json->latest)
      && $json->zipurl === yourls_sanitize_url($json->zipurl)
-     && join('.',array_slice(explode('.',parse_url($json->zipurl, PHP_URL_HOST)), -2, 2)) === 'github.com'
+     && join('.', array_slice(explode('.', parse_url($json->zipurl, PHP_URL_HOST)), -2, 2)) === 'github.com'
      // this last bit get the host ('api.github.com'), explodes on '.' (['api','github','com']) and keeps the last two elements
      // to make sure domain is either github.com or one of its subdomain (api.github.com for instance)
      // TODO: keep an eye on Github API to make sure it doesn't change some day to another domain (githubapi.com, ...)
@@ -385,17 +385,17 @@ 
 function yourls_maybe_check_core_version() {
 
 	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_maybe_check_core_version', null );
-	if ( null !== $pre )
+	$pre = yourls_apply_filter('shunt_maybe_check_core_version', null);
+	if (null !== $pre)
 		return $pre;
 
-	if( defined( 'YOURLS_NO_VERSION_CHECK' ) && YOURLS_NO_VERSION_CHECK )
+	if (defined('YOURLS_NO_VERSION_CHECK') && YOURLS_NO_VERSION_CHECK)
 		return false;
 
-	if( !yourls_is_admin() )
+	if (!yourls_is_admin())
 		return false;
 
-	$checks = yourls_get_option( 'core_version_checks' );
+	$checks = yourls_get_option('core_version_checks');
 
 	/* We don't want to check if :
 	 - last_result is set (a previous check was performed)
@@ -403,14 +403,14 @@ 
 	 - and version checked matched version running
 	 Otherwise, we want to check.
 	*/
-	if( !empty( $checks->last_result )
+	if (!empty($checks->last_result)
 		AND
 		(
-			( $checks->failed_attempts == 0 && ( ( time() - $checks->last_attempt ) < 24 * 3600 ) )
+			($checks->failed_attempts == 0 && ((time() - $checks->last_attempt) < 24 * 3600))
 			OR
-			( $checks->failed_attempts > 0  && ( ( time() - $checks->last_attempt ) <  2 * 3600 ) )
+			($checks->failed_attempts > 0 && ((time() - $checks->last_attempt) < 2 * 3600))
 		)
-		AND ( $checks->version_checked == YOURLS_VERSION )
+		AND ($checks->version_checked == YOURLS_VERSION)
 	)
 		return false;
 
@@ -418,7 +418,7 @@ 
 	$new_check = yourls_check_core_version();
 
 	// Could not check for a new version, and we don't have ancient data
-	if( false == $new_check && !isset( $checks->last_result->latest ) )
+	if (false == $new_check && !isset($checks->last_result->latest))
 		return false;
 
 	return true;
@@ -433,15 +433,15 @@ 
 function yourls_can_http_over_ssl() {
     $ssl_curl = $ssl_socket = false;
 
-    if( function_exists( 'curl_exec' ) ) {
-        $curl_version  = curl_version();
-        $ssl_curl = ( $curl_version['features'] & CURL_VERSION_SSL );
+    if (function_exists('curl_exec')) {
+        $curl_version = curl_version();
+        $ssl_curl = ($curl_version['features'] & CURL_VERSION_SSL);
     }
 
-    if( function_exists( 'stream_socket_client' ) ) {
-        $ssl_socket = extension_loaded( 'openssl' ) && function_exists( 'openssl_x509_parse' );
+    if (function_exists('stream_socket_client')) {
+        $ssl_socket = extension_loaded('openssl') && function_exists('openssl_x509_parse');
     }
 
-    return ( $ssl_curl OR $ssl_socket );
+    return ($ssl_curl OR $ssl_socket);
 }
 

includes/Admin/Logger.php

Spacing +8 added lines, -8 removed lines

@@ -52,18 +52,18 @@ 
      * @param  array  $bind_values  The values bound to the statement.
      * @return void
      */
-    public function addProfile($duration, $function, $statement, array $bind_values = array() ) {
+    public function addProfile($duration, $function, $statement, array $bind_values = array()) {
         parent::addProfile($duration, $function, $statement, $bind_values);
 
-        if($function == 'connect') {
-            $this->log( sprintf('SQL: CONNECT (%s s)', number_format($duration, 5)) );
+        if ($function == 'connect') {
+            $this->log(sprintf('SQL: CONNECT (%s s)', number_format($duration, 5)));
             return;
         }
 
         // If we are emulating prepare, don't log 'prepare' statement, as they are not actual queries sent to the server
         // See YDB::get_queries() for details
         if ($this->ydb->get_emulate_state() && $function !== 'prepare') {
-            $this->log( sprintf('SQL: %s (%s s)', $this->pretty_format($statement, $bind_values), number_format($duration, 5) ) );
+            $this->log(sprintf('SQL: %s (%s s)', $this->pretty_format($statement, $bind_values), number_format($duration, 5)));
         }
     }
 
@@ -78,7 +78,7 @@ 
      * @param  array  $values     Optional array of values corresponding to placeholders
      * @return string             Readable SQL query with placeholders replaced
      */
-    public function pretty_format($statement, array $values = array() ) {
+    public function pretty_format($statement, array $values = array()) {
         if (!$values) {
             return $statement;
         }
@@ -89,9 +89,9 @@ 
             /**
              * @param string $matches
              */
-            function ($matches) use ($values) {
-                $replacement = isset( $values[$matches[1]] ) ? $values[$matches[1]] : '';
-                if(is_array($replacement)) {
+            function($matches) use ($values) {
+                $replacement = isset($values[$matches[1]]) ? $values[$matches[1]] : '';
+                if (is_array($replacement)) {
                     $replacement = implode(",", $replacement);
                 }
                 return "'$replacement'";

includes/functions-auth.php

Indentation +287 added lines, -287 removed lines

@@ -9,12 +9,12 @@ 
  *
  */
 function yourls_maybe_require_auth() {
-	if( yourls_is_private() ) {
-		yourls_do_action( 'require_auth' );
-		require_once( YOURLS_INC.'/auth.php' );
-	} else {
-		yourls_do_action( 'require_no_auth' );
-	}
+    if( yourls_is_private() ) {
+        yourls_do_action( 'require_auth' );
+        require_once( YOURLS_INC.'/auth.php' );
+    } else {
+        yourls_do_action( 'require_no_auth' );
+    }
 }
 
 /**
@@ -22,98 +22,98 @@ 
  *
  */
 function yourls_is_valid_user() {
-	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_is_valid_user', null );
-	if ( null !== $pre ) {
-		return $pre;
-	}
-
-	// $unfiltered_valid : are credentials valid? Boolean value. It's "unfiltered" to allow plugins to eventually filter it.
-	$unfiltered_valid = false;
-
-	// Logout request
-	if( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ) {
-		yourls_do_action( 'logout' );
-		yourls_store_cookie( null );
-		return yourls__( 'Logged out successfully' );
-	}
-
-	// Check cookies or login request. Login form has precedence.
-
-	yourls_do_action( 'pre_login' );
-
-	// Determine auth method and check credentials
-	if
-		// API only: Secure (no login or pwd) and time limited token
-		// ?timestamp=12345678&signature=md5(totoblah12345678)
-		( yourls_is_API() &&
-		  isset( $_REQUEST['timestamp'] ) && !empty($_REQUEST['timestamp'] ) &&
-		  isset( $_REQUEST['signature'] ) && !empty($_REQUEST['signature'] )
-		)
-		{
-			yourls_do_action( 'pre_login_signature_timestamp' );
-			$unfiltered_valid = yourls_check_signature_timestamp();
-		}
-
-	elseif
-		// API only: Secure (no login or pwd)
-		// ?signature=md5(totoblah)
-		( yourls_is_API() &&
-		  !isset( $_REQUEST['timestamp'] ) &&
-		  isset( $_REQUEST['signature'] ) && !empty( $_REQUEST['signature'] )
-		)
-		{
-			yourls_do_action( 'pre_login_signature' );
-			$unfiltered_valid = yourls_check_signature();
-		}
-
-	elseif
-		// API or normal: login with username & pwd
-		( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] )
-		  && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password']  ) )
-		{
-			yourls_do_action( 'pre_login_username_password' );
-			$unfiltered_valid = yourls_check_username_password();
-		}
-
-	elseif
-		// Normal only: cookies
-		( !yourls_is_API() &&
-		  isset( $_COOKIE[ yourls_cookie_name() ] ) )
-		{
-			yourls_do_action( 'pre_login_cookie' );
-			$unfiltered_valid = yourls_check_auth_cookie();
-		}
-
-	// Regardless of validity, allow plugins to filter the boolean and have final word
-	$valid = yourls_apply_filter( 'is_valid_user', $unfiltered_valid );
-
-	// Login for the win!
-	if ( $valid ) {
-		yourls_do_action( 'login' );
-
-		// (Re)store encrypted cookie if needed
-		if ( !yourls_is_API() ) {
-			yourls_store_cookie( YOURLS_USER );
-
-			// Login form : redirect to requested URL to avoid re-submitting the login form on page reload
-			if( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) && isset( $_SERVER['REQUEST_URI'] ) ) {
-				yourls_redirect( yourls_sanitize_url_safe($_SERVER['REQUEST_URI']) );
-			}
-		}
-
-		// Login successful
-		return true;
-	}
-
-	// Login failed
-	yourls_do_action( 'login_failed' );
-
-	if ( isset( $_REQUEST['username'] ) || isset( $_REQUEST['password'] ) ) {
-		return yourls__( 'Invalid username or password' );
-	} else {
-		return yourls__( 'Please log in' );
-	}
+    // Allow plugins to short-circuit the whole function
+    $pre = yourls_apply_filter( 'shunt_is_valid_user', null );
+    if ( null !== $pre ) {
+        return $pre;
+    }
+
+    // $unfiltered_valid : are credentials valid? Boolean value. It's "unfiltered" to allow plugins to eventually filter it.
+    $unfiltered_valid = false;
+
+    // Logout request
+    if( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ) {
+        yourls_do_action( 'logout' );
+        yourls_store_cookie( null );
+        return yourls__( 'Logged out successfully' );
+    }
+
+    // Check cookies or login request. Login form has precedence.
+
+    yourls_do_action( 'pre_login' );
+
+    // Determine auth method and check credentials
+    if
+        // API only: Secure (no login or pwd) and time limited token
+        // ?timestamp=12345678&signature=md5(totoblah12345678)
+        ( yourls_is_API() &&
+          isset( $_REQUEST['timestamp'] ) && !empty($_REQUEST['timestamp'] ) &&
+          isset( $_REQUEST['signature'] ) && !empty($_REQUEST['signature'] )
+        )
+        {
+            yourls_do_action( 'pre_login_signature_timestamp' );
+            $unfiltered_valid = yourls_check_signature_timestamp();
+        }
+
+    elseif
+        // API only: Secure (no login or pwd)
+        // ?signature=md5(totoblah)
+        ( yourls_is_API() &&
+          !isset( $_REQUEST['timestamp'] ) &&
+          isset( $_REQUEST['signature'] ) && !empty( $_REQUEST['signature'] )
+        )
+        {
+            yourls_do_action( 'pre_login_signature' );
+            $unfiltered_valid = yourls_check_signature();
+        }
+
+    elseif
+        // API or normal: login with username & pwd
+        ( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] )
+          && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password']  ) )
+        {
+            yourls_do_action( 'pre_login_username_password' );
+            $unfiltered_valid = yourls_check_username_password();
+        }
+
+    elseif
+        // Normal only: cookies
+        ( !yourls_is_API() &&
+          isset( $_COOKIE[ yourls_cookie_name() ] ) )
+        {
+            yourls_do_action( 'pre_login_cookie' );
+            $unfiltered_valid = yourls_check_auth_cookie();
+        }
+
+    // Regardless of validity, allow plugins to filter the boolean and have final word
+    $valid = yourls_apply_filter( 'is_valid_user', $unfiltered_valid );
+
+    // Login for the win!
+    if ( $valid ) {
+        yourls_do_action( 'login' );
+
+        // (Re)store encrypted cookie if needed
+        if ( !yourls_is_API() ) {
+            yourls_store_cookie( YOURLS_USER );
+
+            // Login form : redirect to requested URL to avoid re-submitting the login form on page reload
+            if( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) && isset( $_SERVER['REQUEST_URI'] ) ) {
+                yourls_redirect( yourls_sanitize_url_safe($_SERVER['REQUEST_URI']) );
+            }
+        }
+
+        // Login successful
+        return true;
+    }
+
+    // Login failed
+    yourls_do_action( 'login_failed' );
+
+    if ( isset( $_REQUEST['username'] ) || isset( $_REQUEST['password'] ) ) {
+        return yourls__( 'Invalid username or password' );
+    } else {
+        return yourls__( 'Please log in' );
+    }
 }
 
 /**
@@ -121,12 +121,12 @@ 
  *
  */
 function yourls_check_username_password() {
-	global $yourls_user_passwords;
-	if( isset( $yourls_user_passwords[ $_REQUEST['username'] ] ) && yourls_check_password_hash( $_REQUEST['username'], $_REQUEST['password'] ) ) {
-		yourls_set_user( $_REQUEST['username'] );
-		return true;
-	}
-	return false;
+    global $yourls_user_passwords;
+    if( isset( $yourls_user_passwords[ $_REQUEST['username'] ] ) && yourls_check_password_hash( $_REQUEST['username'], $_REQUEST['password'] ) ) {
+        yourls_set_user( $_REQUEST['username'] );
+        return true;
+    }
+    return false;
 }
 
 /**
@@ -134,24 +134,24 @@ 
  *
  */
 function yourls_check_password_hash( $user, $submitted_password ) {
-	global $yourls_user_passwords;
-
-	if( !isset( $yourls_user_passwords[ $user ] ) )
-		return false;
-
-	if ( yourls_has_phpass_password( $user ) ) {
-		// Stored password is hashed with phpass
-		list( , $hash ) = explode( ':', $yourls_user_passwords[ $user ] );
-		$hash = str_replace( '!', '$', $hash );
-		return ( yourls_phpass_check( $submitted_password, $hash ) );
-	} else if( yourls_has_md5_password( $user ) ) {
-		// Stored password is a salted md5 hash: "md5:<$r = rand(10000,99999)>:<md5($r.'thepassword')>"
-		list( , $salt, ) = explode( ':', $yourls_user_passwords[ $user ] );
-		return( $yourls_user_passwords[ $user ] == 'md5:'.$salt.':'.md5( $salt . $submitted_password ) );
-	} else {
-		// Password stored in clear text
-		return( $yourls_user_passwords[ $user ] === $submitted_password );
-	}
+    global $yourls_user_passwords;
+
+    if( !isset( $yourls_user_passwords[ $user ] ) )
+        return false;
+
+    if ( yourls_has_phpass_password( $user ) ) {
+        // Stored password is hashed with phpass
+        list( , $hash ) = explode( ':', $yourls_user_passwords[ $user ] );
+        $hash = str_replace( '!', '$', $hash );
+        return ( yourls_phpass_check( $submitted_password, $hash ) );
+    } else if( yourls_has_md5_password( $user ) ) {
+        // Stored password is a salted md5 hash: "md5:<$r = rand(10000,99999)>:<md5($r.'thepassword')>"
+        list( , $salt, ) = explode( ':', $yourls_user_passwords[ $user ] );
+        return( $yourls_user_passwords[ $user ] == 'md5:'.$salt.':'.md5( $salt . $submitted_password ) );
+    } else {
+        // Password stored in clear text
+        return( $yourls_user_passwords[ $user ] === $submitted_password );
+    }
 }
 
 /**
@@ -162,52 +162,52 @@ 
  * @return true if overwrite was successful, an error message otherwise
  */
 function yourls_hash_passwords_now( $config_file ) {
-	if( !is_readable( $config_file ) )
-		return 'cannot read file'; // not sure that can actually happen...
-
-	if( !is_writable( $config_file ) )
-		return 'cannot write file';
-
-	// Include file to read value of $yourls_user_passwords
-	// Temporary suppress error reporting to avoid notices about redeclared constants
-	$errlevel = error_reporting();
-	error_reporting( 0 );
-	require $config_file;
-	error_reporting( $errlevel );
-
-	$configdata = file_get_contents( $config_file );
-	if( $configdata == false )
-		return 'could not read file';
-
-	$to_hash = 0; // keep track of number of passwords that need hashing
-	foreach ( $yourls_user_passwords as $user => $password ) {
-		if ( !yourls_has_phpass_password( $user ) && !yourls_has_md5_password( $user ) ) {
-			$to_hash++;
-			$hash = yourls_phpass_hash( $password );
-			// PHP would interpret $ as a variable, so replace it in storage.
-			$hash = str_replace( '$', '!', $hash );
-			$quotes = "'" . '"';
-			$pattern = "/[$quotes]${user}[$quotes]\s*=>\s*[$quotes]" . preg_quote( $password, '/' ) . "[$quotes]/";
-			$replace = "'$user' => 'phpass:$hash' /* Password encrypted by YOURLS */ ";
-			$count = 0;
-			$configdata = preg_replace( $pattern, $replace, $configdata, -1, $count );
-			// There should be exactly one replacement. Otherwise, fast fail.
-			if ( $count != 1 ) {
-				yourls_debug_log( "Problem with preg_replace for password hash of user $user" );
-				return 'preg_replace problem';
-			}
-		}
-	}
-
-	if( $to_hash == 0 )
-		return 0; // There was no password to encrypt
-
-	$success = file_put_contents( $config_file, $configdata );
-	if ( $success === FALSE ) {
-		yourls_debug_log( 'Failed writing to ' . $config_file );
-		return 'could not write file';
-	}
-	return true;
+    if( !is_readable( $config_file ) )
+        return 'cannot read file'; // not sure that can actually happen...
+
+    if( !is_writable( $config_file ) )
+        return 'cannot write file';
+
+    // Include file to read value of $yourls_user_passwords
+    // Temporary suppress error reporting to avoid notices about redeclared constants
+    $errlevel = error_reporting();
+    error_reporting( 0 );
+    require $config_file;
+    error_reporting( $errlevel );
+
+    $configdata = file_get_contents( $config_file );
+    if( $configdata == false )
+        return 'could not read file';
+
+    $to_hash = 0; // keep track of number of passwords that need hashing
+    foreach ( $yourls_user_passwords as $user => $password ) {
+        if ( !yourls_has_phpass_password( $user ) && !yourls_has_md5_password( $user ) ) {
+            $to_hash++;
+            $hash = yourls_phpass_hash( $password );
+            // PHP would interpret $ as a variable, so replace it in storage.
+            $hash = str_replace( '$', '!', $hash );
+            $quotes = "'" . '"';
+            $pattern = "/[$quotes]${user}[$quotes]\s*=>\s*[$quotes]" . preg_quote( $password, '/' ) . "[$quotes]/";
+            $replace = "'$user' => 'phpass:$hash' /* Password encrypted by YOURLS */ ";
+            $count = 0;
+            $configdata = preg_replace( $pattern, $replace, $configdata, -1, $count );
+            // There should be exactly one replacement. Otherwise, fast fail.
+            if ( $count != 1 ) {
+                yourls_debug_log( "Problem with preg_replace for password hash of user $user" );
+                return 'preg_replace problem';
+            }
+        }
+    }
+
+    if( $to_hash == 0 )
+        return 0; // There was no password to encrypt
+
+    $success = file_put_contents( $config_file, $configdata );
+    if ( $success === FALSE ) {
+        yourls_debug_log( 'Failed writing to ' . $config_file );
+        return 'could not write file';
+    }
+    return true;
 }
 
 /**
@@ -218,8 +218,8 @@ 
  * @return string hashed password
  */
 function yourls_phpass_hash( $password ) {
-	$hasher = yourls_phpass_instance();
-	return $hasher->HashPassword( $password );
+    $hasher = yourls_phpass_instance();
+    return $hasher->HashPassword( $password );
 }
 
 /**
@@ -231,8 +231,8 @@ 
  * @return bool true if the hash matches the password once hashed by phpass, false otherwise
  */
 function yourls_phpass_check( $password, $hash ) {
-	$hasher = yourls_phpass_instance();
-	return $hasher->CheckPassword( $password, $hash );
+    $hasher = yourls_phpass_instance();
+    return $hasher->CheckPassword( $password, $hash );
 }
 
 /**
@@ -244,15 +244,15 @@ 
  * @return object a PasswordHash instance
  */
 function yourls_phpass_instance( $iteration = 8, $portable = false ) {
-	$iteration = yourls_apply_filter( 'phpass_new_instance_iteration', $iteration );
-	$portable  = yourls_apply_filter( 'phpass_new_instance_portable', $portable );
+    $iteration = yourls_apply_filter( 'phpass_new_instance_iteration', $iteration );
+    $portable  = yourls_apply_filter( 'phpass_new_instance_portable', $portable );
 
-	static $instance = false;
-	if( $instance == false ) {
-		$instance = new \Ozh\Phpass\PasswordHash( $iteration, $portable );
-	}
+    static $instance = false;
+    if( $instance == false ) {
+        $instance = new \Ozh\Phpass\PasswordHash( $iteration, $portable );
+    }
 
-	return $instance;
+    return $instance;
 }
 
 
@@ -263,13 +263,13 @@ 
  * @return bool true if any passwords are cleartext
  */
 function yourls_has_cleartext_passwords() {
-	global $yourls_user_passwords;
-	foreach ( $yourls_user_passwords as $user => $pwdata ) {
-		if ( !yourls_has_md5_password( $user ) && !yourls_has_phpass_password( $user ) ) {
-			return true;
-		}
-	}
-	return false;
+    global $yourls_user_passwords;
+    foreach ( $yourls_user_passwords as $user => $pwdata ) {
+        if ( !yourls_has_md5_password( $user ) && !yourls_has_phpass_password( $user ) ) {
+            return true;
+        }
+    }
+    return false;
 }
 
 /**
@@ -283,11 +283,11 @@ 
  * @return bool true if password hashed, false otherwise
  */
 function yourls_has_md5_password( $user ) {
-	global $yourls_user_passwords;
-	return(    isset( $yourls_user_passwords[ $user ] )
-	        && substr( $yourls_user_passwords[ $user ], 0, 4 ) == 'md5:'
-		    && strlen( $yourls_user_passwords[ $user ] ) == 42 // http://www.google.com/search?q=the+answer+to+life+the+universe+and+everything
-		   );
+    global $yourls_user_passwords;
+    return(    isset( $yourls_user_passwords[ $user ] )
+            && substr( $yourls_user_passwords[ $user ], 0, 4 ) == 'md5:'
+            && strlen( $yourls_user_passwords[ $user ] ) == 42 // http://www.google.com/search?q=the+answer+to+life+the+universe+and+everything
+            );
 }
 
 /**
@@ -301,10 +301,10 @@ 
  * @return bool true if password hashed with PHPASS, otherwise false
  */
 function yourls_has_phpass_password( $user ) {
-	global $yourls_user_passwords;
-	return( isset( $yourls_user_passwords[ $user ] )
-	        && substr( $yourls_user_passwords[ $user ], 0, 7 ) == 'phpass:'
-	);
+    global $yourls_user_passwords;
+    return( isset( $yourls_user_passwords[ $user ] )
+            && substr( $yourls_user_passwords[ $user ], 0, 7 ) == 'phpass:'
+    );
 }
 
 /**
@@ -312,14 +312,14 @@ 
  *
  */
 function yourls_check_auth_cookie() {
-	global $yourls_user_passwords;
-	foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
-		if ( yourls_cookie_value( $valid_user ) === $_COOKIE[ yourls_cookie_name() ] ) {
-			yourls_set_user( $valid_user );
-			return true;
-		}
-	}
-	return false;
+    global $yourls_user_passwords;
+    foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+        if ( yourls_cookie_value( $valid_user ) === $_COOKIE[ yourls_cookie_name() ] ) {
+            yourls_set_user( $valid_user );
+            return true;
+        }
+    }
+    return false;
 }
 
 /**
@@ -353,21 +353,21 @@ 
         return false;
     }
 
-	// Check signature & timestamp against all possible users
-	global $yourls_user_passwords;
-	foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
-		if (
+    // Check signature & timestamp against all possible users
+    global $yourls_user_passwords;
+    foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+        if (
             hash( $hash_function, $_REQUEST['timestamp'].yourls_auth_signature( $valid_user ) ) === $_REQUEST['signature']
             or
             hash( $hash_function, yourls_auth_signature( $valid_user ).$_REQUEST['timestamp'] ) === $_REQUEST['signature']
-			) {
-			yourls_set_user( $valid_user );
-			return true;
-		}
-	}
+            ) {
+            yourls_set_user( $valid_user );
+            return true;
+        }
+    }
 
     // Signature doesn't match known user
-	return false;
+    return false;
 }
 
 /**
@@ -380,17 +380,17 @@ 
     if( !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] ) )
         return false;
 
-	// Check signature against all possible users
+    // Check signature against all possible users
     global $yourls_user_passwords;
-	foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
-		if ( yourls_auth_signature( $valid_user ) === $_REQUEST['signature'] ) {
-			yourls_set_user( $valid_user );
-			return true;
-		}
-	}
+    foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+        if ( yourls_auth_signature( $valid_user ) === $_REQUEST['signature'] ) {
+            yourls_set_user( $valid_user );
+            return true;
+        }
+    }
 
     // Signature doesn't match known user
-	return false;
+    return false;
 }
 
 /**
@@ -398,10 +398,10 @@ 
  *
  */
 function yourls_auth_signature( $username = false ) {
-	if( !$username && defined('YOURLS_USER') ) {
-		$username = YOURLS_USER;
-	}
-	return ( $username ? substr( yourls_salt( $username ), 0, 10 ) : 'Cannot generate auth signature: no username' );
+    if( !$username && defined('YOURLS_USER') ) {
+        $username = YOURLS_USER;
+    }
+    return ( $username ? substr( yourls_salt( $username ), 0, 10 ) : 'Cannot generate auth signature: no username' );
 }
 
 /**
@@ -409,9 +409,9 @@ 
  *
  */
 function yourls_check_timestamp( $time ) {
-	$now = time();
-	// Allow timestamp to be a little in the future or the past -- see Issue 766
-	return yourls_apply_filter( 'check_timestamp', abs( $now - (int)$time ) < yourls_get_nonce_life(), $time );
+    $now = time();
+    // Allow timestamp to be a little in the future or the past -- see Issue 766
+    return yourls_apply_filter( 'check_timestamp', abs( $now - (int)$time ) < yourls_get_nonce_life(), $time );
 }
 
 /**
@@ -422,28 +422,28 @@ 
 function yourls_store_cookie( $user = null ) {
 
     // No user will delete the cookie with a cookie time from the past
-	if( !$user ) {
-		$time = time() - 3600;
-	} else {
-		$time = time() + yourls_get_cookie_life();
-	}
+    if( !$user ) {
+        $time = time() - 3600;
+    } else {
+        $time = time() + yourls_get_cookie_life();
+    }
 
     $path     = yourls_apply_filter( 'setcookie_path',     '/' );
-	$domain   = yourls_apply_filter( 'setcookie_domain',   parse_url( yourls_get_yourls_site(), PHP_URL_HOST ) );
-	$secure   = yourls_apply_filter( 'setcookie_secure',   yourls_is_ssl() );
-	$httponly = yourls_apply_filter( 'setcookie_httponly', true );
+    $domain   = yourls_apply_filter( 'setcookie_domain',   parse_url( yourls_get_yourls_site(), PHP_URL_HOST ) );
+    $secure   = yourls_apply_filter( 'setcookie_secure',   yourls_is_ssl() );
+    $httponly = yourls_apply_filter( 'setcookie_httponly', true );
 
-	// Some browsers refuse to store localhost cookie
-	if ( $domain == 'localhost' )
-		$domain = '';
+    // Some browsers refuse to store localhost cookie
+    if ( $domain == 'localhost' )
+        $domain = '';
 
     if ( !headers_sent( $filename, $linenum ) ) {
         yourls_setcookie( yourls_cookie_name(), yourls_cookie_value( $user ), $time, $path, $domain, $secure, $httponly );
-	} else {
-		// For some reason cookies were not stored: action to be able to debug that
-		yourls_do_action( 'setcookie_failed', $user );
+    } else {
+        // For some reason cookies were not stored: action to be able to debug that
+        yourls_do_action( 'setcookie_failed', $user );
         yourls_debug_log( "Could not store cookie: headers already sent in $filename on line $linenum" );
-	}
+    }
 }
 
 /**
@@ -487,8 +487,8 @@ 
  *
  */
 function yourls_set_user( $user ) {
-	if( !defined( 'YOURLS_USER' ) )
-		define( 'YOURLS_USER', $user );
+    if( !defined( 'YOURLS_USER' ) )
+        define( 'YOURLS_USER', $user );
 }
 
 /**
@@ -502,7 +502,7 @@ 
  * @return integer     cookie life span, in seconds
  */
 function yourls_get_cookie_life() {
-	return yourls_apply_filter( 'get_cookie_life', YOURLS_COOKIE_LIFE );
+    return yourls_apply_filter( 'get_cookie_life', YOURLS_COOKIE_LIFE );
 }
 
 /**
@@ -517,7 +517,7 @@ 
  * @return integer     nonce life span, in seconds
  */
 function yourls_get_nonce_life() {
-	return yourls_apply_filter( 'get_nonce_life', YOURLS_NONCE_LIFE );
+    return yourls_apply_filter( 'get_nonce_life', YOURLS_NONCE_LIFE );
 }
 
 /**
@@ -542,7 +542,7 @@ 
  * @return string          cookie value
  */
 function yourls_cookie_value( $user ) {
-	return yourls_apply_filter( 'set_cookie_value', yourls_salt( $user ), $user );
+    return yourls_apply_filter( 'set_cookie_value', yourls_salt( $user ), $user );
 }
 
 /**
@@ -552,7 +552,7 @@ 
  *
  */
 function yourls_tick() {
-	return ceil( time() / yourls_get_nonce_life() );
+    return ceil( time() / yourls_get_nonce_life() );
 }
 
 /**
@@ -560,8 +560,8 @@ 
  *
  */
 function yourls_salt( $string ) {
-	$salt = defined('YOURLS_COOKIEKEY') ? YOURLS_COOKIEKEY : md5(__FILE__) ;
-	return yourls_apply_filter( 'yourls_salt', md5 ($string . $salt), $string );
+    $salt = defined('YOURLS_COOKIEKEY') ? YOURLS_COOKIEKEY : md5(__FILE__) ;
+    return yourls_apply_filter( 'yourls_salt', md5 ($string . $salt), $string );
 }
 
 /**
@@ -569,12 +569,12 @@ 
  *
  */
 function yourls_create_nonce( $action, $user = false ) {
-	if( false == $user )
-		$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
-	$tick = yourls_tick();
-	$nonce = substr( yourls_salt($tick . $action . $user), 0, 10 );
-	// Allow plugins to alter the nonce
-	return yourls_apply_filter( 'create_nonce', $nonce, $action, $user );
+    if( false == $user )
+        $user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+    $tick = yourls_tick();
+    $nonce = substr( yourls_salt($tick . $action . $user), 0, 10 );
+    // Allow plugins to alter the nonce
+    return yourls_apply_filter( 'create_nonce', $nonce, $action, $user );
 }
 
 /**
@@ -582,10 +582,10 @@ 
  *
  */
 function yourls_nonce_field( $action, $name = 'nonce', $user = false, $echo = true ) {
-	$field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.yourls_create_nonce( $action, $user ).'" />';
-	if( $echo )
-		echo $field."\n";
-	return $field;
+    $field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.yourls_create_nonce( $action, $user ).'" />';
+    if( $echo )
+        echo $field."\n";
+    return $field;
 }
 
 /**
@@ -593,8 +593,8 @@ 
  *
  */
 function yourls_nonce_url( $action, $url = false, $name = 'nonce', $user = false ) {
-	$nonce = yourls_create_nonce( $action, $user );
-	return yourls_add_query_arg( $name, $nonce, $url );
+    $nonce = yourls_create_nonce( $action, $user );
+    return yourls_add_query_arg( $name, $nonce, $url );
 }
 
 /**
@@ -605,28 +605,28 @@ 
  *
  */
 function yourls_verify_nonce( $action, $nonce = false, $user = false, $return = '' ) {
-	// get user
-	if( false == $user )
-		$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
-
-	// get current nonce value
-	if( false == $nonce && isset( $_REQUEST['nonce'] ) )
-		$nonce = $_REQUEST['nonce'];
-
-	// Allow plugins to short-circuit the rest of the function
-	$valid = yourls_apply_filter( 'verify_nonce', false, $action, $nonce, $user, $return );
-	if ($valid) {
-		return true;
-	}
-
-	// what nonce should be
-	$valid = yourls_create_nonce( $action, $user );
-
-	if( $nonce == $valid ) {
-		return true;
-	} else {
-		if( $return )
-			die( $return );
-		yourls_die( yourls__( 'Unauthorized action or expired link' ), yourls__( 'Error' ), 403 );
-	}
+    // get user
+    if( false == $user )
+        $user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+
+    // get current nonce value
+    if( false == $nonce && isset( $_REQUEST['nonce'] ) )
+        $nonce = $_REQUEST['nonce'];
+
+    // Allow plugins to short-circuit the rest of the function
+    $valid = yourls_apply_filter( 'verify_nonce', false, $action, $nonce, $user, $return );
+    if ($valid) {
+        return true;
+    }
+
+    // what nonce should be
+    $valid = yourls_create_nonce( $action, $user );
+
+    if( $nonce == $valid ) {
+        return true;
+    } else {
+        if( $return )
+            die( $return );
+        yourls_die( yourls__( 'Unauthorized action or expired link' ), yourls__( 'Error' ), 403 );
+    }
 }

Spacing +152 added lines, -152 removed lines

@@ -9,11 +9,11 @@ 
  *
  */
 function yourls_maybe_require_auth() {
-	if( yourls_is_private() ) {
-		yourls_do_action( 'require_auth' );
-		require_once( YOURLS_INC.'/auth.php' );
+	if (yourls_is_private()) {
+		yourls_do_action('require_auth');
+		require_once(YOURLS_INC.'/auth.php');
 	} else {
-		yourls_do_action( 'require_no_auth' );
+		yourls_do_action('require_no_auth');
 	}
 }
 
@@ -23,8 +23,8 @@ 
  */
 function yourls_is_valid_user() {
 	// Allow plugins to short-circuit the whole function
-	$pre = yourls_apply_filter( 'shunt_is_valid_user', null );
-	if ( null !== $pre ) {
+	$pre = yourls_apply_filter('shunt_is_valid_user', null);
+	if (null !== $pre) {
 		return $pre;
 	}
 
@@ -32,73 +32,73 @@ 
 	$unfiltered_valid = false;
 
 	// Logout request
-	if( isset( $_GET['action'] ) && $_GET['action'] == 'logout' ) {
-		yourls_do_action( 'logout' );
-		yourls_store_cookie( null );
-		return yourls__( 'Logged out successfully' );
+	if (isset($_GET['action']) && $_GET['action'] == 'logout') {
+		yourls_do_action('logout');
+		yourls_store_cookie(null);
+		return yourls__('Logged out successfully');
 	}
 
 	// Check cookies or login request. Login form has precedence.
 
-	yourls_do_action( 'pre_login' );
+	yourls_do_action('pre_login');
 
 	// Determine auth method and check credentials
 	if
 		// API only: Secure (no login or pwd) and time limited token
 		// ?timestamp=12345678&signature=md5(totoblah12345678)
-		( yourls_is_API() &&
-		  isset( $_REQUEST['timestamp'] ) && !empty($_REQUEST['timestamp'] ) &&
-		  isset( $_REQUEST['signature'] ) && !empty($_REQUEST['signature'] )
+		(yourls_is_API() &&
+		  isset($_REQUEST['timestamp']) && !empty($_REQUEST['timestamp']) &&
+		  isset($_REQUEST['signature']) && !empty($_REQUEST['signature'])
 		)
 		{
-			yourls_do_action( 'pre_login_signature_timestamp' );
+			yourls_do_action('pre_login_signature_timestamp');
 			$unfiltered_valid = yourls_check_signature_timestamp();
 		}
 
 	elseif
 		// API only: Secure (no login or pwd)
 		// ?signature=md5(totoblah)
-		( yourls_is_API() &&
-		  !isset( $_REQUEST['timestamp'] ) &&
-		  isset( $_REQUEST['signature'] ) && !empty( $_REQUEST['signature'] )
+		(yourls_is_API() &&
+		  !isset($_REQUEST['timestamp']) &&
+		  isset($_REQUEST['signature']) && !empty($_REQUEST['signature'])
 		)
 		{
-			yourls_do_action( 'pre_login_signature' );
+			yourls_do_action('pre_login_signature');
 			$unfiltered_valid = yourls_check_signature();
 		}
 
 	elseif
 		// API or normal: login with username & pwd
-		( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] )
-		  && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password']  ) )
+		(isset($_REQUEST['username']) && isset($_REQUEST['password'])
+		  && !empty($_REQUEST['username']) && !empty($_REQUEST['password']))
 		{
-			yourls_do_action( 'pre_login_username_password' );
+			yourls_do_action('pre_login_username_password');
 			$unfiltered_valid = yourls_check_username_password();
 		}
 
 	elseif
 		// Normal only: cookies
-		( !yourls_is_API() &&
-		  isset( $_COOKIE[ yourls_cookie_name() ] ) )
+		(!yourls_is_API() &&
+		  isset($_COOKIE[yourls_cookie_name()]))
 		{
-			yourls_do_action( 'pre_login_cookie' );
+			yourls_do_action('pre_login_cookie');
 			$unfiltered_valid = yourls_check_auth_cookie();
 		}
 
 	// Regardless of validity, allow plugins to filter the boolean and have final word
-	$valid = yourls_apply_filter( 'is_valid_user', $unfiltered_valid );
+	$valid = yourls_apply_filter('is_valid_user', $unfiltered_valid);
 
 	// Login for the win!
-	if ( $valid ) {
-		yourls_do_action( 'login' );
+	if ($valid) {
+		yourls_do_action('login');
 
 		// (Re)store encrypted cookie if needed
-		if ( !yourls_is_API() ) {
-			yourls_store_cookie( YOURLS_USER );
+		if (!yourls_is_API()) {
+			yourls_store_cookie(YOURLS_USER);
 
 			// Login form : redirect to requested URL to avoid re-submitting the login form on page reload
-			if( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] ) && isset( $_SERVER['REQUEST_URI'] ) ) {
-				yourls_redirect( yourls_sanitize_url_safe($_SERVER['REQUEST_URI']) );
+			if (isset($_REQUEST['username']) && isset($_REQUEST['password']) && isset($_SERVER['REQUEST_URI'])) {
+				yourls_redirect(yourls_sanitize_url_safe($_SERVER['REQUEST_URI']));
 			}
 		}
 
@@ -107,12 +107,12 @@ 
 	}
 
 	// Login failed
-	yourls_do_action( 'login_failed' );
+	yourls_do_action('login_failed');
 
-	if ( isset( $_REQUEST['username'] ) || isset( $_REQUEST['password'] ) ) {
-		return yourls__( 'Invalid username or password' );
+	if (isset($_REQUEST['username']) || isset($_REQUEST['password'])) {
+		return yourls__('Invalid username or password');
 	} else {
-		return yourls__( 'Please log in' );
+		return yourls__('Please log in');
 	}
 }
 
@@ -122,8 +122,8 @@ 
  */
 function yourls_check_username_password() {
 	global $yourls_user_passwords;
-	if( isset( $yourls_user_passwords[ $_REQUEST['username'] ] ) && yourls_check_password_hash( $_REQUEST['username'], $_REQUEST['password'] ) ) {
-		yourls_set_user( $_REQUEST['username'] );
+	if (isset($yourls_user_passwords[$_REQUEST['username']]) && yourls_check_password_hash($_REQUEST['username'], $_REQUEST['password'])) {
+		yourls_set_user($_REQUEST['username']);
 		return true;
 	}
 	return false;
@@ -133,24 +133,24 @@ 
  * Check a submitted password sent in plain text against stored password which can be a salted hash
  *
  */
-function yourls_check_password_hash( $user, $submitted_password ) {
+function yourls_check_password_hash($user, $submitted_password) {
 	global $yourls_user_passwords;
 
-	if( !isset( $yourls_user_passwords[ $user ] ) )
+	if (!isset($yourls_user_passwords[$user]))
 		return false;
 
-	if ( yourls_has_phpass_password( $user ) ) {
+	if (yourls_has_phpass_password($user)) {
 		// Stored password is hashed with phpass
-		list( , $hash ) = explode( ':', $yourls_user_passwords[ $user ] );
-		$hash = str_replace( '!', '$', $hash );
-		return ( yourls_phpass_check( $submitted_password, $hash ) );
-	} else if( yourls_has_md5_password( $user ) ) {
+		list(, $hash) = explode(':', $yourls_user_passwords[$user]);
+		$hash = str_replace('!', '$', $hash);
+		return (yourls_phpass_check($submitted_password, $hash));
+	} else if (yourls_has_md5_password($user)) {
 		// Stored password is a salted md5 hash: "md5:<$r = rand(10000,99999)>:<md5($r.'thepassword')>"
-		list( , $salt, ) = explode( ':', $yourls_user_passwords[ $user ] );
-		return( $yourls_user_passwords[ $user ] == 'md5:'.$salt.':'.md5( $salt . $submitted_password ) );
+		list(, $salt,) = explode(':', $yourls_user_passwords[$user]);
+		return($yourls_user_passwords[$user] == 'md5:'.$salt.':'.md5($salt.$submitted_password));
 	} else {
 		// Password stored in clear text
-		return( $yourls_user_passwords[ $user ] === $submitted_password );
+		return($yourls_user_passwords[$user] === $submitted_password);
 	}
 }
 
@@ -161,50 +161,50 @@ 
  * @param string $config_file Full path to file
  * @return true if overwrite was successful, an error message otherwise
  */
-function yourls_hash_passwords_now( $config_file ) {
-	if( !is_readable( $config_file ) )
+function yourls_hash_passwords_now($config_file) {
+	if (!is_readable($config_file))
 		return 'cannot read file'; // not sure that can actually happen...
 
-	if( !is_writable( $config_file ) )
+	if (!is_writable($config_file))
 		return 'cannot write file';
 
 	// Include file to read value of $yourls_user_passwords
 	// Temporary suppress error reporting to avoid notices about redeclared constants
 	$errlevel = error_reporting();
-	error_reporting( 0 );
+	error_reporting(0);
 	require $config_file;
-	error_reporting( $errlevel );
+	error_reporting($errlevel);
 
-	$configdata = file_get_contents( $config_file );
-	if( $configdata == false )
+	$configdata = file_get_contents($config_file);
+	if ($configdata == false)
 		return 'could not read file';
 
 	$to_hash = 0; // keep track of number of passwords that need hashing
-	foreach ( $yourls_user_passwords as $user => $password ) {
-		if ( !yourls_has_phpass_password( $user ) && !yourls_has_md5_password( $user ) ) {
+	foreach ($yourls_user_passwords as $user => $password) {
+		if (!yourls_has_phpass_password($user) && !yourls_has_md5_password($user)) {
 			$to_hash++;
-			$hash = yourls_phpass_hash( $password );
+			$hash = yourls_phpass_hash($password);
 			// PHP would interpret $ as a variable, so replace it in storage.
-			$hash = str_replace( '$', '!', $hash );
-			$quotes = "'" . '"';
-			$pattern = "/[$quotes]${user}[$quotes]\s*=>\s*[$quotes]" . preg_quote( $password, '/' ) . "[$quotes]/";
+			$hash = str_replace('$', '!', $hash);
+			$quotes = "'".'"';
+			$pattern = "/[$quotes]${user}[$quotes]\s*=>\s*[$quotes]".preg_quote($password, '/')."[$quotes]/";
 			$replace = "'$user' => 'phpass:$hash' /* Password encrypted by YOURLS */ ";
 			$count = 0;
-			$configdata = preg_replace( $pattern, $replace, $configdata, -1, $count );
+			$configdata = preg_replace($pattern, $replace, $configdata, -1, $count);
 			// There should be exactly one replacement. Otherwise, fast fail.
-			if ( $count != 1 ) {
-				yourls_debug_log( "Problem with preg_replace for password hash of user $user" );
+			if ($count != 1) {
+				yourls_debug_log("Problem with preg_replace for password hash of user $user");
 				return 'preg_replace problem';
 			}
 		}
 	}
 
-	if( $to_hash == 0 )
+	if ($to_hash == 0)
 		return 0; // There was no password to encrypt
 
-	$success = file_put_contents( $config_file, $configdata );
-	if ( $success === FALSE ) {
-		yourls_debug_log( 'Failed writing to ' . $config_file );
+	$success = file_put_contents($config_file, $configdata);
+	if ($success === FALSE) {
+		yourls_debug_log('Failed writing to '.$config_file);
 		return 'could not write file';
 	}
 	return true;
@@ -217,9 +217,9 @@ 
  * @param string $password password to hash
  * @return string hashed password
  */
-function yourls_phpass_hash( $password ) {
+function yourls_phpass_hash($password) {
 	$hasher = yourls_phpass_instance();
-	return $hasher->HashPassword( $password );
+	return $hasher->HashPassword($password);
 }
 
 /**
@@ -230,9 +230,9 @@ 
  * @param string $hash hash supposedly generated by phpass
  * @return bool true if the hash matches the password once hashed by phpass, false otherwise
  */
-function yourls_phpass_check( $password, $hash ) {
+function yourls_phpass_check($password, $hash) {
 	$hasher = yourls_phpass_instance();
-	return $hasher->CheckPassword( $password, $hash );
+	return $hasher->CheckPassword($password, $hash);
 }
 
 /**
@@ -243,13 +243,13 @@ 
  * @param bool $portable flag to force portable (cross platform and system independant) hashes - false to use whatever the system can do best
  * @return object a PasswordHash instance
  */
-function yourls_phpass_instance( $iteration = 8, $portable = false ) {
-	$iteration = yourls_apply_filter( 'phpass_new_instance_iteration', $iteration );
-	$portable  = yourls_apply_filter( 'phpass_new_instance_portable', $portable );
+function yourls_phpass_instance($iteration = 8, $portable = false) {
+	$iteration = yourls_apply_filter('phpass_new_instance_iteration', $iteration);
+	$portable  = yourls_apply_filter('phpass_new_instance_portable', $portable);
 
 	static $instance = false;
-	if( $instance == false ) {
-		$instance = new \Ozh\Phpass\PasswordHash( $iteration, $portable );
+	if ($instance == false) {
+		$instance = new \Ozh\Phpass\PasswordHash($iteration, $portable);
 	}
 
 	return $instance;
@@ -264,8 +264,8 @@ 
  */
 function yourls_has_cleartext_passwords() {
 	global $yourls_user_passwords;
-	foreach ( $yourls_user_passwords as $user => $pwdata ) {
-		if ( !yourls_has_md5_password( $user ) && !yourls_has_phpass_password( $user ) ) {
+	foreach ($yourls_user_passwords as $user => $pwdata) {
+		if (!yourls_has_md5_password($user) && !yourls_has_phpass_password($user)) {
 			return true;
 		}
 	}
@@ -282,11 +282,11 @@ 
  * @param string $user user login
  * @return bool true if password hashed, false otherwise
  */
-function yourls_has_md5_password( $user ) {
+function yourls_has_md5_password($user) {
 	global $yourls_user_passwords;
-	return(    isset( $yourls_user_passwords[ $user ] )
-	        && substr( $yourls_user_passwords[ $user ], 0, 4 ) == 'md5:'
-		    && strlen( $yourls_user_passwords[ $user ] ) == 42 // http://www.google.com/search?q=the+answer+to+life+the+universe+and+everything
+	return(isset($yourls_user_passwords[$user])
+	        && substr($yourls_user_passwords[$user], 0, 4) == 'md5:'
+		    && strlen($yourls_user_passwords[$user]) == 42 // http://www.google.com/search?q=the+answer+to+life+the+universe+and+everything
 		   );
 }
 
@@ -300,10 +300,10 @@ 
  * @param string $user user login
  * @return bool true if password hashed with PHPASS, otherwise false
  */
-function yourls_has_phpass_password( $user ) {
+function yourls_has_phpass_password($user) {
 	global $yourls_user_passwords;
-	return( isset( $yourls_user_passwords[ $user ] )
-	        && substr( $yourls_user_passwords[ $user ], 0, 7 ) == 'phpass:'
+	return(isset($yourls_user_passwords[$user])
+	        && substr($yourls_user_passwords[$user], 0, 7) == 'phpass:'
 	);
 }
 
@@ -313,9 +313,9 @@ 
  */
 function yourls_check_auth_cookie() {
 	global $yourls_user_passwords;
-	foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
-		if ( yourls_cookie_value( $valid_user ) === $_COOKIE[ yourls_cookie_name() ] ) {
-			yourls_set_user( $valid_user );
+	foreach ($yourls_user_passwords as $valid_user => $valid_password) {
+		if (yourls_cookie_value($valid_user) === $_COOKIE[yourls_cookie_name()]) {
+			yourls_set_user($valid_user);
 			return true;
 		}
 	}
@@ -336,32 +336,32 @@ 
  * @return bool False if signature or timestamp missing or invalid, true if valid
  */
 function yourls_check_signature_timestamp() {
-    if(   !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] )
-       OR !isset( $_REQUEST['timestamp'] ) OR empty( $_REQUEST['timestamp'] )
+    if (!isset($_REQUEST['signature']) OR empty($_REQUEST['signature'])
+       OR !isset($_REQUEST['timestamp']) OR empty($_REQUEST['timestamp'])
     ) {
         return false;
     }
 
     // Exit if the timestamp argument is outdated or invalid
-    if( !yourls_check_timestamp( $_REQUEST['timestamp'] )) {
+    if (!yourls_check_timestamp($_REQUEST['timestamp'])) {
         return false;
     }
 
     // if there is a hash argument, make sure it's part of the availables algos
-    $hash_function = isset($_REQUEST['hash']) ? (string)$_REQUEST['hash'] : 'md5';
-    if( !in_array($hash_function, hash_algos()) ) {
+    $hash_function = isset($_REQUEST['hash']) ? (string) $_REQUEST['hash'] : 'md5';
+    if (!in_array($hash_function, hash_algos())) {
         return false;
     }
 
 	// Check signature & timestamp against all possible users
 	global $yourls_user_passwords;
-	foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
+	foreach ($yourls_user_passwords as $valid_user => $valid_password) {
 		if (
-            hash( $hash_function, $_REQUEST['timestamp'].yourls_auth_signature( $valid_user ) ) === $_REQUEST['signature']
+            hash($hash_function, $_REQUEST['timestamp'].yourls_auth_signature($valid_user)) === $_REQUEST['signature']
             or
-            hash( $hash_function, yourls_auth_signature( $valid_user ).$_REQUEST['timestamp'] ) === $_REQUEST['signature']
+            hash($hash_function, yourls_auth_signature($valid_user).$_REQUEST['timestamp']) === $_REQUEST['signature']
 			) {
-			yourls_set_user( $valid_user );
+			yourls_set_user($valid_user);
 			return true;
 		}
 	}
@@ -377,14 +377,14 @@ 
  * @return bool False if signature missing or invalid, true if valid
  */
 function yourls_check_signature() {
-    if( !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] ) )
+    if (!isset($_REQUEST['signature']) OR empty($_REQUEST['signature']))
         return false;
 
 	// Check signature against all possible users
     global $yourls_user_passwords;
-	foreach( $yourls_user_passwords as $valid_user => $valid_password ) {
-		if ( yourls_auth_signature( $valid_user ) === $_REQUEST['signature'] ) {
-			yourls_set_user( $valid_user );
+	foreach ($yourls_user_passwords as $valid_user => $valid_password) {
+		if (yourls_auth_signature($valid_user) === $_REQUEST['signature']) {
+			yourls_set_user($valid_user);
 			return true;
 		}
 	}
@@ -397,21 +397,21 @@ 
  * Generate secret signature hash
  *
  */
-function yourls_auth_signature( $username = false ) {
-	if( !$username && defined('YOURLS_USER') ) {
+function yourls_auth_signature($username = false) {
+	if (!$username && defined('YOURLS_USER')) {
 		$username = YOURLS_USER;
 	}
-	return ( $username ? substr( yourls_salt( $username ), 0, 10 ) : 'Cannot generate auth signature: no username' );
+	return ($username ? substr(yourls_salt($username), 0, 10) : 'Cannot generate auth signature: no username');
 }
 
 /**
  * Check if timestamp is not too old
  *
  */
-function yourls_check_timestamp( $time ) {
+function yourls_check_timestamp($time) {
 	$now = time();
 	// Allow timestamp to be a little in the future or the past -- see Issue 766
-	return yourls_apply_filter( 'check_timestamp', abs( $now - (int)$time ) < yourls_get_nonce_life(), $time );
+	return yourls_apply_filter('check_timestamp', abs($now - (int) $time) < yourls_get_nonce_life(), $time);
 }
 
 /**
@@ -419,30 +419,30 @@ 
  *
  * @param mixed $user  String, user login, or null to delete cookie
  */
-function yourls_store_cookie( $user = null ) {
+function yourls_store_cookie($user = null) {
 
     // No user will delete the cookie with a cookie time from the past
-	if( !$user ) {
+	if (!$user) {
 		$time = time() - 3600;
 	} else {
 		$time = time() + yourls_get_cookie_life();
 	}
 
-    $path     = yourls_apply_filter( 'setcookie_path',     '/' );
-	$domain   = yourls_apply_filter( 'setcookie_domain',   parse_url( yourls_get_yourls_site(), PHP_URL_HOST ) );
-	$secure   = yourls_apply_filter( 'setcookie_secure',   yourls_is_ssl() );
-	$httponly = yourls_apply_filter( 'setcookie_httponly', true );
+    $path = yourls_apply_filter('setcookie_path', '/');
+	$domain   = yourls_apply_filter('setcookie_domain', parse_url(yourls_get_yourls_site(), PHP_URL_HOST));
+	$secure   = yourls_apply_filter('setcookie_secure', yourls_is_ssl());
+	$httponly = yourls_apply_filter('setcookie_httponly', true);
 
 	// Some browsers refuse to store localhost cookie
-	if ( $domain == 'localhost' )
+	if ($domain == 'localhost')
 		$domain = '';
 
-    if ( !headers_sent( $filename, $linenum ) ) {
-        yourls_setcookie( yourls_cookie_name(), yourls_cookie_value( $user ), $time, $path, $domain, $secure, $httponly );
+    if (!headers_sent($filename, $linenum)) {
+        yourls_setcookie(yourls_cookie_name(), yourls_cookie_value($user), $time, $path, $domain, $secure, $httponly);
 	} else {
 		// For some reason cookies were not stored: action to be able to debug that
-		yourls_do_action( 'setcookie_failed', $user );
-        yourls_debug_log( "Could not store cookie: headers already sent in $filename on line $linenum" );
+		yourls_do_action('setcookie_failed', $user);
+        yourls_debug_log("Could not store cookie: headers already sent in $filename on line $linenum");
 	}
 }
 
@@ -465,7 +465,7 @@ 
  * @return bool                setcookie() result : false if output sent before, true otherwise. This does not indicate whether the user accepted the cookie.
  */
 function yourls_setcookie($name, $value, $expire, $path, $domain, $secure, $httponly) {
-    $samesite = yourls_apply_filter('setcookie_samesite', 'Lax' );
+    $samesite = yourls_apply_filter('setcookie_samesite', 'Lax');
 
     if (PHP_VERSION_ID < 70300) {
         return(setcookie($name, $value, $expire, "$path; samesite=$samesite", $domain, $secure, $httponly));
@@ -486,9 +486,9 @@ 
  * Set user name
  *
  */
-function yourls_set_user( $user ) {
-	if( !defined( 'YOURLS_USER' ) )
-		define( 'YOURLS_USER', $user );
+function yourls_set_user($user) {
+	if (!defined('YOURLS_USER'))
+		define('YOURLS_USER', $user);
 }
 
 /**
@@ -502,7 +502,7 @@ 
  * @return integer     cookie life span, in seconds
  */
 function yourls_get_cookie_life() {
-	return yourls_apply_filter( 'get_cookie_life', YOURLS_COOKIE_LIFE );
+	return yourls_apply_filter('get_cookie_life', YOURLS_COOKIE_LIFE);
 }
 
 /**
@@ -517,7 +517,7 @@ 
  * @return integer     nonce life span, in seconds
  */
 function yourls_get_nonce_life() {
-	return yourls_apply_filter( 'get_nonce_life', YOURLS_NONCE_LIFE );
+	return yourls_apply_filter('get_nonce_life', YOURLS_NONCE_LIFE);
 }
 
 /**
@@ -531,7 +531,7 @@ 
  * @return string  unique cookie name for a given YOURLS site
  */
 function yourls_cookie_name() {
-    return yourls_apply_filter( 'cookie_name', 'yourls_' . yourls_salt( yourls_get_yourls_site() ) );
+    return yourls_apply_filter('cookie_name', 'yourls_'.yourls_salt(yourls_get_yourls_site()));
 }
 
 /**
@@ -541,8 +541,8 @@ 
  * @param string $user     user name
  * @return string          cookie value
  */
-function yourls_cookie_value( $user ) {
-	return yourls_apply_filter( 'set_cookie_value', yourls_salt( $user ), $user );
+function yourls_cookie_value($user) {
+	return yourls_apply_filter('set_cookie_value', yourls_salt($user), $user);
 }
 
 /**
@@ -552,38 +552,38 @@ 
  *
  */
 function yourls_tick() {
-	return ceil( time() / yourls_get_nonce_life() );
+	return ceil(time() / yourls_get_nonce_life());
 }
 
 /**
  * Return salted string
  *
  */
-function yourls_salt( $string ) {
-	$salt = defined('YOURLS_COOKIEKEY') ? YOURLS_COOKIEKEY : md5(__FILE__) ;
-	return yourls_apply_filter( 'yourls_salt', md5 ($string . $salt), $string );
+function yourls_salt($string) {
+	$salt = defined('YOURLS_COOKIEKEY') ? YOURLS_COOKIEKEY : md5(__FILE__);
+	return yourls_apply_filter('yourls_salt', md5($string.$salt), $string);
 }
 
 /**
  * Create a time limited, action limited and user limited token
  *
  */
-function yourls_create_nonce( $action, $user = false ) {
-	if( false == $user )
-		$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+function yourls_create_nonce($action, $user = false) {
+	if (false == $user)
+		$user = defined('YOURLS_USER') ? YOURLS_USER : '-1';
 	$tick = yourls_tick();
-	$nonce = substr( yourls_salt($tick . $action . $user), 0, 10 );
+	$nonce = substr(yourls_salt($tick.$action.$user), 0, 10);
 	// Allow plugins to alter the nonce
-	return yourls_apply_filter( 'create_nonce', $nonce, $action, $user );
+	return yourls_apply_filter('create_nonce', $nonce, $action, $user);
 }
 
 /**
  * Create a nonce field for inclusion into a form
  *
  */
-function yourls_nonce_field( $action, $name = 'nonce', $user = false, $echo = true ) {
-	$field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.yourls_create_nonce( $action, $user ).'" />';
-	if( $echo )
+function yourls_nonce_field($action, $name = 'nonce', $user = false, $echo = true) {
+	$field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.yourls_create_nonce($action, $user).'" />';
+	if ($echo)
 		echo $field."\n";
 	return $field;
 }
@@ -592,9 +592,9 @@ 
  * Add a nonce to a URL. If URL omitted, adds nonce to current URL
  *
  */
-function yourls_nonce_url( $action, $url = false, $name = 'nonce', $user = false ) {
-	$nonce = yourls_create_nonce( $action, $user );
-	return yourls_add_query_arg( $name, $nonce, $url );
+function yourls_nonce_url($action, $url = false, $name = 'nonce', $user = false) {
+	$nonce = yourls_create_nonce($action, $user);
+	return yourls_add_query_arg($name, $nonce, $url);
 }
 
 /**
@@ -604,29 +604,29 @@ 
  * if $nonce is false or unspecified, it will use $_REQUEST['nonce']
  *
  */
-function yourls_verify_nonce( $action, $nonce = false, $user = false, $return = '' ) {
+function yourls_verify_nonce($action, $nonce = false, $user = false, $return = '') {
 	// get user
-	if( false == $user )
-		$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+	if (false == $user)
+		$user = defined('YOURLS_USER') ? YOURLS_USER : '-1';
 
 	// get current nonce value
-	if( false == $nonce && isset( $_REQUEST['nonce'] ) )
+	if (false == $nonce && isset($_REQUEST['nonce']))
 		$nonce = $_REQUEST['nonce'];
 
 	// Allow plugins to short-circuit the rest of the function
-	$valid = yourls_apply_filter( 'verify_nonce', false, $action, $nonce, $user, $return );
+	$valid = yourls_apply_filter('verify_nonce', false, $action, $nonce, $user, $return);
 	if ($valid) {
 		return true;
 	}
 
 	// what nonce should be
-	$valid = yourls_create_nonce( $action, $user );
+	$valid = yourls_create_nonce($action, $user);
 
-	if( $nonce == $valid ) {
+	if ($nonce == $valid) {
 		return true;
 	} else {
-		if( $return )
-			die( $return );
-		yourls_die( yourls__( 'Unauthorized action or expired link' ), yourls__( 'Error' ), 403 );
+		if ($return)
+			die($return);
+		yourls_die(yourls__('Unauthorized action or expired link'), yourls__('Error'), 403);
 	}
 }

Braces +50 added lines, -46 removed lines

@@ -49,38 +49,28 @@ 
 		( yourls_is_API() &&
 		  isset( $_REQUEST['timestamp'] ) && !empty($_REQUEST['timestamp'] ) &&
 		  isset( $_REQUEST['signature'] ) && !empty($_REQUEST['signature'] )
-		)
-		{
+		) {
 			yourls_do_action( 'pre_login_signature_timestamp' );
 			$unfiltered_valid = yourls_check_signature_timestamp();
-		}
-
-	elseif
+		} elseif
 		// API only: Secure (no login or pwd)
 		// ?signature=md5(totoblah)
 		( yourls_is_API() &&
 		  !isset( $_REQUEST['timestamp'] ) &&
 		  isset( $_REQUEST['signature'] ) && !empty( $_REQUEST['signature'] )
-		)
-		{
+		) {
 			yourls_do_action( 'pre_login_signature' );
 			$unfiltered_valid = yourls_check_signature();
-		}
-
-	elseif
+		} elseif
 		// API or normal: login with username & pwd
 		( isset( $_REQUEST['username'] ) && isset( $_REQUEST['password'] )
-		  && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password']  ) )
-		{
+		  && !empty( $_REQUEST['username'] ) && !empty( $_REQUEST['password']  ) ) {
 			yourls_do_action( 'pre_login_username_password' );
 			$unfiltered_valid = yourls_check_username_password();
-		}
-
-	elseif
+		} elseif
 		// Normal only: cookies
 		( !yourls_is_API() &&
-		  isset( $_COOKIE[ yourls_cookie_name() ] ) )
-		{
+		  isset( $_COOKIE[ yourls_cookie_name() ] ) ) {
 			yourls_do_action( 'pre_login_cookie' );
 			$unfiltered_valid = yourls_check_auth_cookie();
 		}
@@ -136,8 +126,9 @@ 
 function yourls_check_password_hash( $user, $submitted_password ) {
 	global $yourls_user_passwords;
 
-	if( !isset( $yourls_user_passwords[ $user ] ) )
-		return false;
+	if( !isset( $yourls_user_passwords[ $user ] ) ) {
+			return false;
+	}
 
 	if ( yourls_has_phpass_password( $user ) ) {
 		// Stored password is hashed with phpass
@@ -162,11 +153,14 @@ 
  * @return true if overwrite was successful, an error message otherwise
  */
 function yourls_hash_passwords_now( $config_file ) {
-	if( !is_readable( $config_file ) )
-		return 'cannot read file'; // not sure that can actually happen...
+	if( !is_readable( $config_file ) ) {
+			return 'cannot read file';
+	}
+	// not sure that can actually happen...
 
-	if( !is_writable( $config_file ) )
-		return 'cannot write file';
+	if( !is_writable( $config_file ) ) {
+			return 'cannot write file';
+	}
 
 	// Include file to read value of $yourls_user_passwords
 	// Temporary suppress error reporting to avoid notices about redeclared constants
@@ -176,8 +170,9 @@ 
 	error_reporting( $errlevel );
 
 	$configdata = file_get_contents( $config_file );
-	if( $configdata == false )
-		return 'could not read file';
+	if( $configdata == false ) {
+			return 'could not read file';
+	}
 
 	$to_hash = 0; // keep track of number of passwords that need hashing
 	foreach ( $yourls_user_passwords as $user => $password ) {
@@ -199,8 +194,10 @@ 
 		}
 	}
 
-	if( $to_hash == 0 )
-		return 0; // There was no password to encrypt
+	if( $to_hash == 0 ) {
+			return 0;
+	}
+	// There was no password to encrypt
 
 	$success = file_put_contents( $config_file, $configdata );
 	if ( $success === FALSE ) {
@@ -377,8 +374,9 @@ 
  * @return bool False if signature missing or invalid, true if valid
  */
 function yourls_check_signature() {
-    if( !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] ) )
-        return false;
+    if( !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] ) ) {
+            return false;
+    }
 
 	// Check signature against all possible users
     global $yourls_user_passwords;
@@ -434,8 +432,9 @@ 
 	$httponly = yourls_apply_filter( 'setcookie_httponly', true );
 
 	// Some browsers refuse to store localhost cookie
-	if ( $domain == 'localhost' )
-		$domain = '';
+	if ( $domain == 'localhost' ) {
+			$domain = '';
+	}
 
     if ( !headers_sent( $filename, $linenum ) ) {
         yourls_setcookie( yourls_cookie_name(), yourls_cookie_value( $user ), $time, $path, $domain, $secure, $httponly );
@@ -469,8 +468,7 @@ 
 
     if (PHP_VERSION_ID < 70300) {
         return(setcookie($name, $value, $expire, "$path; samesite=$samesite", $domain, $secure, $httponly));
-    }
-    else {
+    } else {
         return(setcookie($name, $value, array(
             'expires'  => $expire,
             'path'     => $path,
@@ -487,9 +485,10 @@ 
  *
  */
 function yourls_set_user( $user ) {
-	if( !defined( 'YOURLS_USER' ) )
-		define( 'YOURLS_USER', $user );
-}
+	if( !defined( 'YOURLS_USER' ) ) {
+			define( 'YOURLS_USER', $user );
+	}
+	}
 
 /**
  * Get YOURLS_COOKIE_LIFE value (ie the life span of an auth cookie in seconds)
@@ -569,8 +568,9 @@ 
  *
  */
 function yourls_create_nonce( $action, $user = false ) {
-	if( false == $user )
-		$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+	if( false == $user ) {
+			$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+	}
 	$tick = yourls_tick();
 	$nonce = substr( yourls_salt($tick . $action . $user), 0, 10 );
 	// Allow plugins to alter the nonce
@@ -583,8 +583,9 @@ 
  */
 function yourls_nonce_field( $action, $name = 'nonce', $user = false, $echo = true ) {
 	$field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.yourls_create_nonce( $action, $user ).'" />';
-	if( $echo )
-		echo $field."\n";
+	if( $echo ) {
+			echo $field."\n";
+	}
 	return $field;
 }
 
@@ -606,12 +607,14 @@ 
  */
 function yourls_verify_nonce( $action, $nonce = false, $user = false, $return = '' ) {
 	// get user
-	if( false == $user )
-		$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+	if( false == $user ) {
+			$user = defined( 'YOURLS_USER' ) ? YOURLS_USER : '-1';
+	}
 
 	// get current nonce value
-	if( false == $nonce && isset( $_REQUEST['nonce'] ) )
-		$nonce = $_REQUEST['nonce'];
+	if( false == $nonce && isset( $_REQUEST['nonce'] ) ) {
+			$nonce = $_REQUEST['nonce'];
+	}
 
 	// Allow plugins to short-circuit the rest of the function
 	$valid = yourls_apply_filter( 'verify_nonce', false, $action, $nonce, $user, $return );
@@ -625,8 +628,9 @@ 
 	if( $nonce == $valid ) {
 		return true;
 	} else {
-		if( $return )
-			die( $return );
+		if( $return ) {
+					die( $return );
+		}
 		yourls_die( yourls__( 'Unauthorized action or expired link' ), yourls__( 'Error' ), 403 );
 	}
 }

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -203,7 +203,7 @@ 
 		return 0; // There was no password to encrypt
 
 	$success = file_put_contents( $config_file, $configdata );
-	if ( $success === FALSE ) {
+	if ( $success === false ) {
 		yourls_debug_log( 'Failed writing to ' . $config_file );
 		return 'could not write file';
 	}
@@ -336,8 +336,8 @@ 
  * @return bool False if signature or timestamp missing or invalid, true if valid
  */
 function yourls_check_signature_timestamp() {
-    if(   !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] )
-       OR !isset( $_REQUEST['timestamp'] ) OR empty( $_REQUEST['timestamp'] )
+    if(   !isset( $_REQUEST['signature'] ) or empty( $_REQUEST['signature'] )
+       or !isset( $_REQUEST['timestamp'] ) or empty( $_REQUEST['timestamp'] )
     ) {
         return false;
     }
@@ -377,7 +377,7 @@ 
  * @return bool False if signature missing or invalid, true if valid
  */
 function yourls_check_signature() {
-    if( !isset( $_REQUEST['signature'] ) OR empty( $_REQUEST['signature'] ) )
+    if( !isset( $_REQUEST['signature'] ) or empty( $_REQUEST['signature'] ) )
         return false;
 
 	// Check signature against all possible users

includes/functions-debug.php

Spacing +8 added lines, -8 removed lines

@@ -13,9 +13,9 @@ 
  * @param string $msg Message to add to the debug log
  * @return string The message itself
  */
-function yourls_debug_log( $msg ) {
-    yourls_do_action( 'debug_log', $msg );
-    yourls_get_db()->getProfiler()->log( $msg );
+function yourls_debug_log($msg) {
+    yourls_do_action('debug_log', $msg);
+    yourls_get_db()->getProfiler()->log($msg);
     return $msg;
 }
 
@@ -36,13 +36,13 @@ 
  * @since 1.7.3
  * @param bool $bool Debug on or off
  */
-function yourls_debug_mode( $bool ) {
+function yourls_debug_mode($bool) {
     // log queries if true
-    yourls_get_db()->getProfiler()->setActive( (bool)$bool );
+    yourls_get_db()->getProfiler()->setActive((bool) $bool);
 
     // report notices if true
-    $level = $bool ? -1 : ( E_ERROR | E_PARSE );
-    error_reporting( $level );
+    $level = $bool ? -1 : (E_ERROR | E_PARSE);
+    error_reporting($level);
 }
 
 /**
@@ -52,5 +52,5 @@ 
  * @return bool
  */
 function yourls_get_debug_mode() {
-    return defined( 'YOURLS_DEBUG' ) && YOURLS_DEBUG;
+    return defined('YOURLS_DEBUG') && YOURLS_DEBUG;
 }

includes/functions-infos.php

Indentation +217 added lines, -217 removed lines

@@ -6,27 +6,27 @@ 
  */
 function yourls_stats_countries_map( $countries, $id = null ) {
 
-	yourls_do_action( 'pre_stats_countries_map' );
+    yourls_do_action( 'pre_stats_countries_map' );
 
-	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_map_' );
+    // if $id is null then assign a random string
+    if( $id === null )
+        $id = uniqid ( 'yourls_stats_map_' );
 
-	$data = array_merge( array( 'Country' => 'Hits' ), $countries );
-	$data = yourls_google_array_to_data_table( $data );
+    $data = array_merge( array( 'Country' => 'Hits' ), $countries );
+    $data = yourls_google_array_to_data_table( $data );
 
-	$options = array(
-		'backgroundColor' => "white",
-		'colorAxis'       => "{colors:['A8D0ED','99C4E4','8AB8DB','7BACD2','6BA1C9','5C95C0','4D89B7','3E7DAE','2E72A5','1F669C']}",
-		'width'           => "550",
-		'height'          => "340",
-		'theme'           => 'maximized'
-	);
-	$options = yourls_apply_filter( 'stats_countries_map_options', $options );
+    $options = array(
+        'backgroundColor' => "white",
+        'colorAxis'       => "{colors:['A8D0ED','99C4E4','8AB8DB','7BACD2','6BA1C9','5C95C0','4D89B7','3E7DAE','2E72A5','1F669C']}",
+        'width'           => "550",
+        'height'          => "340",
+        'theme'           => 'maximized'
+    );
+    $options = yourls_apply_filter( 'stats_countries_map_options', $options );
 
-	$map = yourls_google_viz_code( 'GeoChart', $data, $options, $id );
+    $map = yourls_google_viz_code( 'GeoChart', $data, $options, $id );
 
-	echo yourls_apply_filter( 'stats_countries_map', $map, $countries, $options, $id );
+    echo yourls_apply_filter( 'stats_countries_map', $map, $countries, $options, $id );
 }
 
 /**
@@ -35,49 +35,49 @@ 
  */
 function yourls_stats_pie( $data, $limit = 10, $size = '340x220', $id = null ) {
 
-	yourls_do_action( 'pre_stats_pie' );
-
-	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_pie_' );
-
-	// Trim array: $limit first item + the sum of all others
-	if ( count( $data ) > $limit ) {
-		$i= 0;
-		$trim_data = array( 'Others' => 0 );
-		foreach( $data as $item=>$value ) {
-			$i++;
-			if( $i <= $limit ) {
-				$trim_data[$item] = $value;
-			} else {
-				$trim_data['Others'] += $value;
-			}
-		}
-		$data = $trim_data;
-	}
-
-	// Scale items
-	$_data = yourls_scale_data( $data );
-
-	list($width, $height) = explode( 'x', $size );
-
-	$options = array(
-		'theme'  => 'maximized',
-		'width'   => $width,
-		'height'   => $height,
-		'colors'    => "['A8D0ED','99C4E4','8AB8DB','7BACD2','6BA1C9','5C95C0','4D89B7','3E7DAE','2E72A5','1F669C']",
-		'legend'     => 'none',
-		'chartArea'   => '{top: "5%", height: "90%"}',
-		'pieSliceText' => 'label',
-	);
-	$options = yourls_apply_filter( 'stats_pie_options', $options );
-
-	$script_data = array_merge( array( 'Country' => 'Value' ), $_data );
-	$script_data = yourls_google_array_to_data_table( $script_data );
-
-	$pie = yourls_google_viz_code( 'PieChart', $script_data, $options, $id );
-
-	echo yourls_apply_filter( 'stats_pie', $pie, $data, $limit, $size, $options, $id );
+    yourls_do_action( 'pre_stats_pie' );
+
+    // if $id is null then assign a random string
+    if( $id === null )
+        $id = uniqid ( 'yourls_stats_pie_' );
+
+    // Trim array: $limit first item + the sum of all others
+    if ( count( $data ) > $limit ) {
+        $i= 0;
+        $trim_data = array( 'Others' => 0 );
+        foreach( $data as $item=>$value ) {
+            $i++;
+            if( $i <= $limit ) {
+                $trim_data[$item] = $value;
+            } else {
+                $trim_data['Others'] += $value;
+            }
+        }
+        $data = $trim_data;
+    }
+
+    // Scale items
+    $_data = yourls_scale_data( $data );
+
+    list($width, $height) = explode( 'x', $size );
+
+    $options = array(
+        'theme'  => 'maximized',
+        'width'   => $width,
+        'height'   => $height,
+        'colors'    => "['A8D0ED','99C4E4','8AB8DB','7BACD2','6BA1C9','5C95C0','4D89B7','3E7DAE','2E72A5','1F669C']",
+        'legend'     => 'none',
+        'chartArea'   => '{top: "5%", height: "90%"}',
+        'pieSliceText' => 'label',
+    );
+    $options = yourls_apply_filter( 'stats_pie_options', $options );
+
+    $script_data = array_merge( array( 'Country' => 'Value' ), $_data );
+    $script_data = yourls_google_array_to_data_table( $script_data );
+
+    $pie = yourls_google_viz_code( 'PieChart', $script_data, $options, $id );
+
+    echo yourls_apply_filter( 'stats_pie', $pie, $data, $limit, $size, $options, $id );
 }
 
 /**
@@ -85,7 +85,7 @@ 
  *
  */
 function yourls_build_list_of_days( $dates ) {
-	/* Say we have an array like:
+    /* Say we have an array like:
 	$dates = array (
 		2009 => array (
 			'08' => array (
@@ -102,55 +102,55 @@ 
 		)
 	*/
 
-	if( !$dates )
-		return array();
-
-	// Get first & last years from our range. In our example: 2009 & 2009
-	$first_year = key( $dates );
-	$_keys      = array_keys( $dates );
-	$last_year  = end( $_keys );
-	reset( $dates );
-
-	// Get first & last months from our range. In our example: 08 & 09
-	$first_month = key( $dates[ $first_year ] );
-	$_keys       = array_keys( $dates[ $last_year ] );
-	$last_month  = end( $_keys );
-	reset( $dates );
-
-	// Get first & last days from our range. In our example: 29 & 05
-	$first_day = key( $dates[ $first_year ][ $first_month ] );
-	$_keys     = array_keys( $dates[ $last_year ][ $last_month ] );
-	$last_day  = end( $_keys );
-
-	unset( $_keys );
-
-	// Now build a list of all years (2009), month (08 & 09) and days (all from 2009-08-29 to 2009-09-05)
-	$list_of_years  = array();
-	$list_of_months = array();
-	$list_of_days   = array();
-	for ( $year = $first_year; $year <= $last_year; $year++ ) {
-		$_year = sprintf( '%04d', $year );
-		$list_of_years[ $_year ] = $_year;
-		$current_first_month = ( $year == $first_year ? $first_month : '01' );
-		$current_last_month  = ( $year == $last_year ? $last_month : '12' );
-		for ( $month = $current_first_month; $month <= $current_last_month; $month++ ) {
-			$_month = sprintf( '%02d', $month );
-			$list_of_months[ $_month ] = $_month;
-			$current_first_day = ( $year == $first_year && $month == $first_month ? $first_day : '01' );
-			$current_last_day  = ( $year == $last_year && $month == $last_month ? $last_day : yourls_days_in_month( $month, $year) );
-			for ( $day = $current_first_day; $day <= $current_last_day; $day++ ) {
-				$day = sprintf( '%02d', $day );
-				$key = date( 'M d, Y', mktime( 0, 0, 0, $_month, $day, $_year ) );
-				$list_of_days[ $key ] = isset( $dates[$_year][$_month][$day] ) ? $dates[$_year][$_month][$day] : 0;
-			}
-		}
-	}
-
-	return array(
-		'list_of_days'   => $list_of_days,
-		'list_of_months' => $list_of_months,
-		'list_of_years'  => $list_of_years,
-	);
+    if( !$dates )
+        return array();
+
+    // Get first & last years from our range. In our example: 2009 & 2009
+    $first_year = key( $dates );
+    $_keys      = array_keys( $dates );
+    $last_year  = end( $_keys );
+    reset( $dates );
+
+    // Get first & last months from our range. In our example: 08 & 09
+    $first_month = key( $dates[ $first_year ] );
+    $_keys       = array_keys( $dates[ $last_year ] );
+    $last_month  = end( $_keys );
+    reset( $dates );
+
+    // Get first & last days from our range. In our example: 29 & 05
+    $first_day = key( $dates[ $first_year ][ $first_month ] );
+    $_keys     = array_keys( $dates[ $last_year ][ $last_month ] );
+    $last_day  = end( $_keys );
+
+    unset( $_keys );
+
+    // Now build a list of all years (2009), month (08 & 09) and days (all from 2009-08-29 to 2009-09-05)
+    $list_of_years  = array();
+    $list_of_months = array();
+    $list_of_days   = array();
+    for ( $year = $first_year; $year <= $last_year; $year++ ) {
+        $_year = sprintf( '%04d', $year );
+        $list_of_years[ $_year ] = $_year;
+        $current_first_month = ( $year == $first_year ? $first_month : '01' );
+        $current_last_month  = ( $year == $last_year ? $last_month : '12' );
+        for ( $month = $current_first_month; $month <= $current_last_month; $month++ ) {
+            $_month = sprintf( '%02d', $month );
+            $list_of_months[ $_month ] = $_month;
+            $current_first_day = ( $year == $first_year && $month == $first_month ? $first_day : '01' );
+            $current_last_day  = ( $year == $last_year && $month == $last_month ? $last_day : yourls_days_in_month( $month, $year) );
+            for ( $day = $current_first_day; $day <= $current_last_day; $day++ ) {
+                $day = sprintf( '%02d', $day );
+                $key = date( 'M d, Y', mktime( 0, 0, 0, $_month, $day, $_year ) );
+                $list_of_days[ $key ] = isset( $dates[$_year][$_month][$day] ) ? $dates[$_year][$_month][$day] : 0;
+            }
+        }
+    }
+
+    return array(
+        'list_of_days'   => $list_of_days,
+        'list_of_months' => $list_of_months,
+        'list_of_years'  => $list_of_years,
+    );
 }
 
 /**
@@ -161,38 +161,38 @@ 
  */
 function yourls_stats_line( $values, $id = null ) {
 
-	yourls_do_action( 'pre_stats_line' );
+    yourls_do_action( 'pre_stats_line' );
 
-	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_line_' );
+    // if $id is null then assign a random string
+    if( $id === null )
+        $id = uniqid ( 'yourls_stats_line_' );
 
-	// If we have only 1 day of data, prepend a fake day with 0 hits for a prettier graph
-	if ( count( $values ) == 1 )
-		array_unshift( $values, 0 );
+    // If we have only 1 day of data, prepend a fake day with 0 hits for a prettier graph
+    if ( count( $values ) == 1 )
+        array_unshift( $values, 0 );
 
-	// Keep only a subset of values to keep graph smooth
-	$values = yourls_array_granularity( $values, 30 );
+    // Keep only a subset of values to keep graph smooth
+    $values = yourls_array_granularity( $values, 30 );
 
-	$data = array_merge( array( 'Time' => 'Hits' ), $values );
-	$data = yourls_google_array_to_data_table( $data );
+    $data = array_merge( array( 'Time' => 'Hits' ), $values );
+    $data = yourls_google_array_to_data_table( $data );
 
-	$options = array(
-		"legend"      => "none",
-		"pointSize"   => "3",
-		"theme"       => "maximized",
-		"curveType"   => "function",
-		"width"       => 430,
-		"height"	  => 220,
-		"hAxis"       => "{minTextSpacing: 80, maxTextLines: 1, maxAlternation: 1}",
-		"vAxis"       => "{minValue: 0, format: '#'}",
-		"colors"	  => "['#2a85b3']",
-	);
-	$options = yourls_apply_filter( 'stats_line_options', $options );
+    $options = array(
+        "legend"      => "none",
+        "pointSize"   => "3",
+        "theme"       => "maximized",
+        "curveType"   => "function",
+        "width"       => 430,
+        "height"	  => 220,
+        "hAxis"       => "{minTextSpacing: 80, maxTextLines: 1, maxAlternation: 1}",
+        "vAxis"       => "{minValue: 0, format: '#'}",
+        "colors"	  => "['#2a85b3']",
+    );
+    $options = yourls_apply_filter( 'stats_line_options', $options );
 
-	$lineChart = yourls_google_viz_code( 'LineChart', $data, $options, $id );
+    $lineChart = yourls_google_viz_code( 'LineChart', $data, $options, $id );
 
-	echo yourls_apply_filter( 'stats_line', $lineChart, $values, $options, $id );
+    echo yourls_apply_filter( 'stats_line', $lineChart, $values, $options, $id );
 }
 
 /**
@@ -200,8 +200,8 @@ 
  *
  */
 function yourls_days_in_month( $month, $year ) {
-	// calculate number of days in a month
-	return $month == 2 ? ( $year % 4 ? 28 : ( $year % 100 ? 29 : ( $year % 400 ? 28 : 29 ) ) ) : ( ( $month - 1 ) % 7 % 2 ? 30 : 31 );
+    // calculate number of days in a month
+    return $month == 2 ? ( $year % 4 ? 28 : ( $year % 100 ? 29 : ( $year % 400 ? 28 : 29 ) ) ) : ( ( $month - 1 ) % 7 % 2 ? 30 : 31 );
 }
 
 /**
@@ -209,11 +209,11 @@ 
  *
  */
 function yourls_stats_get_best_day( $list_of_days ) {
-	$max = max( $list_of_days );
-	foreach( $list_of_days as $k=>$v ) {
-		if ( $v == $max )
-			return array( 'day' => $k, 'max' => $max );
-	}
+    $max = max( $list_of_days );
+    foreach( $list_of_days as $k=>$v ) {
+        if ( $v == $max )
+            return array( 'day' => $k, 'max' => $max );
+    }
 }
 
 /**
@@ -221,19 +221,19 @@ 
  *
  */
 function yourls_get_domain( $url, $include_scheme = false ) {
-	$parse = @parse_url( $url ); // Hiding ugly stuff coming from malformed referrer URLs
+    $parse = @parse_url( $url ); // Hiding ugly stuff coming from malformed referrer URLs
 
-	// Get host & scheme. Fall back to path if not found.
-	$host = isset( $parse['host'] ) ? $parse['host'] : '';
-	$scheme = isset( $parse['scheme'] ) ? $parse['scheme'] : '';
-	$path = isset( $parse['path'] ) ? $parse['path'] : '';
-	if( !$host )
-		$host = $path;
+    // Get host & scheme. Fall back to path if not found.
+    $host = isset( $parse['host'] ) ? $parse['host'] : '';
+    $scheme = isset( $parse['scheme'] ) ? $parse['scheme'] : '';
+    $path = isset( $parse['path'] ) ? $parse['path'] : '';
+    if( !$host )
+        $host = $path;
 
-	if ( $include_scheme && $scheme )
-		$host = $scheme.'://'.$host;
+    if ( $include_scheme && $scheme )
+        $host = $scheme.'://'.$host;
 
-	return $host;
+    return $host;
 }
 
 /**
@@ -241,7 +241,7 @@ 
  *
  */
 function yourls_get_favicon_url( $url ) {
-	return yourls_match_current_protocol( '//www.google.com/s2/favicons?domain=' . yourls_get_domain( $url, false ) );
+    return yourls_match_current_protocol( '//www.google.com/s2/favicons?domain=' . yourls_get_domain( $url, false ) );
 }
 
 /**
@@ -249,13 +249,13 @@ 
  *
  */
 function yourls_scale_data( $data ) {
-	$max = max( $data );
-	if( $max > 100 ) {
-		foreach( $data as $k=>$v ) {
-			$data[$k] = intval( $v / $max * 100 );
-		}
-	}
-	return $data;
+    $max = max( $data );
+    if( $max > 100 ) {
+        foreach( $data as $k=>$v ) {
+            $data[$k] = intval( $v / $max * 100 );
+        }
+    }
+    return $data;
 }
 
 /**
@@ -263,24 +263,24 @@ 
  *
  */
 function yourls_array_granularity( $array, $grain = 100, $preserve_max = true ) {
-	if ( count( $array ) > $grain ) {
-		$max = max( $array );
-		$step = intval( count( $array ) / $grain );
-		$i = 0;
-		// Loop through each item and unset except every $step (optional preserve the max value)
-		foreach( $array as $k=>$v ) {
-			$i++;
-			if ( $i % $step != 0 ) {
-				if ( $preserve_max == false ) {
-					unset( $array[$k] );
-				} else {
-					if ( $v < $max )
-						unset( $array[$k] );
-				}
-			}
-		}
-	}
-	return $array;
+    if ( count( $array ) > $grain ) {
+        $max = max( $array );
+        $step = intval( count( $array ) / $grain );
+        $i = 0;
+        // Loop through each item and unset except every $step (optional preserve the max value)
+        foreach( $array as $k=>$v ) {
+            $i++;
+            if ( $i % $step != 0 ) {
+                if ( $preserve_max == false ) {
+                    unset( $array[$k] );
+                } else {
+                    if ( $v < $max )
+                        unset( $array[$k] );
+                }
+            }
+        }
+    }
+    return $array;
 }
 
 /**
@@ -288,23 +288,23 @@ 
  *
  */
 function yourls_google_array_to_data_table( $data ){
-	$str  = "var data = google.visualization.arrayToDataTable([\n";
-	foreach( $data as $label => $values ){
-		if( !is_array( $values ) ) {
-			$values = array( $values );
-		}
-		$str .= "\t['$label',";
-		foreach( $values as $value ){
-			if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
-				$value = "'$value'";
-			}
-			$str .= "$value";
-		}
-		$str .= "],\n";
-	}
-	$str = substr( $str, 0, -2 ) . "\n"; // remove the trailing comma/return, reappend the return
-	$str .= "]);\n"; // wrap it up
-	return $str;
+    $str  = "var data = google.visualization.arrayToDataTable([\n";
+    foreach( $data as $label => $values ){
+        if( !is_array( $values ) ) {
+            $values = array( $values );
+        }
+        $str .= "\t['$label',";
+        foreach( $values as $value ){
+            if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
+                $value = "'$value'";
+            }
+            $str .= "$value";
+        }
+        $str .= "],\n";
+    }
+    $str = substr( $str, 0, -2 ) . "\n"; // remove the trailing comma/return, reappend the return
+    $str .= "]);\n"; // wrap it up
+    return $str;
 }
 
 /**
@@ -312,28 +312,28 @@ 
  *
  */
 function yourls_google_viz_code( $graph_type, $data, $options, $id ) {
-	$function_name = 'yourls_graph' . $id;
-	$code  = "\n<script id=\"$function_name\" type=\"text/javascript\">\n";
-	$code .= "function $function_name() { \n";
-
-	$code .= "$data\n";
-
-	$code .= "var options = {\n";
-	foreach( $options as $field => $value ) {
-		if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
-			$value = "\"$value\"";
-		}
-		$code .= "\t'$field': $value,\n";
-	}
-	$code  = substr( $code, 0, -2 ) . "\n"; // remove the trailing comma/return, reappend the return
-	$code .= "\t}\n";
-
-	$code .= "new google.visualization.$graph_type( document.getElementById('visualization_$id') ).draw( data, options );";
-	$code .= "}\n";
-	$code .= "google.setOnLoadCallback( $function_name );\n";
-	$code .= "</script>\n";
-	$code .= "<div id=\"visualization_$id\"></div>\n";
-
-	return $code;
+    $function_name = 'yourls_graph' . $id;
+    $code  = "\n<script id=\"$function_name\" type=\"text/javascript\">\n";
+    $code .= "function $function_name() { \n";
+
+    $code .= "$data\n";
+
+    $code .= "var options = {\n";
+    foreach( $options as $field => $value ) {
+        if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
+            $value = "\"$value\"";
+        }
+        $code .= "\t'$field': $value,\n";
+    }
+    $code  = substr( $code, 0, -2 ) . "\n"; // remove the trailing comma/return, reappend the return
+    $code .= "\t}\n";
+
+    $code .= "new google.visualization.$graph_type( document.getElementById('visualization_$id') ).draw( data, options );";
+    $code .= "}\n";
+    $code .= "google.setOnLoadCallback( $function_name );\n";
+    $code .= "</script>\n";
+    $code .= "<div id=\"visualization_$id\"></div>\n";
+
+    return $code;
 }
 

Spacing +109 added lines, -109 removed lines

@@ -4,16 +4,16 @@ 
  * Echoes an image tag of Google Charts map from sorted array of 'country_code' => 'number of visits' (sort by DESC)
  *
  */
-function yourls_stats_countries_map( $countries, $id = null ) {
+function yourls_stats_countries_map($countries, $id = null) {
 
-	yourls_do_action( 'pre_stats_countries_map' );
+	yourls_do_action('pre_stats_countries_map');
 
 	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_map_' );
+	if ($id === null)
+		$id = uniqid('yourls_stats_map_');
 
-	$data = array_merge( array( 'Country' => 'Hits' ), $countries );
-	$data = yourls_google_array_to_data_table( $data );
+	$data = array_merge(array('Country' => 'Hits'), $countries);
+	$data = yourls_google_array_to_data_table($data);
 
 	$options = array(
 		'backgroundColor' => "white",
@@ -22,32 +22,32 @@ 
 		'height'          => "340",
 		'theme'           => 'maximized'
 	);
-	$options = yourls_apply_filter( 'stats_countries_map_options', $options );
+	$options = yourls_apply_filter('stats_countries_map_options', $options);
 
-	$map = yourls_google_viz_code( 'GeoChart', $data, $options, $id );
+	$map = yourls_google_viz_code('GeoChart', $data, $options, $id);
 
-	echo yourls_apply_filter( 'stats_countries_map', $map, $countries, $options, $id );
+	echo yourls_apply_filter('stats_countries_map', $map, $countries, $options, $id);
 }
 
 /**
  * Echoes an image tag of Google Charts pie from sorted array of 'data' => 'value' (sort by DESC). Optional $limit = (integer) limit list of X first countries, sorted by most visits
  *
  */
-function yourls_stats_pie( $data, $limit = 10, $size = '340x220', $id = null ) {
+function yourls_stats_pie($data, $limit = 10, $size = '340x220', $id = null) {
 
-	yourls_do_action( 'pre_stats_pie' );
+	yourls_do_action('pre_stats_pie');
 
 	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_pie_' );
+	if ($id === null)
+		$id = uniqid('yourls_stats_pie_');
 
 	// Trim array: $limit first item + the sum of all others
-	if ( count( $data ) > $limit ) {
-		$i= 0;
-		$trim_data = array( 'Others' => 0 );
-		foreach( $data as $item=>$value ) {
+	if (count($data) > $limit) {
+		$i = 0;
+		$trim_data = array('Others' => 0);
+		foreach ($data as $item=>$value) {
 			$i++;
-			if( $i <= $limit ) {
+			if ($i <= $limit) {
 				$trim_data[$item] = $value;
 			} else {
 				$trim_data['Others'] += $value;
@@ -57,9 +57,9 @@ 
 	}
 
 	// Scale items
-	$_data = yourls_scale_data( $data );
+	$_data = yourls_scale_data($data);
 
-	list($width, $height) = explode( 'x', $size );
+	list($width, $height) = explode('x', $size);
 
 	$options = array(
 		'theme'  => 'maximized',
@@ -70,21 +70,21 @@ 
 		'chartArea'   => '{top: "5%", height: "90%"}',
 		'pieSliceText' => 'label',
 	);
-	$options = yourls_apply_filter( 'stats_pie_options', $options );
+	$options = yourls_apply_filter('stats_pie_options', $options);
 
-	$script_data = array_merge( array( 'Country' => 'Value' ), $_data );
-	$script_data = yourls_google_array_to_data_table( $script_data );
+	$script_data = array_merge(array('Country' => 'Value'), $_data);
+	$script_data = yourls_google_array_to_data_table($script_data);
 
-	$pie = yourls_google_viz_code( 'PieChart', $script_data, $options, $id );
+	$pie = yourls_google_viz_code('PieChart', $script_data, $options, $id);
 
-	echo yourls_apply_filter( 'stats_pie', $pie, $data, $limit, $size, $options, $id );
+	echo yourls_apply_filter('stats_pie', $pie, $data, $limit, $size, $options, $id);
 }
 
 /**
  * Build a list of all daily values between d1/m1/y1 to d2/m2/y2.
  *
  */
-function yourls_build_list_of_days( $dates ) {
+function yourls_build_list_of_days($dates) {
 	/* Say we have an array like:
 	$dates = array (
 		2009 => array (
@@ -102,46 +102,46 @@ 
 		)
 	*/
 
-	if( !$dates )
+	if (!$dates)
 		return array();
 
 	// Get first & last years from our range. In our example: 2009 & 2009
-	$first_year = key( $dates );
-	$_keys      = array_keys( $dates );
-	$last_year  = end( $_keys );
-	reset( $dates );
+	$first_year = key($dates);
+	$_keys      = array_keys($dates);
+	$last_year  = end($_keys);
+	reset($dates);
 
 	// Get first & last months from our range. In our example: 08 & 09
-	$first_month = key( $dates[ $first_year ] );
-	$_keys       = array_keys( $dates[ $last_year ] );
-	$last_month  = end( $_keys );
-	reset( $dates );
+	$first_month = key($dates[$first_year]);
+	$_keys       = array_keys($dates[$last_year]);
+	$last_month  = end($_keys);
+	reset($dates);
 
 	// Get first & last days from our range. In our example: 29 & 05
-	$first_day = key( $dates[ $first_year ][ $first_month ] );
-	$_keys     = array_keys( $dates[ $last_year ][ $last_month ] );
-	$last_day  = end( $_keys );
+	$first_day = key($dates[$first_year][$first_month]);
+	$_keys     = array_keys($dates[$last_year][$last_month]);
+	$last_day  = end($_keys);
 
-	unset( $_keys );
+	unset($_keys);
 
 	// Now build a list of all years (2009), month (08 & 09) and days (all from 2009-08-29 to 2009-09-05)
 	$list_of_years  = array();
 	$list_of_months = array();
 	$list_of_days   = array();
-	for ( $year = $first_year; $year <= $last_year; $year++ ) {
-		$_year = sprintf( '%04d', $year );
-		$list_of_years[ $_year ] = $_year;
-		$current_first_month = ( $year == $first_year ? $first_month : '01' );
-		$current_last_month  = ( $year == $last_year ? $last_month : '12' );
-		for ( $month = $current_first_month; $month <= $current_last_month; $month++ ) {
-			$_month = sprintf( '%02d', $month );
-			$list_of_months[ $_month ] = $_month;
-			$current_first_day = ( $year == $first_year && $month == $first_month ? $first_day : '01' );
-			$current_last_day  = ( $year == $last_year && $month == $last_month ? $last_day : yourls_days_in_month( $month, $year) );
-			for ( $day = $current_first_day; $day <= $current_last_day; $day++ ) {
-				$day = sprintf( '%02d', $day );
-				$key = date( 'M d, Y', mktime( 0, 0, 0, $_month, $day, $_year ) );
-				$list_of_days[ $key ] = isset( $dates[$_year][$_month][$day] ) ? $dates[$_year][$_month][$day] : 0;
+	for ($year = $first_year; $year <= $last_year; $year++) {
+		$_year = sprintf('%04d', $year);
+		$list_of_years[$_year] = $_year;
+		$current_first_month = ($year == $first_year ? $first_month : '01');
+		$current_last_month  = ($year == $last_year ? $last_month : '12');
+		for ($month = $current_first_month; $month <= $current_last_month; $month++) {
+			$_month = sprintf('%02d', $month);
+			$list_of_months[$_month] = $_month;
+			$current_first_day = ($year == $first_year && $month == $first_month ? $first_day : '01');
+			$current_last_day  = ($year == $last_year && $month == $last_month ? $last_day : yourls_days_in_month($month, $year));
+			for ($day = $current_first_day; $day <= $current_last_day; $day++) {
+				$day = sprintf('%02d', $day);
+				$key = date('M d, Y', mktime(0, 0, 0, $_month, $day, $_year));
+				$list_of_days[$key] = isset($dates[$_year][$_month][$day]) ? $dates[$_year][$_month][$day] : 0;
 			}
 		}
 	}
@@ -159,23 +159,23 @@ 
  * $legend1_list & legend2_list are values used for the 2 x-axis labels. $id is an HTML/JS id
  *
  */
-function yourls_stats_line( $values, $id = null ) {
+function yourls_stats_line($values, $id = null) {
 
-	yourls_do_action( 'pre_stats_line' );
+	yourls_do_action('pre_stats_line');
 
 	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_line_' );
+	if ($id === null)
+		$id = uniqid('yourls_stats_line_');
 
 	// If we have only 1 day of data, prepend a fake day with 0 hits for a prettier graph
-	if ( count( $values ) == 1 )
-		array_unshift( $values, 0 );
+	if (count($values) == 1)
+		array_unshift($values, 0);
 
 	// Keep only a subset of values to keep graph smooth
-	$values = yourls_array_granularity( $values, 30 );
+	$values = yourls_array_granularity($values, 30);
 
-	$data = array_merge( array( 'Time' => 'Hits' ), $values );
-	$data = yourls_google_array_to_data_table( $data );
+	$data = array_merge(array('Time' => 'Hits'), $values);
+	$data = yourls_google_array_to_data_table($data);
 
 	$options = array(
 		"legend"      => "none",
@@ -188,31 +188,31 @@ 
 		"vAxis"       => "{minValue: 0, format: '#'}",
 		"colors"	  => "['#2a85b3']",
 	);
-	$options = yourls_apply_filter( 'stats_line_options', $options );
+	$options = yourls_apply_filter('stats_line_options', $options);
 
-	$lineChart = yourls_google_viz_code( 'LineChart', $data, $options, $id );
+	$lineChart = yourls_google_viz_code('LineChart', $data, $options, $id);
 
-	echo yourls_apply_filter( 'stats_line', $lineChart, $values, $options, $id );
+	echo yourls_apply_filter('stats_line', $lineChart, $values, $options, $id);
 }
 
 /**
  * Return the number of days in a month. From php.net, used if PHP built without calendar functions
  *
  */
-function yourls_days_in_month( $month, $year ) {
+function yourls_days_in_month($month, $year) {
 	// calculate number of days in a month
-	return $month == 2 ? ( $year % 4 ? 28 : ( $year % 100 ? 29 : ( $year % 400 ? 28 : 29 ) ) ) : ( ( $month - 1 ) % 7 % 2 ? 30 : 31 );
+	return $month == 2 ? ($year % 4 ? 28 : ($year % 100 ? 29 : ($year % 400 ? 28 : 29))) : (($month - 1) % 7 % 2 ? 30 : 31);
 }
 
 /**
  * Get max value from date array of 'Aug 12, 2012' = '1337'
  *
  */
-function yourls_stats_get_best_day( $list_of_days ) {
-	$max = max( $list_of_days );
-	foreach( $list_of_days as $k=>$v ) {
-		if ( $v == $max )
-			return array( 'day' => $k, 'max' => $max );
+function yourls_stats_get_best_day($list_of_days) {
+	$max = max($list_of_days);
+	foreach ($list_of_days as $k=>$v) {
+		if ($v == $max)
+			return array('day' => $k, 'max' => $max);
 	}
 }
 
@@ -220,17 +220,17 @@ 
  * Return domain of a URL
  *
  */
-function yourls_get_domain( $url, $include_scheme = false ) {
-	$parse = @parse_url( $url ); // Hiding ugly stuff coming from malformed referrer URLs
+function yourls_get_domain($url, $include_scheme = false) {
+	$parse = @parse_url($url); // Hiding ugly stuff coming from malformed referrer URLs
 
 	// Get host & scheme. Fall back to path if not found.
-	$host = isset( $parse['host'] ) ? $parse['host'] : '';
-	$scheme = isset( $parse['scheme'] ) ? $parse['scheme'] : '';
-	$path = isset( $parse['path'] ) ? $parse['path'] : '';
-	if( !$host )
+	$host = isset($parse['host']) ? $parse['host'] : '';
+	$scheme = isset($parse['scheme']) ? $parse['scheme'] : '';
+	$path = isset($parse['path']) ? $parse['path'] : '';
+	if (!$host)
 		$host = $path;
 
-	if ( $include_scheme && $scheme )
+	if ($include_scheme && $scheme)
 		$host = $scheme.'://'.$host;
 
 	return $host;
@@ -240,19 +240,19 @@ 
  * Return favicon URL
  *
  */
-function yourls_get_favicon_url( $url ) {
-	return yourls_match_current_protocol( '//www.google.com/s2/favicons?domain=' . yourls_get_domain( $url, false ) );
+function yourls_get_favicon_url($url) {
+	return yourls_match_current_protocol('//www.google.com/s2/favicons?domain='.yourls_get_domain($url, false));
 }
 
 /**
  * Scale array of data from 0 to 100 max
  *
  */
-function yourls_scale_data( $data ) {
-	$max = max( $data );
-	if( $max > 100 ) {
-		foreach( $data as $k=>$v ) {
-			$data[$k] = intval( $v / $max * 100 );
+function yourls_scale_data($data) {
+	$max = max($data);
+	if ($max > 100) {
+		foreach ($data as $k=>$v) {
+			$data[$k] = intval($v / $max * 100);
 		}
 	}
 	return $data;
@@ -262,20 +262,20 @@ 
  * Tweak granularity of array $array: keep only $grain values. This make less accurate but less messy graphs when too much values. See http://code.google.com/apis/chart/formats.html#granularity
  *
  */
-function yourls_array_granularity( $array, $grain = 100, $preserve_max = true ) {
-	if ( count( $array ) > $grain ) {
-		$max = max( $array );
-		$step = intval( count( $array ) / $grain );
+function yourls_array_granularity($array, $grain = 100, $preserve_max = true) {
+	if (count($array) > $grain) {
+		$max = max($array);
+		$step = intval(count($array) / $grain);
 		$i = 0;
 		// Loop through each item and unset except every $step (optional preserve the max value)
-		foreach( $array as $k=>$v ) {
+		foreach ($array as $k=>$v) {
 			$i++;
-			if ( $i % $step != 0 ) {
-				if ( $preserve_max == false ) {
-					unset( $array[$k] );
+			if ($i % $step != 0) {
+				if ($preserve_max == false) {
+					unset($array[$k]);
 				} else {
-					if ( $v < $max )
-						unset( $array[$k] );
+					if ($v < $max)
+						unset($array[$k]);
 				}
 			}
 		}
@@ -287,22 +287,22 @@ 
  * Transform data array to data table for Google API
  *
  */
-function yourls_google_array_to_data_table( $data ){
-	$str  = "var data = google.visualization.arrayToDataTable([\n";
-	foreach( $data as $label => $values ){
-		if( !is_array( $values ) ) {
-			$values = array( $values );
+function yourls_google_array_to_data_table($data) {
+	$str = "var data = google.visualization.arrayToDataTable([\n";
+	foreach ($data as $label => $values) {
+		if (!is_array($values)) {
+			$values = array($values);
 		}
 		$str .= "\t['$label',";
-		foreach( $values as $value ){
-			if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
+		foreach ($values as $value) {
+			if (!is_numeric($value) && strpos($value, '[') !== 0 && strpos($value, '{') !== 0) {
 				$value = "'$value'";
 			}
 			$str .= "$value";
 		}
 		$str .= "],\n";
 	}
-	$str = substr( $str, 0, -2 ) . "\n"; // remove the trailing comma/return, reappend the return
+	$str = substr($str, 0, -2)."\n"; // remove the trailing comma/return, reappend the return
 	$str .= "]);\n"; // wrap it up
 	return $str;
 }
@@ -311,21 +311,21 @@ 
  * Return javascript code that will display the Google Chart
  *
  */
-function yourls_google_viz_code( $graph_type, $data, $options, $id ) {
-	$function_name = 'yourls_graph' . $id;
+function yourls_google_viz_code($graph_type, $data, $options, $id) {
+	$function_name = 'yourls_graph'.$id;
 	$code  = "\n<script id=\"$function_name\" type=\"text/javascript\">\n";
 	$code .= "function $function_name() { \n";
 
 	$code .= "$data\n";
 
 	$code .= "var options = {\n";
-	foreach( $options as $field => $value ) {
-		if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
+	foreach ($options as $field => $value) {
+		if (!is_numeric($value) && strpos($value, '[') !== 0 && strpos($value, '{') !== 0) {
 			$value = "\"$value\"";
 		}
 		$code .= "\t'$field': $value,\n";
 	}
-	$code  = substr( $code, 0, -2 ) . "\n"; // remove the trailing comma/return, reappend the return
+	$code  = substr($code, 0, -2)."\n"; // remove the trailing comma/return, reappend the return
 	$code .= "\t}\n";
 
 	$code .= "new google.visualization.$graph_type( document.getElementById('visualization_$id') ).draw( data, options );";

Braces +30 added lines, -21 removed lines

@@ -9,8 +9,9 @@ 
 	yourls_do_action( 'pre_stats_countries_map' );
 
 	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_map_' );
+	if( $id === null ) {
+			$id = uniqid ( 'yourls_stats_map_' );
+	}
 
 	$data = array_merge( array( 'Country' => 'Hits' ), $countries );
 	$data = yourls_google_array_to_data_table( $data );
@@ -38,8 +39,9 @@ 
 	yourls_do_action( 'pre_stats_pie' );
 
 	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_pie_' );
+	if( $id === null ) {
+			$id = uniqid ( 'yourls_stats_pie_' );
+	}
 
 	// Trim array: $limit first item + the sum of all others
 	if ( count( $data ) > $limit ) {
@@ -102,8 +104,9 @@ 
 		)
 	*/
 
-	if( !$dates )
-		return array();
+	if( !$dates ) {
+			return array();
+	}
 
 	// Get first & last years from our range. In our example: 2009 & 2009
 	$first_year = key( $dates );
@@ -164,12 +167,14 @@ 
 	yourls_do_action( 'pre_stats_line' );
 
 	// if $id is null then assign a random string
-	if( $id === null )
-		$id = uniqid ( 'yourls_stats_line_' );
+	if( $id === null ) {
+			$id = uniqid ( 'yourls_stats_line_' );
+	}
 
 	// If we have only 1 day of data, prepend a fake day with 0 hits for a prettier graph
-	if ( count( $values ) == 1 )
-		array_unshift( $values, 0 );
+	if ( count( $values ) == 1 ) {
+			array_unshift( $values, 0 );
+	}
 
 	// Keep only a subset of values to keep graph smooth
 	$values = yourls_array_granularity( $values, 30 );
@@ -211,8 +216,9 @@ 
 function yourls_stats_get_best_day( $list_of_days ) {
 	$max = max( $list_of_days );
 	foreach( $list_of_days as $k=>$v ) {
-		if ( $v == $max )
-			return array( 'day' => $k, 'max' => $max );
+		if ( $v == $max ) {
+					return array( 'day' => $k, 'max' => $max );
+		}
 	}
 }
 
@@ -227,11 +233,13 @@ 
 	$host = isset( $parse['host'] ) ? $parse['host'] : '';
 	$scheme = isset( $parse['scheme'] ) ? $parse['scheme'] : '';
 	$path = isset( $parse['path'] ) ? $parse['path'] : '';
-	if( !$host )
-		$host = $path;
+	if( !$host ) {
+			$host = $path;
+	}
 
-	if ( $include_scheme && $scheme )
-		$host = $scheme.'://'.$host;
+	if ( $include_scheme && $scheme ) {
+			$host = $scheme.'://'.$host;
+	}
 
 	return $host;
 }
@@ -274,8 +282,9 @@ 
 				if ( $preserve_max == false ) {
 					unset( $array[$k] );
 				} else {
-					if ( $v < $max )
-						unset( $array[$k] );
+					if ( $v < $max ) {
+											unset( $array[$k] );
+					}
 				}
 			}
 		}
@@ -287,14 +296,14 @@ 
  * Transform data array to data table for Google API
  *
  */
-function yourls_google_array_to_data_table( $data ){
+function yourls_google_array_to_data_table( $data ) {
 	$str  = "var data = google.visualization.arrayToDataTable([\n";
-	foreach( $data as $label => $values ){
+	foreach( $data as $label => $values ) {
 		if( !is_array( $values ) ) {
 			$values = array( $values );
 		}
 		$str .= "\t['$label',";
-		foreach( $values as $value ){
+		foreach( $values as $value ) {
 			if( !is_numeric( $value ) && strpos( $value, '[' ) !== 0 && strpos( $value, '{' ) !== 0 ) {
 				$value = "'$value'";
 			}

includes/functions-formatting.php

Braces +66 added lines, -33 removed lines

@@ -9,8 +9,9 @@ 
  *
  */
 function yourls_int2string( $num, $chars = null ) {
-	if( $chars == null )
-		$chars = yourls_get_shorturl_charset();
+	if( $chars == null ) {
+			$chars = yourls_get_shorturl_charset();
+	}
 	$string = '';
 	$len = strlen( $chars );
 	while( $num >= $len ) {
@@ -28,8 +29,9 @@ 
  *
  */
 function yourls_string2int( $string, $chars = null ) {
-	if( $chars == null )
-		$chars = yourls_get_shorturl_charset();
+	if( $chars == null ) {
+			$chars = yourls_get_shorturl_charset();
+	}
 	$integer = 0;
 	$string = strrev( $string  );
 	$baselen = strlen( $chars );
@@ -135,7 +137,7 @@ 
  * Stolen from WP's _deep_replace
  *
  */
-function yourls_deep_replace( $search, $subject ){
+function yourls_deep_replace( $search, $subject ) {
 	$found = true;
 	while($found) {
 		$found = false;
@@ -182,8 +184,9 @@ 
  *
  */
 function yourls_sanitize_date_for_sql( $date ) {
-	if( !yourls_sanitize_date( $date ) )
-		return false;
+	if( !yourls_sanitize_date( $date ) ) {
+			return false;
+	}
 	return date( 'Y-m-d', strtotime( $date ) );
 }
 
@@ -235,16 +238,39 @@ 
 	$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;
+		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;
@@ -321,18 +347,21 @@ 
 function yourls_specialchars( $string, $quote_style = ENT_NOQUOTES, $double_encode = false ) {
 	$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;
+	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;
+	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';
 
@@ -358,15 +387,17 @@ 
 		// 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 );
 	}
 
 	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ( 'single' === $_quote_style ) {
+			$string = str_replace( "'", '&#039;', $string );
+	}
 
 	return $string;
 }
@@ -489,8 +520,9 @@ 
 		$url
 	);
 
-	if ( '' == $url )
-		return $url;
+	if ( '' == $url ) {
+			return $url;
+	}
 
 	$original_url = $url;
 
@@ -523,8 +555,9 @@ 
             // Note: $yourls_allowedprotocols is also globally filterable in functions-kses.php/yourls_kses_init()
         }
 
-        if ( !yourls_is_allowed_protocol( $url, $protocols ) )
-            return '';
+        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)
     }

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/Database/YDB.php

Spacing +19 added lines, -19 removed lines

@@ -140,7 +140,7 @@ 
     public function connect_to_DB() {
         try {
             $this->connect();
-        } catch ( \Exception $e ) {
+        } catch (\Exception $e) {
             $this->dead_or_error($e);
         }
     }
@@ -156,15 +156,15 @@ 
      */
     public function dead_or_error(\Exception $exception) {
         // Use any /user/db_error.php file
-        if( file_exists( YOURLS_USERDIR . '/db_error.php' ) ) {
-            include_once( YOURLS_USERDIR . '/db_error.php' );
+        if (file_exists(YOURLS_USERDIR.'/db_error.php')) {
+            include_once(YOURLS_USERDIR.'/db_error.php');
             die();
         }
 
-        $message  = yourls__( 'Incorrect DB config, or could not connect to DB' );
-        $message .= '<br/>' . get_class($exception) .': ' . $exception->getMessage();
+        $message  = yourls__('Incorrect DB config, or could not connect to DB');
+        $message .= '<br/>'.get_class($exception).': '.$exception->getMessage();
 
-        yourls_die( yourls__( $message ), yourls__( 'Fatal error' ), 503 );
+        yourls_die(yourls__($message), yourls__('Fatal error'), 503);
         die();
     }
 
@@ -303,7 +303,7 @@ 
      * @return array
      */
     public function get_plugin_pages() {
-        return is_array( $this->plugin_pages ) ? $this->plugin_pages : [];
+        return is_array($this->plugin_pages) ? $this->plugin_pages : [];
     }
 
     /**
@@ -318,8 +318,8 @@ 
      * @param string   $title
      * @param callable $function
      */
-    public function add_plugin_page( $slug, $title, $function ) {
-        $this->plugin_pages[ $slug ] = [
+    public function add_plugin_page($slug, $title, $function) {
+        $this->plugin_pages[$slug] = [
             'slug'     => $slug,
             'title'    => $title,
             'function' => $function,
@@ -329,8 +329,8 @@ 
     /**
      * @param string $slug
      */
-    public function remove_plugin_page( $slug ) {
-        unset( $this->plugin_pages[ $slug ] );
+    public function remove_plugin_page($slug) {
+        unset($this->plugin_pages[$slug]);
     }
 
 
@@ -341,7 +341,7 @@ 
      * @return int
      */
     public function get_num_queries() {
-        return count( (array) $this->get_queries() );
+        return count((array) $this->get_queries());
     }
 
     /**
@@ -381,7 +381,7 @@ 
 
         if ($this->get_emulate_state()) {
             // keep queries if $query['function'] != 'prepare'
-            $queries = array_filter($queries, function($query) {return $query['function'] !== 'prepare';});
+            $queries = array_filter($queries, function($query) {return $query['function'] !== 'prepare'; });
         }
 
         return $queries;
@@ -445,39 +445,39 @@ 
     // @codeCoverageIgnoreStart
 
     public function escape($string) {
-        yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' );
+        yourls_deprecated_function('$ydb->'.__FUNCTION__, '1.7.3', 'PDO');
         // This will escape using PDO->quote(), but then remove the enclosing quotes
         return substr($this->quote($string), 1, -1);
     }
 
     public function get_col($query) {
-        yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' );
+        yourls_deprecated_function('$ydb->'.__FUNCTION__, '1.7.3', 'PDO');
         yourls_debug_log('LEGACY SQL: '.$query);
         return $this->fetchCol($query);
     }
 
     public function get_results($query) {
-        yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' );
+        yourls_deprecated_function('$ydb->'.__FUNCTION__, '1.7.3', 'PDO');
         yourls_debug_log('LEGACY SQL: '.$query);
         $stm = parent::query($query);
         return($stm->fetchAll(PDO::FETCH_OBJ));
     }
 
     public function get_row($query) {
-        yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' );
+        yourls_deprecated_function('$ydb->'.__FUNCTION__, '1.7.3', 'PDO');
         yourls_debug_log('LEGACY SQL: '.$query);
         $row = $this->fetchObjects($query);
         return isset($row[0]) ? $row[0] : null;
     }
 
     public function get_var($query) {
-        yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' );
+        yourls_deprecated_function('$ydb->'.__FUNCTION__, '1.7.3', 'PDO');
         yourls_debug_log('LEGACY SQL: '.$query);
         return $this->fetchValue($query);
     }
 
     public function query($query) {
-        yourls_deprecated_function( '$ydb->'.__FUNCTION__, '1.7.3', 'PDO' );
+        yourls_deprecated_function('$ydb->'.__FUNCTION__, '1.7.3', 'PDO');
         yourls_debug_log('LEGACY SQL: '.$query);
         return $this->fetchAffected($query);
     }

includes/Database/Options.php

Indentation +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 
         // Cache option value to save a DB query if needed later
         $this->ydb->set_option($name, $newvalue);
-    	yourls_do_action( 'update_option', $name, $oldvalue, $newvalue );
+        yourls_do_action( 'update_option', $name, $oldvalue, $newvalue );
         return true;
     }
 

Spacing +14 added lines, -14 removed lines

@@ -48,18 +48,18 @@ 
         try {
             $options = (array) $this->ydb->fetchPairs($sql);
 
-        } catch ( PDOException $e ) {
+        } catch (PDOException $e) {
 
             // We could not fetch value from the table. Let's check if the option table exists
             try {
                 $check = $this->ydb->fetchAffected(sprintf("SHOW TABLES LIKE '%s'", $table));
                 // Table doesn't exist
-                if ($check ==0) {
+                if ($check == 0) {
                     return false;
                 }
 
             // Error at this point means the database isn't readable
-            } catch ( PDOException $e ) {
+            } catch (PDOException $e) {
                 $this->ydb->dead_or_error($e);
             }
 
@@ -90,13 +90,13 @@ 
      * @return mixed            Value set for the option
      */
     public function get($name, $default) {
-        $name = trim((string)$name);
+        $name = trim((string) $name);
         if (empty($name)) {
             return $default;
         }
 
         // Check if option value is cached already
-        if($this->ydb->has_option($name)) {
+        if ($this->ydb->has_option($name)) {
             return $this->ydb->get_option($name);
         }
 
@@ -108,8 +108,8 @@ 
         // Use fechOne() to get array('option_value'=>$value), or false if not found.
         // This way, we can effectively store false as an option value, and not confuse with false as the default return value
         $value = $this->ydb->fetchOne($sql, $bind);
-        if($value !== false) {
-            $value = yourls_maybe_unserialize( $value['option_value'] );
+        if ($value !== false) {
+            $value = yourls_maybe_unserialize($value['option_value']);
             // Cache option value to save a DB query if needed later
             $this->ydb->set_option($name, $value);
         } else {
@@ -137,7 +137,7 @@ 
      * @return bool              False if value was not updated, true otherwise.
      */
     public function update($name, $newvalue) {
-        $name = trim((string)$name);
+        $name = trim((string) $name);
         if (empty($name)) {
             return false;
         }
@@ -165,14 +165,14 @@ 
         $bind = array('name' => $name, 'value' => $_newvalue);
         $do   = $this->ydb->fetchAffected($sql, $bind);
 
-        if($do !== 1) {
+        if ($do !== 1) {
             // Something went wrong :(
             return false;
         }
 
         // Cache option value to save a DB query if needed later
         $this->ydb->set_option($name, $newvalue);
-    	yourls_do_action( 'update_option', $name, $oldvalue, $newvalue );
+    	yourls_do_action('update_option', $name, $oldvalue, $newvalue);
         return true;
     }
 
@@ -186,7 +186,7 @@ 
      * @return bool           False if option was not added (eg already exists), true otherwise.
      */
     public function add($name, $value) {
-        $name = trim((string)$name);
+        $name = trim((string) $name);
         if (empty($name)) {
             return false;
         }
@@ -210,7 +210,7 @@ 
         $bind = array('name' => $name, 'value' => $_value);
         $do   = $this->ydb->fetchAffected($sql, $bind);
 
-        if($do !== 1) {
+        if ($do !== 1) {
             // Something went wrong :(
             return false;
         }
@@ -231,7 +231,7 @@ 
      * @return bool          False if option was not deleted (eg not found), true otherwise.
      */
     public function delete($name) {
-        $name = trim((string)$name);
+        $name = trim((string) $name);
         if (empty($name)) {
             return false;
         }
@@ -241,7 +241,7 @@ 
         $bind = array('name' => $name);
         $do   = $this->ydb->fetchAffected($sql, $bind);
 
-        if($do !== 1) {
+        if ($do !== 1) {
             // Something went wrong :(
             return false;
         }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 
         $_newvalue = yourls_maybe_serialize($newvalue);
         $table = YOURLS_DB_TABLE_OPTIONS;
-        $sql  = "UPDATE $table SET option_value = :value WHERE option_name = :name";
+        $sql  = "update $table SET option_value = :value WHERE option_name = :name";
         $bind = array('name' => $name, 'value' => $_newvalue);
         $do   = $this->ydb->fetchAffected($sql, $bind);