DakuTree / manga-tracker

application/third_party/Ion-Auth/language/korean/auth_lang.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if(!defined('BASEPATH')) exit('No direct script access allowed');
 /**
 * Name:  Auth Lang - Korean
 *
@@ -135,7 +135,7 @@ 
 $lang['forgot_password_username_identity_label'] = '계정명';
 $lang['forgot_password_email_identity_label']    = '이메일';
 $lang['forgot_password_email_not_found']         = 'No record of that email address.';
-$lang['forgot_password_identity_not_found']         = 'No record of that username address.';
+$lang['forgot_password_identity_not_found'] = 'No record of that username address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = '비밀번호 바꾸기';

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * Name:  Auth Lang - Korean
 *

application/third_party/Ion-Auth/language/italian/ion_auth_lang.php

Spacing +22 added lines, -22 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if(!defined('BASEPATH')) exit('No direct script access allowed');
 /**
 * Name:  Ion Auth Lang - Italian
 *
@@ -15,10 +15,10 @@ 
 */
 
 // Account Creation
-$lang['account_creation_successful'] 	  	 = 'Account creato con successo.';
-$lang['account_creation_unsuccessful'] 	 	 = 'Impossibile creare l\'account.';
-$lang['account_creation_duplicate_email'] 	 = 'Email gi&agrave; in uso o non valida.';
-$lang['account_creation_duplicate_identity'] 	 = 'Nome utente gi&agrave; in uso o non valido.';
+$lang['account_creation_successful'] = 'Account creato con successo.';
+$lang['account_creation_unsuccessful'] = 'Impossibile creare l\'account.';
+$lang['account_creation_duplicate_email'] = 'Email gi&agrave; in uso o non valida.';
+$lang['account_creation_duplicate_identity'] = 'Nome utente gi&agrave; in uso o non valido.';
 
 // TODO Please Translate
 $lang['account_creation_missing_default_group'] = 'Default group is not set';
@@ -27,24 +27,24 @@ 
 
 // Password
 $lang['password_change_successful'] 	 	 = 'Password modificata con successo.';
-$lang['password_change_unsuccessful'] 	  	 = 'Impossibile modificare la password.';
+$lang['password_change_unsuccessful'] = 'Impossibile modificare la password.';
 $lang['forgot_password_successful'] 	 	 = 'Email di reset della password inviata.';
-$lang['forgot_password_unsuccessful'] 	 	 = 'Impossibile resettare la password.';
+$lang['forgot_password_unsuccessful'] = 'Impossibile resettare la password.';
 
 // Activation
-$lang['activate_successful'] 		  	 = 'Account attivato.';
-$lang['activate_unsuccessful'] 		 	 = 'Impossibile attivare l\'account.';
-$lang['deactivate_successful'] 		  	 = 'Account disattivato.';
-$lang['deactivate_unsuccessful'] 	  	 = 'Impossibile disattivare l\'account.';
-$lang['activation_email_successful'] 	  	 = 'Email di attivazione inviata.';
-$lang['activation_email_unsuccessful']   	 = 'Impossibile inviare l\'email di attivazione.';
-$lang['deactivate_current_user_unsuccessful']= 'You cannot De-Activate your self.';
+$lang['activate_successful'] = 'Account attivato.';
+$lang['activate_unsuccessful'] = 'Impossibile attivare l\'account.';
+$lang['deactivate_successful'] = 'Account disattivato.';
+$lang['deactivate_unsuccessful'] = 'Impossibile disattivare l\'account.';
+$lang['activation_email_successful'] = 'Email di attivazione inviata.';
+$lang['activation_email_unsuccessful'] = 'Impossibile inviare l\'email di attivazione.';
+$lang['deactivate_current_user_unsuccessful'] = 'You cannot De-Activate your self.';
 
 // Login / Logout
-$lang['login_successful'] 		  	 = 'Login effettuato con successo.';
-$lang['login_unsuccessful'] 		  	 = 'Login non corretto.';
-$lang['login_unsuccessful_not_active'] 		 = 'Account is inactive';
-$lang['login_timeout']                       = 'Temporarily Locked Out. Try again later.';
+$lang['login_successful'] = 'Login effettuato con successo.';
+$lang['login_unsuccessful'] = 'Login non corretto.';
+$lang['login_unsuccessful_not_active'] = 'Account is inactive';
+$lang['login_timeout'] = 'Temporarily Locked Out. Try again later.';
 $lang['logout_successful'] 		 	 = 'Logout effettuato con successo.';
 
 // Account Changes
@@ -60,20 +60,20 @@ 
 $lang['group_delete_successful']    = 'Group deleted';
 $lang['group_delete_unsuccessful'] 	= 'Unable to delete group';
 $lang['group_delete_notallowed']    = 'Can\'t delete the administrators\' group';
-$lang['group_name_required'] 		= 'Group name is a required field';
+$lang['group_name_required'] = 'Group name is a required field';
 $lang['group_name_admin_not_alter'] = 'Admin group name can not be changed';
 
 // Activation Email
-$lang['email_activation_subject']            = 'Attivazione Account';
+$lang['email_activation_subject'] = 'Attivazione Account';
 $lang['email_activate_heading']    = 'Activate account for %s';
 $lang['email_activate_subheading'] = 'Please click this link to %s.';
 $lang['email_activate_link']       = 'Activate Your Account';
 // Forgot Password Email
-$lang['email_forgotten_password_subject']    = 'Verifica il cambio password dimenticata';
+$lang['email_forgotten_password_subject'] = 'Verifica il cambio password dimenticata';
 $lang['email_forgot_password_heading']    = 'Reset Password for %s';
 $lang['email_forgot_password_subheading'] = 'Please click this link to %s.';
 $lang['email_forgot_password_link']       = 'Reset Your Password';
 // New Password Email
-$lang['email_new_password_subject']          = 'Nuova Password';
+$lang['email_new_password_subject'] = 'Nuova Password';
 $lang['email_new_password_heading']    = 'New Password for %s';
 $lang['email_new_password_subheading'] = 'Your password has been reset to: %s';

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * Name:  Ion Auth Lang - Italian
 *

application/third_party/Ion-Auth/language/italian/auth_lang.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if(!defined('BASEPATH')) exit('No direct script access allowed');
 /**
 * Name:  Auth Lang - Italian
 *
@@ -138,7 +138,7 @@ 
 $lang['forgot_password_username_identity_label'] = 'Username';
 $lang['forgot_password_email_identity_label']    = 'Email';
 $lang['forgot_password_email_not_found']         = 'Indirizzo email non presente nel database.';
-$lang['forgot_password_identity_not_found']         = 'No record of that username address.';
+$lang['forgot_password_identity_not_found'] = 'No record of that username address.';
 
 // Reset Password
 $lang['reset_password_heading']                               = 'Cambia Password';

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
 * Name:  Auth Lang - Italian
 *

application/third_party/Ion-Auth/config/ion_auth.php

Spacing +23 added lines, -23 removed lines

@@ -66,8 +66,8 @@ 
  | salt_prefix: Used for bcrypt. Versions of PHP before 5.3.7 only support "$2a$" as the salt prefix
  | Versions 5.3.7 or greater should use the default of "$2y$".
  */
-$config['hash_method']    = 'bcrypt';	// sha1 or bcrypt, bcrypt is STRONGLY recommended
-$config['default_rounds'] = 8;		// This does not apply if random_rounds is set to true
+$config['hash_method']    = 'bcrypt'; // sha1 or bcrypt, bcrypt is STRONGLY recommended
+$config['default_rounds'] = 8; // This does not apply if random_rounds is set to true
 $config['random_rounds']  = FALSE;
 $config['min_rounds']     = 5;
 $config['max_rounds']     = 9;
@@ -82,24 +82,24 @@ 
  | The controller should check this function and act
  | appropriately. If this variable set to 0, there is no maximum.
  */
-$config['site_title']                 = "Manga Tracker";        // Site Title, example.com
-$config['admin_email']                = "no-reply@trackr.moe";  // Admin Email, admin@example.com //FIXME: This is being used for a lot of things it shouldn't be. We need a diff config option.
-$config['default_group']              = 'members';              // Default group, use name
-$config['admin_group']                = 'admin';                // Default administrators group, use name
-$config['identity']                   = 'email';                // [NOTE: username can be used too] You can use any unique column in your table as identity column. The values in this column, alongside password, will be used for login purposes
-$config['min_password_length']        = 6;                      // Minimum Required Length of Password
-$config['max_password_length']        = 64;                     // Maximum Allowed Length of Password
-$config['email_activation']           = FALSE;                  // Email Activation for registration
-$config['manual_activation']          = FALSE;                  // Manual Activation for registration
-$config['remember_users']             = TRUE;                   // Allow users to be remembered and enable auto-login
+$config['site_title']                 = "Manga Tracker"; // Site Title, example.com
+$config['admin_email']                = "no-reply@trackr.moe"; // Admin Email, admin@example.com //FIXME: This is being used for a lot of things it shouldn't be. We need a diff config option.
+$config['default_group']              = 'members'; // Default group, use name
+$config['admin_group']                = 'admin'; // Default administrators group, use name
+$config['identity']                   = 'email'; // [NOTE: username can be used too] You can use any unique column in your table as identity column. The values in this column, alongside password, will be used for login purposes
+$config['min_password_length']        = 6; // Minimum Required Length of Password
+$config['max_password_length']        = 64; // Maximum Allowed Length of Password
+$config['email_activation']           = FALSE; // Email Activation for registration
+$config['manual_activation']          = FALSE; // Manual Activation for registration
+$config['remember_users']             = TRUE; // Allow users to be remembered and enable auto-login
 $config['user_expire']                = 259200; /*3DAYS*/       // How long to remember the user (seconds). Set to zero for no expiration
-$config['user_extend_on_login']       = TRUE;                   // Extend the users cookies every time they auto-login
-$config['track_login_attempts']       = FALSE;                  // Track the number of failed login attempts for each user or ip. //CHECK: Should this be true?
-$config['track_login_ip_address']     = TRUE;                   // Track login attempts by IP Address, if FALSE will track based on identity. (Default: TRUE)
-$config['maximum_login_attempts']     = 3;                      // The maximum number of failed login attempts.
-$config['lockout_time']               = 600;                    // The number of seconds to lockout an account due to exceeded attempts
+$config['user_extend_on_login']       = TRUE; // Extend the users cookies every time they auto-login
+$config['track_login_attempts']       = FALSE; // Track the number of failed login attempts for each user or ip. //CHECK: Should this be true?
+$config['track_login_ip_address']     = TRUE; // Track login attempts by IP Address, if FALSE will track based on identity. (Default: TRUE)
+$config['maximum_login_attempts']     = 3; // The maximum number of failed login attempts.
+$config['lockout_time']               = 600; // The number of seconds to lockout an account due to exceeded attempts
 $config['forgot_password_expiration'] = 43200000; /*12HR*/      // The number of milliseconds after which a forgot password request will expire. If set to 0, forgot password requests will not expire.
-$config['recheck_timer']              = 0;                      // The number of seconds after which the session is checked again against database to see if the user still exists and is active. Leave 0 if you don't want session recheck. if you really think you need to recheck the session against database, we would recommend a higher value, as this would affect performance.
+$config['recheck_timer']              = 0; // The number of seconds after which the session is checked again against database to see if the user still exists and is active. Leave 0 if you don't want session recheck. if you really think you need to recheck the session against database, we would recommend a higher value, as this would affect performance.
 
 /*
  | -------------------------------------------------------------------------
@@ -176,11 +176,11 @@ 
  | Message Delimiters.
  | -------------------------------------------------------------------------
  */
-$config['delimiters_source']       = 'config'; 	// "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
-$config['message_start_delimiter'] = '<p>'; 	// Message start delimiter
-$config['message_end_delimiter']   = '</p>'; 	// Message end delimiter
-$config['error_start_delimiter']   = '<p>';		// Error message start delimiter
-$config['error_end_delimiter']     = '</p>';	// Error message end delimiter
+$config['delimiters_source']       = 'config'; // "config" = use the settings defined here, "form_validation" = use the settings defined in CI's form validation library
+$config['message_start_delimiter'] = '<p>'; // Message start delimiter
+$config['message_end_delimiter']   = '</p>'; // Message end delimiter
+$config['error_start_delimiter']   = '<p>'; // Error message start delimiter
+$config['error_end_delimiter']     = '</p>'; // Error message end delimiter
 
 /* End of file ion_auth.php */
 /* Location: ./application/config/ion_auth.php */

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

@@ -1,4 +1,4 @@
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 /**
 * Name:  Ion Auth
 *

application/third_party/Ion-Auth/libraries/Bcrypt.php

Indentation +118 added lines, -118 removed lines

@@ -13,84 +13,84 @@ 
    */
   public function __construct($params=array('rounds'=>7, 'salt_prefix'=>'$2y$')) {
 
-    if(CRYPT_BLOWFISH != 1) {
-      throw new Exception("bcrypt not supported in this installation. See http://php.net/crypt");
-    }
+	if(CRYPT_BLOWFISH != 1) {
+	  throw new Exception("bcrypt not supported in this installation. See http://php.net/crypt");
+	}
 
-    $this->rounds = $params['rounds'];
-    $this->salt_prefix = $params['salt_prefix'];
+	$this->rounds = $params['rounds'];
+	$this->salt_prefix = $params['salt_prefix'];
   }
 
   public function hash($input) {
-    $hash = crypt($input, $this->getSalt());
+	$hash = crypt($input, $this->getSalt());
 
-    if(strlen($hash) > 13) {
-      return $hash;
-    }
+	if(strlen($hash) > 13) {
+	  return $hash;
+	}
 
-    return false;
+	return false;
   }
 
   /**
    * @param $input
    * @param $existingHash
    * @return bool
-     */
+   */
   public function verify($input, $existingHash) {
-    $hash = crypt($input, $existingHash);
-    return $this->hashEquals($existingHash, $hash);
+	$hash = crypt($input, $existingHash);
+	return $this->hashEquals($existingHash, $hash);
   }
   
    /**
-   * Polyfill for hash_equals()
-   * Code mainly taken from hash_equals() compat function of CodeIgniter 3
-   *
-   * @param  string  $known_string
-   * @param  string  $user_string
-   * @return  bool
-   */
+    * Polyfill for hash_equals()
+    * Code mainly taken from hash_equals() compat function of CodeIgniter 3
+    *
+    * @param  string  $known_string
+    * @param  string  $user_string
+    * @return  bool
+    */
   private function hashEquals($known_string, $user_string)
   {
-    // For CI3 or PHP >= 5.6
-    if (function_exists('hash_equals')) 
-    {
-      return hash_equals($known_string, $user_string);
-    }
+	// For CI3 or PHP >= 5.6
+	if (function_exists('hash_equals')) 
+	{
+	  return hash_equals($known_string, $user_string);
+	}
     
-    // For CI2 with PHP < 5.6
-    // Code from CI3 https://github.com/bcit-ci/CodeIgniter/blob/develop/system/core/compat/hash.php
-    if ( ! is_string($known_string))
-    {
-      trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
-      return FALSE;
-    }
-    elseif ( ! is_string($user_string))
-    {
-      trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
-      return FALSE;
-    }
-    elseif (($length = strlen($known_string)) !== strlen($user_string))
-    {
-      return FALSE;
-    }
-
-    $diff = 0;
-    for ($i = 0; $i < $length; $i++)
-    {
-      $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
-    }
-
-    return ($diff === 0);
+	// For CI2 with PHP < 5.6
+	// Code from CI3 https://github.com/bcit-ci/CodeIgniter/blob/develop/system/core/compat/hash.php
+	if ( ! is_string($known_string))
+	{
+	  trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
+	  return FALSE;
+	}
+	elseif ( ! is_string($user_string))
+	{
+	  trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
+	  return FALSE;
+	}
+	elseif (($length = strlen($known_string)) !== strlen($user_string))
+	{
+	  return FALSE;
+	}
+
+	$diff = 0;
+	for ($i = 0; $i < $length; $i++)
+	{
+	  $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
+	}
+
+	return ($diff === 0);
   }
 
   private function getSalt() {
-    $salt = sprintf($this->salt_prefix.'%02d$', $this->rounds);
+	$salt = sprintf($this->salt_prefix.'%02d$', $this->rounds);
 
-    $bytes = $this->getRandomBytes(16);
+	$bytes = $this->getRandomBytes(16);
 
-    $salt .= $this->encodeBytes($bytes);
+	$salt .= $this->encodeBytes($bytes);
 
-    return $salt;
+	return $salt;
   }
 
   private $randomState;
@@ -99,78 +99,78 @@ 
   /**
    * @param $count
    * @return string
-     */
+   */
   private function getRandomBytes($count) {
-    $bytes = '';
-
-    if(function_exists('openssl_random_pseudo_bytes') &&
-        (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) { // OpenSSL slow on Win
-      $bytes = openssl_random_pseudo_bytes($count);
-    }
-
-    if($bytes === '' && @is_readable('/dev/urandom') &&
-       ($hRand = @fopen('/dev/urandom', 'rb')) !== FALSE) {
-      $bytes = fread($hRand, $count);
-      fclose($hRand);
-    }
-
-    if(strlen($bytes) < $count) {
-      $bytes = '';
-
-      if($this->randomState === null) {
-        $this->randomState = microtime();
-        if(function_exists('getmypid')) {
-          $this->randomState .= getmypid();
-        }
-      }
-
-      for($i = 0; $i < $count; $i += 16) {
-        $this->randomState = md5(microtime() . $this->randomState);
-
-        if (PHP_VERSION >= '5') {
-          $bytes .= md5($this->randomState, true);
-        } else {
-          $bytes .= pack('H*', md5($this->randomState));
-        }
-      }
-
-      $bytes = substr($bytes, 0, $count);
-    }
-
-    return $bytes;
+	$bytes = '';
+
+	if(function_exists('openssl_random_pseudo_bytes') &&
+		(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) { // OpenSSL slow on Win
+	  $bytes = openssl_random_pseudo_bytes($count);
+	}
+
+	if($bytes === '' && @is_readable('/dev/urandom') &&
+	   ($hRand = @fopen('/dev/urandom', 'rb')) !== FALSE) {
+	  $bytes = fread($hRand, $count);
+	  fclose($hRand);
+	}
+
+	if(strlen($bytes) < $count) {
+	  $bytes = '';
+
+	  if($this->randomState === null) {
+		$this->randomState = microtime();
+		if(function_exists('getmypid')) {
+		  $this->randomState .= getmypid();
+		}
+	  }
+
+	  for($i = 0; $i < $count; $i += 16) {
+		$this->randomState = md5(microtime() . $this->randomState);
+
+		if (PHP_VERSION >= '5') {
+		  $bytes .= md5($this->randomState, true);
+		} else {
+		  $bytes .= pack('H*', md5($this->randomState));
+		}
+	  }
+
+	  $bytes = substr($bytes, 0, $count);
+	}
+
+	return $bytes;
   }
 
   /**
    * @param $input
    * @return string
-     */
+   */
   private function encodeBytes($input) {
-    // The following is code from the PHP Password Hashing Framework
-    $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-    $output = '';
-    $i = 0;
-    do {
-      $c1 = ord($input[$i++]);
-      $output .= $itoa64[$c1 >> 2];
-      $c1 = ($c1 & 0x03) << 4;
-      if ($i >= 16) {
-        $output .= $itoa64[$c1];
-        break;
-      }
-
-      $c2 = ord($input[$i++]);
-      $c1 |= $c2 >> 4;
-      $output .= $itoa64[$c1];
-      $c1 = ($c2 & 0x0f) << 2;
-
-      $c2 = ord($input[$i++]);
-      $c1 |= $c2 >> 6;
-      $output .= $itoa64[$c1];
-      $output .= $itoa64[$c2 & 0x3f];
-    } while (1);
-
-    return $output;
+	// The following is code from the PHP Password Hashing Framework
+	$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+	$output = '';
+	$i = 0;
+	do {
+	  $c1 = ord($input[$i++]);
+	  $output .= $itoa64[$c1 >> 2];
+	  $c1 = ($c1 & 0x03) << 4;
+	  if ($i >= 16) {
+		$output .= $itoa64[$c1];
+		break;
+	  }
+
+	  $c2 = ord($input[$i++]);
+	  $c1 |= $c2 >> 4;
+	  $output .= $itoa64[$c1];
+	  $c1 = ($c2 & 0x0f) << 2;
+
+	  $c2 = ord($input[$i++]);
+	  $c1 |= $c2 >> 6;
+	  $output .= $itoa64[$c1];
+	  $output .= $itoa64[$c2 & 0x3f];
+	} while (1);
+
+	return $output;
   }
 }
 

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
 
 
 class Bcrypt {
@@ -11,7 +11,7 @@ 
    * @param array $params
    * @throws Exception
    */
-  public function __construct($params=array('rounds'=>7, 'salt_prefix'=>'$2y$')) {
+  public function __construct($params = array('rounds'=>7, 'salt_prefix'=>'$2y$')) {
 
     if(CRYPT_BLOWFISH != 1) {
       throw new Exception("bcrypt not supported in this installation. See http://php.net/crypt");
@@ -52,30 +52,30 @@ 
   private function hashEquals($known_string, $user_string)
   {
     // For CI3 or PHP >= 5.6
-    if (function_exists('hash_equals')) 
+    if(function_exists('hash_equals')) 
     {
       return hash_equals($known_string, $user_string);
     }
     
     // For CI2 with PHP < 5.6
     // Code from CI3 https://github.com/bcit-ci/CodeIgniter/blob/develop/system/core/compat/hash.php
-    if ( ! is_string($known_string))
+    if(!is_string($known_string))
     {
       trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
       return FALSE;
     }
-    elseif ( ! is_string($user_string))
+    elseif(!is_string($user_string))
     {
       trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
       return FALSE;
     }
-    elseif (($length = strlen($known_string)) !== strlen($user_string))
+    elseif(($length = strlen($known_string)) !== strlen($user_string))
     {
       return FALSE;
     }
 
     $diff = 0;
-    for ($i = 0; $i < $length; $i++)
+    for($i = 0; $i < $length; $i++)
     {
       $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
     }
@@ -125,9 +125,9 @@ 
       }
 
       for($i = 0; $i < $count; $i += 16) {
-        $this->randomState = md5(microtime() . $this->randomState);
+        $this->randomState = md5(microtime().$this->randomState);
 
-        if (PHP_VERSION >= '5') {
+        if(PHP_VERSION >= '5') {
           $bytes .= md5($this->randomState, true);
         } else {
           $bytes .= pack('H*', md5($this->randomState));
@@ -154,7 +154,7 @@ 
       $c1 = ord($input[$i++]);
       $output .= $itoa64[$c1 >> 2];
       $c1 = ($c1 & 0x03) << 4;
-      if ($i >= 16) {
+      if($i >= 16) {
         $output .= $itoa64[$c1];
         break;
       }
@@ -168,7 +168,7 @@ 
       $c1 |= $c2 >> 6;
       $output .= $itoa64[$c1];
       $output .= $itoa64[$c2 & 0x3f];
-    } while (1);
+    } while(1);
 
     return $output;
   }

Braces +11 added lines, -16 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 
 class Bcrypt {
@@ -49,34 +51,26 @@ 
    * @param  string  $user_string
    * @return  bool
    */
-  private function hashEquals($known_string, $user_string)
-  {
+  private function hashEquals($known_string, $user_string) {
     // For CI3 or PHP >= 5.6
-    if (function_exists('hash_equals')) 
-    {
+    if (function_exists('hash_equals')) {
       return hash_equals($known_string, $user_string);
     }
     
     // For CI2 with PHP < 5.6
     // Code from CI3 https://github.com/bcit-ci/CodeIgniter/blob/develop/system/core/compat/hash.php
-    if ( ! is_string($known_string))
-    {
+    if ( ! is_string($known_string)) {
       trigger_error('hash_equals(): Expected known_string to be a string, '.strtolower(gettype($known_string)).' given', E_USER_WARNING);
       return FALSE;
-    }
-    elseif ( ! is_string($user_string))
-    {
+    } elseif ( ! is_string($user_string)) {
       trigger_error('hash_equals(): Expected user_string to be a string, '.strtolower(gettype($user_string)).' given', E_USER_WARNING);
       return FALSE;
-    }
-    elseif (($length = strlen($known_string)) !== strlen($user_string))
-    {
+    } elseif (($length = strlen($known_string)) !== strlen($user_string)) {
       return FALSE;
     }
 
     $diff = 0;
-    for ($i = 0; $i < $length; $i++)
-    {
+    for ($i = 0; $i < $length; $i++) {
       $diff |= ord($known_string[$i]) ^ ord($user_string[$i]);
     }
 
@@ -104,7 +98,8 @@ 
     $bytes = '';
 
     if(function_exists('openssl_random_pseudo_bytes') &&
-        (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) { // OpenSSL slow on Win
+        (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
+// OpenSSL slow on Win
       $bytes = openssl_random_pseudo_bytes($count);
     }
 

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

@@ -28,7 +28,7 @@ 
       return $hash;
     }
 
-    return false;
+    return FALSE;
   }
 
   /**
@@ -117,7 +117,7 @@ 
     if(strlen($bytes) < $count) {
       $bytes = '';
 
-      if($this->randomState === null) {
+      if($this->randomState === NULL) {
         $this->randomState = microtime();
         if(function_exists('getmypid')) {
           $this->randomState .= getmypid();
@@ -128,7 +128,7 @@ 
         $this->randomState = md5(microtime() . $this->randomState);
 
         if (PHP_VERSION >= '5') {
-          $bytes .= md5($this->randomState, true);
+          $bytes .= md5($this->randomState, TRUE);
         } else {
           $bytes .= pack('H*', md5($this->randomState));
         }

application/third_party/asset-helper/helpers/asset_helper.php

Spacing +77 added lines, -77 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if(!defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * Sekati CodeIgniter Asset Helper
@@ -51,11 +51,11 @@ 
  * @return  string
  */
 
-if (!function_exists('asset_url')) {
+if(!function_exists('asset_url')) {
 	function asset_url()
 	{
 		//get an instance of CI so we can access our configuration
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		//return the full asset path
 		return $CI->config->slash_item('static_url')/* . $CI->config->item('asset_path')*/;
@@ -68,12 +68,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('css_url')) {
+if(!function_exists('css_url')) {
 	function css_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return $CI->config->slash_item('static_url') . $CI->config->item('css_path');
+		return $CI->config->slash_item('static_url').$CI->config->item('css_path');
 	}
 }
 
@@ -83,12 +83,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('less_url')) {
+if(!function_exists('less_url')) {
 	function less_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return $CI->config->slash_item('static_url') . $CI->config->item('less_path');
+		return $CI->config->slash_item('static_url').$CI->config->item('less_path');
 	}
 }
 
@@ -98,12 +98,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('js_url')) {
+if(!function_exists('js_url')) {
 	function js_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return $CI->config->slash_item('static_url') . $CI->config->item('js_path');
+		return $CI->config->slash_item('static_url').$CI->config->item('js_path');
 	}
 }
 
@@ -113,12 +113,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('img_url')) {
+if(!function_exists('img_url')) {
 	function img_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return $CI->config->slash_item('static_url') . $CI->config->item('img_path');
+		return $CI->config->slash_item('static_url').$CI->config->item('img_path');
 	}
 }
 
@@ -128,12 +128,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('swf_url')) {
+if(!function_exists('swf_url')) {
 	function swf_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return $CI->config->slash_item('static_url') . $CI->config->item('swf_path');
+		return $CI->config->slash_item('static_url').$CI->config->item('swf_path');
 	}
 }
 
@@ -143,12 +143,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('upload_url')) {
+if(!function_exists('upload_url')) {
 	function upload_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return base_url() . $CI->config->item('upload_path');
+		return base_url().$CI->config->item('upload_path');
 	}
 }
 
@@ -158,12 +158,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('download_url')) {
+if(!function_exists('download_url')) {
 	function download_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return base_url() . $CI->config->item('download_path');
+		return base_url().$CI->config->item('download_path');
 	}
 }
 
@@ -173,12 +173,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('xml_url')) {
+if(!function_exists('xml_url')) {
 	function xml_url()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return base_url() . $CI->config->item('xml_path');
+		return base_url().$CI->config->item('xml_path');
 	}
 }
 
@@ -192,13 +192,13 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('asset_path')) {
+if(!function_exists('asset_path')) {
 	function asset_path()
 	{
 		//get an instance of CI so we can access our configuration
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('asset_path');
+		return FCPATH.$CI->config->item('asset_path');
 	}
 }
 
@@ -208,13 +208,13 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('css_path')) {
+if(!function_exists('css_path')) {
 	function css_path()
 	{
 		//get an instance of CI so we can access our configuration
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('css_path');
+		return FCPATH.$CI->config->item('css_path');
 	}
 }
 
@@ -224,13 +224,13 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('less_path')) {
+if(!function_exists('less_path')) {
 	function less_path()
 	{
 		//get an instance of CI so we can access our configuration
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('less_path');
+		return FCPATH.$CI->config->item('less_path');
 	}
 }
 
@@ -240,13 +240,13 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('js_path')) {
+if(!function_exists('js_path')) {
 	function js_path()
 	{
 		//get an instance of CI so we can access our configuration
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('js_path');
+		return FCPATH.$CI->config->item('js_path');
 	}
 }
 
@@ -256,13 +256,13 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('img_path')) {
+if(!function_exists('img_path')) {
 	function img_path()
 	{
 		//get an instance of CI so we can access our configuration
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('img_path');
+		return FCPATH.$CI->config->item('img_path');
 	}
 }
 
@@ -272,12 +272,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('swf_path')) {
+if(!function_exists('swf_path')) {
 	function swf_path()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('swf_path');
+		return FCPATH.$CI->config->item('swf_path');
 	}
 }
 
@@ -287,12 +287,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('xml_path')) {
+if(!function_exists('xml_path')) {
 	function xml_path()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('xml_path');
+		return FCPATH.$CI->config->item('xml_path');
 	}
 }
 
@@ -302,12 +302,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('upload_path')) {
+if(!function_exists('upload_path')) {
 	function upload_path()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('upload_path');
+		return FCPATH.$CI->config->item('upload_path');
 	}
 }
 
@@ -317,12 +317,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('upload_path_relative')) {
+if(!function_exists('upload_path_relative')) {
 	function upload_path_relative()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return './' . $CI->config->item('upload_path');
+		return './'.$CI->config->item('upload_path');
 	}
 }
 
@@ -332,12 +332,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('download_path')) {
+if(!function_exists('download_path')) {
 	function download_path()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return FCPATH . $CI->config->item('download_path');
+		return FCPATH.$CI->config->item('download_path');
 	}
 }
 
@@ -347,12 +347,12 @@ 
  * @access  public
  * @return  string
  */
-if (!function_exists('download_path_relative')) {
+if(!function_exists('download_path_relative')) {
 	function download_path_relative()
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
-		return './' . $CI->config->item('download_path');
+		return './'.$CI->config->item('download_path');
 	}
 }
 
@@ -369,10 +369,10 @@ 
  *
  * @return  string
  */
-if (!function_exists('css')) {
+if(!function_exists('css')) {
 	function css($file, $media = 'all')
 	{
-		return '<link rel="stylesheet" type="text/css" href="' . css_url() . $file . '" media="' . $media . '">' . "\n";
+		return '<link rel="stylesheet" type="text/css" href="'.css_url().$file.'" media="'.$media.'">'."\n";
 	}
 }
 
@@ -385,10 +385,10 @@ 
  *
  * @return  string
  */
-if (!function_exists('less')) {
+if(!function_exists('less')) {
 	function less($file)
 	{
-		return '<link rel="stylesheet/less" type="text/css" href="' . less_url() . $file . '">' . "\n";
+		return '<link rel="stylesheet/less" type="text/css" href="'.less_url().$file.'">'."\n";
 	}
 }
 
@@ -402,14 +402,14 @@ 
  *
  * @return  string
  */
-if (!function_exists('js')) {
+if(!function_exists('js')) {
 	function js($file, $atts = array())
 	{
-		$element = '<script type="text/javascript" src="' . js_url() . $file . '"';
+		$element = '<script type="text/javascript" src="'.js_url().$file.'"';
 
-		foreach ($atts as $key => $val)
-			$element .= ' ' . $key . '="' . $val . '"';
-		$element .= '></script>' . "\n";
+		foreach($atts as $key => $val)
+			$element .= ' '.$key.'="'.$val.'"';
+		$element .= '></script>'."\n";
 
 		return $element;
 	}
@@ -425,12 +425,12 @@ 
  *
  * @return  string
  */
-if (!function_exists('img')) {
+if(!function_exists('img')) {
 	function img($file, $atts = array())
 	{
-		$url = '<img src="' . img_url() . $file . '"';
-		foreach ($atts as $key => $val)
-			$url .= ' ' . $key . '="' . $val . '"';
+		$url = '<img src="'.img_url().$file.'"';
+		foreach($atts as $key => $val)
+			$url .= ' '.$key.'="'.$val.'"';
 		$url .= " />\n";
 
 		return $url;
@@ -446,12 +446,12 @@ 
  *
  * @return  string
  */
-if (!function_exists('jquery')) {
+if(!function_exists('jquery')) {
 	function jquery($version = '')
 	{
 		// Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline
-		$out = '<script src="//ajax.googleapis.com/ajax/libs/jquery/' . $version . '/jquery.min.js"></script>' . "\n";
-		$out .= '<script>window.jQuery || document.write(\'<script src="' . js_url() . 'jquery-' . $version . '.min.js"><\/script>\')</script>' . "\n";
+		$out = '<script src="//ajax.googleapis.com/ajax/libs/jquery/'.$version.'/jquery.min.js"></script>'."\n";
+		$out .= '<script>window.jQuery || document.write(\'<script src="'.js_url().'jquery-'.$version.'.min.js"><\/script>\')</script>'."\n";
 
 		return $out;
 	}
@@ -466,7 +466,7 @@ 
  *
  * @return  string
  */
-if (!function_exists('google_analytics')) {
+if(!function_exists('google_analytics')) {
 	function google_analytics($ua = '')
 	{
 		// Change UA-XXXXX-X to be your site's ID

Braces +35 added lines, -57 removed lines

@@ -1,4 +1,6 @@ 
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Sekati CodeIgniter Asset Helper
@@ -52,8 +54,7 @@ 
  */
 
 if (!function_exists('asset_url')) {
-	function asset_url()
-	{
+	function asset_url() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -69,8 +70,7 @@ 
  * @return  string
  */
 if (!function_exists('css_url')) {
-	function css_url()
-	{
+	function css_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('css_path');
@@ -84,8 +84,7 @@ 
  * @return  string
  */
 if (!function_exists('less_url')) {
-	function less_url()
-	{
+	function less_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('less_path');
@@ -99,8 +98,7 @@ 
  * @return  string
  */
 if (!function_exists('js_url')) {
-	function js_url()
-	{
+	function js_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('js_path');
@@ -114,8 +112,7 @@ 
  * @return  string
  */
 if (!function_exists('img_url')) {
-	function img_url()
-	{
+	function img_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('img_path');
@@ -129,8 +126,7 @@ 
  * @return  string
  */
 if (!function_exists('swf_url')) {
-	function swf_url()
-	{
+	function swf_url() {
 		$CI =& get_instance();
 
 		return $CI->config->slash_item('static_url') . $CI->config->item('swf_path');
@@ -144,8 +140,7 @@ 
  * @return  string
  */
 if (!function_exists('upload_url')) {
-	function upload_url()
-	{
+	function upload_url() {
 		$CI =& get_instance();
 
 		return base_url() . $CI->config->item('upload_path');
@@ -159,8 +154,7 @@ 
  * @return  string
  */
 if (!function_exists('download_url')) {
-	function download_url()
-	{
+	function download_url() {
 		$CI =& get_instance();
 
 		return base_url() . $CI->config->item('download_path');
@@ -174,8 +168,7 @@ 
  * @return  string
  */
 if (!function_exists('xml_url')) {
-	function xml_url()
-	{
+	function xml_url() {
 		$CI =& get_instance();
 
 		return base_url() . $CI->config->item('xml_path');
@@ -193,8 +186,7 @@ 
  * @return  string
  */
 if (!function_exists('asset_path')) {
-	function asset_path()
-	{
+	function asset_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -209,8 +201,7 @@ 
  * @return  string
  */
 if (!function_exists('css_path')) {
-	function css_path()
-	{
+	function css_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -225,8 +216,7 @@ 
  * @return  string
  */
 if (!function_exists('less_path')) {
-	function less_path()
-	{
+	function less_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -241,8 +231,7 @@ 
  * @return  string
  */
 if (!function_exists('js_path')) {
-	function js_path()
-	{
+	function js_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -257,8 +246,7 @@ 
  * @return  string
  */
 if (!function_exists('img_path')) {
-	function img_path()
-	{
+	function img_path() {
 		//get an instance of CI so we can access our configuration
 		$CI =& get_instance();
 
@@ -273,8 +261,7 @@ 
  * @return  string
  */
 if (!function_exists('swf_path')) {
-	function swf_path()
-	{
+	function swf_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('swf_path');
@@ -288,8 +275,7 @@ 
  * @return  string
  */
 if (!function_exists('xml_path')) {
-	function xml_path()
-	{
+	function xml_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('xml_path');
@@ -303,8 +289,7 @@ 
  * @return  string
  */
 if (!function_exists('upload_path')) {
-	function upload_path()
-	{
+	function upload_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('upload_path');
@@ -318,8 +303,7 @@ 
  * @return  string
  */
 if (!function_exists('upload_path_relative')) {
-	function upload_path_relative()
-	{
+	function upload_path_relative() {
 		$CI =& get_instance();
 
 		return './' . $CI->config->item('upload_path');
@@ -333,8 +317,7 @@ 
  * @return  string
  */
 if (!function_exists('download_path')) {
-	function download_path()
-	{
+	function download_path() {
 		$CI =& get_instance();
 
 		return FCPATH . $CI->config->item('download_path');
@@ -348,8 +331,7 @@ 
  * @return  string
  */
 if (!function_exists('download_path_relative')) {
-	function download_path_relative()
-	{
+	function download_path_relative() {
 		$CI =& get_instance();
 
 		return './' . $CI->config->item('download_path');
@@ -370,8 +352,7 @@ 
  * @return  string
  */
 if (!function_exists('css')) {
-	function css($file, $media = 'all')
-	{
+	function css($file, $media = 'all') {
 		return '<link rel="stylesheet" type="text/css" href="' . css_url() . $file . '" media="' . $media . '">' . "\n";
 	}
 }
@@ -386,8 +367,7 @@ 
  * @return  string
  */
 if (!function_exists('less')) {
-	function less($file)
-	{
+	function less($file) {
 		return '<link rel="stylesheet/less" type="text/css" href="' . less_url() . $file . '">' . "\n";
 	}
 }
@@ -403,12 +383,12 @@ 
  * @return  string
  */
 if (!function_exists('js')) {
-	function js($file, $atts = array())
-	{
+	function js($file, $atts = array()) {
 		$element = '<script type="text/javascript" src="' . js_url() . $file . '"';
 
-		foreach ($atts as $key => $val)
-			$element .= ' ' . $key . '="' . $val . '"';
+		foreach ($atts as $key => $val) {
+					$element .= ' ' . $key . '="' . $val . '"';
+		}
 		$element .= '></script>' . "\n";
 
 		return $element;
@@ -426,11 +406,11 @@ 
  * @return  string
  */
 if (!function_exists('img')) {
-	function img($file, $atts = array())
-	{
+	function img($file, $atts = array()) {
 		$url = '<img src="' . img_url() . $file . '"';
-		foreach ($atts as $key => $val)
-			$url .= ' ' . $key . '="' . $val . '"';
+		foreach ($atts as $key => $val) {
+					$url .= ' ' . $key . '="' . $val . '"';
+		}
 		$url .= " />\n";
 
 		return $url;
@@ -447,8 +427,7 @@ 
  * @return  string
  */
 if (!function_exists('jquery')) {
-	function jquery($version = '')
-	{
+	function jquery($version = '') {
 		// Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline
 		$out = '<script src="//ajax.googleapis.com/ajax/libs/jquery/' . $version . '/jquery.min.js"></script>' . "\n";
 		$out .= '<script>window.jQuery || document.write(\'<script src="' . js_url() . 'jquery-' . $version . '.min.js"><\/script>\')</script>' . "\n";
@@ -467,8 +446,7 @@ 
  * @return  string
  */
 if (!function_exists('google_analytics')) {
-	function google_analytics($ua = '')
-	{
+	function google_analytics($ua = '') {
 		// Change UA-XXXXX-X to be your site's ID
 		$out = "<!-- Google Webmaster Tools & Analytics -->\n";
 		$out .= '<script type="text/javascript">';

application/third_party/Gravatar/config/gravatar.php

Spacing +2 added lines, -2 removed lines

@@ -11,14 +11,14 @@
 
 $config['gravatar_base_url']        = 'http://www.gravatar.com/';
 $config['gravatar_secure_base_url'] = 'https://secure.gravatar.com/';
-$config['gravatar_image_extension'] = '.png';   // '', '.png' or '.jpg'.
+$config['gravatar_image_extension'] = '.png'; // '', '.png' or '.jpg'.
 $config['gravatar_image_size']      = 44;
 
 $config['gravatar_default_image'] = 'identicon'; // '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
 //$config['gravatar_default_image'] = BASE_URL.'assets/img/lib/default-person.png'; // Another possible option: a custon image.
 
 $config['gravatar_force_default_image'] = false;
-$config['gravatar_rating']              = '';  // '', 'g' (default), 'pg', 'r', 'x'.
+$config['gravatar_rating']              = ''; // '', 'g' (default), 'pg', 'r', 'x'.
 
 // Useragent string for server-made requests.
 // It is for not getting 403 forbidden response.

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

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * Gravatar Library for CodeIgniter - Configuration
@@ -17,7 +17,7 @@ 
 $config['gravatar_default_image'] = 'identicon'; // '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
 //$config['gravatar_default_image'] = BASE_URL.'assets/img/lib/default-person.png'; // Another possible option: a custon image.
 
-$config['gravatar_force_default_image'] = false;
+$config['gravatar_force_default_image'] = FALSE;
 $config['gravatar_rating']              = '';  // '', 'g' (default), 'pg', 'r', 'x'.
 
 // Useragent string for server-made requests.

application/third_party/Gravatar/libraries/Gravatar.php

Indentation +425 added lines, -425 removed lines

@@ -23,487 +23,487 @@
 
 class Gravatar {
 
-    protected $defaults;
-
-    protected $gravatar_base_url;
-    protected $gravatar_secure_base_url;
-    protected $gravatar_image_extension;
-    protected $gravatar_image_size;
-    protected $gravatar_default_image;
-    protected $gravatar_force_default_image;
-    protected $gravatar_rating ;
-    protected $gravatar_useragent;
+	protected $defaults;
+
+	protected $gravatar_base_url;
+	protected $gravatar_secure_base_url;
+	protected $gravatar_image_extension;
+	protected $gravatar_image_size;
+	protected $gravatar_default_image;
+	protected $gravatar_force_default_image;
+	protected $gravatar_rating ;
+	protected $gravatar_useragent;
 
-    protected $last_error = GRAVATAR_NO_ERROR;
-
-    protected $is_https;
-    protected $curl_exists;
-    protected $allow_url_fopen;
-
-    public function __construct($config = array()) {
-
-        $this->defaults = array(
-            'gravatar_base_url' => 'http://www.gravatar.com/',
-            'gravatar_secure_base_url' => 'https://secure.gravatar.com/',
-            'gravatar_image_extension' => '.png',
-            'gravatar_image_size' => 80,
-            'gravatar_default_image' => '',
-            'gravatar_force_default_image' => false,
-            'gravatar_rating' => '',
-            'gravatar_useragent' => 'PHP Gravatar Library',
-        );
-
-        $this->is_https = $this->is_https();
-        $this->curl_exists = function_exists('curl_init');
-        $allow_url_fopen = @ini_get('allow_url_fopen');
-        $allow_url_fopen = $allow_url_fopen === false || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
-        $this->allow_url_fopen = $allow_url_fopen;
-
-        if (!is_array($config)) {
-            $config = array();
-        }
-
-        $this->defaults = array_merge($this->defaults, $config);
-        $this->initialize($this->defaults);
-    }
-
-    public function initialize($config = array()) {
-
-        if (!is_array($config)) {
-            $config = array();
-        }
-
-        foreach ($config as $key => $value) {
-            $this->{$key} = $value;
-        }
-
-        $this->gravatar_base_url = (string) $this->gravatar_base_url;
-        $this->gravatar_secure_base_url = (string) $this->gravatar_secure_base_url;
-        $this->gravatar_image_extension = (string) $this->gravatar_image_extension;
-
-        $this->gravatar_image_size = (int) $this->gravatar_image_size;
-
-        if ($this->gravatar_image_size <= 0) {
-            $this->gravatar_image_size = 80;
-        }
-
-        $this->gravatar_default_image = (string) $this->gravatar_default_image;
-        $this->gravatar_force_default_image = !empty($this->gravatar_force_default_image);
-        $this->gravatar_rating = (string) $this->gravatar_rating;
-        $this->gravatar_useragent = (string) $this->gravatar_useragent;
-
-        return $this;
-    }
-
-    public function reset() {
-
-        $this->initialize($this->defaults);
-
-        return $this;
-    }
-
-    public function get_defaults() {
-
-        return $this->defaults;
-    }
-
-    /**
-     * Creates a URL for requesting a Gravatar image.
-     * @link http://en.gravatar.com/site/implement/images/
-     *
-     * @param   string      $email                  A registered email.
-     * @param   int         $size                   The requested size of the avarar in pixels (a square image).
-     * @param   string      $default_image          The fallback image option: '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
-     * @param   bool        $force_default_image    Enforces the fallback image to be shown.
-     * @param   string      $rating                 The level of allowed self-rate of the avatar: '', 'g' (default), 'pg', 'r', 'x'.
-     * @return  string                              Returns the URL of the avatar to be requested.
-     *
-     * When optional parameters are not set, their default values are taken
-     * from the configuration file application/config/gravatar.php
-     */
-    public function get($email, $size = null, $default_image = null, $force_default_image = null, $rating = null) {
-
-        $url = ($this->is_https ? $this->gravatar_secure_base_url : $this->gravatar_base_url).'avatar/'.$this->create_hash($email).$this->gravatar_image_extension;
-
-        $query = array();
-
-        $size = (int) $size;
+	protected $last_error = GRAVATAR_NO_ERROR;
+
+	protected $is_https;
+	protected $curl_exists;
+	protected $allow_url_fopen;
+
+	public function __construct($config = array()) {
+
+		$this->defaults = array(
+			'gravatar_base_url' => 'http://www.gravatar.com/',
+			'gravatar_secure_base_url' => 'https://secure.gravatar.com/',
+			'gravatar_image_extension' => '.png',
+			'gravatar_image_size' => 80,
+			'gravatar_default_image' => '',
+			'gravatar_force_default_image' => false,
+			'gravatar_rating' => '',
+			'gravatar_useragent' => 'PHP Gravatar Library',
+		);
+
+		$this->is_https = $this->is_https();
+		$this->curl_exists = function_exists('curl_init');
+		$allow_url_fopen = @ini_get('allow_url_fopen');
+		$allow_url_fopen = $allow_url_fopen === false || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
+		$this->allow_url_fopen = $allow_url_fopen;
+
+		if (!is_array($config)) {
+			$config = array();
+		}
+
+		$this->defaults = array_merge($this->defaults, $config);
+		$this->initialize($this->defaults);
+	}
+
+	public function initialize($config = array()) {
+
+		if (!is_array($config)) {
+			$config = array();
+		}
+
+		foreach ($config as $key => $value) {
+			$this->{$key} = $value;
+		}
+
+		$this->gravatar_base_url = (string) $this->gravatar_base_url;
+		$this->gravatar_secure_base_url = (string) $this->gravatar_secure_base_url;
+		$this->gravatar_image_extension = (string) $this->gravatar_image_extension;
+
+		$this->gravatar_image_size = (int) $this->gravatar_image_size;
+
+		if ($this->gravatar_image_size <= 0) {
+			$this->gravatar_image_size = 80;
+		}
+
+		$this->gravatar_default_image = (string) $this->gravatar_default_image;
+		$this->gravatar_force_default_image = !empty($this->gravatar_force_default_image);
+		$this->gravatar_rating = (string) $this->gravatar_rating;
+		$this->gravatar_useragent = (string) $this->gravatar_useragent;
+
+		return $this;
+	}
+
+	public function reset() {
+
+		$this->initialize($this->defaults);
+
+		return $this;
+	}
+
+	public function get_defaults() {
+
+		return $this->defaults;
+	}
+
+	/**
+	 * Creates a URL for requesting a Gravatar image.
+	 * @link http://en.gravatar.com/site/implement/images/
+	 *
+	 * @param   string      $email                  A registered email.
+	 * @param   int         $size                   The requested size of the avarar in pixels (a square image).
+	 * @param   string      $default_image          The fallback image option: '', '404', 'mm', 'identicon', 'monsterid', 'wavatar', 'retro', 'blank'.
+	 * @param   bool        $force_default_image    Enforces the fallback image to be shown.
+	 * @param   string      $rating                 The level of allowed self-rate of the avatar: '', 'g' (default), 'pg', 'r', 'x'.
+	 * @return  string                              Returns the URL of the avatar to be requested.
+	 *
+	 * When optional parameters are not set, their default values are taken
+	 * from the configuration file application/config/gravatar.php
+	 */
+	public function get($email, $size = null, $default_image = null, $force_default_image = null, $rating = null) {
+
+		$url = ($this->is_https ? $this->gravatar_secure_base_url : $this->gravatar_base_url).'avatar/'.$this->create_hash($email).$this->gravatar_image_extension;
+
+		$query = array();
+
+		$size = (int) $size;
 
-        if ($size <= 0) {
-            $size = $this->gravatar_image_size;
-        }
+		if ($size <= 0) {
+			$size = $this->gravatar_image_size;
+		}
 
-        if ($size > 0) {
-            $query['s'] = $size;
-        }
+		if ($size > 0) {
+			$query['s'] = $size;
+		}
 
-        if (isset($default_image)) {
-            $default_image = (string) $default_image;
-        } else {
-            $default_image = $this->gravatar_default_image;
-        }
+		if (isset($default_image)) {
+			$default_image = (string) $default_image;
+		} else {
+			$default_image = $this->gravatar_default_image;
+		}
 
-        if ($default_image != '') {
-            $query['d'] = $default_image;
-        }
+		if ($default_image != '') {
+			$query['d'] = $default_image;
+		}
 
-        if (isset($force_default_image)) {
-            $force_default_image = !empty($force_default_image);
-        } else {
-            $force_default_image = $this->gravatar_force_default_image;
-        }
+		if (isset($force_default_image)) {
+			$force_default_image = !empty($force_default_image);
+		} else {
+			$force_default_image = $this->gravatar_force_default_image;
+		}
 
-        if ($force_default_image) {
-            $query['f'] = 'y';
-        }
+		if ($force_default_image) {
+			$query['f'] = 'y';
+		}
 
-        if (isset($rating)) {
-            $rating = (string) $rating;
-        } else {
-            $rating = $this->gravatar_rating;
-        }
+		if (isset($rating)) {
+			$rating = (string) $rating;
+		} else {
+			$rating = $this->gravatar_rating;
+		}
 
-        if ($rating != '') {
-            $query['r'] = $rating;
-        }
+		if ($rating != '') {
+			$query['r'] = $rating;
+		}
 
-        if (!empty($query)) {
-            $url = $url.'?'.http_build_query($query);
-        }
+		if (!empty($query)) {
+			$url = $url.'?'.http_build_query($query);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 
-    /**
-     * Executes a request for Gravatar profile data and returns it as a multidimensional array.
-     * @link https://en.gravatar.com/site/implement/profiles/
-     *
-     * @param   string      $email          A registered email.
-     * @return  array/null                  Received profile data.
-     */
-    public function get_profile_data($email) {
+	/**
+	 * Executes a request for Gravatar profile data and returns it as a multidimensional array.
+	 * @link https://en.gravatar.com/site/implement/profiles/
+	 *
+	 * @param   string      $email          A registered email.
+	 * @return  array/null                  Received profile data.
+	 */
+	public function get_profile_data($email) {
 
-        $result = $this->execute_profile_request($email, 'php');
+		$result = $this->execute_profile_request($email, 'php');
 
-        if ($this->last_error != GRAVATAR_NO_ERROR) {
-            return null;
-        }
+		if ($this->last_error != GRAVATAR_NO_ERROR) {
+			return null;
+		}
 
-        $result = @ unserialize($result);
+		$result = @ unserialize($result);
 
-        if ($result === false) {
+		if ($result === false) {
 
-            $this->last_error = GRAVATAR_INCORRECT_FORMAT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_INCORRECT_FORMAT;
+			return null;
+		}
 
-        if (!is_array($result)) {
+		if (!is_array($result)) {
 
-            $this->last_error = GRAVATAR_PROFILE_DOES_NOT_EXIST;
-            return null;
-        }
+			$this->last_error = GRAVATAR_PROFILE_DOES_NOT_EXIST;
+			return null;
+		}
 
-        if (!isset($result['entry']) || !isset($result['entry'][0])) {
+		if (!isset($result['entry']) || !isset($result['entry'][0])) {
 
-            $this->last_error = GRAVATAR_INCORRECT_FORMAT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_INCORRECT_FORMAT;
+			return null;
+		}
 
-        return $result['entry'][0];
-    }
+		return $result['entry'][0];
+	}
 
-    /**
-     * Executes a request for Gravatar profile data and returns raw received response.
-     * @link https://en.gravatar.com/site/implement/profiles/
-     *
-     * @param   string      $email      A registered email.
-     * @param   string      $format     '', 'json', 'xml', 'php', 'vcf', 'qr'.
-     * @return  string/null             Received profile raw data.
-     */
-    public function execute_profile_request($email, $format = null) {
+	/**
+	 * Executes a request for Gravatar profile data and returns raw received response.
+	 * @link https://en.gravatar.com/site/implement/profiles/
+	 *
+	 * @param   string      $email      A registered email.
+	 * @param   string      $format     '', 'json', 'xml', 'php', 'vcf', 'qr'.
+	 * @return  string/null             Received profile raw data.
+	 */
+	public function execute_profile_request($email, $format = null) {
 
-        $this->last_error = GRAVATAR_NO_ERROR;
+		$this->last_error = GRAVATAR_NO_ERROR;
 
-        if (function_exists('valid_email')) {
+		if (function_exists('valid_email')) {
 
-            if (!valid_email($email)) {
+			if (!valid_email($email)) {
 
-                $this->last_error = GRAVATAR_INVALID_EMAIL;
-                return null;
-            }
+				$this->last_error = GRAVATAR_INVALID_EMAIL;
+				return null;
+			}
 
-        } else {
+		} else {
 
-            if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 
-                $this->last_error = GRAVATAR_INVALID_EMAIL;
-                return null;
-            }
-        }
+				$this->last_error = GRAVATAR_INVALID_EMAIL;
+				return null;
+			}
+		}
 
-        $format = trim($format);
+		$format = trim($format);
 
-        if ($format != '') {
-            $format = '.'.ltrim($format, '.');
-        }
+		if ($format != '') {
+			$format = '.'.ltrim($format, '.');
+		}
 
-        $result = null;
+		$result = null;
 
-        if ($this->curl_exists) {
+		if ($this->curl_exists) {
 
-            $url = $this->gravatar_secure_base_url.$this->create_hash($email).$format;
+			$url = $this->gravatar_secure_base_url.$this->create_hash($email).$format;
 
-            $ch = curl_init();
+			$ch = curl_init();
 
-            $options = array(
-                CURLOPT_USERAGENT, $this->gravatar_useragent,
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_POST => true,
-                CURLOPT_POSTFIELDS => array(),
-                CURLOPT_URL => $url,
-                CURLOPT_TIMEOUT => 3,
-            );
+			$options = array(
+				CURLOPT_USERAGENT, $this->gravatar_useragent,
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_POST => true,
+				CURLOPT_POSTFIELDS => array(),
+				CURLOPT_URL => $url,
+				CURLOPT_TIMEOUT => 3,
+			);
 
-            if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
-                $options[CURLOPT_FOLLOWLOCATION] = true;
-            }
+			if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
+				$options[CURLOPT_FOLLOWLOCATION] = true;
+			}
 
-            curl_setopt_array($ch, $options);
+			curl_setopt_array($ch, $options);
 
-            $result = curl_exec($ch);
+			$result = curl_exec($ch);
 
-            $code = @ curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			$code = @ curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-            @ curl_close($ch);
+			@ curl_close($ch);
 
-            if ($code != 200) {
+			if ($code != 200) {
 
-                $this->last_error = GRAVATAR_CANT_CONNECT;
-                return null;
-            }
+				$this->last_error = GRAVATAR_CANT_CONNECT;
+				return null;
+			}
 
-        } elseif ($this->allow_url_fopen) {
+		} elseif ($this->allow_url_fopen) {
 
-            $url = $this->gravatar_base_url.$this->create_hash($email).$format;
+			$url = $this->gravatar_base_url.$this->create_hash($email).$format;
 
-            $options = array(
-                'http' => array(
-                    'method' => 'GET',
-                    'useragent' => $this->gravatar_useragent,
-                ),
-            );
+			$options = array(
+				'http' => array(
+					'method' => 'GET',
+					'useragent' => $this->gravatar_useragent,
+				),
+			);
 
-            $context = stream_context_create($options);
+			$context = stream_context_create($options);
 
-            $result = @ file_get_contents($url, false, $context);
+			$result = @ file_get_contents($url, false, $context);
 
-        } else {
+		} else {
 
-            $this->last_error = GRAVATAR_CANT_CONNECT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_CANT_CONNECT;
+			return null;
+		}
 
-        if ($result === false) {
+		if ($result === false) {
 
-            $this->last_error = GRAVATAR_CANT_CONNECT;
-            return null;
-        }
+			$this->last_error = GRAVATAR_CANT_CONNECT;
+			return null;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns the error code as a result of the last profile request operation.
-     *
-     * @return int          GRAVATAR_NO_ERROR - the last operation was successfull,
-     *                      other returned value indicates failure.
-     */
-    public function last_error() {
+	/**
+	 * Returns the error code as a result of the last profile request operation.
+	 *
+	 * @return int          GRAVATAR_NO_ERROR - the last operation was successfull,
+	 *                      other returned value indicates failure.
+	 */
+	public function last_error() {
 
-        return $this->last_error;
-    }
+		return $this->last_error;
+	}
 
-    /**
-     * Creates a hash value from a provided e-mail address.
-     * @link https://en.gravatar.com/site/implement/hash/
-     *
-     * @param   string      $email      A registered email.
-     * @return  string/null             The hash for accessing the avatar or profile data.
-     */
-    public function create_hash($email) {
-
-        return md5(strtolower(trim($email)));
-    }
-
-    protected function is_https() {
-
-        if (function_exists('is_https')) {
-            return is_https();
-        }
-
-        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
-            return true;
-        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-            return true;
-        } elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
-            return true;
-        }
-
-        return false;
-    }
-
-    //--------------------------------------------------------------------------
-    // The following original methods are kept here for backward compatibility.
-    // Consider them as deprecated.
-    //--------------------------------------------------------------------------
-
-
-    /**
-     * Set the email to be used, converting it into an md5 hash as required by gravatar.com
-     *
-     * @param string $email
-     *
-     * @return string|null Email hash or if email didn't validate then return NULL
-     *
-     * @deprecated
-     */
-    public function set_email($email)
-    {
-        $email = trim(strtolower($email));
-
-        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
-        {
-            return md5($email);
-        }
-
-        return NULL;
-    }
-
-    /**
-     * get_gravatar_url
-     *
-     * @see http://en.gravatar.com/site/implement/images/ for available options
-     *
-     * @param string $rating defaults to g
-     * @param string $size defaults to 80
-     * @param string $default_image default sets can be found on the above link
-     * @param boolean $secure set to TRUE if a secure url is required
-     *
-     * @return string gratavar url
-     *
-     * @deprecated
-     */
-    public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL)
-    {
-        $hash = $this->set_email($email);
-
-        if ($hash === NULL)
-        {
-            // $hash has to be set to a value so the gravatar site can return a default image
-            $hash = 'invalid_email';
-        }
-
-        $query_string = NULL;
-        $options = array();
-
-        if ($rating !== NULL)
-        {
-            $options['r'] = $rating;
-        }
-
-        if ($size !== NULL)
-        {
-            $options['s'] = $size;
-        }
-
-        if ($default_image !== NULL)
-        {
-            $options['d'] = urlencode($default_image);
-        }
-
-        if (count($options) > 0)
-        {
-            $query_string = '?'. http_build_query($options);
-        }
-
-        if ($secure !== NULL)
-        {
-            $base = $this->gravatar_secure_base_url;
-        }
-        else
-        {
-            $base = $this->gravatar_base_url;
-        }
-
-        return $base .'avatar/'. $hash . $query_string;
-    }
-
-    /**
-     * Grab the full profile data for a given email from gravatar.com in xml format
-     *
-     * @param string $email
-     * @param string fetch_method defaults to file, 'curl' is the other option
-     *
-     * @return object|null $xml->entry on success, NULL on an error
-     *
-     * @deprecated
-     */
-    public function get_profile($email, $fetch_method = 'file')
-    {
-        $hash = $this->set_email($email);
-
-        if ($hash === NULL)
-        {
-            // A hash value of NULL will return no xml so the method returns NULL
-            return NULL;
-        }
-
-        libxml_use_internal_errors(TRUE);
-
-        if ($fetch_method === 'file')
-        {
-            if (ini_get('allow_url_fopen') == FALSE)
-            {
-                return NULL;
-            }
-
-            $str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
-        }
-
-        if ($fetch_method === 'curl')
-        {
-            if ( ! function_exists('curl_init'))
-            {
-                return NULL;
-            }
-
-            $ch = curl_init();
-            $options = array(
-                CURLOPT_RETURNTRANSFER => TRUE,
-                CURLOPT_POST => TRUE,
-                CURLOPT_URL => $this->gravatar_secure_base_url . $hash .'.xml',
-                CURLOPT_TIMEOUT => 3
-            );
-            curl_setopt_array($ch, $options);
-            $str = curl_exec($ch);
-        }
-
-        $xml = simplexml_load_string($str);
-
-        if ($xml === FALSE)
-        {
-            $errors = array();
-            foreach(libxml_get_errors() as $error)
-            {
-                $errors[] = $error->message.'\n';
-            }
-            $error_string = implode('\n', $errors);
-            throw new Exception('Failed loading XML\n'. $error_string);
-        }
-        else
-        {
-            return $xml->entry;
-        }
-    }
+	/**
+	 * Creates a hash value from a provided e-mail address.
+	 * @link https://en.gravatar.com/site/implement/hash/
+	 *
+	 * @param   string      $email      A registered email.
+	 * @return  string/null             The hash for accessing the avatar or profile data.
+	 */
+	public function create_hash($email) {
+
+		return md5(strtolower(trim($email)));
+	}
+
+	protected function is_https() {
+
+		if (function_exists('is_https')) {
+			return is_https();
+		}
+
+		if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+			return true;
+		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+			return true;
+		} elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------------
+	// The following original methods are kept here for backward compatibility.
+	// Consider them as deprecated.
+	//--------------------------------------------------------------------------
+
+
+	/**
+	 * Set the email to be used, converting it into an md5 hash as required by gravatar.com
+	 *
+	 * @param string $email
+	 *
+	 * @return string|null Email hash or if email didn't validate then return NULL
+	 *
+	 * @deprecated
+	 */
+	public function set_email($email)
+	{
+		$email = trim(strtolower($email));
+
+		if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
+		{
+			return md5($email);
+		}
+
+		return NULL;
+	}
+
+	/**
+	 * get_gravatar_url
+	 *
+	 * @see http://en.gravatar.com/site/implement/images/ for available options
+	 *
+	 * @param string $rating defaults to g
+	 * @param string $size defaults to 80
+	 * @param string $default_image default sets can be found on the above link
+	 * @param boolean $secure set to TRUE if a secure url is required
+	 *
+	 * @return string gratavar url
+	 *
+	 * @deprecated
+	 */
+	public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL)
+	{
+		$hash = $this->set_email($email);
+
+		if ($hash === NULL)
+		{
+			// $hash has to be set to a value so the gravatar site can return a default image
+			$hash = 'invalid_email';
+		}
+
+		$query_string = NULL;
+		$options = array();
+
+		if ($rating !== NULL)
+		{
+			$options['r'] = $rating;
+		}
+
+		if ($size !== NULL)
+		{
+			$options['s'] = $size;
+		}
+
+		if ($default_image !== NULL)
+		{
+			$options['d'] = urlencode($default_image);
+		}
+
+		if (count($options) > 0)
+		{
+			$query_string = '?'. http_build_query($options);
+		}
+
+		if ($secure !== NULL)
+		{
+			$base = $this->gravatar_secure_base_url;
+		}
+		else
+		{
+			$base = $this->gravatar_base_url;
+		}
+
+		return $base .'avatar/'. $hash . $query_string;
+	}
+
+	/**
+	 * Grab the full profile data for a given email from gravatar.com in xml format
+	 *
+	 * @param string $email
+	 * @param string fetch_method defaults to file, 'curl' is the other option
+	 *
+	 * @return object|null $xml->entry on success, NULL on an error
+	 *
+	 * @deprecated
+	 */
+	public function get_profile($email, $fetch_method = 'file')
+	{
+		$hash = $this->set_email($email);
+
+		if ($hash === NULL)
+		{
+			// A hash value of NULL will return no xml so the method returns NULL
+			return NULL;
+		}
+
+		libxml_use_internal_errors(TRUE);
+
+		if ($fetch_method === 'file')
+		{
+			if (ini_get('allow_url_fopen') == FALSE)
+			{
+				return NULL;
+			}
+
+			$str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
+		}
+
+		if ($fetch_method === 'curl')
+		{
+			if ( ! function_exists('curl_init'))
+			{
+				return NULL;
+			}
+
+			$ch = curl_init();
+			$options = array(
+				CURLOPT_RETURNTRANSFER => TRUE,
+				CURLOPT_POST => TRUE,
+				CURLOPT_URL => $this->gravatar_secure_base_url . $hash .'.xml',
+				CURLOPT_TIMEOUT => 3
+			);
+			curl_setopt_array($ch, $options);
+			$str = curl_exec($ch);
+		}
+
+		$xml = simplexml_load_string($str);
+
+		if ($xml === FALSE)
+		{
+			$errors = array();
+			foreach(libxml_get_errors() as $error)
+			{
+				$errors[] = $error->message.'\n';
+			}
+			$error_string = implode('\n', $errors);
+			throw new Exception('Failed loading XML\n'. $error_string);
+		}
+		else
+		{
+			return $xml->entry;
+		}
+	}
 
 }

Spacing +49 added lines, -49 removed lines

@@ -31,7 +31,7 @@ 
     protected $gravatar_image_size;
     protected $gravatar_default_image;
     protected $gravatar_force_default_image;
-    protected $gravatar_rating ;
+    protected $gravatar_rating;
     protected $gravatar_useragent;
 
     protected $last_error = GRAVATAR_NO_ERROR;
@@ -59,7 +59,7 @@ 
         $allow_url_fopen = $allow_url_fopen === false || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
         $this->allow_url_fopen = $allow_url_fopen;
 
-        if (!is_array($config)) {
+        if(!is_array($config)) {
             $config = array();
         }
 
@@ -69,11 +69,11 @@ 
 
     public function initialize($config = array()) {
 
-        if (!is_array($config)) {
+        if(!is_array($config)) {
             $config = array();
         }
 
-        foreach ($config as $key => $value) {
+        foreach($config as $key => $value) {
             $this->{$key} = $value;
         }
 
@@ -83,7 +83,7 @@ 
 
         $this->gravatar_image_size = (int) $this->gravatar_image_size;
 
-        if ($this->gravatar_image_size <= 0) {
+        if($this->gravatar_image_size <= 0) {
             $this->gravatar_image_size = 80;
         }
 
@@ -129,45 +129,45 @@ 
 
         $size = (int) $size;
 
-        if ($size <= 0) {
+        if($size <= 0) {
             $size = $this->gravatar_image_size;
         }
 
-        if ($size > 0) {
+        if($size > 0) {
             $query['s'] = $size;
         }
 
-        if (isset($default_image)) {
+        if(isset($default_image)) {
             $default_image = (string) $default_image;
         } else {
             $default_image = $this->gravatar_default_image;
         }
 
-        if ($default_image != '') {
+        if($default_image != '') {
             $query['d'] = $default_image;
         }
 
-        if (isset($force_default_image)) {
+        if(isset($force_default_image)) {
             $force_default_image = !empty($force_default_image);
         } else {
             $force_default_image = $this->gravatar_force_default_image;
         }
 
-        if ($force_default_image) {
+        if($force_default_image) {
             $query['f'] = 'y';
         }
 
-        if (isset($rating)) {
+        if(isset($rating)) {
             $rating = (string) $rating;
         } else {
             $rating = $this->gravatar_rating;
         }
 
-        if ($rating != '') {
+        if($rating != '') {
             $query['r'] = $rating;
         }
 
-        if (!empty($query)) {
+        if(!empty($query)) {
             $url = $url.'?'.http_build_query($query);
         }
 
@@ -185,25 +185,25 @@ 
 
         $result = $this->execute_profile_request($email, 'php');
 
-        if ($this->last_error != GRAVATAR_NO_ERROR) {
+        if($this->last_error != GRAVATAR_NO_ERROR) {
             return null;
         }
 
         $result = @ unserialize($result);
 
-        if ($result === false) {
+        if($result === false) {
 
             $this->last_error = GRAVATAR_INCORRECT_FORMAT;
             return null;
         }
 
-        if (!is_array($result)) {
+        if(!is_array($result)) {
 
             $this->last_error = GRAVATAR_PROFILE_DOES_NOT_EXIST;
             return null;
         }
 
-        if (!isset($result['entry']) || !isset($result['entry'][0])) {
+        if(!isset($result['entry']) || !isset($result['entry'][0])) {
 
             $this->last_error = GRAVATAR_INCORRECT_FORMAT;
             return null;
@@ -224,9 +224,9 @@ 
 
         $this->last_error = GRAVATAR_NO_ERROR;
 
-        if (function_exists('valid_email')) {
+        if(function_exists('valid_email')) {
 
-            if (!valid_email($email)) {
+            if(!valid_email($email)) {
 
                 $this->last_error = GRAVATAR_INVALID_EMAIL;
                 return null;
@@ -234,7 +234,7 @@ 
 
         } else {
 
-            if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            if(!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 
                 $this->last_error = GRAVATAR_INVALID_EMAIL;
                 return null;
@@ -243,13 +243,13 @@ 
 
         $format = trim($format);
 
-        if ($format != '') {
+        if($format != '') {
             $format = '.'.ltrim($format, '.');
         }
 
         $result = null;
 
-        if ($this->curl_exists) {
+        if($this->curl_exists) {
 
             $url = $this->gravatar_secure_base_url.$this->create_hash($email).$format;
 
@@ -264,7 +264,7 @@ 
                 CURLOPT_TIMEOUT => 3,
             );
 
-            if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
+            if(!ini_get('safe_mode') && !ini_get('open_basedir')) {
                 $options[CURLOPT_FOLLOWLOCATION] = true;
             }
 
@@ -276,13 +276,13 @@ 
 
             @ curl_close($ch);
 
-            if ($code != 200) {
+            if($code != 200) {
 
                 $this->last_error = GRAVATAR_CANT_CONNECT;
                 return null;
             }
 
-        } elseif ($this->allow_url_fopen) {
+        } elseif($this->allow_url_fopen) {
 
             $url = $this->gravatar_base_url.$this->create_hash($email).$format;
 
@@ -303,7 +303,7 @@ 
             return null;
         }
 
-        if ($result === false) {
+        if($result === false) {
 
             $this->last_error = GRAVATAR_CANT_CONNECT;
             return null;
@@ -337,15 +337,15 @@ 
 
     protected function is_https() {
 
-        if (function_exists('is_https')) {
+        if(function_exists('is_https')) {
             return is_https();
         }
 
-        if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+        if(!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
             return true;
-        } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+        } elseif(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
             return true;
-        } elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
+        } elseif(!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
             return true;
         }
 
@@ -371,7 +371,7 @@ 
     {
         $email = trim(strtolower($email));
 
-        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
+        if(!filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
         {
             return md5($email);
         }
@@ -397,7 +397,7 @@ 
     {
         $hash = $this->set_email($email);
 
-        if ($hash === NULL)
+        if($hash === NULL)
         {
             // $hash has to be set to a value so the gravatar site can return a default image
             $hash = 'invalid_email';
@@ -406,27 +406,27 @@ 
         $query_string = NULL;
         $options = array();
 
-        if ($rating !== NULL)
+        if($rating !== NULL)
         {
             $options['r'] = $rating;
         }
 
-        if ($size !== NULL)
+        if($size !== NULL)
         {
             $options['s'] = $size;
         }
 
-        if ($default_image !== NULL)
+        if($default_image !== NULL)
         {
             $options['d'] = urlencode($default_image);
         }
 
-        if (count($options) > 0)
+        if(count($options) > 0)
         {
-            $query_string = '?'. http_build_query($options);
+            $query_string = '?'.http_build_query($options);
         }
 
-        if ($secure !== NULL)
+        if($secure !== NULL)
         {
             $base = $this->gravatar_secure_base_url;
         }
@@ -435,7 +435,7 @@ 
             $base = $this->gravatar_base_url;
         }
 
-        return $base .'avatar/'. $hash . $query_string;
+        return $base.'avatar/'.$hash.$query_string;
     }
 
     /**
@@ -452,7 +452,7 @@ 
     {
         $hash = $this->set_email($email);
 
-        if ($hash === NULL)
+        if($hash === NULL)
         {
             // A hash value of NULL will return no xml so the method returns NULL
             return NULL;
@@ -460,19 +460,19 @@ 
 
         libxml_use_internal_errors(TRUE);
 
-        if ($fetch_method === 'file')
+        if($fetch_method === 'file')
         {
-            if (ini_get('allow_url_fopen') == FALSE)
+            if(ini_get('allow_url_fopen') == FALSE)
             {
                 return NULL;
             }
 
-            $str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
+            $str = file_get_contents($this->gravatar_base_url.$hash.'.xml');
         }
 
-        if ($fetch_method === 'curl')
+        if($fetch_method === 'curl')
         {
-            if ( ! function_exists('curl_init'))
+            if(!function_exists('curl_init'))
             {
                 return NULL;
             }
@@ -481,7 +481,7 @@ 
             $options = array(
                 CURLOPT_RETURNTRANSFER => TRUE,
                 CURLOPT_POST => TRUE,
-                CURLOPT_URL => $this->gravatar_secure_base_url . $hash .'.xml',
+                CURLOPT_URL => $this->gravatar_secure_base_url.$hash.'.xml',
                 CURLOPT_TIMEOUT => 3
             );
             curl_setopt_array($ch, $options);
@@ -490,7 +490,7 @@ 
 
         $xml = simplexml_load_string($str);
 
-        if ($xml === FALSE)
+        if($xml === FALSE)
         {
             $errors = array();
             foreach(libxml_get_errors() as $error)
@@ -498,7 +498,7 @@ 
                 $errors[] = $error->message.'\n';
             }
             $error_string = implode('\n', $errors);
-            throw new Exception('Failed loading XML\n'. $error_string);
+            throw new Exception('Failed loading XML\n'.$error_string);
         }
         else
         {

Braces +19 added lines, -40 removed lines

@@ -367,12 +367,10 @@ 
      *
      * @deprecated
      */
-    public function set_email($email)
-    {
+    public function set_email($email) {
         $email = trim(strtolower($email));
 
-        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE)
-        {
+        if ( ! filter_var($email, FILTER_VALIDATE_EMAIL) === FALSE) {
             return md5($email);
         }
 
@@ -393,12 +391,10 @@ 
      *
      * @deprecated
      */
-    public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL)
-    {
+    public function get_gravatar($email, $rating = NULL, $size = NULL, $default_image = NULL, $secure = NULL) {
         $hash = $this->set_email($email);
 
-        if ($hash === NULL)
-        {
+        if ($hash === NULL) {
             // $hash has to be set to a value so the gravatar site can return a default image
             $hash = 'invalid_email';
         }
@@ -406,32 +402,25 @@ 
         $query_string = NULL;
         $options = array();
 
-        if ($rating !== NULL)
-        {
+        if ($rating !== NULL) {
             $options['r'] = $rating;
         }
 
-        if ($size !== NULL)
-        {
+        if ($size !== NULL) {
             $options['s'] = $size;
         }
 
-        if ($default_image !== NULL)
-        {
+        if ($default_image !== NULL) {
             $options['d'] = urlencode($default_image);
         }
 
-        if (count($options) > 0)
-        {
+        if (count($options) > 0) {
             $query_string = '?'. http_build_query($options);
         }
 
-        if ($secure !== NULL)
-        {
+        if ($secure !== NULL) {
             $base = $this->gravatar_secure_base_url;
-        }
-        else
-        {
+        } else {
             $base = $this->gravatar_base_url;
         }
 
@@ -448,32 +437,26 @@ 
      *
      * @deprecated
      */
-    public function get_profile($email, $fetch_method = 'file')
-    {
+    public function get_profile($email, $fetch_method = 'file') {
         $hash = $this->set_email($email);
 
-        if ($hash === NULL)
-        {
+        if ($hash === NULL) {
             // A hash value of NULL will return no xml so the method returns NULL
             return NULL;
         }
 
         libxml_use_internal_errors(TRUE);
 
-        if ($fetch_method === 'file')
-        {
-            if (ini_get('allow_url_fopen') == FALSE)
-            {
+        if ($fetch_method === 'file') {
+            if (ini_get('allow_url_fopen') == FALSE) {
                 return NULL;
             }
 
             $str = file_get_contents($this->gravatar_base_url . $hash .'.xml');
         }
 
-        if ($fetch_method === 'curl')
-        {
-            if ( ! function_exists('curl_init'))
-            {
+        if ($fetch_method === 'curl') {
+            if ( ! function_exists('curl_init')) {
                 return NULL;
             }
 
@@ -490,18 +473,14 @@ 
 
         $xml = simplexml_load_string($str);
 
-        if ($xml === FALSE)
-        {
+        if ($xml === FALSE) {
             $errors = array();
-            foreach(libxml_get_errors() as $error)
-            {
+            foreach(libxml_get_errors() as $error) {
                 $errors[] = $error->message.'\n';
             }
             $error_string = implode('\n', $errors);
             throw new Exception('Failed loading XML\n'. $error_string);
-        }
-        else
-        {
+        } else {
             return $xml->entry;
         }
     }

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

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed.');
+<?php defined('BASEPATH') or exit('No direct script access allowed.');
 
 /**
  * Gravatar Library for CodeIgniter
@@ -15,11 +15,11 @@ 
  */
 
 // Gravatar pofile error results.
-defined('GRAVATAR_NO_ERROR') OR define('GRAVATAR_NO_ERROR', 0);
-defined('GRAVATAR_CANT_CONNECT') OR define('GRAVATAR_CANT_CONNECT', 1);
-defined('GRAVATAR_INVALID_EMAIL') OR define('GRAVATAR_INVALID_EMAIL', 2);
-defined('GRAVATAR_PROFILE_DOES_NOT_EXIST') OR define('GRAVATAR_PROFILE_DOES_NOT_EXIST', 3);
-defined('GRAVATAR_INCORRECT_FORMAT') OR define('GRAVATAR_INCORRECT_FORMAT', 4);
+defined('GRAVATAR_NO_ERROR') or define('GRAVATAR_NO_ERROR', 0);
+defined('GRAVATAR_CANT_CONNECT') or define('GRAVATAR_CANT_CONNECT', 1);
+defined('GRAVATAR_INVALID_EMAIL') or define('GRAVATAR_INVALID_EMAIL', 2);
+defined('GRAVATAR_PROFILE_DOES_NOT_EXIST') or define('GRAVATAR_PROFILE_DOES_NOT_EXIST', 3);
+defined('GRAVATAR_INCORRECT_FORMAT') or define('GRAVATAR_INCORRECT_FORMAT', 4);
 
 class Gravatar {
 
@@ -48,7 +48,7 @@ 
             'gravatar_image_extension' => '.png',
             'gravatar_image_size' => 80,
             'gravatar_default_image' => '',
-            'gravatar_force_default_image' => false,
+            'gravatar_force_default_image' => FALSE,
             'gravatar_rating' => '',
             'gravatar_useragent' => 'PHP Gravatar Library',
         );
@@ -56,7 +56,7 @@ 
         $this->is_https = $this->is_https();
         $this->curl_exists = function_exists('curl_init');
         $allow_url_fopen = @ini_get('allow_url_fopen');
-        $allow_url_fopen = $allow_url_fopen === false || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
+        $allow_url_fopen = $allow_url_fopen === FALSE || in_array(strtolower($allow_url_fopen), array('on', 'true', '1'));
         $this->allow_url_fopen = $allow_url_fopen;
 
         if (!is_array($config)) {
@@ -121,7 +121,7 @@ 
      * When optional parameters are not set, their default values are taken
      * from the configuration file application/config/gravatar.php
      */
-    public function get($email, $size = null, $default_image = null, $force_default_image = null, $rating = null) {
+    public function get($email, $size = NULL, $default_image = NULL, $force_default_image = NULL, $rating = NULL) {
 
         $url = ($this->is_https ? $this->gravatar_secure_base_url : $this->gravatar_base_url).'avatar/'.$this->create_hash($email).$this->gravatar_image_extension;
 
@@ -186,27 +186,27 @@ 
         $result = $this->execute_profile_request($email, 'php');
 
         if ($this->last_error != GRAVATAR_NO_ERROR) {
-            return null;
+            return NULL;
         }
 
         $result = @ unserialize($result);
 
-        if ($result === false) {
+        if ($result === FALSE) {
 
             $this->last_error = GRAVATAR_INCORRECT_FORMAT;
-            return null;
+            return NULL;
         }
 
         if (!is_array($result)) {
 
             $this->last_error = GRAVATAR_PROFILE_DOES_NOT_EXIST;
-            return null;
+            return NULL;
         }
 
         if (!isset($result['entry']) || !isset($result['entry'][0])) {
 
             $this->last_error = GRAVATAR_INCORRECT_FORMAT;
-            return null;
+            return NULL;
         }
 
         return $result['entry'][0];
@@ -220,7 +220,7 @@ 
      * @param   string      $format     '', 'json', 'xml', 'php', 'vcf', 'qr'.
      * @return  string/null             Received profile raw data.
      */
-    public function execute_profile_request($email, $format = null) {
+    public function execute_profile_request($email, $format = NULL) {
 
         $this->last_error = GRAVATAR_NO_ERROR;
 
@@ -229,7 +229,7 @@ 
             if (!valid_email($email)) {
 
                 $this->last_error = GRAVATAR_INVALID_EMAIL;
-                return null;
+                return NULL;
             }
 
         } else {
@@ -237,7 +237,7 @@ 
             if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
 
                 $this->last_error = GRAVATAR_INVALID_EMAIL;
-                return null;
+                return NULL;
             }
         }
 
@@ -247,7 +247,7 @@ 
             $format = '.'.ltrim($format, '.');
         }
 
-        $result = null;
+        $result = NULL;
 
         if ($this->curl_exists) {
 
@@ -257,15 +257,15 @@ 
 
             $options = array(
                 CURLOPT_USERAGENT, $this->gravatar_useragent,
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_POST => true,
+                CURLOPT_RETURNTRANSFER => TRUE,
+                CURLOPT_POST => TRUE,
                 CURLOPT_POSTFIELDS => array(),
                 CURLOPT_URL => $url,
                 CURLOPT_TIMEOUT => 3,
             );
 
             if (!ini_get('safe_mode') && !ini_get('open_basedir')) {
-                $options[CURLOPT_FOLLOWLOCATION] = true;
+                $options[CURLOPT_FOLLOWLOCATION] = TRUE;
             }
 
             curl_setopt_array($ch, $options);
@@ -279,7 +279,7 @@ 
             if ($code != 200) {
 
                 $this->last_error = GRAVATAR_CANT_CONNECT;
-                return null;
+                return NULL;
             }
 
         } elseif ($this->allow_url_fopen) {
@@ -295,18 +295,18 @@ 
 
             $context = stream_context_create($options);
 
-            $result = @ file_get_contents($url, false, $context);
+            $result = @ file_get_contents($url, FALSE, $context);
 
         } else {
 
             $this->last_error = GRAVATAR_CANT_CONNECT;
-            return null;
+            return NULL;
         }
 
-        if ($result === false) {
+        if ($result === FALSE) {
 
             $this->last_error = GRAVATAR_CANT_CONNECT;
-            return null;
+            return NULL;
         }
 
         return $result;
@@ -342,14 +342,14 @@ 
         }
 
         if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
-            return true;
+            return TRUE;
         } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-            return true;
+            return TRUE;
         } elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     //--------------------------------------------------------------------------

application/third_party/Gravatar/helpers/gravatar_helper.php

Indentation +13 added lines, -13 removed lines

@@ -7,23 +7,23 @@
 
 if (!function_exists('gravatar')) {
 
-    // This helper function has been added here for compatibility with PyroCMS.
-    function gravatar($email = '', $size = 50, $rating = 'g', $url_only = false, $default = false) {
+	// This helper function has been added here for compatibility with PyroCMS.
+	function gravatar($email = '', $size = 50, $rating = 'g', $url_only = false, $default = false) {
 
-        $ci = & get_instance();
-        $ci->load->library('gravatar');
+		$ci = & get_instance();
+		$ci->load->library('gravatar');
 
-        if (@ (string) $default == '') {
-            $default = null;
-        }
+		if (@ (string) $default == '') {
+			$default = null;
+		}
 
-        $gravatar_url = $ci->gravatar->get($email, $size, $default, null, $rating);
+		$gravatar_url = $ci->gravatar->get($email, $size, $default, null, $rating);
 
-        if ($url_only) {
-            return $gravatar_url;
-        }
+		if ($url_only) {
+			return $gravatar_url;
+		}
 
-        return '<img src="'.$gravatar_url.'" alt="Gravatar" class="gravatar" />';
-    }
+		return '<img src="'.$gravatar_url.'" alt="Gravatar" class="gravatar" />';
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  * @license The MIT License, http://opensource.org/licenses/MIT
  */
 
-if (!function_exists('gravatar')) {
+if(!function_exists('gravatar')) {
 
     // This helper function has been added here for compatibility with PyroCMS.
     function gravatar($email = '', $size = 50, $rating = 'g', $url_only = false, $default = false) {
@@ -13,13 +13,13 @@ 
         $ci = & get_instance();
         $ci->load->library('gravatar');
 
-        if (@ (string) $default == '') {
+        if(@ (string) $default == '') {
             $default = null;
         }
 
         $gravatar_url = $ci->gravatar->get($email, $size, $default, null, $rating);
 
-        if ($url_only) {
+        if($url_only) {
             return $gravatar_url;
         }
 

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

@@ -1,4 +1,4 @@ 
-<?php defined('BASEPATH') OR exit('No direct script access allowed');
+<?php defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * @author Ivan Tcholakov <ivantcholakov@gmail.com>, 2015
@@ -8,16 +8,16 @@ 
 if (!function_exists('gravatar')) {
 
     // This helper function has been added here for compatibility with PyroCMS.
-    function gravatar($email = '', $size = 50, $rating = 'g', $url_only = false, $default = false) {
+    function gravatar($email = '', $size = 50, $rating = 'g', $url_only = FALSE, $default = FALSE) {
 
         $ci = & get_instance();
         $ci->load->library('gravatar');
 
         if (@ (string) $default == '') {
-            $default = null;
+            $default = NULL;
         }
 
-        $gravatar_url = $ci->gravatar->get($email, $size, $default, null, $rating);
+        $gravatar_url = $ci->gravatar->get($email, $size, $default, NULL, $rating);
 
         if ($url_only) {
             return $gravatar_url;