GeoDirectory / geodirectory

geodirectory-functions/signup_function.php

Doc Comments +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
  * @package GeoDirectory

  * @global object $current_user Current user object.

  * @param bool $redirect Optional. Do you want to redirect to signup page, if user not logged in? Default: false.

- * @return bool

+ * @return null|boolean

  */

 function geodir_is_login($redirect = false)

 {

@@ -69,7 +69,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return string|mixed|void The email ID.

+ * @return string The email ID.

  */

 function geodir_get_site_email_id()

 {

Spacing +21 added lines, -21 removed lines

@@ -22,7 +22,7 @@ 
         if ($redirect) {

             ?>

             <script type="text/javascript">

-                window.location.href = '<?php echo geodir_login_url();?>';

+                window.location.href = '<?php echo geodir_login_url(); ?>';

             </script>

         <?php

         } else

@@ -47,7 +47,7 @@ 
             wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

             exit();

         } else {

-            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

+            wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);

             exit();

         }

     }

@@ -60,7 +60,7 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) echo $message."\n";

 

 }

 

@@ -208,9 +208,9 @@ 
 

     wp_set_password($new_pass, $user->ID);

     update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

-    $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

-    $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

-    $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

+    $message = '<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>';

+    $message .= '<p>'.sprintf(__('Username: %s', 'geodirectory'), $user->user_login)."</p>";

+    $message .= '<p>'.sprintf(__('Password: %s', 'geodirectory'), $new_pass)."</p>";

     //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

     //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

     $user_email = $user_data->user_email;

@@ -236,7 +236,7 @@ 
      */

     $message = apply_filters('password_reset_message', $message, $new_pass);

     //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID); ///forgot password email

 

     return true;

 }

@@ -390,13 +390,13 @@ 
         ///////REGISTRATION EMAIL START//////

         $fromEmail = geodir_get_site_email_id();

         $fromEmailName = get_site_emailName();

-        $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

-<p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>

-<p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');

+        $message = __('<p><b>'.__('Your login Information :', 'geodirectory').'</b></p>

+<p>' . __('Username:', 'geodirectory').' '.$user_login.'</p>

+<p>' . __('Password:', 'geodirectory').' '.$user_pass.'</p>');

 

         /////////////customer email//////////////

         //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id); /// registration email

         //////REGISTRATION EMAIL END////////

     }

 

@@ -427,7 +427,7 @@ 
         $action = 'resetpass';

 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_'.$action))

         $action = 'login';

 

     nocache_headers();

@@ -437,8 +437,8 @@ 
             $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']) != home_url())

+            update_option('siteurl', dirname($schema.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF']));

     }

 

     //Set a cookie now to see if they are supported by the browser.

@@ -453,7 +453,7 @@ 
      *

      * @since 1.0.0

      */

-    do_action('login_form_' . $action);

+    do_action('login_form_'.$action);

 

     $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

 

@@ -493,7 +493,7 @@ 
          * @since 1.0.0

          */

         do_action('lost_password');

-            $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

+            $message = '<div class="sucess_msg">'.ENTER_USER_EMAIL_NEW_PW_MSG.'</div>';

             $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

 

             break;

@@ -507,7 +507,7 @@ 
                 exit();

             }

 

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+            wp_redirect(geodir_login_url(array('error'=>'invalidkey', 'action'=>'lostpassword')));

             exit();

 

             break;

@@ -682,7 +682,7 @@ 
 

             if (is_wp_error($user)) {

                 if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

-                    wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

+                    wp_redirect($_SERVER['HTTP_REFERER'].'&emsg=1');

                 }

             }

             if (!is_wp_error($user)) {

@@ -710,7 +710,7 @@ 
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

-                $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

+                $successmsg = '<div class="sucess_msg">'.YOU_ARE_LOGED_OUT_MSG.'</div>';

             } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

                 $successmsg = USER_REG_NOT_ALLOW_MSG;

             } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

@@ -723,9 +723,9 @@ 
 

             if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

                 if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

-                    wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

+                    wp_redirect($_REQUEST['pagetype'].'&emsg=1');

                 } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+                    wp_redirect(geodir_login_url(array('logemsg'=>'1', 'redirect_to'=>urlencode($_REQUEST['redirect_to']))));

                 }

                 gd_die();

             }

Indentation +612 added lines, -612 removed lines

@@ -17,18 +17,18 @@ 
  */

 function geodir_is_login($redirect = false)

 {

-    global $current_user;

-    if (!$current_user->ID) {

-        if ($redirect) {

-            ?>

+	global $current_user;

+	if (!$current_user->ID) {

+		if ($redirect) {

+			?>

             <script type="text/javascript">

                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

+		} else

+			return false;

+	} else

+		return true;

 }

 

 /**

@@ -42,25 +42,25 @@ 
 {

 

 // Redirect to https login if forced to use SSL

-    if (force_ssl_admin() && !is_ssl()) {

-        if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

-            wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

-            exit();

-        } else {

-            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

-            exit();

-        }

-    }

-

-    /**

-     * Filter the login message.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Login message.

-     */

-    $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+	if (force_ssl_admin() && !is_ssl()) {

+		if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {

+			wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));

+			exit();

+		} else {

+			wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);

+			exit();

+		}

+	}

+

+	/**

+	 * Filter the login message.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Login message.

+	 */

+	$message = apply_filters('login_message', $message);

+	if (!empty($message)) echo $message . "\n";

 

 }

 

@@ -73,59 +73,59 @@ 
  */

 function geodir_get_site_email_id()

 {

-    if (get_option('site_email')) {

+	if (get_option('site_email')) {

 

-        return get_option('site_email');

+		return get_option('site_email');

 

-    } else {

+	} else {

 

-        return get_option('admin_email');

+		return get_option('admin_email');

 

-    }

+	}

 

 }

 

 

 if (!function_exists('get_site_emailName')) {

-    /**

-     * Get site name for sending emails.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Site name.

-     */

-    function get_site_emailName()

+	/**

+	 * Get site name for sending emails.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Site name.

+	 */

+	function get_site_emailName()

 

-    {

+	{

 

-        if (get_option('site_email_name')) {

+		if (get_option('site_email_name')) {

 

-            return stripslashes(get_option('site_email_name'));

+			return stripslashes(get_option('site_email_name'));

 

-        } else {

+		} else {

 

-            return stripslashes(get_option('blogname'));

+			return stripslashes(get_option('blogname'));

 

-        }

+		}

 

-    }

+	}

 }

 

 if (!function_exists('is_allow_user_register')) {

-    /**

-     * Checks whether the site allowing user registration or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool|string

-     */

-    function is_allow_user_register()

+	/**

+	 * Checks whether the site allowing user registration or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool|string

+	 */

+	function is_allow_user_register()

 

-    {

+	{

 

-        return get_option('users_can_register');

+		return get_option('users_can_register');

 

-    }

+	}

 }

 

 /**

@@ -138,107 +138,107 @@ 
  */

 function geodir_retrieve_password()

 {

-    global $wpdb;

-

-    $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

-

-    if (strpos($_POST['user_login'], '@')) {

-        //$user_data = get_user_by_email(trim($_POST['user_login']));

-        $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

-    } else {

-        $login = trim($_POST['user_login']);

-        $user_data = get_user_by('email', $login);

-    }

-

-    /**

-     * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

-     *

-     * @since 1.0.0

-     */

-    do_action('lostpassword_post');

-

-    if ($errors->get_error_code())

-        return $errors;

-

-    if (!$user_data) {

-        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

-        return $errors;

-    }

-

-    // redefining user_login ensures we return the right case in the email

-    $user_login = $user_data->user_login;

-    $user_email = $user_data->user_email;

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param string $user_login The users username.

-     */

-    do_action('retrieve_password', $user_login);

-

-    ////////////////////////////////////

-    $user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

-    $user_login = $_POST['user_login'];

-

-    $user = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

-            array($user_login, $user_login)

-        )

-    );

-

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

-

-    $new_pass = wp_generate_password(12, false);

-

-    /**

-     * Called in the geodir_retrieve_password() function before any emails are sent.

-     *

-     * @since 1.0.0

-     * @param object $user The user object.

-     * @param string $new_pass The new pass being sent to the user.

-     */

-    do_action('password_reset', $user, $new_pass);

-

-    wp_set_password($new_pass, $user->ID);

-    update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

-    $message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

-    $message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

-    $message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

-    //$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

-    //$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

-    $user_email = $user_data->user_email;

-    $user_name = geodir_get_client_name($user->ID);

-    $fromEmail = geodir_get_site_email_id();

-    $fromEmailName = get_site_emailName();

-    $title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

-    /**

-     * Filter the password reset email subject part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $title Password reset email subject.

-     */

-    $title = apply_filters('password_reset_title', $title);

-    /**

-     * Filter the password reset email message part.

-     *

-     * @since 1.0.0

-     *

-     * @param string $message Password reset email message.

-     * @param string $new_pass The new password string.

-     */

-    $message = apply_filters('password_reset_message', $message, $new_pass);

-    //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

-    geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

-

-    return true;

+	global $wpdb;

+

+	$errors = new WP_Error();

+	if (empty($_POST['user_login']) && empty($_POST['user_email']))

+		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+

+	if (strpos($_POST['user_login'], '@')) {

+		//$user_data = get_user_by_email(trim($_POST['user_login']));

+		$user_data = get_user_by('email', trim($_POST['user_login']));

+		if (empty($user_data))

+			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+	} else {

+		$login = trim($_POST['user_login']);

+		$user_data = get_user_by('email', $login);

+	}

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any errors are set or any emails are sent.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('lostpassword_post');

+

+	if ($errors->get_error_code())

+		return $errors;

+

+	if (!$user_data) {

+		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

+		return $errors;

+	}

+

+	// redefining user_login ensures we return the right case in the email

+	$user_login = $user_data->user_login;

+	$user_email = $user_data->user_email;

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param string $user_login The users username.

+	 */

+	do_action('retrieve_password', $user_login);

+

+	////////////////////////////////////

+	$user_email = isset($_POST['user_email']) ? $_POST['user_email'] : '';

+	$user_login = $_POST['user_login'];

+

+	$user = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM $wpdb->users WHERE user_login like %s or user_email like %s",

+			array($user_login, $user_login)

+		)

+	);

+

+	if (empty($user))

+		return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+

+	$new_pass = wp_generate_password(12, false);

+

+	/**

+	 * Called in the geodir_retrieve_password() function before any emails are sent.

+	 *

+	 * @since 1.0.0

+	 * @param object $user The user object.

+	 * @param string $new_pass The new pass being sent to the user.

+	 */

+	do_action('password_reset', $user, $new_pass);

+

+	wp_set_password($new_pass, $user->ID);

+	update_user_meta($user->ID, 'default_password_nag', true); //Set up the Password change nag.

+	$message = '<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>';

+	$message .= '<p>' . sprintf(__('Username: %s', 'geodirectory'), $user->user_login) . "</p>";

+	$message .= '<p>' . sprintf(__('Password: %s', 'geodirectory'), $new_pass) . "</p>";

+	//$message .= '<p>You can login to : <a href="'.home_url().'/?ptype=login' . "\">Login</a> or the URL is :  ".home_url()."/?ptype=login</p>";

+	//$message .= '<p>Thank You,<br> '.get_option('blogname').'</p>';

+	$user_email = $user_data->user_email;

+	$user_name = geodir_get_client_name($user->ID);

+	$fromEmail = geodir_get_site_email_id();

+	$fromEmailName = get_site_emailName();

+	$title = sprintf(__('[%s] Your new password', 'geodirectory'), get_option('blogname'));

+	/**

+	 * Filter the password reset email subject part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $title Password reset email subject.

+	 */

+	$title = apply_filters('password_reset_title', $title);

+	/**

+	 * Filter the password reset email message part.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $message Password reset email message.

+	 * @param string $new_pass The new password string.

+	 */

+	$message = apply_filters('password_reset_message', $message, $new_pass);

+	//geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$user_name,$title,$message,$extra='');///forgot password email

+	geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $user_name, $title, $message, $extra = '', 'forgot_password', $post_id = '', $user->ID);///forgot password email

+

+	return true;

 }

 

 /**

@@ -253,80 +253,80 @@ 
  */

 function geodir_register_new_user($user_login, $user_email)

 {

-    global $wpdb;

-    $errors = new WP_Error();

-

-

-    $user_login = sanitize_user($user_login);

-    $user_login = str_replace(",", "", $user_login);

-    $user_email = str_replace(",", "", $user_email);

-    /**

-     * Filter the user registration email.

-     *

-     * @since 1.0.0

-     *

-     * @param string $user_email User registration email.

-     */

-    $user_email = apply_filters('user_registration_email', $user_email);

-

-

-    if (get_option('geodir_allow_cpass')) {

-        $user_pass = $_REQUEST['user_pass'];

-        $user_pass2 = $_REQUEST['user_pass2'];

-        // Check the password

-        if ($user_pass != $user_pass2) {

-            $errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

-        } elseif (strlen($user_pass) < 7) {

-            $errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

-        }

-    }

-

-    // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

-        $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

-        $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

-

-    // Check the e-mail address

-    if ($user_email == '') {

-        $errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

-    } elseif (!is_email($user_email)) {

-        $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

-        $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

-

-    /**

-     * Called when registering a new user.

-     *

-     * This is a WordPress core hook.

-     *

-     * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

-     * @since 1.0.0

-     */

-    do_action('register_post', $user_login, $user_email, $errors);

-    /**

-     * Filter the registration error messages.

-     *

-     * @since 1.0.0

-     *

-     * @param object $errors Registration error messages.

-     */

-    $errors = apply_filters('registration_errors', $errors);

-

-    if ($errors->get_error_code())

-        return $errors;

-

-

-    if (!isset($user_pass) || $user_pass == '') {

-        $user_pass = wp_generate_password(12, false);

-    }

-    $user_id = wp_create_user($user_login, $user_pass, $user_email);

-    $user_web = '';

-    /*$user_add1 = $_POST['user_add1'];

+	global $wpdb;

+	$errors = new WP_Error();

+

+

+	$user_login = sanitize_user($user_login);

+	$user_login = str_replace(",", "", $user_login);

+	$user_email = str_replace(",", "", $user_email);

+	/**

+	 * Filter the user registration email.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param string $user_email User registration email.

+	 */

+	$user_email = apply_filters('user_registration_email', $user_email);

+

+

+	if (get_option('geodir_allow_cpass')) {

+		$user_pass = $_REQUEST['user_pass'];

+		$user_pass2 = $_REQUEST['user_pass2'];

+		// Check the password

+		if ($user_pass != $user_pass2) {

+			$errors->add('pass_match', __('ERROR: Passwords do not match.', 'geodirectory'));

+		} elseif (strlen($user_pass) < 7) {

+			$errors->add('pass_match', __('ERROR: Password must be 7 characters or more.', 'geodirectory'));

+		}

+	}

+

+	// Check the username

+	if ($user_login == '')

+		$errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

+	elseif (!validate_username($user_login)) {

+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

+		$user_login = '';

+	} elseif (username_exists($user_login))

+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+

+	// Check the e-mail address

+	if ($user_email == '') {

+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your e-mail address.', 'geodirectory'));

+	} elseif (!is_email($user_email)) {

+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

+		$user_email = '';

+	} elseif (email_exists($user_email))

+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+

+	/**

+	 * Called when registering a new user.

+	 *

+	 * This is a WordPress core hook.

+	 *

+	 * @link https://codex.wordpress.org/Plugin_API/Action_Reference/register_post

+	 * @since 1.0.0

+	 */

+	do_action('register_post', $user_login, $user_email, $errors);

+	/**

+	 * Filter the registration error messages.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param object $errors Registration error messages.

+	 */

+	$errors = apply_filters('registration_errors', $errors);

+

+	if ($errors->get_error_code())

+		return $errors;

+

+

+	if (!isset($user_pass) || $user_pass == '') {

+		$user_pass = wp_generate_password(12, false);

+	}

+	$user_id = wp_create_user($user_login, $user_pass, $user_email);

+	$user_web = '';

+	/*$user_add1 = $_POST['user_add1'];

     $user_add2 = $_POST['user_add2'];

     $user_city = $_POST['user_city'];

     $user_state = $_POST['user_state'];

@@ -335,77 +335,77 @@ 
     $user_web = $_POST['user_web'];

     $user_phone = $_POST['user_phone'];

     $user_twitter = $_POST['user_twitter'];	*/

-    $user_fname = sanitize_user($_POST['user_fname']);

-    $user_fname = str_replace(",", "", $user_fname);

-

-    /**

-     * Filter the submitted user meta.

-     *

-     * @since 1.0.0

-     *

-     * @param int $user_id User ID.

-     */

-    $user_address_info = apply_filters('geodir_manage_user_meta', array(

-        "user_add1" => '',

-        "user_add2" => '',

-        "user_city" => '',

-        "user_state" => '',

-        "user_country" => '',

-        "user_postalcode" => '',

-        "user_phone" => '',

-        "user_twitter" => '',

-        "first_name" => $user_fname,

-        "last_name" => '',

-    ), $user_id);

-    foreach ($user_address_info as $key => $val) {

-        update_user_meta($user_id, $key, $val); // User Address Information Here

-    }

-    //update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

-    $userName = $user_fname;

-    update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

-    //update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

-

-    // Changed by vikas sharma to enable all type of characters in author permalink...

-    $user_nicename = sanitize_title($userName);

-

-    $updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

-

-    $wpdb->query($updateUsersql);

-

-    if (!$user_id) {

-        $errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

-        return $errors;

-    }

-    global $upload_folder_path;

-

-    if ($user_id) {

-

-        /**

-         * Called after registering a user and before the registration email is sent.

-         *

-         * @since 1.0.0

-         * @param int $user_id The user ID of the registered user.

-         */

-        do_action('geodir_user_register', $user_id);

-        ///////REGISTRATION EMAIL START//////

-        $fromEmail = geodir_get_site_email_id();

-        $fromEmailName = get_site_emailName();

-        $message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

+	$user_fname = sanitize_user($_POST['user_fname']);

+	$user_fname = str_replace(",", "", $user_fname);

+

+	/**

+	 * Filter the submitted user meta.

+	 *

+	 * @since 1.0.0

+	 *

+	 * @param int $user_id User ID.

+	 */

+	$user_address_info = apply_filters('geodir_manage_user_meta', array(

+		"user_add1" => '',

+		"user_add2" => '',

+		"user_city" => '',

+		"user_state" => '',

+		"user_country" => '',

+		"user_postalcode" => '',

+		"user_phone" => '',

+		"user_twitter" => '',

+		"first_name" => $user_fname,

+		"last_name" => '',

+	), $user_id);

+	foreach ($user_address_info as $key => $val) {

+		update_user_meta($user_id, $key, $val); // User Address Information Here

+	}

+	//update_user_meta($user_id, 'user_address_info', ($user_address_info)); // User Address Information Here

+	$userName = $user_fname;

+	update_user_meta($user_id, 'first_name', $userName); // User Address Information Here

+	//update_user_meta($user_id, 'last_name', $_POST['user_lname']); // User Address Information Here

+

+	// Changed by vikas sharma to enable all type of characters in author permalink...

+	$user_nicename = sanitize_title($userName);

+

+	$updateUsersql = $wpdb->prepare("update $wpdb->users set user_url=%s, user_nicename=%s, display_name=%s  where ID=%d", array($user_web, $user_nicename, $userName, $user_id));

+

+	$wpdb->query($updateUsersql);

+

+	if (!$user_id) {

+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'geodirectory'), get_option('admin_email')));

+		return $errors;

+	}

+	global $upload_folder_path;

+

+	if ($user_id) {

+

+		/**

+		 * Called after registering a user and before the registration email is sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $user_id The user ID of the registered user.

+		 */

+		do_action('geodir_user_register', $user_id);

+		///////REGISTRATION EMAIL START//////

+		$fromEmail = geodir_get_site_email_id();

+		$fromEmailName = get_site_emailName();

+		$message = __('<p><b>' . __('Your login Information :', 'geodirectory') . '</b></p>

 <p>' . __('Username:', 'geodirectory') . ' ' . $user_login . '</p>

 <p>' . __('Password:', 'geodirectory') . ' ' . $user_pass . '</p>');

 

-        /////////////customer email//////////////

-        //geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

-        geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

-        //////REGISTRATION EMAIL END////////

-    }

+		/////////////customer email//////////////

+		//geodir_sendEmail($fromEmail,$fromEmailName,$user_email,$userName,$subject,$client_message,$extra='');///To client email

+		geodir_sendEmail($fromEmail, $fromEmailName, $user_email, $userName, '', $message, '', 'registration', '', $user_id);/// registration email

+		//////REGISTRATION EMAIL END////////

+	}

 

-    if (get_option('ptthemes_auto_login')) {

-        $errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

-        return $errors;

-    }

+	if (get_option('ptthemes_auto_login')) {

+		$errors->add('auto_login', __('<strong>SUCCESS</strong>: Thank you for registering, please check your email for your login details.', 'geodirectory'));

+		return $errors;

+	}

 

-    return array($user_id, $user_pass);

+	return array($user_id, $user_pass);

 }

 

 /**

@@ -418,317 +418,317 @@ 
  */

 function geodir_user_signup()

 {

-    global $errors;

-    $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

-

-    $errors = new WP_Error();

-

-    if (isset($_GET['key']))

-        $action = 'resetpass';

-

-    // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

-

-    nocache_headers();

-

-    if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

-

-        $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

-    }

-

-    //Set a cookie now to see if they are supported by the browser.

-    //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

-

-    /**

-     * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

-     *

-     * Used dynamic hook login_form_$action

-     *

-     * @since 1.0.0

-     */

-    do_action('login_form_' . $action);

-

-    $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

-

-    switch ($action):

-

-        case 'logout' :

-            //check_admin_referer('log-out');

-            wp_logout();

-

-            $redirect_to = $_SERVER['HTTP_REFERER'];

-            //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

-                $redirect_to = $_REQUEST['redirect_to'];

-            $redirect_to = home_url();

-            wp_safe_redirect($redirect_to);

-            exit();

-

-            break;

-

-        case 'lostpassword' :

-        case 'retrievepassword' :

-            if ($http_post) {

-                $errors = geodir_retrieve_password();

-                $error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

-                if (!is_wp_error($errors)) {

-                    wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

-                    gd_die();

-                } else {

-                    wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));

-                    gd_die();

-                }

-            }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

-        /**

-         * Called in the geodir_user_signup() function during the lostpassword case.

-         *

-         * @since 1.0.0

-         */

-        do_action('lost_password');

-            $message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

-            $user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

-

-            break;

-

-        case 'resetpass' :

-        case 'rp' :

-            $errors = reset_password($_GET['key'], $_GET['login']);

-

-            if (!is_wp_error($errors)) {

-                wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

-                exit();

-            }

-

-            wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

-            exit();

-

-            break;

-

-        case 'register' :

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            if (!get_option('users_can_register')) {

-                wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

-                exit();

-            }

-            ############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

-            global $user_email, $user_fname;

-            $user_login = '';

-            $user_email = '';

-            if ($http_post) {

-                $user_login = $_POST['user_email'];

-                $user_email = $_POST['user_email'];

-                $user_fname = $_POST['user_fname'];

-

-                $errors = geodir_register_new_user($user_login, $user_email);

-

-                /* display error in registration form */

-                if (is_wp_error($errors)) {

-                    $error_code = $errors->get_error_code();

-                    $error_message = $errors->get_error_message($error_code);

-                    if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

-                        if ($error_code == 'empty_username') {

-                            $error_code = 'empty_email';

-                        } else if ($error_code == 'invalid_username') {

-                            $error_code = 'invalid_email';

-                        } else if ($error_code == 'username_exists') {

-                            $error_code = 'email_exists';

-                        }

-

-                        $error_message = $errors->get_error_message($error_code);

-                    }

-                    global $geodir_signup_error;

-                    $geodir_signup_error = $error_message;

-                }

-

-                if (!is_wp_error($errors)) {

-                    $_POST['log'] = $user_login;

-                    $_POST['pwd'] = $errors[1];

-                    $_POST['testcookie'] = 1;

-

-                    $secure_cookie = '';

-                    // If the user wants ssl but the session is not ssl, force a secure cookie.

-                    if (!empty($_POST['log'])) {

-                        $user_name = sanitize_user($_POST['log']);

-                        if ($user = get_user_by('email', $user_name)) {

-                            if (get_user_option('use_ssl', $user->ID)) {

-                                $secure_cookie = true;

-                                force_ssl_admin(true);

-                            }

-                        }

-                    }

-

-                    $redirect_to = $_REQUEST['redirect_to'];

-

-                    if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                        if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

-                            $redirect_to = $_SERVER['HTTP_REFERER'];

-                        } else {

-                            $redirect_to = home_url();

-                        }

-

-                    }

-

-                    if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {

-

-                        $redirect_to = $_REQUEST['redirect_add_listing'];

-                    }

-

-

-                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

-

-                    $user = wp_signon('', $secure_cookie);

-

-                    $requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

-                    /**

-                     * Filter the login redirect URL.

-                     *

-                     * @since 1.4.9

-                     * @param string $redirect_to The redirect destination URL.

-                     * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

-                     * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-                     */

-                    $redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

-

-

-                    if (!is_wp_error($user)) {

-                        wp_safe_redirect($redirect_to);

-                        exit();

-                    }

-                    exit();

-                }

-            }

-

-            break;

-

-        case 'login' :

-        default:

-            $secure_cookie = '';

-

-            if (!empty($_POST['log'])) {

-                $user_name = sanitize_user($_POST['log']);

-                if ($user = get_user_by('login', $user_name)) {

-

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                } elseif ($user = get_user_by('email', $user_name)) {

-                    $_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

-                    if (get_user_option('use_ssl', $user->ID)) {

-                        $secure_cookie = true;

-                        force_ssl_admin(true);

-                    }

-                }

-            }

-            ///////////////////////////

-            if (isset($_REQUEST['redirect_add_listing'])) {

-                $_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

-            }

-

-

-            if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

-                if (is_user_logged_in()) :

-                    $user_ID = isset($user->ID) ? $user->ID : '';

-                    $author_link = get_author_posts_url($user_ID);

-                    $default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

-

-                    /**

-                     * Filter the author link.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $default_author_link Default author link.

-                     * @param int $user_ID The user ID.

-                     */

-                    $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

-

-                    $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

-                endif;

-

-            }

-            if (isset($_REQUEST['redirect_to'])) {

-                $redirect_to = $_REQUEST['redirect_to'];

-                // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

-            } else {

-                $redirect_to = admin_url();

-            }

-

-            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

-            $user = wp_signon('', $secure_cookie);

-

-

-            /**

-             * Filter the login redirect URL.

-             *

-             * @since 1.4.9

-             * @param string $redirect_to The redirect destination URL.

-             * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

-             */

-            $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

-

-            if (is_wp_error($user)) {

-                if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

-                    wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

-                }

-            }

-            if (!is_wp_error($user)) {

-

-                // Some servers are not logging the user in properly after wp_signon, se we set the user here.

-                //wp_set_current_user($user->ID);

-                //echo '###';exit;

-

-                if ($redirect_to) {

-                    wp_redirect($redirect_to);

-                } else {

-                    wp_redirect(home_url());

-                }

-                gd_die();

-            }

-

-            $errors = $user;

-

-            // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

-            // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

-

-            // Some parts of this script use the main login form to display a message

-            if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

-                $successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

-            } elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

-                $successmsg = USER_REG_NOT_ALLOW_MSG;

-            } elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

-                $successmsg = EMAIL_CONFIRM_LINK_MSG;

-            } elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {

-                $successmsg = NEW_PW_EMAIL_MSG;

-            } elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {

-                $successmsg = REG_COMPLETE_MSG;

-            }

-

-            if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

-                if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

-                    wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

-                } else {

-                    wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

-                }

-                gd_die();

-            }

-            break;

-    endswitch; // end action switch

+	global $errors;

+	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';

+

+	$errors = new WP_Error();

+

+	if (isset($_GET['key']))

+		$action = 'resetpass';

+

+	// validate action so as to default to the login screen

+	if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

+		$action = 'login';

+

+	nocache_headers();

+

+	if (defined('RELOCATE')) { // Move flag is set

+		if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

+			$_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+

+		$schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

+		if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

+			update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+	}

+

+	//Set a cookie now to see if they are supported by the browser.

+	//setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

+	if (SITECOOKIEPATH != COOKIEPATH)

+		setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+

+	/**

+	 * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

+	 *

+	 * Used dynamic hook login_form_$action

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('login_form_' . $action);

+

+	$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);

+

+	switch ($action):

+

+		case 'logout' :

+			//check_admin_referer('log-out');

+			wp_logout();

+

+			$redirect_to = $_SERVER['HTTP_REFERER'];

+			//$redirect_to = home_url().'/?ptype=login&loggedout=true';

+			if (isset($_REQUEST['redirect_to']))

+				$redirect_to = $_REQUEST['redirect_to'];

+			$redirect_to = home_url();

+			wp_safe_redirect($redirect_to);

+			exit();

+

+			break;

+

+		case 'lostpassword' :

+		case 'retrievepassword' :

+			if ($http_post) {

+				$errors = geodir_retrieve_password();

+				$error_message = isset($errors->errors['invalid_email'][0]) ? $errors->errors['invalid_email'][0] : '';

+				if (!is_wp_error($errors)) {

+					wp_redirect(geodir_login_url(array('checkemail'=>'confirm')));

+					gd_die();

+				} else {

+					wp_redirect(geodir_login_url(array('forgot' => 1, 'emsg'=>'fw')));

+					gd_die();

+				}

+			}

+			if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+		/**

+		 * Called in the geodir_user_signup() function during the lostpassword case.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('lost_password');

+			$message = '<div class="sucess_msg">' . ENTER_USER_EMAIL_NEW_PW_MSG . '</div>';

+			$user_login = isset($_POST['user_login']) ? stripslashes($_POST['user_login']) : '';

+

+			break;

+

+		case 'resetpass' :

+		case 'rp' :

+			$errors = reset_password($_GET['key'], $_GET['login']);

+

+			if (!is_wp_error($errors)) {

+				wp_redirect(geodir_login_url(array('checkemail'=>'newpass')));

+				exit();

+			}

+

+			wp_redirect(geodir_login_url(array('error'=>'invalidkey','action'=>'lostpassword')));

+			exit();

+

+			break;

+

+		case 'register' :

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			if (!get_option('users_can_register')) {

+				wp_redirect(geodir_login_url(array('emsg'=>'regnewusr')));

+				exit();

+			}

+			############################### fix by Stiofan -  HebTech.co.uk ### SECURITY FIX ##############################

+			global $user_email, $user_fname;

+			$user_login = '';

+			$user_email = '';

+			if ($http_post) {

+				$user_login = $_POST['user_email'];

+				$user_email = $_POST['user_email'];

+				$user_fname = $_POST['user_fname'];

+

+				$errors = geodir_register_new_user($user_login, $user_email);

+

+				/* display error in registration form */

+				if (is_wp_error($errors)) {

+					$error_code = $errors->get_error_code();

+					$error_message = $errors->get_error_message($error_code);

+					if (!isset($_POST['user_login']) && ($error_code == 'empty_username' || $error_code == 'invalid_username' || $error_code == 'username_exists')) {

+						if ($error_code == 'empty_username') {

+							$error_code = 'empty_email';

+						} else if ($error_code == 'invalid_username') {

+							$error_code = 'invalid_email';

+						} else if ($error_code == 'username_exists') {

+							$error_code = 'email_exists';

+						}

+

+						$error_message = $errors->get_error_message($error_code);

+					}

+					global $geodir_signup_error;

+					$geodir_signup_error = $error_message;

+				}

+

+				if (!is_wp_error($errors)) {

+					$_POST['log'] = $user_login;

+					$_POST['pwd'] = $errors[1];

+					$_POST['testcookie'] = 1;

+

+					$secure_cookie = '';

+					// If the user wants ssl but the session is not ssl, force a secure cookie.

+					if (!empty($_POST['log'])) {

+						$user_name = sanitize_user($_POST['log']);

+						if ($user = get_user_by('email', $user_name)) {

+							if (get_user_option('use_ssl', $user->ID)) {

+								$secure_cookie = true;

+								force_ssl_admin(true);

+							}

+						}

+					}

+

+					$redirect_to = $_REQUEST['redirect_to'];

+

+					if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+						if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], home_url())) {

+							$redirect_to = $_SERVER['HTTP_REFERER'];

+						} else {

+							$redirect_to = home_url();

+						}

+

+					}

+

+					if (isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '') {

+

+						$redirect_to = $_REQUEST['redirect_add_listing'];

+					}

+

+

+					if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+						$secure_cookie = false;

+

+					$user = wp_signon('', $secure_cookie);

+

+					$requested_redirect_to = isset($_REQUEST['redirect_add_listing']) && $_REQUEST['redirect_add_listing'] != '' ? $_REQUEST['redirect_add_listing'] : (isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '');

+					/**

+					 * Filter the login redirect URL.

+					 *

+					 * @since 1.4.9

+					 * @param string $redirect_to The redirect destination URL.

+					 * @param string $requested_redirect_to The requested redirect destination URL passed as a parameter.

+					 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+					 */

+					$redirect_to = apply_filters('login_redirect', $redirect_to, $requested_redirect_to, $user);

+

+

+					if (!is_wp_error($user)) {

+						wp_safe_redirect($redirect_to);

+						exit();

+					}

+					exit();

+				}

+			}

+

+			break;

+

+		case 'login' :

+		default:

+			$secure_cookie = '';

+

+			if (!empty($_POST['log'])) {

+				$user_name = sanitize_user($_POST['log']);

+				if ($user = get_user_by('login', $user_name)) {

+

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				} elseif ($user = get_user_by('email', $user_name)) {

+					$_POST['log'] = $user->user_login; // If signing in by email, set the username for normal WP login

+					if (get_user_option('use_ssl', $user->ID)) {

+						$secure_cookie = true;

+						force_ssl_admin(true);

+					}

+				}

+			}

+			///////////////////////////

+			if (isset($_REQUEST['redirect_add_listing'])) {

+				$_REQUEST['redirect_to'] = $_REQUEST['redirect_add_listing'];

+			}

+

+

+			if (!isset($_REQUEST['redirect_to']) || $_REQUEST['redirect_to'] == '') {

+				if (is_user_logged_in()) :

+					$user_ID = isset($user->ID) ? $user->ID : '';

+					$author_link = get_author_posts_url($user_ID);

+					$default_author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true', 'stype' => 'gd_place'), false);

+

+					/**

+					 * Filter the author link.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $default_author_link Default author link.

+					 * @param int $user_ID The user ID.

+					 */

+					$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

+

+					$_REQUEST['redirect_to'] = $default_author_link;

+				else:

+					$_REQUEST['redirect_to'] = home_url();

+				endif;

+

+			}

+			if (isset($_REQUEST['redirect_to'])) {

+				$redirect_to = $_REQUEST['redirect_to'];

+				// Redirect to https if user wants ssl

+				if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

+					$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+			} else {

+				$redirect_to = admin_url();

+			}

+

+			if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

+				$secure_cookie = false;

+			$user = wp_signon('', $secure_cookie);

+

+

+			/**

+			 * Filter the login redirect URL.

+			 *

+			 * @since 1.4.9

+			 * @param string $redirect_to The redirect destination URL.

+			 * @param WP_User|WP_Error $user WP_User object if login was successful, WP_Error object otherwise.

+			 */

+			$redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);

+

+			if (is_wp_error($user)) {

+				if (isset($_SERVER['HTTP_REFERER']) && strstr($_SERVER['HTTP_REFERER'], 'ptype=property_submit') && $_POST['log'] != '' && $_POST['pwd'] != '') {

+					wp_redirect($_SERVER['HTTP_REFERER'] . '&emsg=1');

+				}

+			}

+			if (!is_wp_error($user)) {

+

+				// Some servers are not logging the user in properly after wp_signon, se we set the user here.

+				//wp_set_current_user($user->ID);

+				//echo '###';exit;

+

+				if ($redirect_to) {

+					wp_redirect($redirect_to);

+				} else {

+					wp_redirect(home_url());

+				}

+				gd_die();

+			}

+

+			$errors = $user;

+

+			// Clear errors if loggedout is set.

+			if (!empty($_GET['loggedout']))

+				$errors = new WP_Error();

+			// If cookies are disabled we can't log in even with a valid user+pass

+			if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

+				$errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+

+			// Some parts of this script use the main login form to display a message

+			if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

+				$successmsg = '<div class="sucess_msg">' . YOU_ARE_LOGED_OUT_MSG . '</div>';

+			} elseif (isset($_GET['registration']) && 'disabled' == $_GET['registration']) {

+				$successmsg = USER_REG_NOT_ALLOW_MSG;

+			} elseif (isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail']) {

+				$successmsg = EMAIL_CONFIRM_LINK_MSG;

+			} elseif (isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail']) {

+				$successmsg = NEW_PW_EMAIL_MSG;

+			} elseif (isset($_GET['checkemail']) && 'registered' == $_GET['checkemail']) {

+				$successmsg = REG_COMPLETE_MSG;

+			}

+

+			if ((isset($_POST['log']) && $_POST['log'] != '' && $errors) || ((!isset($_POST['log']) || $_POST['log'] == '') && isset($_REQUEST['testcookie']) && $_REQUEST['testcookie'])) {

+				if (isset($_REQUEST['pagetype']) && $_REQUEST['pagetype'] != '') {

+					wp_redirect($_REQUEST['pagetype'] . '&emsg=1');

+				} else {

+					wp_redirect(geodir_login_url(array('logemsg'=>'1','redirect_to'=>urlencode($_REQUEST['redirect_to']))));

+				}

+				gd_die();

+			}

+			break;

+	endswitch; // end action switch

 }
\ No newline at end of file

Braces +74 added lines, -48 removed lines

@@ -25,11 +25,13 @@ 
                 window.location.href = '<?php echo geodir_login_url();?>';

             </script>

         <?php

-        } else

-            return false;

-    } else

-        return true;

-}

+        } else {
+                    return false;
+        }
+    } else {
+            return true;
+    }
+    }

 

 /**

  * Redirect to SSL url, if SSL is being used.

@@ -60,7 +62,9 @@ 
      * @param string $message Login message.

      */

     $message = apply_filters('login_message', $message);

-    if (!empty($message)) echo $message . "\n";

+    if (!empty($message)) {
+    	echo $message . "\n";
+    }
 

 }

 

@@ -141,14 +145,16 @@ 
     global $wpdb;

 

     $errors = new WP_Error();

-    if (empty($_POST['user_login']) && empty($_POST['user_email']))

-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));

+    if (empty($_POST['user_login']) && empty($_POST['user_email'])) {
+            $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.', 'geodirectory'));
+    }
 

     if (strpos($_POST['user_login'], '@')) {

         //$user_data = get_user_by_email(trim($_POST['user_login']));

         $user_data = get_user_by('email', trim($_POST['user_login']));

-        if (empty($user_data))

-            $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));

+        if (empty($user_data)) {
+                    $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.', 'geodirectory'));
+        }
     } else {

         $login = trim($_POST['user_login']);

         $user_data = get_user_by('email', $login);

@@ -161,8 +167,9 @@ 
      */

     do_action('lostpassword_post');

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

     if (!$user_data) {

         $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.', 'geodirectory'));

@@ -192,8 +199,9 @@ 
         )

     );

 

-    if (empty($user))

-        return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));

+    if (empty($user)) {
+            return new WP_Error('invalid_key', __('Invalid key', 'geodirectory'));
+    }
 

     $new_pass = wp_generate_password(12, false);

 

@@ -282,13 +290,14 @@ 
     }

 

     // Check the username

-    if ($user_login == '')

-        $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));

-    elseif (!validate_username($user_login)) {

+    if ($user_login == '') {
+            $errors->add('empty_username', __('ERROR: Please enter a username.', 'geodirectory'));
+    } elseif (!validate_username($user_login)) {

         $errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.', 'geodirectory'));

         $user_login = '';

-    } elseif (username_exists($user_login))

-        $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));

+    } elseif (username_exists($user_login)) {
+            $errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered, please choose another one.', 'geodirectory'));
+    }
 

     // Check the e-mail address

     if ($user_email == '') {

@@ -296,8 +305,9 @@ 
     } elseif (!is_email($user_email)) {

         $errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.', 'geodirectory'));

         $user_email = '';

-    } elseif (email_exists($user_email))

-        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));

+    } elseif (email_exists($user_email)) {
+            $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.', 'geodirectory'));
+    }
 

     /**

      * Called when registering a new user.

@@ -317,8 +327,9 @@ 
      */

     $errors = apply_filters('registration_errors', $errors);

 

-    if ($errors->get_error_code())

-        return $errors;

+    if ($errors->get_error_code()) {
+            return $errors;
+    }
 

 

     if (!isset($user_pass) || $user_pass == '') {

@@ -423,28 +434,33 @@ 
 

     $errors = new WP_Error();

 

-    if (isset($_GET['key']))

-        $action = 'resetpass';

+    if (isset($_GET['key'])) {
+            $action = 'resetpass';
+    }
 

     // validate action so as to default to the login screen

-    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action))

-        $action = 'login';

+    if (!in_array($action, array('logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login')) && false === has_filter('login_form_' . $action)) {
+            $action = 'login';
+    }
 

     nocache_headers();

 

     if (defined('RELOCATE')) { // Move flag is set

-        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']))

-            $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);

+        if (isset($_SERVER['PATH_INFO']) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'])) {
+                    $_SERVER['PHP_SELF'] = str_replace($_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF']);
+        }
 

         $schema = (isset($_SERVER['HTTPS']) && geodir_strtolower($_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';

-        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url())

-            update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));

+        if (dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != home_url()) {
+                    update_option('siteurl', dirname($schema . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']));
+        }
     }

 

     //Set a cookie now to see if they are supported by the browser.

     //setcookie(TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN);

-    if (SITECOOKIEPATH != COOKIEPATH)

-        setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);

+    if (SITECOOKIEPATH != COOKIEPATH) {
+            setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
+    }
 

     /**

      * Allow plugins to override the default actions, and to add extra actions if they want on the register/signin page.

@@ -465,8 +481,9 @@ 
 

             $redirect_to = $_SERVER['HTTP_REFERER'];

             //$redirect_to = home_url().'/?ptype=login&loggedout=true';

-            if (isset($_REQUEST['redirect_to']))

-                $redirect_to = $_REQUEST['redirect_to'];

+            if (isset($_REQUEST['redirect_to'])) {
+                            $redirect_to = $_REQUEST['redirect_to'];
+            }
             $redirect_to = home_url();

             wp_safe_redirect($redirect_to);

             exit();

@@ -486,7 +503,9 @@ 
                     gd_die();

                 }

             }

-            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));

+            if (isset($_GET['error']) && 'invalidkey' == $_GET['error']) {
+            	$errors->add('invalidkey', __('Sorry, that key does not appear to be valid.', 'geodirectory'));
+            }
         /**

          * Called in the geodir_user_signup() function during the lostpassword case.

          *

@@ -582,8 +601,9 @@ 
                     }

 

 

-                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                        $secure_cookie = false;

+                    if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                                            $secure_cookie = false;
+                    }
 

                     $user = wp_signon('', $secure_cookie);

 

@@ -652,22 +672,26 @@ 
                     $default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_ID);

 

                     $_REQUEST['redirect_to'] = $default_author_link;

-                else:

-                    $_REQUEST['redirect_to'] = home_url();

+                else {
+                	:

+                    $_REQUEST['redirect_to'] = home_url();
+                }
                 endif;

 

             }

             if (isset($_REQUEST['redirect_to'])) {

                 $redirect_to = $_REQUEST['redirect_to'];

                 // Redirect to https if user wants ssl

-                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin'))

-                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);

+                if ($secure_cookie && false !== strpos($redirect_to, 'wp-admin')) {
+                                    $redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
+                }
             } else {

                 $redirect_to = admin_url();

             }

 

-            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http')))

-                $secure_cookie = false;

+            if (!$secure_cookie && is_ssl() && force_ssl_admin() && !force_ssl_admin() && (0 !== strpos($redirect_to, 'https')) && (0 === strpos($redirect_to, 'http'))) {
+                            $secure_cookie = false;
+            }
             $user = wp_signon('', $secure_cookie);

 

 

@@ -702,11 +726,13 @@ 
             $errors = $user;

 

             // Clear errors if loggedout is set.

-            if (!empty($_GET['loggedout']))

-                $errors = new WP_Error();

+            if (!empty($_GET['loggedout'])) {
+                            $errors = new WP_Error();
+            }
             // If cookies are disabled we can't log in even with a valid user+pass

-            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE]))

-                $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));

+            if (isset($_POST['testcookie']) && empty($_COOKIE[TEST_COOKIE])) {
+                            $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress.", 'geodirectory'));
+            }
 

             // Some parts of this script use the main login form to display a message

             if (isset($_GET['loggedout']) && TRUE == $_GET['loggedout']) {

geodirectory-functions/template_functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
  * @global object $post The current post object.

  * @global object $geodirectory Not yet implemented.

  * @param string $slug The template slug.

- * @param null $name The template name.

+ * @param string $name The template name.

  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

Braces +58 added lines, -26 removed lines

@@ -47,16 +47,19 @@ 
 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             if (empty($post_type) && !isset($_REQUEST['pid'])) {

                 $pagename = $wp->query_vars['pagename'];

                 $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+                if (!empty($post_types)) {
+                                    $post_type = $post_types[0];
+                }
 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+				if($sc_post_type != '' ) {
+									$post_type = $sc_post_type;
+				}
 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

@@ -71,14 +74,16 @@ 
             $success_page_id = geodir_success_page_id();

             if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

             break;

         case 'detail':

         case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

+            if (in_array(get_post_type(), geodir_get_posttypes())) {
+                            $post_type = get_post_type();
+            }
             return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

             break;

         case 'listing':

@@ -184,7 +189,9 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        }
 

         /**

          * Filter the signup template path.

@@ -202,7 +209,9 @@ 
 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+            }
             /**

              * Filter the information template path.

              *

@@ -219,7 +228,9 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) {
+                	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+                }
                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +252,9 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';
+        }
         /**

          * Filter the add listing template path.

          *

@@ -258,7 +271,9 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the preview template path.

          *

@@ -274,7 +289,9 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';
+        }
         /**

          * Filter the success template path.

          *

@@ -289,7 +306,9 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the detail template path.

          *

@@ -304,7 +323,9 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';
+        }
         /**

          * Filter the listing template path.

          *

@@ -319,7 +340,9 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';
+        }
         /**

          * Filter the search template path.

          *

@@ -334,7 +357,9 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) {
+        	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';
+        }
         /**

          * Filter the author template path.

          *

@@ -355,7 +380,9 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';
+            }
             /**

              * Filter the home page template path.

              *

@@ -368,7 +395,9 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) {
+            	$template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';
+            }
             /**

              * Filter the location template path.

              *

@@ -377,8 +406,9 @@ 
              */

             return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+        } else {
+                    return $template;
+        }
 

     }

 

@@ -432,8 +462,10 @@ 
          * @since 1.0.0

          */

         include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+    else {
+    	:

+        locate_template(array("geodirectory/" . $template_name), true, false);
+    }
     endif;

 

 }

Spacing +32 added lines, -32 removed lines

@@ -55,13 +55,13 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

+				if ($sc_post_type != '')

 					$post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

-					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+					wp_redirect(trailingslashit(get_site_url()).$pagename.'/?listing_type='.$post_type);

 				}

                 exit();

             }

@@ -119,14 +119,14 @@ 
         case 'listing-listview':

             $template = locate_template(array("geodirectory/listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/listing-listview.php';

             }

             return $template;

             break;

         case 'widget-listing-listview':

             $template = locate_template(array("geodirectory/widget-listing-listview.php"));

             if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+                $template = geodir_plugin_path().'/geodirectory-templates/widget-listing-listview.php';

             }

             return $template;

             break;

@@ -184,7 +184,7 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-signup.php';

 

         /**

          * Filter the signup template path.

@@ -198,11 +198,11 @@ 
     if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

         if (!geodir_is_default_location_set()) {

             global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>');

 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

             /**

              * Filter the information template path.

              *

@@ -219,7 +219,7 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';

                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +241,7 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/add-listing.php';

         /**

          * Filter the add listing template path.

          *

@@ -258,7 +258,7 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the preview template path.

          *

@@ -274,7 +274,7 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-success.php';

         /**

          * Filter the success template path.

          *

@@ -289,7 +289,7 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/listing-detail.php';

         /**

          * Filter the detail template path.

          *

@@ -304,7 +304,7 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-listing.php';

         /**

          * Filter the listing template path.

          *

@@ -319,7 +319,7 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-search.php';

         /**

          * Filter the search template path.

          *

@@ -334,7 +334,7 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-author.php';

         /**

          * Filter the author template path.

          *

@@ -355,7 +355,7 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-home.php';

             /**

              * Filter the home page template path.

              *

@@ -368,7 +368,7 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) $template = geodir_plugin_path().'/geodirectory-templates/geodir-location.php';

             /**

              * Filter the location template path.

              *

@@ -410,7 +410,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -418,14 +418,14 @@ 
         $template_name = "{$slug}.php";

     }

 

-    if (!locate_template(array("geodirectory/" . $template_name))) :

+    if (!locate_template(array("geodirectory/".$template_name))) :

         /**

          * Filter the template part with slug and name.

          *

          * @since 1.0.0

          * @param string $template_name The template name.

          */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path().'/geodirectory-templates/'.$template_name);

         /**

          * Includes the template part with slug and name.

          *

@@ -433,7 +433,7 @@ 
          */

         include($template);

     else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+        locate_template(array("geodirectory/".$template_name), true, false);

     endif;

 

 }

@@ -461,9 +461,9 @@ 
     $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

     if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

+        $append_class = 'gd-post-'.$gdp_post_type;

         $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

+        $class = $class != '' ? $class.' '.$append_class : $append_class;

     }

 

     return $class;

@@ -495,7 +495,7 @@ 
 	 */

 	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+	echo '<li class="no-listing">'.$message.'</li>';

 }

 

 /**

@@ -524,7 +524,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -589,7 +589,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option '.selected((int) ($i + 1), (int) $default, false).' value="'.(int) ($i + 1).'">'.$text.'</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -618,14 +618,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fa fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

@@ -644,7 +644,7 @@ 
 		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

 		if ($full_color != '#757575') {

 			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

-			.gd-star-rating i.fa {color:' . stripslashes($full_color) . '!important;}</style>';

+			.gd-star-rating i.fa {color:' . stripslashes($full_color).'!important;}</style>';

 		}

 	}

 }
\ No newline at end of file

Indentation +356 added lines, -356 removed lines

@@ -19,18 +19,18 @@ 
  */

 function geodir_locate_template($template = '')

 {

-    global $post_type, $wp, $post;

-    $fields = array();

+	global $post_type, $wp, $post;

+	$fields = array();

 

-    switch ($template):

-        case 'signup':

-            return $template = locate_template(array("geodirectory/geodir-signup.php"));

-            break;

-        case 'add-listing':

+	switch ($template):

+		case 'signup':

+			return $template = locate_template(array("geodirectory/geodir-signup.php"));

+			break;

+		case 'add-listing':

 

-            $sc_post_type = '';

+			$sc_post_type = '';

 			if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

-                $listing_page_id = $post->ID;

+				$listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

 				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

@@ -39,100 +39,100 @@ 
 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

 					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

 				}

-            } else {

-                $listing_page_id = geodir_add_listing_page_id();

-            }

+			} else {

+				$listing_page_id = geodir_add_listing_page_id();

+			}

 			

 			$is_wpml = function_exists('icl_object_id') ? true : false;

 

-            if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            if (empty($post_type) && !isset($_REQUEST['pid'])) {

-                $pagename = $wp->query_vars['pagename'];

-                $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+			if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			if (empty($post_type) && !isset($_REQUEST['pid'])) {

+				$pagename = $wp->query_vars['pagename'];

+				$post_types = geodir_get_posttypes();

+				if (!empty($post_types))

+					$post_type = $post_types[0];

 					

 				if($sc_post_type != '' )

 					$post_type = $sc_post_type;

 				

-                if ($is_wpml && !empty($wp->query_vars['page_id'])) {

+				if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

 				} else {

 					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

 				}

-                gd_die();

-            }

-            return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

-            break;

-        case 'success':

-            $success_page_id = geodir_success_page_id();

-            if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

-                && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

-            return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

-            break;

-        case 'detail':

-        case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

-            return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

-            break;

-        case 'listing':

-            $templates = array();

-            if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

-                $post_type = get_post_type();

-                $templates[] = "geodirectory/archive-$post_type.php";

-            }

-

-

-            if (is_tax() && geodir_get_taxonomy_posttype()) {

-                $query_obj = get_queried_object();

-                $curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

-                $curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

-                $templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

-            }

-

-            $templates[] = "geodirectory/geodir-listing.php";

-

-            return $template = locate_template($templates);

-            break;

-        case 'information':

-            return $template = locate_template(array("geodirectory/geodir-information.php"));

-            break;

-        case 'author':

-            return $template = locate_template(array("geodirectory/geodir-author.php"));

-            break;

-        case 'search':

-            return $template = locate_template(array("geodirectory/geodir-search.php"));

-            break;

-        case 'location':

-            return $template = locate_template(array("geodirectory/geodir-location.php"));

-            break;

-        case 'geodir-home':

-            return $template = locate_template(array("geodirectory/geodir-home.php"));

-            break;

-        case 'listing-listview':

-            $template = locate_template(array("geodirectory/listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

-            }

-            return $template;

-            break;

-        case 'widget-listing-listview':

-            $template = locate_template(array("geodirectory/widget-listing-listview.php"));

-            if (!$template) {

-                $template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

-            }

-            return $template;

-            break;

-    endswitch;

-

-    return false;

+				gd_die();

+			}

+			return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

+			break;

+		case 'success':

+			$success_page_id = geodir_success_page_id();

+			if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

+				&& in_array($_REQUEST['listing_type'], geodir_get_posttypes())

+			)

+				$post_type = sanitize_text_field($_REQUEST['listing_type']);

+			return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

+			break;

+		case 'detail':

+		case 'preview':

+			if (in_array(get_post_type(), geodir_get_posttypes()))

+				$post_type = get_post_type();

+			return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

+			break;

+		case 'listing':

+			$templates = array();

+			if (is_post_type_archive() && in_array(get_post_type(), geodir_get_posttypes())) {

+				$post_type = get_post_type();

+				$templates[] = "geodirectory/archive-$post_type.php";

+			}

+

+

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

+				$query_obj = get_queried_object();

+				$curr_taxonomy = isset($query_obj->taxonomy) ? $query_obj->taxonomy : '';

+				$curr_term = isset($query_obj->slug) ? $query_obj->slug : '';

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy-$curr_term.php";

+				$templates[] = "geodirectory/taxonomy-$curr_taxonomy.php";

+			}

+

+			$templates[] = "geodirectory/geodir-listing.php";

+

+			return $template = locate_template($templates);

+			break;

+		case 'information':

+			return $template = locate_template(array("geodirectory/geodir-information.php"));

+			break;

+		case 'author':

+			return $template = locate_template(array("geodirectory/geodir-author.php"));

+			break;

+		case 'search':

+			return $template = locate_template(array("geodirectory/geodir-search.php"));

+			break;

+		case 'location':

+			return $template = locate_template(array("geodirectory/geodir-location.php"));

+			break;

+		case 'geodir-home':

+			return $template = locate_template(array("geodirectory/geodir-home.php"));

+			break;

+		case 'listing-listview':

+			$template = locate_template(array("geodirectory/listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/listing-listview.php';

+			}

+			return $template;

+			break;

+		case 'widget-listing-listview':

+			$template = locate_template(array("geodirectory/widget-listing-listview.php"));

+			if (!$template) {

+				$template = geodir_plugin_path() . '/geodirectory-templates/widget-listing-listview.php';

+			}

+			return $template;

+			break;

+	endswitch;

+

+	return false;

 

 }

 

@@ -151,238 +151,238 @@ 
 function geodir_template_loader($template)

 {

 

-    global $wp_query;

-

-    /**

-     * Filter the custom page list.

-     *

-     * @since 1.0.0

-     */

-    $geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

-        'geodir_signup_page' =>

-            apply_filters('geodir_set_custom_signup_page', false),

-        'geodir_add_listing_page' =>

-            apply_filters('geodir_set_custom_add_listing_page', false),

-        'geodir_preview_page' =>

-            apply_filters('geodir_set_custom_preview_page', false),

-        'geodir_listing_success_page' =>

-            apply_filters('geodir_set_custom_listing_success_page', false),

-        'geodir_listing_detail_page' =>

-            apply_filters('geodir_set_custom_listing_detail_page', false),

-        'geodir_listing_page' =>

-            apply_filters('geodir_set_custom_listing_page', false),

-        'geodir_search_page' =>

-            apply_filters('geodir_set_custom_search_page', false),

-        'geodir_author_page' =>

-            apply_filters('geodir_set_custom_author_page', false),

-        'geodir_home_map_page' =>

-            apply_filters('geodir_set_custom_home_map_page', false)

-    ));

-

-

-    if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

-

-        $template = geodir_locate_template('signup');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

-

-        /**

-         * Filter the signup template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_signup', $template);

-    }

-

-    if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

-        if (!geodir_is_default_location_set()) {

-            global $information;

-            $information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

-

-            $template = geodir_locate_template('information');

-

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-            /**

-             * Filter the information template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_information', $template);

-        }

-        // check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            global $information;

-            $information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

-            $is_current_user_owner = geodir_listing_belong_to_current_user();

-            if (!$is_current_user_owner) {

-                $template = geodir_locate_template('information');

-

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

-                /**

-                 * Filter the information template path.

-                 *

-                 * @since 1.0.0

-                 * @param string $template The template path.

-                 */

-                return $template = apply_filters('geodir_template_information', $template);

-            }

-

-

-        }

-

-        //geodir_is_login(true);

-        global $current_user;

-        if (!$current_user->ID) {

-            wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

-            exit;

-        }

-

-        $template = geodir_locate_template('add-listing');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

-        /**

-         * Filter the add listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_add_listing', $template);

-    }

-

-

-    if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

-        global $preview;

-        $preview = true;

-

-        $template = geodir_locate_template('preview');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the preview template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_preview', $template);

-

-    }

-

-

-    if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

-

-        $template = geodir_locate_template('success');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

-        /**

-         * Filter the success template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_success', $template);

-

-    }

-

-    if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

-

-        $template = geodir_locate_template('detail');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

-        /**

-         * Filter the detail template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_detail', $template);

-

-    }

-

-    if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

-

-        $template = geodir_locate_template('listing');

-

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

-        /**

-         * Filter the listing template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_listing', $template);

+	global $wp_query;

 

-    }

+	/**

+	 * Filter the custom page list.

+	 *

+	 * @since 1.0.0

+	 */

+	$geodir_custom_page_list = apply_filters('geodir_set_custom_pages', array(

+		'geodir_signup_page' =>

+			apply_filters('geodir_set_custom_signup_page', false),

+		'geodir_add_listing_page' =>

+			apply_filters('geodir_set_custom_add_listing_page', false),

+		'geodir_preview_page' =>

+			apply_filters('geodir_set_custom_preview_page', false),

+		'geodir_listing_success_page' =>

+			apply_filters('geodir_set_custom_listing_success_page', false),

+		'geodir_listing_detail_page' =>

+			apply_filters('geodir_set_custom_listing_detail_page', false),

+		'geodir_listing_page' =>

+			apply_filters('geodir_set_custom_listing_page', false),

+		'geodir_search_page' =>

+			apply_filters('geodir_set_custom_search_page', false),

+		'geodir_author_page' =>

+			apply_filters('geodir_set_custom_author_page', false),

+		'geodir_home_map_page' =>

+			apply_filters('geodir_set_custom_home_map_page', false)

+	));

+

+

+	if (geodir_is_page('login') || $geodir_custom_page_list['geodir_signup_page']) {

+

+		$template = geodir_locate_template('signup');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+

+		/**

+		 * Filter the signup template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_signup', $template);

+	}

 

-    if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

+	if (geodir_is_page('add-listing') || $geodir_custom_page_list['geodir_add_listing_page']) {

+		if (!geodir_is_default_location_set()) {

+			global $information;

+			$information = sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>');

+

+			$template = geodir_locate_template('information');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+			/**

+			 * Filter the information template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_information', $template);

+		}

+		// check if pid exists in the record if yes then check if this post belongs to the user who is logged in.

+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			global $information;

+			$information = __('This listing does not belong to your account, please check the listing id carefully.', 'geodirectory');

+			$is_current_user_owner = geodir_listing_belong_to_current_user();

+			if (!$is_current_user_owner) {

+				$template = geodir_locate_template('information');

+

+				if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+				/**

+				 * Filter the information template path.

+				 *

+				 * @since 1.0.0

+				 * @param string $template The template path.

+				 */

+				return $template = apply_filters('geodir_template_information', $template);

+			}

 

-        $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

-        /**

-         * Filter the search template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_search', $template);

+		}

+

+		//geodir_is_login(true);

+		global $current_user;

+		if (!$current_user->ID) {

+			wp_redirect(geodir_login_url(array('redirect_add_listing'=>urlencode(geodir_curPageURL()))), 302);

+			exit;

+		}

+

+		$template = geodir_locate_template('add-listing');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+		/**

+		 * Filter the add listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_add_listing', $template);

+	}

 

-    }

 

-    if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+	if (geodir_is_page('preview') || $geodir_custom_page_list['geodir_preview_page']) {

+		global $preview;

+		$preview = true;

 

-        $template = geodir_locate_template('author');

+		$template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

-        /**

-         * Filter the author template path.

-         *

-         * @since 1.0.0

-         * @param string $template The template path.

-         */

-        return $template = apply_filters('geodir_template_author', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the preview template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_preview', $template);

 

-    }

+	}

 

-    if (get_option('geodir_set_as_home') || geodir_is_page('home') || geodir_is_page('location')) {

 

-        global $post, $wp_query;

+	if (geodir_is_page('listing-success') || $geodir_custom_page_list['geodir_listing_success_page']) {

 

-        if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

-            || (is_home() && !$wp_query->is_posts_page)

-        ) {

+		$template = geodir_locate_template('success');

 

-            $template = geodir_locate_template('geodir-home');

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+		/**

+		 * Filter the success template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_success', $template);

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

-            /**

-             * Filter the home page template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_homepage', $template);

+	}

 

-        } elseif (geodir_is_page('location')) {

+	if (geodir_is_page('detail') || $geodir_custom_page_list['geodir_listing_detail_page']) {

 

-            $template = geodir_locate_template('location');

+		$template = geodir_locate_template('detail');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

-            /**

-             * Filter the location template path.

-             *

-             * @since 1.0.0

-             * @param string $template The template path.

-             */

-            return $template = apply_filters('geodir_template_location', $template);

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+		/**

+		 * Filter the detail template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_detail', $template);

+

+	}

+

+	if (geodir_is_page('listing') || $geodir_custom_page_list['geodir_listing_page']) {

+

+		$template = geodir_locate_template('listing');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+		/**

+		 * Filter the listing template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_listing', $template);

+

+	}

 

-        } else

-            return $template;

+	if (geodir_is_page('search') || $geodir_custom_page_list['geodir_search_page']) {

 

-    }

+		$template = geodir_locate_template('search');

 

-    return $template;

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+		/**

+		 * Filter the search template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_search', $template);

+

+	}

+

+	if (geodir_is_page('author') || $geodir_custom_page_list['geodir_author_page']) {

+

+		$template = geodir_locate_template('author');

+

+		if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+		/**

+		 * Filter the author template path.

+		 *

+		 * @since 1.0.0

+		 * @param string $template The template path.

+		 */

+		return $template = apply_filters('geodir_template_author', $template);

+

+	}

+

+	if (get_option('geodir_set_as_home') || geodir_is_page('home') || geodir_is_page('location')) {

+

+		global $post, $wp_query;

+

+		if (geodir_is_page('home') || ('page' == get_option('show_on_front') && isset($post->ID) && $post->ID == get_option('page_on_front'))

+			|| (is_home() && !$wp_query->is_posts_page)

+		) {

+

+			$template = geodir_locate_template('geodir-home');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+			/**

+			 * Filter the home page template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_homepage', $template);

+

+		} elseif (geodir_is_page('location')) {

+

+			$template = geodir_locate_template('location');

+

+			if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+			/**

+			 * Filter the location template path.

+			 *

+			 * @since 1.0.0

+			 * @param string $template The template path.

+			 */

+			return $template = apply_filters('geodir_template_location', $template);

+

+		} else

+			return $template;

+

+	}

+

+	return $template;

 }

 

 /**

@@ -397,44 +397,44 @@ 
  */

 function geodir_get_template_part($slug = '', $name = NULL)

 {

-    global $geodirectory, $post;

-    /**

-     * Called at the start for the geodir_get_template_part() function.

-     *

-     * Used dynamic hook name: geodir_get_template_part_{$slug}

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $slug The template slug.

-     * @param string $name The template name.

-     */

-    do_action("geodir_get_template_part_{$slug}", $slug, $name);

-    $templates = array();

-    $name = (string)$name;

-    if ('' !== $name) {

-        $template_name = "{$slug}-{$name}.php";

-

-    } else {

-        $template_name = "{$slug}.php";

-    }

-

-    if (!locate_template(array("geodirectory/" . $template_name))) :

-        /**

-         * Filter the template part with slug and name.

-         *

-         * @since 1.0.0

-         * @param string $template_name The template name.

-         */

-        $template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

-        /**

-         * Includes the template part with slug and name.

-         *

-         * @since 1.0.0

-         */

-        include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

-    endif;

+	global $geodirectory, $post;

+	/**

+	 * Called at the start for the geodir_get_template_part() function.

+	 *

+	 * Used dynamic hook name: geodir_get_template_part_{$slug}

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $slug The template slug.

+	 * @param string $name The template name.

+	 */

+	do_action("geodir_get_template_part_{$slug}", $slug, $name);

+	$templates = array();

+	$name = (string)$name;

+	if ('' !== $name) {

+		$template_name = "{$slug}-{$name}.php";

+

+	} else {

+		$template_name = "{$slug}.php";

+	}

+

+	if (!locate_template(array("geodirectory/" . $template_name))) :

+		/**

+		 * Filter the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 * @param string $template_name The template name.

+		 */

+		$template = apply_filters("geodir_template_part-{$slug}-{$name}", geodir_plugin_path() . '/geodirectory-templates/' . $template_name);

+		/**

+		 * Includes the template part with slug and name.

+		 *

+		 * @since 1.0.0

+		 */

+		include($template);

+	else:

+		locate_template(array("geodirectory/" . $template_name), true, false);

+	endif;

 

 }

 

@@ -450,23 +450,23 @@ 
  */

 function geodir_core_post_view_extra_class($class, $all_postypes = '')

 {

-    global $post;

+	global $post;

 

-    if (!$all_postypes) {

-        $all_postypes = geodir_get_posttypes();

-    }

+	if (!$all_postypes) {

+		$all_postypes = geodir_get_posttypes();

+	}

 

-    $gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

-    $gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

-    $gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

+	$gdp_post_id = !empty($post) && isset($post->ID) ? $post->ID : NULL;

+	$gdp_post_type = $gdp_post_id > 0 && isset($post->post_type) ? $post->post_type : NULL;

+	$gdp_post_type = $gdp_post_type != '' && !empty($all_postypes) && in_array($gdp_post_type, $all_postypes) ? $gdp_post_type : NULL;

 

-    if ($gdp_post_id && $gdp_post_type) {

-        $append_class = 'gd-post-' . $gdp_post_type;

-        $append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

-        $class = $class != '' ? $class . ' ' . $append_class : $append_class;

-    }

+	if ($gdp_post_id && $gdp_post_type) {

+		$append_class = 'gd-post-' . $gdp_post_type;

+		$append_class .= isset($post->is_featured) && $post->is_featured > 0 ? ' gd-post-featured' : '';

+		$class = $class != '' ? $class . ' ' . $append_class : $append_class;

+	}

 

-    return $class;

+	return $class;

 }

 

 /**

@@ -480,7 +480,7 @@ 
  * @param bool $favorite Listing Optional. Are favorite listings results? Default: false.

  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

-    if ($favorite) {

+	if ($favorite) {

 		$message = __('No favorite listings found which match your selection.', 'geodirectory');

 	} else {

 		$message = __('No listings found which match your selection.', 'geodirectory');

geodirectory-functions/wp-session/class-recursive-arrayaccess.php

Doc Comments -1 removed lines

@@ -107,7 +107,6 @@
 	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
 	 *
 	 * @param mixed $offset The offset to assign the value to.
-	 * @param mixed $value  The value to set.
 	 *
 	 * @return void
 	 */

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Recursive array class to allow multidimensional array access.
@@ -39,9 +39,9 @@ 
 	 *
 	 * @param array $data
 	 */
-	protected function __construct( $data = array() ) {
-		foreach ( $data as $key => $value ) {
-			$this[ $key ] = $value;
+	protected function __construct($data = array()) {
+		foreach ($data as $key => $value) {
+			$this[$key] = $value;
 		}
 	}
 
@@ -49,9 +49,9 @@ 
 	 * Allow deep copies of objects
 	 */
 	public function __clone() {
-		foreach ( $this->container as $key => $value ) {
-			if ( $value instanceof self ) {
-				$this[ $key ] = clone $value;
+		foreach ($this->container as $key => $value) {
+			if ($value instanceof self) {
+				$this[$key] = clone $value;
 			}
 		}
 	}
@@ -63,9 +63,9 @@ 
 	 */
 	public function toArray() {
 		$data = $this->container;
-		foreach ( $data as $key => $value ) {
-			if ( $value instanceof self ) {
-				$data[ $key ] = $value->toArray();
+		foreach ($data as $key => $value) {
+			if ($value instanceof self) {
+				$data[$key] = $value->toArray();
 			}
 		}
 		return $data;
@@ -84,8 +84,8 @@ 
 	 *
 	 * @return boolean true on success or false on failure.
 	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->container[ $offset ]) ;
+	public function offsetExists($offset) {
+		return isset($this->container[$offset]);
 	}
 
 	/**
@@ -97,8 +97,8 @@ 
 	 *
 	 * @return mixed Can return all value types.
 	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->container[ $offset ] ) ? $this->container[ $offset ] : null;
+	public function offsetGet($offset) {
+		return isset($this->container[$offset]) ? $this->container[$offset] : null;
 	}
 
 	/**
@@ -111,14 +111,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetSet( $offset, $data ) {
-		if ( is_array( $data ) ) {
-			$data = new self( $data );
+	public function offsetSet($offset, $data) {
+		if (is_array($data)) {
+			$data = new self($data);
 		}
-		if ( $offset === null ) { // don't forget this!
+		if ($offset === null) { // don't forget this!
 			$this->container[] = $data;
 		} else {
-			$this->container[ $offset ] = $data;
+			$this->container[$offset] = $data;
 		}
 
 		$this->dirty = true;
@@ -133,7 +133,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->container[ $offset ] );
+	public function offsetUnset($offset) {
+		unset($this->container[$offset]);
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Return the current cache expire setting.

Indentation +2 added lines, -2 removed lines

@@ -72,8 +72,8 @@
 	}
 
 	/**
-	* ArrayAccess Implementation
-	**/
+	 * ArrayAccess Implementation
+	 **/
 
 	/**
 	 * Whether a offset exists

geodirectory-functions/wp-session/class-wp-session.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * Retrieve the current session instance.
 	 *
-	 * @param bool $session_id Session ID from which to populate data.
 	 *
 	 * @return bool|WP_Session
 	 */

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Return the current cache expire setting.

Spacing +41 added lines, -41 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * WordPress Session class for managing user session data.
@@ -56,7 +56,7 @@ 
 	 * @return bool|WP_Session
 	 */
 	public static function get_instance() {
-		if ( ! self::$instance ) {
+		if (!self::$instance) {
 			self::$instance = new self();
 		}
 
@@ -72,17 +72,17 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to determine how long until sessions expire.
 	 */
 	protected function __construct() {
-		if ( isset( $_COOKIE[WP_SESSION_COOKIE] ) ) {
-			$cookie = stripslashes( $_COOKIE[WP_SESSION_COOKIE] );
-			$cookie_crumbs = explode( '||', $cookie );
+		if (isset($_COOKIE[WP_SESSION_COOKIE])) {
+			$cookie = stripslashes($_COOKIE[WP_SESSION_COOKIE]);
+			$cookie_crumbs = explode('||', $cookie);
 
-			if( $this->is_valid_md5( $cookie_crumbs[0] ) ) {
+			if ($this->is_valid_md5($cookie_crumbs[0])) {
 
 				$this->session_id = $cookie_crumbs[0];
 
 			} else {
 
-				$this->regenerate_id( true );
+				$this->regenerate_id(true);
 
 			}
 
@@ -90,10 +90,10 @@ 
 			$this->exp_variant = $cookie_crumbs[2];
 
 			// Update the session expiration if we're past the variant time
-			if ( time() > $this->exp_variant ) {
+			if (time() > $this->exp_variant) {
 				$this->set_expiration();
-				delete_option( "_wp_session_expires_{$this->session_id}" );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+				delete_option("_wp_session_expires_{$this->session_id}");
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			}
 		} else {
 			$this->session_id = $this->generate_id();
@@ -125,19 +125,19 @@ 
 	 * @uses apply_filters Calls `wp_session_expiration` to get the standard expiration time for sessions.
 	 */
 	protected function set_expiration() {
-		$this->exp_variant = time() + (int) apply_filters( 'wp_session_expiration_variant', 24 * 60 );
-		$this->expires = time() + (int) apply_filters( 'wp_session_expiration', 30 * 60 );
+		$this->exp_variant = time() + (int) apply_filters('wp_session_expiration_variant', 24 * 60);
+		$this->expires = time() + (int) apply_filters('wp_session_expiration', 30 * 60);
 	}
 
 	/**
 	 * Set the session cookie
 	 */
 	protected function set_cookie() {
-		if (! defined( 'GD_TESTING_MODE' )) {
+		if (!defined('GD_TESTING_MODE')) {
 			try {
-				setcookie( WP_SESSION_COOKIE, $this->session_id . '||' . $this->expires . '||' . $this->exp_variant , $this->expires, COOKIEPATH, COOKIE_DOMAIN );
-			} catch(Exception $e) {
-				error_log( 'Set Cookie Error: ' . $e->getMessage() );
+				setcookie(WP_SESSION_COOKIE, $this->session_id.'||'.$this->expires.'||'.$this->exp_variant, $this->expires, COOKIEPATH, COOKIE_DOMAIN);
+			} catch (Exception $e) {
+				error_log('Set Cookie Error: '.$e->getMessage());
 			}
 		}
 	}
@@ -148,10 +148,10 @@ 
 	 * @return string
 	 */
 	protected function generate_id() {
-		require_once( ABSPATH . 'wp-includes/class-phpass.php');
-		$hasher = new PasswordHash( 8, false );
+		require_once(ABSPATH.'wp-includes/class-phpass.php');
+		$hasher = new PasswordHash(8, false);
 
-		return md5( $hasher->get_random_bytes( 32 ) );
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -160,8 +160,8 @@ 
 	 * @param string $md5
 	 * @return int
 	 */
-	protected function is_valid_md5( $md5 = '' ){
-		return preg_match( '/^[a-f0-9]{32}$/', $md5 );
+	protected function is_valid_md5($md5 = '') {
+		return preg_match('/^[a-f0-9]{32}$/', $md5);
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 * @return array
 	 */
 	protected function read_data() {
-		$this->container = get_option( "_wp_session_{$this->session_id}", array() );
+		$this->container = get_option("_wp_session_{$this->session_id}", array());
 
 		return $this->container;
 	}
@@ -184,13 +184,13 @@ 
 		$option_key = "_wp_session_{$this->session_id}";
 
 		// Only write the collection to the DB if it's changed.
-		if ( $this->dirty ) {
-			if ( false === get_option( $option_key ) ) {
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
-				add_option( "_wp_session_expires_{$this->session_id}", $this->expires, '', 'no' );
+		if ($this->dirty) {
+			if (false === get_option($option_key)) {
+				add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
+				add_option("_wp_session_expires_{$this->session_id}", $this->expires, '', 'no');
 			} else {
-				delete_option( "_wp_session_{$this->session_id}" );
-				add_option( "_wp_session_{$this->session_id}", $this->container, '', 'no' );
+				delete_option("_wp_session_{$this->session_id}");
+				add_option("_wp_session_{$this->session_id}", $this->container, '', 'no');
 			}
 		}
 	}
@@ -201,7 +201,7 @@ 
 	 * @return string
 	 */
 	public function json_out() {
-		return json_encode( $this->container );
+		return json_encode($this->container);
 	}
 
 	/**
@@ -211,10 +211,10 @@ 
 	 *
 	 * @return bool
 	 */
-	public function json_in( $data ) {
-		$array = json_decode( $data );
+	public function json_in($data) {
+		$array = json_decode($data);
 
-		if ( is_array( $array ) ) {
+		if (is_array($array)) {
 			$this->container = $array;
 			return true;
 		}
@@ -227,9 +227,9 @@ 
 	 *
 	 * @param bool $delete_old Flag whether or not to delete the old session data from the server.
 	 */
-	public function regenerate_id( $delete_old = false ) {
-		if ( $delete_old ) {
-			delete_option( "_wp_session_{$this->session_id}" );
+	public function regenerate_id($delete_old = false) {
+		if ($delete_old) {
+			delete_option("_wp_session_{$this->session_id}");
 		}
 
 		$this->session_id = $this->generate_id();
@@ -274,7 +274,7 @@ 
 	 * @return mixed
 	 */
 	public function current() {
-		return current( $this->container );
+		return current($this->container);
 	}
 
 	/**
@@ -285,7 +285,7 @@ 
 	 * @return mixed
 	 */
 	public function key() {
-		return key( $this->container );
+		return key($this->container);
 	}
 
 	/**
@@ -296,7 +296,7 @@ 
 	 * @return void
 	 */
 	public function next() {
-		next( $this->container );
+		next($this->container);
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 	 * @return void
 	 */
 	public function rewind() {
-		reset( $this->container );
+		reset($this->container);
 	}
 
 	/**
@@ -318,7 +318,7 @@ 
 	 * @return bool
 	 */
 	public function valid() {
-		return $this->offsetExists( $this->key() );
+		return $this->offsetExists($this->key());
 	}
 
 	/*****************************************************************/
@@ -333,6 +333,6 @@ 
 	 * @return int
 	 */
 	public function count() {
-		return count( $this->container );
+		return count($this->container);
 	}
 }

geodirectory-admin/option-pages/design_settings_array.php

Braces +3 added lines, -2 removed lines

@@ -40,8 +40,9 @@
     $geodir_active_nav_locations = get_nav_menu_locations();

     if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {

         foreach ($geodir_active_nav_locations as $key => $theme_location) {

-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];

+            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations)) {
+                            $post_type_arr[$key] = $geodir_all_nav_locations[$key];
+            }
         }

     }

 

Spacing +5 added lines, -5 removed lines

@@ -149,7 +149,7 @@ 
     ),

     array(

         'name' => __('Resize image large size', 'geodirectory'),

-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

+        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w').'x'.get_option('large_size_h')),

         'id' => 'geodir_use_wp_media_large_size',

         'type' => 'checkbox',

         'std' => '0'

@@ -590,11 +590,11 @@ 
         'id' => 'geodir_default_rating_star_icon',

         'type' => 'file',

         'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

+        'value' => geodir_plugin_url().'/geodirectory-assets/images/stars.png'// Default value to show home top section

     ),

 	array(

 		'name' => __('Enable Font Awesome', 'geodirectory'),

-		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

+		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory'),

 		'id' => 'geodir_reviewrating_enable_font_awesome',

 		'type' => 'checkbox',

 		'std' => '0'

@@ -1059,7 +1059,7 @@ 
         'name' => __('Google Maps API KEY', 'geodirectory'),

         'desc' => sprintf(

             __('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),

-            'https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),

+            'https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend&keyType=CLIENT_SIDE&reusekey=true', 'https://wpgeodirectory.com/docs/add-google-api-key/' ),

         'tip' => '',

         'id' => 'geodir_google_api_key',

         'css' => 'min-width:300px;',

@@ -1134,7 +1134,7 @@ 
         'id' => 'geodir_default_marker_icon',

         'type' => 'file',

         'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

+        'value' => geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

     ),

     // add option that allows enable/disable map dragging to phone devices

     array(

Indentation +946 added lines, -946 removed lines

@@ -17,14 +17,14 @@ 
  */

 function geodir_post_type_setting_fun()

 {

-    $post_type_arr = array();

+	$post_type_arr = array();

 

-    $post_types = geodir_get_posttypes('object');

+	$post_types = geodir_get_posttypes('object');

 

-    foreach ($post_types as $key => $post_types_obj) {

-        $post_type_arr[$key] = $post_types_obj->labels->singular_name;

-    }

-    return $post_type_arr;

+	foreach ($post_types as $key => $post_types_obj) {

+		$post_type_arr[$key] = $post_types_obj->labels->singular_name;

+	}

+	return $post_type_arr;

 }

 

 /**

@@ -35,17 +35,17 @@ 
  */

 function geodir_theme_location_setting_fun()

 {

-    $post_type_arr = array();

-    $geodir_all_nav_locations = get_registered_nav_menus();

-    $geodir_active_nav_locations = get_nav_menu_locations();

-    if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {

-        foreach ($geodir_active_nav_locations as $key => $theme_location) {

-            if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

-                $post_type_arr[$key] = $geodir_all_nav_locations[$key];

-        }

-    }

-

-    return $post_type_arr;

+	$post_type_arr = array();

+	$geodir_all_nav_locations = get_registered_nav_menus();

+	$geodir_active_nav_locations = get_nav_menu_locations();

+	if (!empty($geodir_active_nav_locations) && is_array($geodir_active_nav_locations)) {

+		foreach ($geodir_active_nav_locations as $key => $theme_location) {

+			if (!empty($geodir_all_nav_locations) && is_array($geodir_all_nav_locations) && array_key_exists($key, $geodir_all_nav_locations))

+				$post_type_arr[$key] = $geodir_all_nav_locations[$key];

+		}

+	}

+

+	return $post_type_arr;

 }

 /**

  * Filter GD design settings array.

@@ -55,543 +55,543 @@ 
  */

 $geodir_settings['design_settings'] = apply_filters('geodir_design_settings', array(

 

-    /* Home Layout Settings start */

-    array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),

+	/* Home Layout Settings start */

+	array('name' => __('Home', 'geodirectory'), 'type' => 'title', 'desc' => 'Setting to set home page layout', 'id' => 'home_page_settings '),

 

 

-    array('name' => __('Home Top Section Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_top_section'),

+	array('name' => __('Home Top Section Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_top_section'),

 

-    array(

-        'name' => __('Geodirectory home page', 'geodirectory'),

-        'desc' => __('Set geodirectory home page as your home. <b style="color:red;">This setting has been depreciated and will be removed in the next version, instead please set the GD home page in GD>Permalinks and then set this page to the front page under Settings>Reading>Front Page</b>', 'geodirectory'),

-        'id' => 'geodir_set_as_home',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Geodirectory home page', 'geodirectory'),

+		'desc' => __('Set geodirectory home page as your home. <b style="color:red;">This setting has been depreciated and will be removed in the next version, instead please set the GD home page in GD>Permalinks and then set this page to the front page under Settings>Reading>Front Page</b>', 'geodirectory'),

+		'id' => 'geodir_set_as_home',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home top section', 'geodirectory'),

-        'desc' => __('Show the top section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home top section', 'geodirectory'),

+		'desc' => __('Show the top section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),

+	array('type' => 'sectionend', 'id' => 'geodir_home_top_section'),

 

 

-    array('name' => __('Home Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_layout'),

+	array('name' => __('Home Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_layout'),

 

-    array(

-        'name' => __('Home right section', 'geodirectory'),

-        'desc' => __('Show the right section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home right section', 'geodirectory'),

+		'desc' => __('Show the right section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home content section', 'geodirectory'),

-        'desc' => __('Show the content section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_contant_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home content section', 'geodirectory'),

+		'desc' => __('Show the content section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_contant_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home left section', 'geodirectory'),

-        'desc' => __('Show the left section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Home left section', 'geodirectory'),

+		'desc' => __('Show the left section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of home left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_home_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of home left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_home_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Home bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of home page', 'geodirectory'),

-        'id' => 'geodir_show_home_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Resize image large size', 'geodirectory'),

-        'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

-        'id' => 'geodir_use_wp_media_large_size',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Home bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of home page', 'geodirectory'),

+		'id' => 'geodir_show_home_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'name' => __('Resize image large size', 'geodirectory'),

+		'desc' => sprintf(__('Use default wordpress media image large size ( %s ) for featured image upload. If unchecked then default geodirectory image large size ( 800x800 ) will be used.', 'geodirectory'), get_option('large_size_w') . 'x' . get_option('large_size_h')),

+		'id' => 'geodir_use_wp_media_large_size',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_home_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_home_layout'),

 

 

-    /* Home Layout Settings end */

+	/* Home Layout Settings end */

 

 

-    /* Listing Layout Settings end */

+	/* Listing Layout Settings end */

 

-    array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),

+	array('name' => __('Listings', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_listing_settings '),

 

 

-    array('name' => __('Listing Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_listing_layout'),

+	array('name' => __('Listing Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_listing_layout'),

 

-    array(

-        'name' => __('Listing top section', 'geodirectory'),

-        'desc' => __('Show the top section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing top section', 'geodirectory'),

+		'desc' => __('Show the top section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing right section', 'geodirectory'),

-        'desc' => __('Show the right section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing right section', 'geodirectory'),

+		'desc' => __('Show the right section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of listing right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of listing page in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Listing content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of listing page', 'geodirectory'),

-        'id' => 'geodir_listing_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Listing content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of listing page', 'geodirectory'),

+		'id' => 'geodir_listing_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of listing content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of listing page in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing left section', 'geodirectory'),

-        'desc' => __('Show the left section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing left section', 'geodirectory'),

+		'desc' => __('Show the left section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of listing left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),

-        'id' => 'geodir_width_listing_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of listing left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of listing in %', 'geodirectory'),

+		'id' => 'geodir_width_listing_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Listing bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_listing_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Listing bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_listing_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Upload listing no image', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_listing_no_img',

-        'type' => 'file',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload listing no image', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_listing_no_img',

+		'type' => 'file',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Description word limit', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_desc_word_limit',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '50' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Description word limit', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_desc_word_limit',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '50' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Hover listing map animation', 'geodirectory'),

-        'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),

-        'id' => 'geodir_listing_hover_bounce_map_pin',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Hover listing map animation', 'geodirectory'),

+		'desc' => __('Bounce map pin if listing hovered', 'geodirectory'),

+		'id' => 'geodir_listing_hover_bounce_map_pin',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_listing_layout'),

 

 

-    array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),

+	array('name' => __('Listing General Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_listing_gen_settings '),

 

-    array(

-        'name' => __('New listing default status', 'geodirectory'),

-        'desc' => __('Select new listing default status.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_new_post_default_status',

-        'css' => 'min-width:300px;',

-        'std' => 'publish',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'publish' => __('publish', 'geodirectory'),

-            'draft' => __('draft', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('New listing default status', 'geodirectory'),

+		'desc' => __('Select new listing default status.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_new_post_default_status',

+		'css' => 'min-width:300px;',

+		'std' => 'publish',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'publish' => __('publish', 'geodirectory'),

+			'draft' => __('draft', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('New listings settings', 'geodirectory'),

-        'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),

-        'id' => 'geodir_listing_new_days',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('New listings settings', 'geodirectory'),

+		'desc' => __('Enter number of days a listing will appear new.(enter 0 to disable feature)', 'geodirectory'),

+		'id' => 'geodir_listing_new_days',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value for the page title - changed in settings

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_listing_gen_settings'),

 

 

-    array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),

+	array('name' => __('Add Listing Form Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_add_listing_gen_settings'),

 

-    array(

-        'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),

-        'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),

-        'id' => 'geodir_accept_term_condition',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Enable "Accept Terms and Conditions"', 'geodirectory'),

+		'desc' => __('Show the "Accept Terms and Conditions" field on add listing.', 'geodirectory'),

+		'id' => 'geodir_accept_term_condition',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Show description field as editor', 'geodirectory'),

-        'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_tiny_editor_on_add_listing',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show description field as editor', 'geodirectory'),

+		'desc' => __('Select post types to show advanced editor on add listing page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_tiny_editor_on_add_listing',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),

-    /* Listing Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'geodir_add_listing_gen_settings'),

+	/* Listing Layout Settings end */

 

 

-    /* Search Layout Settings end */

+	/* Search Layout Settings end */

 

-    array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),

+	array('name' => __('Search', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_search_settings '),

 

 

-    array('name' => __('Search Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_search_layout'),

+	array('name' => __('Search Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_search_layout'),

 

-    array(

-        'name' => __('Search top section', 'geodirectory'),

-        'desc' => __('Show the top section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search top section', 'geodirectory'),

+		'desc' => __('Show the top section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search right section', 'geodirectory'),

-        'desc' => __('Show the right section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search right section', 'geodirectory'),

+		'desc' => __('Show the right section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of search right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),

-        'id' => 'geodir_width_search_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of search page in %', 'geodirectory'),

+		'id' => 'geodir_width_search_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Search content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of search page', 'geodirectory'),

-        'id' => 'geodir_search_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Search content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of search page', 'geodirectory'),

+		'id' => 'geodir_search_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of search content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),

-        'id' => 'geodir_width_search_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of search page in %', 'geodirectory'),

+		'id' => 'geodir_width_search_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search left section', 'geodirectory'),

-        'desc' => __('Show the left section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search left section', 'geodirectory'),

+		'desc' => __('Show the left section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of search left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of search in %', 'geodirectory'),

-        'id' => 'geodir_width_search_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of search left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of search in %', 'geodirectory'),

+		'id' => 'geodir_width_search_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Search bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of search page', 'geodirectory'),

-        'id' => 'geodir_show_search_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Search bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of search page', 'geodirectory'),

+		'id' => 'geodir_show_search_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 	

 	array(

-        'name' => __('Show advanced pagination details', 'geodirectory'),

-        'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),

-        'id' => 'geodir_pagination_advance_info',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array(

+		'name' => __('Show advanced pagination details', 'geodirectory'),

+		'desc' => __('This will add extra pagination info like "Showing listings x-y of z" after/before pagination.', 'geodirectory'),

+		'id' => 'geodir_pagination_advance_info',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array(

 						'' => __('Never Display', 'geodirectory'),

 						'after' => __('After Pagination', 'geodirectory'),

 						'before' => __('Before Pagination', 'geodirectory')

 					)

-    ),

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_search_layout'),

+	array('type' => 'sectionend', 'id' => 'geodir_search_layout'),

 

 

-    array('name' => __('Search form default text settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),

+	array('name' => __('Search form default text settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_search_form_default_text_settings'),

 

-    array(

-        'name' => __('Search field default value', 'geodirectory'),

-        'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),

-        'id' => 'geodir_search_field_default_text',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Search for' // show on the listing page.

-    ),

+	array(

+		'name' => __('Search field default value', 'geodirectory'),

+		'desc' => __('Show the search text box \'placeholder\' value on search form.', 'geodirectory'),

+		'id' => 'geodir_search_field_default_text',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Search for' // show on the listing page.

+	),

 

-    array(

-        'name' => __('Near field default value', 'geodirectory'),

-        'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),

-        'id' => 'geodir_near_field_default_text',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Near' // show on the listing page.

-    ),

+	array(

+		'name' => __('Near field default value', 'geodirectory'),

+		'desc' => __('Show the near text box \'placeholder\' value on search form.', 'geodirectory'),

+		'id' => 'geodir_near_field_default_text',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Near' // show on the listing page.

+	),

 

-    array(

-        'name' => __('Search button label', 'geodirectory'),

-        'desc' => __('Show the search button label on search form.', 'geodirectory'),

-        'id' => 'geodir_search_button_label',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => 'Search' // show on the listing page.

-    ),

+	array(

+		'name' => __('Search button label', 'geodirectory'),

+		'desc' => __('Show the search button label on search form.', 'geodirectory'),

+		'id' => 'geodir_search_button_label',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => 'Search' // show on the listing page.

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_search_form_default_text_settings'),

 

-    /* Listing Layout Settings end */

+	/* Listing Layout Settings end */

 

 

-    /* Detail Layout Settings end */

+	/* Detail Layout Settings end */

 

-    array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),

+	array('name' => __('Detail', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_detail_settings '),

 

-    array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),

+	array('name' => __('Detail/Single Page Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_settings '),

 

-    array(

-        'name' => __('Detail top section', 'geodirectory'),

-        'desc' => __('Show the top section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_detail_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Detail top section', 'geodirectory'),

+		'desc' => __('Show the top section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_detail_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Detail bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of listing page', 'geodirectory'),

-        'id' => 'geodir_show_detail_bottom_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Detail sidebar section on left side', 'geodirectory'),

-        'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),

-        'id' => 'geodir_detail_sidebar_left_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable GD modal', 'geodirectory'),

-        'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),

-        'id' => 'geodir_disable_gb_modal',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),

-        'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_tfg_buttons_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable share this button section', 'geodirectory'),

-        'desc' => __('Disable share this button section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_sharethis_button_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Google Analytics section', 'geodirectory'),

-        'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_google_analytics_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable User Links section', 'geodirectory'),

-        'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_user_links_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Rating Info section', 'geodirectory'),

-        'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_rating_info_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

-    array(

-        'name' => __('Disable Listing Info section', 'geodirectory'),

-        'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),

-        'id' => 'geodir_disable_listing_info_section',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Detail bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of listing page', 'geodirectory'),

+		'id' => 'geodir_show_detail_bottom_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

+	array(

+		'name' => __('Detail sidebar section on left side', 'geodirectory'),

+		'desc' => __('Display detail sidebar section on left side of the detail page', 'geodirectory'),

+		'id' => 'geodir_detail_sidebar_left_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable GD modal', 'geodirectory'),

+		'desc' => __('Disable GD modal that displays slideshow images in popup', 'geodirectory'),

+		'id' => 'geodir_disable_gb_modal',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Tweet, Fb Like, Google+ buttons section', 'geodirectory'),

+		'desc' => __('Disable Tweet, Fb Like, Google+ buttons section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_tfg_buttons_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable share this button section', 'geodirectory'),

+		'desc' => __('Disable share this button section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_sharethis_button_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Google Analytics section', 'geodirectory'),

+		'desc' => __('Disable Google Analytics section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_google_analytics_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable User Links section', 'geodirectory'),

+		'desc' => __('Disable User Links section (Edit post, Favorite etc..) that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_user_links_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Rating Info section', 'geodirectory'),

+		'desc' => __('Disable Rating Info section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_rating_info_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

+	array(

+		'name' => __('Disable Listing Info section', 'geodirectory'),

+		'desc' => __('Disable Listing Info section that displays on Detail page sidebar', 'geodirectory'),

+		'id' => 'geodir_disable_listing_info_section',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'detail_page_settings'),

+	array('type' => 'sectionend', 'id' => 'detail_page_settings'),

 

 

-    /* ---------- DETAIL PAGE TAB SETTING START*/

+	/* ---------- DETAIL PAGE TAB SETTING START*/

 

-    array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),

+	array('name' => __('Detail Page Tab Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_detail_page_tab_settings '),

 

-    array(

-        'name' => __('Exclude selected tabs from detail page', 'geodirectory'),

-        'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_detail_page_tabs_excluded',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select tabs', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_detail_page_tabs_key_value_array())

-    ),

+	array(

+		'name' => __('Exclude selected tabs from detail page', 'geodirectory'),

+		'desc' => __('Select tabs to exclude from the list of all appearing tabs on detail page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_detail_page_tabs_excluded',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select tabs', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_detail_page_tabs_key_value_array())

+	),

     

-    array(

-        'name' => __('Show as list', 'geodirectory'),

-        'desc' => __('Show as list instead of tabs', 'geodirectory'),

-        'id' => 'geodir_disable_tabs',

-        'type' => 'checkbox',

-        'std' => '0'

-    ),

+	array(

+		'name' => __('Show as list', 'geodirectory'),

+		'desc' => __('Show as list instead of tabs', 'geodirectory'),

+		'id' => 'geodir_disable_tabs',

+		'type' => 'checkbox',

+		'std' => '0'

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

-    /* ---------- DETAIL PAGE TAB SETTING END*/

+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

+	/* ---------- DETAIL PAGE TAB SETTING END*/

 

-    /* START DEFAULT STAR IMAGE*/

-    array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),

+	/* START DEFAULT STAR IMAGE*/

+	array('name' => __('Default Rating Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_rating_settings '),

 

-    array(

-        'name' => __('Upload default rating star icon', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_default_rating_star_icon',

-        'type' => 'file',

-        'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

-    ),

+	array(

+		'name' => __('Upload default rating star icon', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_default_rating_star_icon',

+		'type' => 'file',

+		'std' => '0',

+		'value' => geodir_plugin_url() . '/geodirectory-assets/images/stars.png'// Default value to show home top section

+	),

 	array(

 		'name' => __('Enable Font Awesome', 'geodirectory'),

 		'desc' => __('When enabled all rating images will be using font awesome rating icons as images.', 'geodirectory' ),

@@ -607,369 +607,369 @@ 
 		'std' => '#757575'

 	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

+	array('type' => 'sectionend', 'id' => 'geodir_detail_page_tab_settings'),

 

-    /* END DEFAULT STAR IMAGE*/

+	/* END DEFAULT STAR IMAGE*/

 

-    /* Detail related post settings start */

+	/* Detail related post settings start */

 

-    array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),

+	array('name' => __('Related Post Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'detail_page_related_post_settings '),

 

-    array(

-        'name' => __('Show related post listing on', 'geodirectory'),

-        'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_add_related_listing_posttypes',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show related post listing on', 'geodirectory'),

+		'desc' => __('Select the post types to display related listing on detail page.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_add_related_listing_posttypes',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Relate to', 'geodirectory'),

-        'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),

-        'id' => 'geodir_related_post_relate_to',

-        'css' => 'min-width:300px;',

-        'std' => 'category',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'category' => __('Categories', 'geodirectory'),

-            'tags' => __('Tags', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Relate to', 'geodirectory'),

+		'desc' => __('Set the relation between current post to related posts.', 'geodirectory'),

+		'id' => 'geodir_related_post_relate_to',

+		'css' => 'min-width:300px;',

+		'std' => 'category',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'category' => __('Categories', 'geodirectory'),

+			'tags' => __('Tags', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Layout', 'geodirectory'),

-        'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),

-        'id' => 'geodir_related_post_listing_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Layout', 'geodirectory'),

+		'desc' => __('Set the listing view of relate post on detail page', 'geodirectory'),

+		'id' => 'geodir_related_post_listing_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Sort by', 'geodirectory'),

-        'desc' => __('Set the related post listing sort by view', 'geodirectory'),

-        'id' => 'geodir_related_post_sortby',

-        'css' => 'min-width:300px;',

-        'std' => 'latest',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'latest' => __('Latest', 'geodirectory'),

-            'featured' => __('Featured', 'geodirectory'),

-            'high_review' => __('Review', 'geodirectory'),

-            'high_rating' => __('Rating', 'geodirectory'),

-            'random' => __('Random', 'geodirectory'),

-            'nearest' => __('Nearest', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Sort by', 'geodirectory'),

+		'desc' => __('Set the related post listing sort by view', 'geodirectory'),

+		'id' => 'geodir_related_post_sortby',

+		'css' => 'min-width:300px;',

+		'std' => 'latest',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'latest' => __('Latest', 'geodirectory'),

+			'featured' => __('Featured', 'geodirectory'),

+			'high_review' => __('Review', 'geodirectory'),

+			'high_rating' => __('Rating', 'geodirectory'),

+			'random' => __('Random', 'geodirectory'),

+			'nearest' => __('Nearest', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Number of posts:', 'geodirectory'),

-        'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),

-        'id' => 'geodir_related_post_count',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '5' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Number of posts:', 'geodirectory'),

+		'desc' => __('Enter number of posts to display on related posts listing', 'geodirectory'),

+		'id' => 'geodir_related_post_count',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '5' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Post excerpt', 'geodirectory'),

-        'desc' => __('Post content excerpt character count', 'geodirectory'),

-        'id' => 'geodir_related_post_excerpt',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '20' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Post excerpt', 'geodirectory'),

+		'desc' => __('Post content excerpt character count', 'geodirectory'),

+		'id' => 'geodir_related_post_excerpt',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '20' // Default value to show home top section

+	),

 

 

-    array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),

-    /* Detail Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'detail_page_related_post_settings'),

+	/* Detail Layout Settings end */

 

-    /* Author Layout Settings Start */

+	/* Author Layout Settings Start */

 

-    array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),

+	array('name' => __('Author', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_author_settings '),

 

 

-    array('name' => __('Author Page Layout Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_author_layout'),

+	array('name' => __('Author Page Layout Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_author_layout'),

 

-    array(

-        'name' => __('Author top section', 'geodirectory'),

-        'desc' => __('Show the top section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_top_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author top section', 'geodirectory'),

+		'desc' => __('Show the top section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_top_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author right section', 'geodirectory'),

-        'desc' => __('Show the right section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_right_section',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author right section', 'geodirectory'),

+		'desc' => __('Show the right section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_right_section',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of author right section', 'geodirectory'),

-        'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_right_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author right section', 'geodirectory'),

+		'desc' => __('Enter the width of right section of author page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_right_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author content section view', 'geodirectory'),

-        'desc' => __('Set the listing view of author page', 'geodirectory'),

-        'id' => 'geodir_author_view',

-        'css' => 'min-width:300px;',

-        'std' => 'gridview_onehalf',

-        'type' => 'select',

-        'class' => 'chosen_select',

-        'options' => array_unique(array(

-            'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

-            'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

-            'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

-            'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

-            'listview' => __('List view', 'geodirectory'),

-        ))

-    ),

+	array(

+		'name' => __('Author content section view', 'geodirectory'),

+		'desc' => __('Set the listing view of author page', 'geodirectory'),

+		'id' => 'geodir_author_view',

+		'css' => 'min-width:300px;',

+		'std' => 'gridview_onehalf',

+		'type' => 'select',

+		'class' => 'chosen_select',

+		'options' => array_unique(array(

+			'gridview_onehalf' => __('Grid View (Two Columns)', 'geodirectory'),

+			'gridview_onethird' => __('Grid View (Three Columns)', 'geodirectory'),

+			'gridview_onefourth' => __('Grid View (Four Columns)', 'geodirectory'),

+			'gridview_onefifth' => __('Grid View (Five Columns)', 'geodirectory'),

+			'listview' => __('List view', 'geodirectory'),

+		))

+	),

 

-    array(

-        'name' => __('Width of author content section', 'geodirectory'),

-        'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_contant_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '63' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author content section', 'geodirectory'),

+		'desc' => __('Enter the width of content section of author page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_contant_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '63' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author left section', 'geodirectory'),

-        'desc' => __('Show the left section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_left_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author left section', 'geodirectory'),

+		'desc' => __('Show the left section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_left_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Width of author left section', 'geodirectory'),

-        'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

-        'id' => 'geodir_width_author_left_section',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '30' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Width of author left section', 'geodirectory'),

+		'desc' => __('Enter the width of left section of home page in %', 'geodirectory'),

+		'id' => 'geodir_width_author_left_section',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '30' // Default value to show home top section

+	),

 

-    array(

-        'name' => __('Author bottom section', 'geodirectory'),

-        'desc' => __('Show the bottom section of author page', 'geodirectory'),

-        'id' => 'geodir_show_author_bottom_section',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Author bottom section', 'geodirectory'),

+		'desc' => __('Show the bottom section of author page', 'geodirectory'),

+		'id' => 'geodir_show_author_bottom_section',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

 

 

-    array(

-        'name' => __('Description word limit', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_author_desc_word_limit',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => '50' // Default value to show home top section

-    ),

+	array(

+		'name' => __('Description word limit', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_author_desc_word_limit',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => '50' // Default value to show home top section

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_author_layout'),

-    /* Author Layout Settings end */

+	array('type' => 'sectionend', 'id' => 'geodir_author_layout'),

+	/* Author Layout Settings end */

 

 

-    /* Post Type Navigation Settings Start */

-    array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),

+	/* Post Type Navigation Settings Start */

+	array('name' => __('Navigation', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_navigation_settings'),

 

 

-    /* Post Type Navigation Settings Start */

+	/* Post Type Navigation Settings Start */

 

-    array('name' => __('Navigation Locations', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_navigation_locations'),

+	array('name' => __('Navigation Locations', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_navigation_locations'),

 

-    array(

-        'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_theme_location_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select menu locations', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_theme_location_setting_fun())

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

-

-

-    array('name' => __('Navigation Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_navigation_options'),

+	array(

+		'name' => __('Show geodirectory navigation in selected menu locations', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_theme_location_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select menu locations', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_theme_location_setting_fun())

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

 

 

-    array(

-        'name' => __('Show add listing navigation in menu', 'geodirectory'),

-        'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),

-        'id' => 'geodir_show_addlisting_nav',

-        'std' => '1',

-        'type' => 'checkbox'

-    ),

+	array('name' => __('Navigation Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_navigation_options'),

 

-    array(

-        'name' => __('Show listings navigation in menu', 'geodirectory'),

-        'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),

-        'id' => 'geodir_show_listing_nav',

-        'std' => '1',

-        'type' => 'checkbox'

-    ),

 

-    array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

+	array(

+		'name' => __('Show add listing navigation in menu', 'geodirectory'),

+		'desc' => sprintf(__('Show add listing navigation in main menu? (untick to disable) If you disable this option, none of the add listing link will appear in main navigation.', 'geodirectory')),

+		'id' => 'geodir_show_addlisting_nav',

+		'std' => '1',

+		'type' => 'checkbox'

+	),

 

+	array(

+		'name' => __('Show listings navigation in menu', 'geodirectory'),

+		'desc' => sprintf(__('Show listing navigation in main menu? (untick to disable) If you disable this option, none of the listing link will appear in main navigation.', 'geodirectory')),

+		'id' => 'geodir_show_listing_nav',

+		'std' => '1',

+		'type' => 'checkbox'

+	),

 

-    array('name' => __('Post Type Navigation Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_post_type_navigation_layout'),

-    array(

-        'name' => __('Show listing link in main navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_posttype_in_main_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('type' => 'sectionend', 'id' => 'geodir_navigation_options'),

 

-    array(

-        'name' => __('Show listing link in listing navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_posttype_in_listing_nav',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

 

-    array(

-        'name' => __('Allow post type to add from frontend', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_allow_posttype_frontend',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('name' => __('Post Type Navigation Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_post_type_navigation_layout'),

+	array(

+		'name' => __('Show listing link in main navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_posttype_in_main_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Show add listing link in main navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_main_nav',

-        'css' => 'min-width:300px;',

-        'std' => array(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Show listing link in listing navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_posttype_in_listing_nav',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array(

-        'name' => __('Show add listing link in add listing navigation', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_add_listing_nav',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array(

+		'name' => __('Allow post type to add from frontend', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_allow_posttype_frontend',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),

+	array(

+		'name' => __('Show add listing link in main navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_main_nav',

+		'css' => 'min-width:300px;',

+		'std' => array(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

+	array(

+		'name' => __('Show add listing link in add listing navigation', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_add_listing_nav',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

 

-    array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),

+	array('type' => 'sectionend', 'id' => 'geodir_post_type_navigation_layout'),

 

 

-    array(

-        'name' => __('Show add listing link in user dashboard', 'geodirectory'),

-        'desc' => '',

-        'tip' => '',

-        'id' => 'geodir_add_listing_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

+	array('name' => __('User Dashboard Post Type Navigation Settings', 'geodirectory'), 'type' => 'sectionstart', 'desc' => '', 'id' => 'geodir_user_dashboard_post_type '),

 

-    array(

-        'name' => __('Show favorite link in user dashboard', 'geodirectory'),

-        'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_favorite_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

 

-    array(

-        'name' => __('Show listing link in user dashboard', 'geodirectory'),

-        'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_listing_link_user_dashboard',

-        'css' => 'min-width:300px;',

-        'std' => geodir_get_posttypes(),

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select post types', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => array_unique(geodir_post_type_setting_fun())

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),

-    /* Post Type Navigation Settings End */

-

-    /* Script Settings Start */

-    array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),

-

-    /*

+	array(

+		'name' => __('Show add listing link in user dashboard', 'geodirectory'),

+		'desc' => '',

+		'tip' => '',

+		'id' => 'geodir_add_listing_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array(

+		'name' => __('Show favorite link in user dashboard', 'geodirectory'),

+		'desc' => __('Option will not appear if user does not have a favorite of that post type', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_favorite_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array(

+		'name' => __('Show listing link in user dashboard', 'geodirectory'),

+		'desc' => __('Option will not appear if user does not have his/her own listing of that post type', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_listing_link_user_dashboard',

+		'css' => 'min-width:300px;',

+		'std' => geodir_get_posttypes(),

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select post types', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => array_unique(geodir_post_type_setting_fun())

+	),

+

+	array('type' => 'sectionend', 'id' => 'geodir_user_dashboard_post_type'),

+	/* Post Type Navigation Settings End */

+

+	/* Script Settings Start */

+	array('name' => __('Scripts', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_script_settings '),

+

+	/*

     array( 	'name' => __( 'Add/Remove Scripts', 'geodirectory' ),

                 'type' => 'sectionstart',

                 'desc' => '',

@@ -995,190 +995,190 @@ 
 

     */

 

-    array('name' => __('GD Lazy Load Images', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_gdll_settings'),

+	array('name' => __('GD Lazy Load Images', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_gdll_settings'),

 

-    array(

-        'name' => __('Enable lazy load images?', 'geodirectory'),

-        'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),

-        'id' => 'geodir_lazy_load',

-        'type' => 'checkbox',

-        'std' => '1' // Default value to show home top section

-    ),

-    array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),

+	array(

+		'name' => __('Enable lazy load images?', 'geodirectory'),

+		'desc' => __('GD images will be loaded only when visible on the page', 'geodirectory'),

+		'id' => 'geodir_lazy_load',

+		'type' => 'checkbox',

+		'std' => '1' // Default value to show home top section

+	),

+	array('type' => 'sectionend', 'id' => 'geodir_gdll_settings'),

     

 

-    array('name' => __('Script Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_script_settings'),

+	array('name' => __('Script Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_script_settings'),

 

-    array(

-        'name' => __('Custom style css code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_coustem_css',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Custom style css code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_coustem_css',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Header script code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_header_scripts',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Header script code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_header_scripts',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Footer script code', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_footer_scripts',

-        'type' => 'textarea',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => __('Footer script code', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_footer_scripts',

+		'type' => 'textarea',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array('type' => 'sectionend', 'id' => 'geodir_script_settings'),

-    /* Script Settings End */

+	array('type' => 'sectionend', 'id' => 'geodir_script_settings'),

+	/* Script Settings End */

 

-    /* Map Settings Start */

-    array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),

+	/* Map Settings Start */

+	array('name' => __('Map', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'geodir_map_settings '),

 

 

-    // Google API key

-    array(

-        'name' => __('Google Maps API KEY', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_google_api_key'

-    ),

-    array(

-        'name' => __('Google Maps API KEY', 'geodirectory'),

-        'desc' => sprintf(

-            __('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),

-            'https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),

-        'tip' => '',

-        'id' => 'geodir_google_api_key',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'text',

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_google_api_key'

-    ),

+	// Google API key

+	array(

+		'name' => __('Google Maps API KEY', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_google_api_key'

+	),

+	array(

+		'name' => __('Google Maps API KEY', 'geodirectory'),

+		'desc' => sprintf(

+			__('This is a requirement to use Google Maps, you can get a key from <a href="%s" target="_blank">here</a> OR you can set GD to use Open Street Maps below under Select Maps API setting.   (<a href="%s" target="_blank">How to add a Google API KEY?</a>)', 'geodirectory'),

+			'https://console.developers.google.com/flows/enableapi?apiid=maps_backend,geocoding_backend,directions_backend,distance_matrix_backend,elevation_backend&keyType=CLIENT_SIDE&reusekey=true','https://wpgeodirectory.com/docs/add-google-api-key/' ),

+		'tip' => '',

+		'id' => 'geodir_google_api_key',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'text',

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_google_api_key'

+	),

 

-    /* Untick the category by default on home map */

-    array(

-        'name' => __('Home Map Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_home_map_section'

-    ),

-    array(

-        'name' => __('Select category to untick by default on map', 'geodirectory'),

-        'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_home_map_untick',

-        'css' => 'min-width:300px;',

-        'std' => '',

-        'type' => 'multiselect',

-        'placeholder_text' => __('Select category', 'geodirectory'),

-        'class' => 'chosen_select',

-        'options' => geodir_home_map_cats_key_value_array()

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_home_map_section'

-    ),

+	/* Untick the category by default on home map */

+	array(

+		'name' => __('Home Map Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_home_map_section'

+	),

+	array(

+		'name' => __('Select category to untick by default on map', 'geodirectory'),

+		'desc' => __('Select category to untick by default on the home map.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_home_map_untick',

+		'css' => 'min-width:300px;',

+		'std' => '',

+		'type' => 'multiselect',

+		'placeholder_text' => __('Select category', 'geodirectory'),

+		'class' => 'chosen_select',

+		'options' => geodir_home_map_cats_key_value_array()

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_home_map_section'

+	),

 

-    array(

-        'name' => __('Add Listing Map Settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_add_listing_map_section'

-    ),

-    array(

-        'name' => __('Disable mouse scroll', 'geodirectory'),

-        'desc' => __('Stops the mouse scroll zooming the map', 'geodirectory'),

-        'id' => 'geodir_add_listing_mouse_scroll',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'type' => 'sectionend',

-        'id' => 'geodir_add_listing_map_section'

-    ),

+	array(

+		'name' => __('Add Listing Map Settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_add_listing_map_section'

+	),

+	array(

+		'name' => __('Disable mouse scroll', 'geodirectory'),

+		'desc' => __('Stops the mouse scroll zooming the map', 'geodirectory'),

+		'id' => 'geodir_add_listing_mouse_scroll',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'type' => 'sectionend',

+		'id' => 'geodir_add_listing_map_section'

+	),

 

 

-    array('name' => __('Default map settings', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_map_default_settings'),

+	array('name' => __('Default map settings', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_map_default_settings'),

 

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'map_default_settings',

-        'type' => 'map_default_settings',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'map_default_settings',

+		'type' => 'map_default_settings',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

 

-    array(

-        'name' => __('Upload map default marker icon', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_default_marker_icon',

-        'type' => 'file',

-        'std' => '0',

-        'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

-    ),

-    // add option that allows enable/disable map dragging to phone devices

-    array(

-        'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),

-        'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),

-        'id' => 'geodir_map_onoff_dragging',

-        'type' => 'checkbox',

-        'std' => '0' // Default value to show home top section

-    ),

-    array(

-        'name' => __('Select Maps API', 'geodirectory'),

-        'desc' => __('- Google Maps API will force to load Google JS library only.<br>- OpenStreetMap API will force to load OpenStreetMap JS library only.<br>- Load Automatic will load Google JS library first, but if Google maps JS library not loaded it then loads the OpenStreetMap JS library to load the maps (recommended for regions where Google maps banned).<br>- Disable Maps will disable and hides maps for entire site.', 'geodirectory'),

-        'tip' => '',

-        'id' => 'geodir_load_map',

-        'css' => 'min-width:300px;',

-        'std' => 'auto',

-        'type' => 'select',

-        'placeholder_text' => __('Select Map', 'geodirectory'),

-        'options' => array(

-                        'auto' => __('Load Automatic', 'geodirectory'),

-                        'google' => __('Load Google Maps API', 'geodirectory'),

-                        'osm' => __('Load OpenStreetMap API', 'geodirectory'),

-                        'none' => __('Disable Maps', 'geodirectory')

-                    )

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),

-

-    array('name' => __('Show / hide post type and category on map', 'geodirectory'),

-        'type' => 'sectionstart',

-        'desc' => '',

-        'id' => 'geodir_map_settings'),

+	array(

+		'name' => __('Upload map default marker icon', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_default_marker_icon',

+		'type' => 'file',

+		'std' => '0',

+		'value' => geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png'// Default value to show home top section

+	),

+	// add option that allows enable/disable map dragging to phone devices

+	array(

+		'name' => __('Show button control on map to enable/disable dragging', 'geodirectory'),

+		'desc' => __('If checked, it displays button control to enable/disable dragging on google maps for phone devices', 'geodirectory'),

+		'id' => 'geodir_map_onoff_dragging',

+		'type' => 'checkbox',

+		'std' => '0' // Default value to show home top section

+	),

+	array(

+		'name' => __('Select Maps API', 'geodirectory'),

+		'desc' => __('- Google Maps API will force to load Google JS library only.<br>- OpenStreetMap API will force to load OpenStreetMap JS library only.<br>- Load Automatic will load Google JS library first, but if Google maps JS library not loaded it then loads the OpenStreetMap JS library to load the maps (recommended for regions where Google maps banned).<br>- Disable Maps will disable and hides maps for entire site.', 'geodirectory'),

+		'tip' => '',

+		'id' => 'geodir_load_map',

+		'css' => 'min-width:300px;',

+		'std' => 'auto',

+		'type' => 'select',

+		'placeholder_text' => __('Select Map', 'geodirectory'),

+		'options' => array(

+						'auto' => __('Load Automatic', 'geodirectory'),

+						'google' => __('Load Google Maps API', 'geodirectory'),

+						'osm' => __('Load OpenStreetMap API', 'geodirectory'),

+						'none' => __('Disable Maps', 'geodirectory')

+					)

+	),

 

-    array(

-        'name' => __('Select Map Category', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_map_settings',

-        'type' => 'map',

-        'css' => 'min-width:300px;',

-        'std' => '' // Default value for the page title - changed in settings

-    ),

-

-    array('type' => 'sectionend', 'id' => 'geodir_map_settings'),

-    /* Map Settings End */

+	array('type' => 'sectionend', 'id' => 'geodir_map_default_settings'),

+

+	array('name' => __('Show / hide post type and category on map', 'geodirectory'),

+		'type' => 'sectionstart',

+		'desc' => '',

+		'id' => 'geodir_map_settings'),

+

+	array(

+		'name' => __('Select Map Category', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_map_settings',

+		'type' => 'map',

+		'css' => 'min-width:300px;',

+		'std' => '' // Default value for the page title - changed in settings

+	),

+

+	array('type' => 'sectionend', 'id' => 'geodir_map_settings'),

+	/* Map Settings End */

 

 )); // End Design settings

geodirectory-admin/option-pages/notifications_settings_array.php

Spacing +9 added lines, -9 removed lines

@@ -129,7 +129,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject_admin',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -137,7 +137,7 @@ 
         'id' => 'geodir_post_submited_success_email_content_admin',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -154,7 +154,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -162,7 +162,7 @@ 
         'id' => 'geodir_post_submited_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -180,7 +180,7 @@ 
         'id' => 'geodir_forgot_password_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array(

@@ -197,7 +197,7 @@ 
         'id' => 'geodir_registration_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

     array(

         'name' => __('Listing published email', 'geodirectory'),

@@ -236,7 +236,7 @@ 
         'id' => 'geodir_email_friend_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>", 'geodirectory')

     ),

 

     array(

@@ -253,7 +253,7 @@ 
         'id' => 'geodir_email_enquiry_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array('type' => 'sectionend', 'id' => 'other_emails'),

@@ -269,7 +269,7 @@ 
         'id' => 'geodir_post_added_success_msg_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>', 'geodirectory')

     ),

 

 

Indentation +291 added lines, -291 removed lines

@@ -17,296 +17,296 @@
 $geodir_settings['notifications_settings'] = apply_filters('geodir_notifications_settings', array(

 

 

-    array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

-

-

-    array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

-

-    array(

-        'name' => __('List of usable shortcodes', 'geodirectory'),

-        'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

-        'id' => 'geodir_list_of_usable_shordcodes',

-        'type' => 'html_content',

-        'css' => 'min-width:300px;',

-        'std' => 'All Places' // Default value for the page title - changed in settings

-    ),

-

-    array(

-        'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_tiny_editor',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'notification_options'),

-

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

-

-    array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

-

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('New user registration', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_new_user',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_friend',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Send enquiry', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_bcc_enquiry',

-        'std' => 'yes',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'site_bcc_options'),

-

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

-

-    array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

-

-    array(

-        'name' => __('Post submit success to admin email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-     array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('Yes', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '1',

-        'radiogroup' => 'start'

-    ),

-    array(

-        'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

-        'desc' => __('No', 'geodirectory'),

-        'id' => 'geodir_notify_post_edited',

-        'std' => '0',

-        'type' => 'radio',

-        'value' => '0',

-        'radiogroup' => 'end'

-    ),

-    array(

-        'name' => __('Listing edited by Author', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_subject_admin',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_edited_email_content_admin',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'admin_emails'),

-

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

-

-    array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

-

-    array(

-        'name' => __('Post submit success to client email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_submited_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

-    ),

-

-

-    array(

-        'name' => __('User forgot password email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_forgot_password_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_forgot_password_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Registration success email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_registration_success_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-    array(

-        'name' => __('Listing published email', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_published_email_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_post_published_email_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'client_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

-

-    array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

-

-    array(

-        'name' => __('Send to friend', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_friend_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_friend_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

-    ),

-

-    array(

-        'name' => __('Email enquiry', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_subject',

-        'type' => 'text',

-        'css' => 'min-width:300px;',

-        'std' => __('Website Enquiry', 'geodirectory')

-    ),

-    array(

-        'name' => '',

-        'desc' => '',

-        'id' => 'geodir_email_enquiry_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

-    ),

-

-    array('type' => 'sectionend', 'id' => 'other_emails'),

-

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

-

-    array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

-

-    array(

-        'name' => __('Post submitted success', 'geodirectory'),

-        'desc' => '',

-        'id' => 'geodir_post_added_success_msg_content',

-        'css' => 'width:500px; height: 150px;',

-        'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

-    ),

-

-

-    array('type' => 'sectionend', 'id' => 'messages'),

+	array('name' => __('Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'notification_options'),

+

+

+	array('name' => __('Notification Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'notification_options'),

+

+	array(

+		'name' => __('List of usable shortcodes', 'geodirectory'),

+		'desc' => __('[#client_name#],[#listing_link#],[#posted_date#],[#number_of_days#],[#number_of_grace_days#],[#login_url#],[#username#],[#user_email#],[#site_name_url#],[#renew_link#],[#post_id#],[#site_name#],[#from_email#](in most cases this will be the admin email, except for popup forms)', 'geodirectory'),

+		'id' => 'geodir_list_of_usable_shordcodes',

+		'type' => 'html_content',

+		'css' => 'min-width:300px;',

+		'std' => 'All Places' // Default value for the page title - changed in settings

+	),

+

+	array(

+		'name' => __('Use advanced editor? (slow loading)', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Use advanced editor?(slow loading)', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_tiny_editor',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'notification_options'),

+

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'site_bcc_options'),

+

+	array('name' => __('Site Bcc Options', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'site_bcc_options'),

+

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('New user registration', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_new_user',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_friend',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Send enquiry', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_bcc_enquiry',

+		'std' => 'yes',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'site_bcc_options'),

+

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'admin_emails'),

+

+	array('name' => __('Admin Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'admin_emails'),

+

+	array(

+		'name' => __('Post submit success to admin email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	 array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('Yes', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '1',

+		'radiogroup' => 'start'

+	),

+	array(

+		'name' => __('Notify Admin when listing edited by Author', 'geodirectory'),

+		'desc' => __('No', 'geodirectory'),

+		'id' => 'geodir_notify_post_edited',

+		'std' => '0',

+		'type' => 'radio',

+		'value' => '0',

+		'radiogroup' => 'end'

+	),

+	array(

+		'name' => __('Listing edited by Author', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_subject_admin',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[[#site_name#]] Listing edited by Author', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_edited_email_content_admin',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear Admin,</p><p>A listing [#listing_link#] has been edited by it\'s author [#post_author_name#].</p><br><p><b>Listing Details:</b></p><p>Listing ID: [#post_id#]</p><p>Listing URL: [#listing_link#]</p><p>Date: [#current_date#]</p><br><p>This email is just for your information.</p><p>[#site_name#]</p>', 'geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'admin_emails'),

+

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'client_emails'),

+

+	array('name' => __('Client Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'client_emails'),

+

+	array(

+		'name' => __('Post submit success to client email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_submited_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+	),

+

+

+	array(

+		'name' => __('User forgot password email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_forgot_password_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#site_name#] - Your new password', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_forgot_password_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Registration success email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Your Log In Details', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_registration_success_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+	array(

+		'name' => __('Listing published email', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_published_email_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Listing Published Successfully', 'geodirectory') // Default value for the page title - changed in settings

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_post_published_email_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'client_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'other_emails'),

+

+	array('name' => __('Other Emails', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'other_emails'),

+

+	array(

+		'name' => __('Send to friend', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_friend_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('[#from_name#] thought you might be interested in..', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_friend_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+	),

+

+	array(

+		'name' => __('Email enquiry', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_subject',

+		'type' => 'text',

+		'css' => 'min-width:300px;',

+		'std' => __('Website Enquiry', 'geodirectory')

+	),

+	array(

+		'name' => '',

+		'desc' => '',

+		'id' => 'geodir_email_enquiry_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+	),

+

+	array('type' => 'sectionend', 'id' => 'other_emails'),

+

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'title', 'desc' => '', 'id' => 'messages'),

+

+	array('name' => __('Messages', 'geodirectory'), 'type' => 'sectionstart', 'id' => 'messages'),

+

+	array(

+		'name' => __('Post submitted success', 'geodirectory'),

+		'desc' => '',

+		'id' => 'geodir_post_added_success_msg_content',

+		'css' => 'width:500px; height: 150px;',

+		'type' => 'textarea',

+		'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+	),

+

+

+	array('type' => 'sectionend', 'id' => 'messages'),

 

 )); // End Manage NOtifications settings

geodirectory-functions/ajax_handler_functions.php

Braces +34 added lines, -25 removed lines

@@ -126,10 +126,11 @@ 
     }

 

     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

+        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
+                    geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
+        } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
+                    geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
+        }
     }

 

     if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

@@ -151,22 +152,25 @@ 
         if (current_user_can('manage_options')) {

             switch ($_REQUEST['geodir_autofill']):

                 case "geodir_dummy_delete" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename'))

-                        return;

+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename')) {
+                                            return;
+                    }
 

-                    if (isset($_REQUEST['posttype']))

-                        /**

+                    if (isset($_REQUEST['posttype'])) {
+                                            /**

                          * Used to delete the dummy post data per post type.

                          *

                          * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

                          *

                          * @since 1.0.0

                          */

-                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);

+                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);
+                    }
                     break;

                 case "geodir_dummy_insert" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
+                                            return;
+                    }
 

                     global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

                     $dummy_post_index = $_REQUEST['insert_dummy_post_index'];

@@ -175,15 +179,16 @@ 
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];

                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];

 

-                    if (isset($_REQUEST['posttype']))

-                        /**

+                    if (isset($_REQUEST['posttype'])) {
+                                            /**

                          * Used to insert the dummy post data per post type.

                          *

                          * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

                          *

                          * @since 1.0.0

                          */

-                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);

+                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);
+                    }
 

                     break;

             endswitch;

@@ -204,8 +209,9 @@ 
 

     if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {

 

-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend')

-            require_once(geodir_plugin_path() . '/geodirectory-templates/popup-forms.php');

+        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
+                    require_once(geodir_plugin_path() . '/geodirectory-templates/popup-forms.php');
+        }
 

         exit;

     }

@@ -266,8 +272,9 @@ 
                         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

                             $redirect_to = get_permalink(geodir_add_listing_page_id());

                             $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                        } else

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

+                        } else {
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
+                        }
 

                         wp_redirect($redirect_to);

                     } else {

@@ -280,9 +287,9 @@ 
 

                     $gd_session->un_set('listing');

 

-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

-                        wp_redirect(get_permalink($_REQUEST['pid']));

-                    else {

+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
+                                            wp_redirect(get_permalink($_REQUEST['pid']));
+                    } else {

                         geodir_remove_temp_images();

                         wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

                     }

@@ -310,8 +317,9 @@ 
                             } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

                                 $redirect_to = get_permalink(geodir_add_listing_page_id());

                                 $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                            } else

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

+                            } else {
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
+                            }
 

                             $gd_session->un_set('listing');

                             wp_redirect($redirect_to);

@@ -333,8 +341,9 @@ 
                             $lastid = wp_delete_post($_REQUEST['pid']);

                         }

 

-                        if ($lastid && !is_wp_error($lastid))

-                            wp_redirect($_SERVER['HTTP_REFERER']);

+                        if ($lastid && !is_wp_error($lastid)) {
+                                                    wp_redirect($_SERVER['HTTP_REFERER']);
+                        }
 

                         //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

                     }

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

+    if (geodir_is_page('login')) {

         geodir_user_signup();

     }

 

@@ -82,7 +82,7 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');

         die;

     }

 

@@ -140,7 +140,7 @@ 
              * @since 1.0.0

              * @package GeoDirectory

              */

-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');

         } else {

             wp_redirect(geodir_login_url());

             exit();

@@ -162,7 +162,7 @@ 
                          *

                          * @since 1.0.0

                          */

-                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);

+                        do_action('geodir_delete_dummy_posts_'.$_REQUEST['posttype']);

                     break;

                 case "geodir_dummy_insert" :

                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

@@ -183,7 +183,7 @@ 
                          *

                          * @since 1.0.0

                          */

-                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);

+                        do_action('geodir_insert_dummy_posts_'.$_REQUEST['posttype']);

 

                     break;

             endswitch;

@@ -196,7 +196,7 @@ 
     if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {

 

         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend')

-            require_once(geodir_plugin_path() . '/geodirectory-templates/popup-forms.php');

+            require_once(geodir_plugin_path().'/geodirectory-templates/popup-forms.php');

 

         exit;

     }

@@ -212,17 +212,17 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');

     }

 

     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

         if (is_user_logged_in()) {

             switch ($_REQUEST['ajax_action']):

                 case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

+                    geodir_add_to_favorite((int) $_REQUEST['pid']);

                     break;

                 case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);

                     break;

             endswitch;

         } else {

@@ -235,7 +235,7 @@ 
 

         $is_current_user_owner = true;

         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);

         }

 

         $request = $gd_session->get('listing');

@@ -346,7 +346,7 @@ 
          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');

     }

 

 

Indentation +290 added lines, -290 removed lines

@@ -16,22 +16,22 @@ 
  */

 function geodir_on_wp_loaded()

 {

-    /**

-     * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.

-     *

-     * @since 1.0.0

-     */

-    do_action('giodir_handle_request_plugins_loaded');

-    global $wpdb;

+	/**

+	 * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('giodir_handle_request_plugins_loaded');

+	global $wpdb;

 

 

-    if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {

-        geodir_send_inquiry($_REQUEST); // function in custom_functions.php

+	if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {

+		geodir_send_inquiry($_REQUEST); // function in custom_functions.php

 

-    } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {

-        geodir_send_friend($_REQUEST); // function in custom_functions.php

+	} elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {

+		geodir_send_friend($_REQUEST); // function in custom_functions.php

 

-    }

+	}

 

 }

 

@@ -44,9 +44,9 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

-        geodir_user_signup();

-    }

+	if(geodir_is_page('login')) {

+		geodir_user_signup();

+	}

 

 }

 

@@ -59,47 +59,47 @@ 
  */

 function geodir_on_init()

 {

-    /**

-     * Called on the wp_init WP hook at the start of the geodir_on_init() function.

-     *

-     * @since 1.0.0

-     */

-    do_action('giodir_handle_request');

-    global $wpdb;

-

-

-

-

-    if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options')) {

-        show_admin_bar(false);

-    }

-

-

-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {

-        /**

-         * Contains map marker functions.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

-        die;

-    }

-

-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'ga') {

-        if (isset($_REQUEST['ga_start'])) {

-            $ga_start = $_REQUEST['ga_start'];

-        } else {

-            $ga_start = '';

-        }

-        if (isset($_REQUEST['ga_end'])) {

-            $ga_end = $_REQUEST['ga_end'];

-        } else {

-            $ga_end = '';

-        }

-        geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

-        die;

-    }

+	/**

+	 * Called on the wp_init WP hook at the start of the geodir_on_init() function.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('giodir_handle_request');

+	global $wpdb;

+

+

+

+

+	if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options')) {

+		show_admin_bar(false);

+	}

+

+

+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {

+		/**

+		 * Contains map marker functions.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+		die;

+	}

+

+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'ga') {

+		if (isset($_REQUEST['ga_start'])) {

+			$ga_start = $_REQUEST['ga_start'];

+		} else {

+			$ga_start = '';

+		}

+		if (isset($_REQUEST['ga_end'])) {

+			$ga_end = $_REQUEST['ga_end'];

+		} else {

+			$ga_end = '';

+		}

+		geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);

+		die;

+	}

 

 

 }

@@ -118,240 +118,240 @@ 
  * @todo check if nonce is required here and if so add one.

  */

 function geodir_ajax_handler() {

-    global $wpdb, $gd_session;

+	global $wpdb, $gd_session;

 

-    if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {

+	if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {

 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);

-        echo '1';

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

-    }

-

-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

-        if (current_user_can('manage_options')) {

-            /**

-             * Contains admin ajax handling functions.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             */

-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

-        } else {

-            wp_redirect(geodir_login_url());

-            gd_die();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {

-        if (current_user_can('manage_options')) {

-            switch ($_REQUEST['geodir_autofill']):

-                case "geodir_dummy_delete" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename'))

-                        return;

-

-                    if (isset($_REQUEST['posttype']))

-                        /**

-                         * Used to delete the dummy post data per post type.

-                         *

-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);

-                    break;

-                case "geodir_dummy_insert" :

-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

-                        return;

-

-                    global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

-                    $dummy_post_index = $_REQUEST['insert_dummy_post_index'];

-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];

-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];

-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];

-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];

-

-                    if (isset($_REQUEST['posttype']))

-                        /**

-                         * Used to insert the dummy post data per post type.

-                         *

-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);

-

-                    break;

-            endswitch;

-        } else {

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {

-

-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend')

-            require_once(geodir_plugin_path() . '/geodirectory-templates/popup-forms.php');

-

-        gd_die();

-    }

-

-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){

+		echo '1';

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {

+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))

+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);

+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))

+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);

+	}

+

+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {

+		if (current_user_can('manage_options')) {

+			/**

+			 * Contains admin ajax handling functions.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 */

+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');

+		} else {

+			wp_redirect(geodir_login_url());

+			gd_die();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {

+		if (current_user_can('manage_options')) {

+			switch ($_REQUEST['geodir_autofill']):

+				case "geodir_dummy_delete" :

+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_delete_noncename'))

+						return;

+

+					if (isset($_REQUEST['posttype']))

+						/**

+						 * Used to delete the dummy post data per post type.

+						 *

+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_delete_dummy_posts_' . $_REQUEST['posttype']);

+					break;

+				case "geodir_dummy_insert" :

+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))

+						return;

+

+					global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;

+					$dummy_post_index = $_REQUEST['insert_dummy_post_index'];

+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];

+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];

+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];

+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];

+

+					if (isset($_REQUEST['posttype']))

+						/**

+						 * Used to insert the dummy post data per post type.

+						 *

+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_insert_dummy_posts_' . $_REQUEST['posttype']);

+

+					break;

+			endswitch;

+		} else {

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {

+

+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend')

+			require_once(geodir_plugin_path() . '/geodirectory-templates/popup-forms.php');

+

+		gd_die();

+	}

+

+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){

         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');

     }*/

 

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {

-        /**

-         * Contains map marker functions.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

-        if (is_user_logged_in()) {

-            switch ($_REQUEST['ajax_action']):

-                case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

-                    break;

-                case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

-                    break;

-            endswitch;

-        } else {

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {

-

-        $is_current_user_owner = true;

-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

-        }

-

-        $request = $gd_session->get('listing');

-

-        if (is_user_logged_in() && $is_current_user_owner) {

-

-            switch ($_REQUEST['ajax_action']):

-                case "add":

-                case "update":

-

-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

-                        $last_id = geodir_save_listing();

-

-                        if ($last_id) {

-                            //$redirect_to = get_permalink( $last_id );

-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

-

-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                        } else

-                            $redirect_to = get_permalink(geodir_add_listing_page_id());

-

-                        wp_redirect($redirect_to);

-                    } else {

-                        $gd_session->un_set('listing');

-                        wp_redirect(home_url());

-                    }

-

-                    break;

-                case "cancel" :

-

-                    $gd_session->un_set('listing');

-

-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

-                        wp_redirect(get_permalink($_REQUEST['pid']));

-                    else {

-                        geodir_remove_temp_images();

-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

-                    }

-

-                    break;

-

-                case "publish" :

-

-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

-

-                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                            $new_post = array();

-                            $new_post['ID'] = $_REQUEST['pid'];

-

-                            $lastid = wp_update_post($new_post);

-

-                            $gd_session->un_set('listing');

-                            wp_redirect(get_permalink($lastid));

-                        } else {

-                            $last_id = geodir_save_listing();

-

-                            if ($last_id) {

-                                //$redirect_to = get_permalink( $last_id );

-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

-                            } else

-                                $redirect_to = get_permalink(geodir_add_listing_page_id());

-

-                            $gd_session->un_set('listing');

-                            wp_redirect($redirect_to);

-                        }

-                    } else {

-                        $gd_session->un_set('listing');

-                        wp_redirect(home_url());

-                    }

-

-                    break;

-                case "delete" :

-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-                        global $current_user;

-

-                        if (get_option('geodir_disable_perm_delete')) {

-                            $lastid = wp_trash_post($_REQUEST['pid']);

-                        } else {

-                            $lastid = wp_delete_post($_REQUEST['pid']);

-                        }

-

-                        if ($lastid && !is_wp_error($lastid))

-                            wp_redirect($_SERVER['HTTP_REFERER']);

-

-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

-                    }

-                    break;

-            endswitch;

-

-            $gd_session->un_set('listing');

-        } else {

-            $gd_session->un_set('listing');

-            wp_redirect(geodir_login_url());

-            exit();

-        }

-    }

-

-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {

-        /**

-         * Contains registration and login functions.

-         * @todo Fix the file path.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

-    }

-

-

-    if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {

-        $terms_o = get_terms(sanitize_text_field($_REQUEST['term']));

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {

+		/**

+		 * Contains map marker functions.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {

+		if (is_user_logged_in()) {

+			switch ($_REQUEST['ajax_action']):

+				case "add" :

+					geodir_add_to_favorite((int)$_REQUEST['pid']);

+					break;

+				case "remove" :

+					geodir_remove_from_favorite((int)$_REQUEST['pid']);

+					break;

+			endswitch;

+		} else {

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {

+

+		$is_current_user_owner = true;

+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

+		}

+

+		$request = $gd_session->get('listing');

+

+		if (is_user_logged_in() && $is_current_user_owner) {

+

+			switch ($_REQUEST['ajax_action']):

+				case "add":

+				case "update":

+

+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

+						$last_id = geodir_save_listing();

+

+						if ($last_id) {

+							//$redirect_to = get_permalink( $last_id );

+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

+

+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+							$redirect_to = get_permalink(geodir_add_listing_page_id());

+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

+						} else

+							$redirect_to = get_permalink(geodir_add_listing_page_id());

+

+						wp_redirect($redirect_to);

+					} else {

+						$gd_session->un_set('listing');

+						wp_redirect(home_url());

+					}

+

+					break;

+				case "cancel" :

+

+					$gd_session->un_set('listing');

+

+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))

+						wp_redirect(get_permalink($_REQUEST['pid']));

+					else {

+						geodir_remove_temp_images();

+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));

+					}

+

+					break;

+

+				case "publish" :

+

+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {

+

+						if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+							$new_post = array();

+							$new_post['ID'] = $_REQUEST['pid'];

+

+							$lastid = wp_update_post($new_post);

+

+							$gd_session->un_set('listing');

+							wp_redirect(get_permalink($lastid));

+						} else {

+							$last_id = geodir_save_listing();

+

+							if ($last_id) {

+								//$redirect_to = get_permalink( $last_id );

+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));

+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+								$redirect_to = get_permalink(geodir_add_listing_page_id());

+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);

+							} else

+								$redirect_to = get_permalink(geodir_add_listing_page_id());

+

+							$gd_session->un_set('listing');

+							wp_redirect($redirect_to);

+						}

+					} else {

+						$gd_session->un_set('listing');

+						wp_redirect(home_url());

+					}

+

+					break;

+				case "delete" :

+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+						global $current_user;

+

+						if (get_option('geodir_disable_perm_delete')) {

+							$lastid = wp_trash_post($_REQUEST['pid']);

+						} else {

+							$lastid = wp_delete_post($_REQUEST['pid']);

+						}

+

+						if ($lastid && !is_wp_error($lastid))

+							wp_redirect($_SERVER['HTTP_REFERER']);

+

+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );

+					}

+					break;

+			endswitch;

+

+			$gd_session->un_set('listing');

+		} else {

+			$gd_session->un_set('listing');

+			wp_redirect(geodir_login_url());

+			exit();

+		}

+	}

+

+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {

+		/**

+		 * Contains registration and login functions.

+		 * @todo Fix the file path.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');

+	}

+

+

+	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {

+		$terms_o = get_terms(sanitize_text_field($_REQUEST['term']));

 		

 		// Skip terms which has no listing

 		if (!empty($terms_o)) {

@@ -365,11 +365,11 @@ 
 			$terms_o = $filter_terms;

 		}

 		

-        $terms = geodir_sort_terms($terms_o, 'count');

-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));

-        exit();

+		$terms = geodir_sort_terms($terms_o, 'count');

+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));

+		exit();

 

-    }

+	}

 

-    gd_die();

+	gd_die();

 }

geodirectory-functions/cat-meta-functions/cat_meta.php

Braces +15 added lines, -12 removed lines

@@ -204,8 +204,9 @@ 
 #############################################################
 function manage_category_custom_fields($deprecated, $column_name, $term_id)
 {
-    if ($column_name == 'cat_ID_num')
-        echo $term_id;
+    if ($column_name == 'cat_ID_num') {
+            echo $term_id;
+    }
 
     if ($column_name == 'cat_icon') {
         $term_icon_url = get_tax_meta($term_id, 'ct_cat_icon');
@@ -214,9 +215,9 @@ 
 
             $file_info = pathinfo($term_icon_url['src']);
 
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                $sub_dir = $file_info['dirname'];
-            else{$sub_dir = '';}
+            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                            $sub_dir = $file_info['dirname'];
+            } else{$sub_dir = '';}
 
             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
             $uploads_baseurl = $uploads['baseurl'];
@@ -236,8 +237,9 @@ 
 
     if ($column_name == 'cat_default_img') {
         $cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img');
-        if ($cat_default_img != '')
-            echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
+        if ($cat_default_img != '') {
+                    echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
+        }
 
     }
 }
@@ -245,11 +247,12 @@ 
 function geodir_get_default_catimage($term_id, $post_type = 'gd_place')
 {
 
-    if ($cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
-        return $cat_default_img;
-    else
-        return false;
-}
+    if ($cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type)) {
+            return $cat_default_img;
+    } else {
+            return false;
+    }
+    }
 
 //Clear custom fields
 add_action('in_admin_footer', 'geodir_tax_meta_clear_custom_field');

Spacing +22 added lines, -22 removed lines

@@ -24,12 +24,12 @@ 
      */
 
     $config = array(
-        'id' => 'demo_meta_box',                    // meta box id, unique per meta box
-        'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
-        'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
-        'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
-        'fields' => array(),                        // list of meta fields (can be added by field arrays)
-        'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
+        'id' => 'demo_meta_box', // meta box id, unique per meta box
+        'title' => __('Demo Meta Box', 'geodirectory'), // meta box title
+        'pages' => geodir_get_taxonomies(), // taxonomy name, accept categories, post_tag and custom taxonomies
+        'context' => 'normal', // where the meta box appear: normal (default), advanced, side; optional
+        'fields' => array(), // list of meta fields (can be added by field arrays)
+        'local_images' => false, // Use local or hosted images (meta box images for add/remove)
         'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
     );
 
@@ -38,18 +38,18 @@ 
      * Initiate your meta box
      */
     $my_meta = new Tax_Meta_Class($config);
-    $my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
+    $my_meta->addWysiwyg($prefix.'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
+    $my_meta->addImage($prefix.'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
+    $my_meta->addImage($prefix.'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
     /*$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));*/// hidden setting to trick WPML
 
-    $my_meta->addSelect($prefix . 'cat_schema',
+    $my_meta->addSelect($prefix.'cat_schema',
     /*
      * Allows you to add/filter the cat schema types.
      *
      * @since 1.5.7
      */
-        apply_filters('geodir_cat_schemas',array(
+        apply_filters('geodir_cat_schemas', array(
             '' => __('Default (LocalBusiness)', 'geodirectory'),
             'AccountingService' => 'AccountingService',
             'Attorney' => 'Attorney',
@@ -141,7 +141,7 @@ 
             'WholesaleStore' => 'WholesaleStore',
             'Winery' => 'Winery'
         )),
-        array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
+        array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory')."", 'std' => array('selectkey2')));
 
     /*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
     'random'=>__('Random','geodirectory'),
@@ -179,8 +179,8 @@ 
 if (!empty($gd_taxonomies)) {
     foreach ($gd_taxonomies as $gd_taxonomy) {
 
-        add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
-        add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
+        add_filter('manage_edit-'.$gd_taxonomy.'_columns', 'addCat_column', 10, 2);
+        add_action('manage_'.$gd_taxonomy.'_custom_column', 'manage_category_custom_fields', 10, 3);
 
     }
 }
@@ -214,9 +214,9 @@ 
 
             $file_info = pathinfo($term_icon_url['src']);
 
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+            if (isset($file_info['dirname']) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
                 $sub_dir = $file_info['dirname'];
-            else{$sub_dir = '';}
+            else {$sub_dir = ''; }
 
             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
             $uploads_baseurl = $uploads['baseurl'];
@@ -226,10 +226,10 @@ 
 
             $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
 
-            $uploads_url = $uploads_baseurl . $sub_dir;
+            $uploads_url = $uploads_baseurl.$sub_dir;
 
-            $term_icon_url['src'] = $uploads_url . '/' . $file_name;
-            echo '<img src="' . $term_icon_url['src'] . '" />';
+            $term_icon_url['src'] = $uploads_url.'/'.$file_name;
+            echo '<img src="'.$term_icon_url['src'].'" />';
 
         }
     }
@@ -237,7 +237,7 @@ 
     if ($column_name == 'cat_default_img') {
         $cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img');
         if ($cat_default_img != '')
-            echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
+            echo '<img src="'.$cat_default_img['src'].'" style="max-height:60px;max-width:60px;"/>';
 
     }
 }
@@ -268,8 +268,8 @@ 
                             jQuery("#addtag iframe").contents().find("body").html('');
                             jQuery('#addtag [rel="ct_cat_default_img"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
                             jQuery('#addtag [rel="ct_cat_icon"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
-                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image','geodirectory');?>');
-                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image','geodirectory');?>');
+                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
+                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
                         }
                     }, 1000);
 

Indentation +166 added lines, -166 removed lines

@@ -11,142 +11,142 @@ 
 //include the main class file
 require_once("Tax-meta-class.php");
 if (is_admin()) {
-    /*
+	/*
      * prefix of meta keys, optional
      * use underscore (_) at the beginning to make keys hidden, for example $prefix = '_ba_';
      *  you also can make prefix empty to disable it
      *
      */
 
-    $prefix = 'ct_';
-    /*
+	$prefix = 'ct_';
+	/*
      * configure your meta box
      */
 
-    $config = array(
-        'id' => 'demo_meta_box',                    // meta box id, unique per meta box
-        'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
-        'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
-        'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
-        'fields' => array(),                        // list of meta fields (can be added by field arrays)
-        'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
-        'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
-    );
+	$config = array(
+		'id' => 'demo_meta_box',                    // meta box id, unique per meta box
+		'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
+		'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
+		'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
+		'fields' => array(),                        // list of meta fields (can be added by field arrays)
+		'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
+		'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
+	);
 
 
-    /*
+	/*
      * Initiate your meta box
      */
-    $my_meta = new Tax_Meta_Class($config);
-    $my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
-    $my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
-    /*$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));*/// hidden setting to trick WPML
-
-    $my_meta->addSelect($prefix . 'cat_schema',
-    /*
+	$my_meta = new Tax_Meta_Class($config);
+	$my_meta->addWysiwyg($prefix . 'cat_top_desc', array('name' => __('Category Top Description', 'geodirectory'), 'desc' => __('This will appear at the top of the category listing.', 'geodirectory')));
+	$my_meta->addImage($prefix . 'cat_default_img', array('name' => __('Default Listing Image', 'geodirectory'), 'desc' => __('Choose a default "no image"', 'geodirectory')));
+	$my_meta->addImage($prefix . 'cat_icon', array('name' => __('Category Icon', 'geodirectory'), 'desc' => __('Choose a category icon', 'geodirectory'), 'validate_func' => '!empty'));
+	/*$my_meta->addCheckbox($prefix.'pointless',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory'),'style'=>'hidden'));*/// hidden setting to trick WPML
+
+	$my_meta->addSelect($prefix . 'cat_schema',
+	/*
      * Allows you to add/filter the cat schema types.
      *
      * @since 1.5.7
      */
-        apply_filters('geodir_cat_schemas',array(
-            '' => __('Default (LocalBusiness)', 'geodirectory'),
-            'AccountingService' => 'AccountingService',
-            'Attorney' => 'Attorney',
-            'AutoBodyShop' => 'AutoBodyShop',
-            'AutoDealer' => 'AutoDealer',
-            'AutoPartsStore' => 'AutoPartsStore',
-            'AutoRental' => 'AutoRental',
-            'AutoRepair' => 'AutoRepair',
-            'AutoWash' => 'AutoWash',
-            'Bakery' => 'Bakery',
-            'BarOrPub' => 'BarOrPub',
-            'BeautySalon' => 'BeautySalon',
-            'BedAndBreakfast' => 'BedAndBreakfast',
-            'BikeStore' => 'BikeStore',
-            'BookStore' => 'BookStore',
-            'CafeOrCoffeeShop' => 'CafeOrCoffeeShop',
-            'Campground' => 'Campground',
-            'ChildCare' => 'ChildCare',
-            'ClothingStore' => 'ClothingStore',
-            'ComputerStore' => 'ComputerStore',
-            'DaySpa' => 'DaySpa',
-            'Dentist' => 'Dentist',
-            'DryCleaningOrLaundry' => 'DryCleaningOrLaundry',
-            'Electrician' => 'Electrician',
-            'ElectronicsStore' => 'ElectronicsStore',
-            'EmergencyService' => 'EmergencyService',
-            'EntertainmentBusiness' => 'EntertainmentBusiness',
-            'Event' => 'Event',
-            'EventVenue' => 'EventVenue',
-            'ExerciseGym' => 'ExerciseGym',
-            'FinancialService' => 'FinancialService',
-            'Florist' => 'Florist',
-            'FoodEstablishment' => 'FoodEstablishment',
-            'FurnitureStore' => 'FurnitureStore',
-            'GardenStore' => 'GardenStore',
-            'GeneralContractor' => 'GeneralContractor',
-            'GolfCourse' => 'GolfCourse',
-            'HairSalon' => 'HairSalon',
-            'HardwareStore' => 'HardwareStore',
-            'HealthAndBeautyBusiness' => 'HealthAndBeautyBusiness',
-            'HobbyShop' => 'HobbyShop',
-            'HomeAndConstructionBusiness' => 'HomeAndConstructionBusiness',
-            'HomeGoodsStore' => 'HomeGoodsStore',
-            'Hospital' => 'Hospital',
-            'Hostel' => 'Hostel',
-            'Hotel' => 'Hotel',
-            'HousePainter' => 'HousePainter',
-            'HVACBusiness' => 'HVACBusiness',
-            'InsuranceAgency' => 'InsuranceAgency',
-            'JewelryStore' => 'JewelryStore',
-            'LiquorStore' => 'LiquorStore',
-            'Locksmith' => 'Locksmith',
-            'LodgingBusiness' => 'LodgingBusiness',
-            'MedicalClinic' => 'MedicalClinic',
-            'MensClothingStore' => 'MensClothingStore',
-            'MobilePhoneStore' => 'MobilePhoneStore',
-            'Motel' => 'Motel',
-            'MotorcycleDealer' => 'MotorcycleDealer',
-            'MotorcycleRepair' => 'MotorcycleRepair',
-            'MovingCompany' => 'MovingCompany',
-            'MusicStore' => 'MusicStore',
-            'NailSalon' => 'NailSalon',
-            'NightClub' => 'NightClub',
-            'Notary' => 'Notary',
-            'OfficeEquipmentStore' => 'OfficeEquipmentStore',
-            'Optician' => 'Optician',
-            'PetStore' => 'PetStore',
-            'Physician' => 'Physician',
-            'Plumber' => 'Plumber',
-            'ProfessionalService' => 'ProfessionalService',
-            'RealEstateAgent' => 'RealEstateAgent',
-            'Residence' => 'Residence',
-            'Restaurant' => 'Restaurant',
-            'RoofingContractor' => 'RoofingContractor',
-            'RVPark' => 'RVPark',
-            'School' => 'School',
-            'SelfStorage' => 'SelfStorage',
-            'ShoeStore' => 'ShoeStore',
-            'SkiResort' => 'SkiResort',
-            'SportingGoodsStore' => 'SportingGoodsStore',
-            'SportsClub' => 'SportsClub',
-            'Store' => 'Store',
-            'TattooParlor' => 'TattooParlor',
-            'Taxi' => 'Taxi',
-            'TennisComplex' => 'TennisComplex',
-            'TireShop' => 'TireShop',
-            'TouristAttraction' => 'TouristAttraction',
-            'ToyStore' => 'ToyStore',
-            'TravelAgency' => 'TravelAgency',
-            //'VacationRentals' => 'VacationRentals', // Not recognised by google yet
-            'VeterinaryCare' => 'VeterinaryCare',
-            'WholesaleStore' => 'WholesaleStore',
-            'Winery' => 'Winery'
-        )),
-        array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
-
-    /*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
+		apply_filters('geodir_cat_schemas',array(
+			'' => __('Default (LocalBusiness)', 'geodirectory'),
+			'AccountingService' => 'AccountingService',
+			'Attorney' => 'Attorney',
+			'AutoBodyShop' => 'AutoBodyShop',
+			'AutoDealer' => 'AutoDealer',
+			'AutoPartsStore' => 'AutoPartsStore',
+			'AutoRental' => 'AutoRental',
+			'AutoRepair' => 'AutoRepair',
+			'AutoWash' => 'AutoWash',
+			'Bakery' => 'Bakery',
+			'BarOrPub' => 'BarOrPub',
+			'BeautySalon' => 'BeautySalon',
+			'BedAndBreakfast' => 'BedAndBreakfast',
+			'BikeStore' => 'BikeStore',
+			'BookStore' => 'BookStore',
+			'CafeOrCoffeeShop' => 'CafeOrCoffeeShop',
+			'Campground' => 'Campground',
+			'ChildCare' => 'ChildCare',
+			'ClothingStore' => 'ClothingStore',
+			'ComputerStore' => 'ComputerStore',
+			'DaySpa' => 'DaySpa',
+			'Dentist' => 'Dentist',
+			'DryCleaningOrLaundry' => 'DryCleaningOrLaundry',
+			'Electrician' => 'Electrician',
+			'ElectronicsStore' => 'ElectronicsStore',
+			'EmergencyService' => 'EmergencyService',
+			'EntertainmentBusiness' => 'EntertainmentBusiness',
+			'Event' => 'Event',
+			'EventVenue' => 'EventVenue',
+			'ExerciseGym' => 'ExerciseGym',
+			'FinancialService' => 'FinancialService',
+			'Florist' => 'Florist',
+			'FoodEstablishment' => 'FoodEstablishment',
+			'FurnitureStore' => 'FurnitureStore',
+			'GardenStore' => 'GardenStore',
+			'GeneralContractor' => 'GeneralContractor',
+			'GolfCourse' => 'GolfCourse',
+			'HairSalon' => 'HairSalon',
+			'HardwareStore' => 'HardwareStore',
+			'HealthAndBeautyBusiness' => 'HealthAndBeautyBusiness',
+			'HobbyShop' => 'HobbyShop',
+			'HomeAndConstructionBusiness' => 'HomeAndConstructionBusiness',
+			'HomeGoodsStore' => 'HomeGoodsStore',
+			'Hospital' => 'Hospital',
+			'Hostel' => 'Hostel',
+			'Hotel' => 'Hotel',
+			'HousePainter' => 'HousePainter',
+			'HVACBusiness' => 'HVACBusiness',
+			'InsuranceAgency' => 'InsuranceAgency',
+			'JewelryStore' => 'JewelryStore',
+			'LiquorStore' => 'LiquorStore',
+			'Locksmith' => 'Locksmith',
+			'LodgingBusiness' => 'LodgingBusiness',
+			'MedicalClinic' => 'MedicalClinic',
+			'MensClothingStore' => 'MensClothingStore',
+			'MobilePhoneStore' => 'MobilePhoneStore',
+			'Motel' => 'Motel',
+			'MotorcycleDealer' => 'MotorcycleDealer',
+			'MotorcycleRepair' => 'MotorcycleRepair',
+			'MovingCompany' => 'MovingCompany',
+			'MusicStore' => 'MusicStore',
+			'NailSalon' => 'NailSalon',
+			'NightClub' => 'NightClub',
+			'Notary' => 'Notary',
+			'OfficeEquipmentStore' => 'OfficeEquipmentStore',
+			'Optician' => 'Optician',
+			'PetStore' => 'PetStore',
+			'Physician' => 'Physician',
+			'Plumber' => 'Plumber',
+			'ProfessionalService' => 'ProfessionalService',
+			'RealEstateAgent' => 'RealEstateAgent',
+			'Residence' => 'Residence',
+			'Restaurant' => 'Restaurant',
+			'RoofingContractor' => 'RoofingContractor',
+			'RVPark' => 'RVPark',
+			'School' => 'School',
+			'SelfStorage' => 'SelfStorage',
+			'ShoeStore' => 'ShoeStore',
+			'SkiResort' => 'SkiResort',
+			'SportingGoodsStore' => 'SportingGoodsStore',
+			'SportsClub' => 'SportsClub',
+			'Store' => 'Store',
+			'TattooParlor' => 'TattooParlor',
+			'Taxi' => 'Taxi',
+			'TennisComplex' => 'TennisComplex',
+			'TireShop' => 'TireShop',
+			'TouristAttraction' => 'TouristAttraction',
+			'ToyStore' => 'ToyStore',
+			'TravelAgency' => 'TravelAgency',
+			//'VacationRentals' => 'VacationRentals', // Not recognised by google yet
+			'VeterinaryCare' => 'VeterinaryCare',
+			'WholesaleStore' => 'WholesaleStore',
+			'Winery' => 'Winery'
+		)),
+		array('name' => __('Schema Type', 'geodirectory'), 'desc' => __('Select the Schema to use for this category', 'geodirectory') . "", 'std' => array('selectkey2')));
+
+	/*$my_meta->addSelect($prefix.'cat_sort',array(''=>__('Default' , 'geodirectory'),
     'random'=>__('Random','geodirectory'),
     'az'=>__('Alphabetical' , 'geodirectory'),
     'newest'=>__('Newest','geodirectory'),
@@ -157,8 +157,8 @@ 
     'low_review'=>__('Lowest Reviews','geodirectory')),
     array('name'=> __('Sort By','geodirectory'),'desc' => __('Select the default sort option.' ,'geodirectory'), 'std'=> array('selectkey2')));*/
 
-    // Show options for placecategories only
-    /*	if(isset($_REQUEST['taxonomy']) && in_array($_REQUEST['taxonomy'],$config['pages']) ){
+	// Show options for placecategories only
+	/*	if(isset($_REQUEST['taxonomy']) && in_array($_REQUEST['taxonomy'],$config['pages']) ){
         // Exclude sort options
         $my_meta->addCheckbox($prefix.'cat_exclude_rating',array('name'=> __('<b>Exclude</b> Rating sort option','geodirectory')));
         $my_meta->addCheckbox($prefix.'cat_exclude_reviews',array('name'=> __('<b>Exclude</b> Reviews sort option','geodirectory')));
@@ -170,8 +170,8 @@ 
 
         }*/
 
-    //Finish Meta Box Declaration
-    $my_meta->Finish();
+	//Finish Meta Box Declaration
+	$my_meta->Finish();
 }
 
 
@@ -180,82 +180,82 @@ 
 ##############################################################
 $gd_taxonomies = geodir_get_taxonomies();
 if (!empty($gd_taxonomies)) {
-    foreach ($gd_taxonomies as $gd_taxonomy) {
+	foreach ($gd_taxonomies as $gd_taxonomy) {
 
-        add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
-        add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
+		add_filter('manage_edit-' . $gd_taxonomy . '_columns', 'addCat_column', 10, 2);
+		add_action('manage_' . $gd_taxonomy . '_custom_column', 'manage_category_custom_fields', 10, 3);
 
-    }
+	}
 }
 
 function addCat_column($columns)
 {
-    if (isset($columns['description']) && $posts = $columns['description']) {
-        unset($columns['description']);
-    }
-
-    $columns['cat_icon'] = 'Icon';
-    $columns['cat_default_img'] = __('Default Image', 'geodirectory');
-    $columns['cat_ID_num'] = __('Cat ID', 'geodirectory');
-    return $columns;
+	if (isset($columns['description']) && $posts = $columns['description']) {
+		unset($columns['description']);
+	}
+
+	$columns['cat_icon'] = 'Icon';
+	$columns['cat_default_img'] = __('Default Image', 'geodirectory');
+	$columns['cat_ID_num'] = __('Cat ID', 'geodirectory');
+	return $columns;
 }
 
 #############################################################
 function manage_category_custom_fields($deprecated, $column_name, $term_id)
 {
-    if ($column_name == 'cat_ID_num')
-        echo $term_id;
+	if ($column_name == 'cat_ID_num')
+		echo $term_id;
 
-    if ($column_name == 'cat_icon') {
-        $term_icon_url = get_tax_meta($term_id, 'ct_cat_icon');
+	if ($column_name == 'cat_icon') {
+		$term_icon_url = get_tax_meta($term_id, 'ct_cat_icon');
 
-        if ($term_icon_url != '') {
+		if ($term_icon_url != '') {
 
-            $file_info = pathinfo($term_icon_url['src']);
+			$file_info = pathinfo($term_icon_url['src']);
 
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                $sub_dir = $file_info['dirname'];
-            else{$sub_dir = '';}
+			if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+				$sub_dir = $file_info['dirname'];
+			else{$sub_dir = '';}
 
-            $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
-            $uploads_baseurl = $uploads['baseurl'];
-            $uploads_path = $uploads['path'];
+			$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
+			$uploads_baseurl = $uploads['baseurl'];
+			$uploads_path = $uploads['path'];
 
-            $file_name = $file_info['basename'];
+			$file_name = $file_info['basename'];
 
-            $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
+			$sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
 
-            $uploads_url = $uploads_baseurl . $sub_dir;
+			$uploads_url = $uploads_baseurl . $sub_dir;
 
-            $term_icon_url['src'] = $uploads_url . '/' . $file_name;
-            echo '<img src="' . $term_icon_url['src'] . '" />';
+			$term_icon_url['src'] = $uploads_url . '/' . $file_name;
+			echo '<img src="' . $term_icon_url['src'] . '" />';
 
-        }
-    }
+		}
+	}
 
-    if ($column_name == 'cat_default_img') {
-        $cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img');
-        if ($cat_default_img != '')
-            echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
+	if ($column_name == 'cat_default_img') {
+		$cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img');
+		if ($cat_default_img != '')
+			echo '<img src="' . $cat_default_img['src'] . '" style="max-height:60px;max-width:60px;"/>';
 
-    }
+	}
 }
 
 function geodir_get_default_catimage($term_id, $post_type = 'gd_place')
 {
 
-    if ($cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
-        return $cat_default_img;
-    else
-        return false;
+	if ($cat_default_img = get_tax_meta($term_id, 'ct_cat_default_img', '', $post_type))
+		return $cat_default_img;
+	else
+		return false;
 }
 
 //Clear custom fields
 add_action('in_admin_footer', 'geodir_tax_meta_clear_custom_field');
 function geodir_tax_meta_clear_custom_field()
 {
-    if (isset($_REQUEST['taxonomy']) && !empty($_REQUEST['taxonomy'])):
-        ?>
+	if (isset($_REQUEST['taxonomy']) && !empty($_REQUEST['taxonomy'])):
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 jQuery('#addtag #submit').click(function () {
@@ -276,5 +276,5 @@ 
             });
         </script>
     <?php
-    endif;
+	endif;
 }

geodirectory-functions/comments_functions.php

Braces +60 added lines, -48 removed lines

@@ -248,8 +248,9 @@ 
 

     $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

 

-    if (!empty($comment_info))

-        $status = $comment_info->comment_approved;

+    if (!empty($comment_info)) {
+            $status = $comment_info->comment_approved;
+    }
 

     if ($status == 'approve' || $status == 1) {

         $status = 1;

@@ -381,12 +382,14 @@ 
 function geodir_wrap_comment_text($content, $comment = '')

 {

     $rating = 0;

-    if (!empty($comment))

-        $rating = geodir_get_commentoverall($comment->comment_ID);

+    if (!empty($comment)) {
+            $rating = geodir_get_commentoverall($comment->comment_ID);
+    }
     if ($rating != 0 && !is_admin()) {

         return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

-    } else

-        return $content;

+    } else {
+            return $content;
+    }
 

 }

 

@@ -475,11 +478,12 @@ 
         $post_ratings = get_post_meta($post_id, 'overall_rating');

     }

 

-    if ($post_ratings)

-        return $post_ratings;

-    else

-        return false;

-}

+    if ($post_ratings) {
+            return $post_ratings;
+    } else {
+            return false;
+    }
+    }

 

 

 /**

@@ -504,11 +508,12 @@ 
         )

     );

 

-    if (!empty($reatings))

-        return $reatings;

-    else

-        return false;

-}

+    if (!empty($reatings)) {
+            return $reatings;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get review total of a Post.

@@ -532,11 +537,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get review count by user ID.

@@ -559,11 +565,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get average overall rating of a Post.

@@ -597,11 +604,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get review count of a Post.

@@ -625,11 +633,12 @@ 
         )

     );

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get comments count of a Post.

@@ -655,11 +664,12 @@ 
     );

 

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

-}

+    if (!empty($results)) {
+            return $results;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Get overall rating of a comment.

@@ -683,11 +693,12 @@ 
         )

     );

 

-    if ($reatings)

-        return $reatings;

-    else

-        return false;

-}

+    if ($reatings) {
+            return $reatings;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns average overall rating of a Post. Depreciated since ver 1.3.6.

@@ -930,8 +941,9 @@ 
     $active_tabs = get_option('geodir_detail_page_tabs_excluded');

 

     $is_display = true;

-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))

-        $is_display = false;

+    if (!empty($active_tabs) && in_array('reviews', $active_tabs)) {
+            $is_display = false;
+    }
 

     /**

      * Filter to change display value.

Indentation +417 added lines, -417 removed lines

@@ -31,14 +31,14 @@ 
  */

 function geodir_comment_meta_row_action($a)

 {

-    global $comment;

-

-    $rating = geodir_get_commentoverall($comment->comment_ID);

-    if ($rating != 0) {

-        //echo '<div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$comment->comment_ID.'"></div>';

-        echo geodir_get_rating_stars($rating, $comment->comment_ID);

-    }

-    return $a;

+	global $comment;

+

+	$rating = geodir_get_commentoverall($comment->comment_ID);

+	if ($rating != 0) {

+		//echo '<div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$comment->comment_ID.'"></div>';

+		echo geodir_get_rating_stars($rating, $comment->comment_ID);

+	}

+	return $a;

 }

 

 add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

@@ -53,7 +53,7 @@ 
  */

 function geodir_comment_add_meta_box($comment)

 {

-    add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

+	add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');

 }

 

 /**

@@ -67,7 +67,7 @@ 
  */

 function geodir_comment_rating_meta($comment)

 {

-    $post_type = get_post_type($comment->comment_post_ID);

+	$post_type = get_post_type($comment->comment_post_ID);

 	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

@@ -107,12 +107,12 @@ 
  */

 function geodir_comment_rating_fields()

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (in_array($post->post_type, $post_types)) {

-        $star_texts = array();

+	if (in_array($post->post_type, $post_types)) {

+		$star_texts = array();

 		$star_texts[] = __('Terrible', 'geodirectory');

 		$star_texts[] = __('Poor', 'geodirectory');

 		$star_texts[] = __('Average', 'geodirectory');

@@ -120,10 +120,10 @@ 
 		$star_texts[] = __('Excellent', 'geodirectory');

 		

 		$gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);

-        echo $gd_rating_html;

-        ?>

+		echo $gd_rating_html;

+		?>

         <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/><?php

-    }

+	}

 }

 

 

@@ -139,9 +139,9 @@ 
 function geodir_comment_replaylink($link)

 {

 

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+	$link = '<div class="gd_comment_replaylink">' . $link . '</div>';

 

-    return $link;

+	return $link;

 }

 

 add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');

@@ -156,9 +156,9 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+	$link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

 

-    return $link;

+	return $link;

 }

 

 add_action('comment_post', 'geodir_save_rating');

@@ -174,29 +174,29 @@ 
  */

 function geodir_save_rating($comment = 0)

 {

-    global $wpdb, $user_ID, $plugin_prefix;

+	global $wpdb, $user_ID, $plugin_prefix;

 

-    $comment_info = get_comment($comment);

+	$comment_info = get_comment($comment);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $rating_ip = getenv("REMOTE_ADDR");

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$rating_ip = getenv("REMOTE_ADDR");

 	

-    $post = geodir_get_post_info($post_id);

+	$post = geodir_get_post_info($post_id);

 

-    if ($post->post_status == 'publish') {

-        $post_status = '1';

-    } else {

-        $post_status = '0';

-    }

+	if ($post->post_status == 'publish') {

+		$post_status = '1';

+	} else {

+		$post_status = '0';

+	}

 	

-    if (isset($_REQUEST['geodir_overallrating'])) {

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+	if (isset($_REQUEST['geodir_overallrating'])) {

+		$overall_rating = $_REQUEST['geodir_overallrating'];

         

 		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -214,35 +214,35 @@ 
 					post_latitude	= %s,

 					comment_content	= %s 

 					",

-                array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

-            );

-

-            $wpdb->query($sqlqry);

-

-            /**

-             * Called after saving the comment.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $_REQUEST {

-             *    Attributes of the $_REQUEST variable.

-             *

-             *    @type string $geodir_overallrating Overall rating.

-             *    @type string $comment Comment text.

-             *    @type string $submit Submit button text.

-             *    @type string $comment_post_ID Comment post ID.

-             *    @type string $comment_parent Comment Parent ID.

-             *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

-             *

-             * }

-             */

-            do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

-

-            if ($status) {

-                geodir_update_postrating($post_id);

-            }

-        }

-    }

+				array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)

+			);

+

+			$wpdb->query($sqlqry);

+

+			/**

+			 * Called after saving the comment.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $_REQUEST {

+			 *    Attributes of the $_REQUEST variable.

+			 *

+			 *    @type string $geodir_overallrating Overall rating.

+			 *    @type string $comment Comment text.

+			 *    @type string $submit Submit button text.

+			 *    @type string $comment_post_ID Comment post ID.

+			 *    @type string $comment_parent Comment Parent ID.

+			 *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.

+			 *

+			 * }

+			 */

+			do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');

+

+			if ($status) {

+				geodir_update_postrating($post_id);

+			}

+		}

+	}

 }

 

 

@@ -260,51 +260,51 @@ 
  */

 function geodir_update_rating_status_change($comment_id, $status)

 {

-    if ($status == 'delete') {

-        return;

-    }

-    global $wpdb, $plugin_prefix, $user_ID;

+	if ($status == 'delete') {

+		return;

+	}

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

+	$post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';

 

-    if (!empty($comment_info))

-        $status = $comment_info->comment_approved;

+	if (!empty($comment_info))

+		$status = $comment_info->comment_approved;

 

-    if ($status == 'approve' || $status == 1) {

-        $status = 1;

-    } else {

-        $status = 0;

-    }

+	if ($status == 'approve' || $status == 1) {

+		$status = 1;

+	} else {

+		$status = 0;

+	}

 

-    $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

-    $old_rating = geodir_get_commentoverall($comment_info_ID);

+	$comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';

+	$old_rating = geodir_get_commentoverall($comment_info_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if ($comment_id) {

+	if ($comment_id) {

 

-        $overall_rating = $old_rating;

+		$overall_rating = $old_rating;

 

-        if (isset($old_rating)) {

+		if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+			$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-            $wpdb->query($sqlqry);

+			$wpdb->query($sqlqry);

 

-            //update rating

-            geodir_update_postrating($post_id, $post_type);

+			//update rating

+			geodir_update_postrating($post_id, $post_type);

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -323,41 +323,41 @@ 
 function geodir_update_rating($comment_id = 0)

 {

 

-    global $wpdb, $plugin_prefix, $user_ID;

+	global $wpdb, $plugin_prefix, $user_ID;

 

-    $comment_info = get_comment($comment_id);

+	$comment_info = get_comment($comment_id);

 

-    $post_id = $comment_info->comment_post_ID;

-    $status = $comment_info->comment_approved;

-    $old_rating = geodir_get_commentoverall($comment_info->comment_ID);

+	$post_id = $comment_info->comment_post_ID;

+	$status = $comment_info->comment_approved;

+	$old_rating = geodir_get_commentoverall($comment_info->comment_ID);

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if (isset($_REQUEST['geodir_overallrating'])) {

+	if (isset($_REQUEST['geodir_overallrating'])) {

 

-        $overall_rating = $_REQUEST['geodir_overallrating'];

+		$overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

+		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            if (isset($old_rating)) {

+			if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+				$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));

 

-                $wpdb->query($sqlqry);

+				$wpdb->query($sqlqry);

 

-                //update rating

-                geodir_update_postrating($post_id, $post_type);

+				//update rating

+				geodir_update_postrating($post_id, $post_type);

 

-            }

-        }

-    }

+			}

+		}

+	}

 

 

 }

@@ -373,19 +373,19 @@ 
  */

 function geodir_comment_delete_comment($comment_id)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $review_info = geodir_get_review($comment_id);

-    if ($review_info) {

-        geodir_update_postrating($review_info->post_id);

-    }

+	$review_info = geodir_get_review($comment_id);

+	if ($review_info) {

+		geodir_update_postrating($review_info->post_id);

+	}

 

-    $wpdb->query(

-        $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

-            array($comment_id)

-        )

-    );

+	$wpdb->query(

+		$wpdb->prepare(

+			"DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+			array($comment_id)

+		)

+	);

 

 }

 

@@ -401,13 +401,13 @@ 
  */

 function geodir_wrap_comment_text($content, $comment = '')

 {

-    $rating = 0;

-    if (!empty($comment))

-        $rating = geodir_get_commentoverall($comment->comment_ID);

-    if ($rating != 0 && !is_admin()) {

-        return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

-    } else

-        return $content;

+	$rating = 0;

+	if (!empty($comment))

+		$rating = geodir_get_commentoverall($comment->comment_ID);

+	if ($rating != 0 && !is_admin()) {

+		return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+	} else

+		return $content;

 

 }

 

@@ -425,41 +425,41 @@ 
  */

 function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false)

 {

-    global $wpdb, $plugin_prefix, $comment;

-    if (!$post_type) {

-        $post_type = get_post_type($post_id);

-    }

-    $detail_table = $plugin_prefix . $post_type . '_detail';

-    $post_newrating = geodir_get_post_rating($post_id, 1);

-    $post_newrating_count = geodir_get_review_count_total($post_id);

+	global $wpdb, $plugin_prefix, $comment;

+	if (!$post_type) {

+		$post_type = get_post_type($post_id);

+	}

+	$detail_table = $plugin_prefix . $post_type . '_detail';

+	$post_newrating = geodir_get_post_rating($post_id, 1);

+	$post_newrating_count = geodir_get_review_count_total($post_id);

 

 

-    //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

+	//$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $detail_table . " SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

-                array($post_newrating, $post_newrating_count, $post_id)

-            )

-        );

-

-        update_post_meta($post_id, 'overall_rating', $post_newrating);

-        update_post_meta($post_id, 'rating_count', $post_newrating_count);

-    }

-    /**

-     * Called after Updating post overall rating and rating count.

-     *

-     * @since 1.0.0

-     * @since 1.4.3 Added `$post_id` param.

-     * @package GeoDirectory

-     * @param int $post_id The post ID.

-     */

-    do_action('geodir_update_postrating',$post_id);

+				array($post_newrating, $post_newrating_count, $post_id)

+			)

+		);

+

+		update_post_meta($post_id, 'overall_rating', $post_newrating);

+		update_post_meta($post_id, 'rating_count', $post_newrating_count);

+	}

+	/**

+	 * Called after Updating post overall rating and rating count.

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.3 Added `$post_id` param.

+	 * @package GeoDirectory

+	 * @param int $post_id The post ID.

+	 */

+	do_action('geodir_update_postrating',$post_id);

 

 }

 

@@ -477,29 +477,29 @@ 
  */

 function geodir_get_postoverall($post_id = 0)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+	$post_type = get_post_type($post_id);

+	$detail_table = $plugin_prefix . $post_type . '_detail';

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

 

-        $post_ratings = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

-                array($post_id)

-            )

-        );

+		$post_ratings = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+				array($post_id)

+			)

+		);

 

 

-    } else {

-        $post_ratings = get_post_meta($post_id, 'overall_rating');

-    }

+	} else {

+		$post_ratings = get_post_meta($post_id, 'overall_rating');

+	}

 

-    if ($post_ratings)

-        return $post_ratings;

-    else

-        return false;

+	if ($post_ratings)

+		return $post_ratings;

+	else

+		return false;

 }

 

 

@@ -516,19 +516,19 @@ 
  */

 function geodir_get_review($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_row(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if (!empty($reatings))

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_row(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if (!empty($reatings))

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -544,19 +544,19 @@ 
  */

 function geodir_get_review_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -572,18 +572,18 @@ 
  */

 function geodir_get_review_count_by_user_id($user_id = 0)

 {

-    global $wpdb;

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

-            array($user_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+			array($user_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -601,27 +601,27 @@ 
  */

 function geodir_get_post_rating($post_id = 0, $force_query = 0)

 {

-    global $wpdb, $post;

-

-    if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

-        if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

-            return $post->overall_rating;

-        } else {

-            return 0;

-        }

-    }

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb, $post;

+

+	if (isset($post->ID) && $post->ID == $post_id && !$force_query) {

+		if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {

+			return $post->overall_rating;

+		} else {

+			return 0;

+		}

+	}

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -637,19 +637,19 @@ 
  */

 function geodir_get_review_count_total($post_id = 0)

 {

-    global $wpdb;

-

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

-

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	global $wpdb;

+

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

+

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -666,20 +666,20 @@ 
  */

 function geodir_get_comments_number($post_id = 0)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $results = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

-            array($post_id)

-        )

-    );

+	$results = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+			array($post_id)

+		)

+	);

 

 

-    if (!empty($results))

-        return $results;

-    else

-        return false;

+	if (!empty($results))

+		return $results;

+	else

+		return false;

 }

 

 /**

@@ -695,19 +695,19 @@ 
  */

 function geodir_get_commentoverall($comment_id = 0)

 {

-    global $wpdb;

-

-    $reatings = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

-            array($comment_id)

-        )

-    );

-

-    if ($reatings)

-        return $reatings;

-    else

-        return false;

+	global $wpdb;

+

+	$reatings = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+			array($comment_id)

+		)

+	);

+

+	if ($reatings)

+		return $reatings;

+	else

+		return false;

 }

 

 /**

@@ -721,7 +721,7 @@ 
  */

 function geodir_get_commentoverall_number($post_id = 0)

 {

-    return geodir_get_post_rating($post_id);

+	return geodir_get_post_rating($post_id);

 }

 

 

@@ -739,98 +739,98 @@ 
  */

 function geodir_comment_template($comment_template)

 {

-    global $post;

-

-    $post_types = geodir_get_posttypes();

-

-    if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

-        return;

-    }

-    if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

-        $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

-        if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

-        }

-        return $template;

-    }

+	global $post;

+

+	$post_types = geodir_get_posttypes();

+

+	if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {

+		return;

+	}

+	if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

+		$template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

+		if (!$template) {

+			$template = dirname(__FILE__) . '/reviews.php';

+		}

+		return $template;

+	}

 }

 

 add_filter("comments_template", "geodir_comment_template");

 

 

 if (!function_exists('geodir_comment')) {

-    /**

-     * Comment HTML markup.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post The current post object.

-     * @param object $comment The comment object.

-     * @param string|array $args {

-     *     Optional. Formatting options.

-     *

-     *     @type object $walker            Instance of a Walker class to list comments. Default null.

-     *     @type int    $max_depth         The maximum comments depth. Default empty.

-     *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

-     *     @type string $callback          Callback function to use. Default null.

-     *     @type string $end-callback      Callback function to use at the end. Default null.

-     *     @type string $type              Type of comments to list.

-     *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

-     *     @type int    $page              Page ID to list comments for. Default empty.

-     *     @type int    $per_page          Number of comments to list per page. Default empty.

-     *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

-     *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

-     *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

-     *     @type string $format            How to format the comments list.

-     *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

-     *     @type bool   $short_ping        Whether to output short pings. Default false.

-     *     @type bool   $echo              Whether to echo the output or return it. Default true.

-     * }

-     * @param int $depth Depth of comment.

-     */

-    function geodir_comment($comment, $args, $depth)

-    {

-        $GLOBALS['comment'] = $comment;

-        switch ($comment->comment_type) :

-            case 'pingback' :

-            case 'trackback' :

-                // Display trackbacks differently than normal comments.

-                ?>

+	/**

+	 * Comment HTML markup.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post The current post object.

+	 * @param object $comment The comment object.

+	 * @param string|array $args {

+	 *     Optional. Formatting options.

+	 *

+	 *     @type object $walker            Instance of a Walker class to list comments. Default null.

+	 *     @type int    $max_depth         The maximum comments depth. Default empty.

+	 *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.

+	 *     @type string $callback          Callback function to use. Default null.

+	 *     @type string $end-callback      Callback function to use at the end. Default null.

+	 *     @type string $type              Type of comments to list.

+	 *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.

+	 *     @type int    $page              Page ID to list comments for. Default empty.

+	 *     @type int    $per_page          Number of comments to list per page. Default empty.

+	 *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.

+	 *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.

+	 *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.

+	 *     @type string $format            How to format the comments list.

+	 *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.

+	 *     @type bool   $short_ping        Whether to output short pings. Default false.

+	 *     @type bool   $echo              Whether to echo the output or return it. Default true.

+	 * }

+	 * @param int $depth Depth of comment.

+	 */

+	function geodir_comment($comment, $args, $depth)

+	{

+		$GLOBALS['comment'] = $comment;

+		switch ($comment->comment_type) :

+			case 'pingback' :

+			case 'trackback' :

+				// Display trackbacks differently than normal comments.

+				?>

                 <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">

                 <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>

                 <?php

-                break;

-            default :

-                // Proceed with normal comments.

-                global $post;

-                ?>

+				break;

+			default :

+				// Proceed with normal comments.

+				global $post;

+				?>

             <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">

                 <article id="comment-<?php comment_ID(); ?>" class="comment hreview">

                     <header class="comment-meta comment-author vcard">

                         <?php

-                        /**

-                         * Filter to modify comment avatar size

-                         *

-                         * You can use this filter to change comment avatar size.

-                         *

-                         * @since 1.0.0

-                         * @package GeoDirectory

-                         */

-                        $avatar_size = apply_filters('geodir_comment_avatar_size', 44);

-                        echo get_avatar($comment, $avatar_size);

-                        printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

-                            get_comment_author_link(),

-                            // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

-                        );

-                        echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

-                        printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

-                            esc_url(get_comment_link($comment->comment_ID)),

-                            get_comment_time('c'),

-                            /* translators: 1: date, 2: time */

-                            sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

-                        );

-                        ?>

+						/**

+						 * Filter to modify comment avatar size

+						 *

+						 * You can use this filter to change comment avatar size.

+						 *

+						 * @since 1.0.0

+						 * @package GeoDirectory

+						 */

+						$avatar_size = apply_filters('geodir_comment_avatar_size', 44);

+						echo get_avatar($comment, $avatar_size);

+						printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

+							get_comment_author_link(),

+							// If current post author is also comment author, make it known visually.

+							($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+						);

+						echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

+						printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

+							esc_url(get_comment_link($comment->comment_ID)),

+							get_comment_time('c'),

+							/* translators: 1: date, 2: time */

+							sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())

+						);

+						?>

                     </header>

                     <!-- .comment-meta -->

 

@@ -854,47 +854,47 @@ 
                 </article>

                 <!-- #comment-## -->

                 <?php

-                break;

-        endswitch; // end comment_type check

-    }

+				break;

+		endswitch; // end comment_type check

+	}

 }

 

 

 add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);

 if (!function_exists('geodir_fix_comment_count')) {

-    /**

-     * Fix comment count by not listing replies as reviews

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post The current post object.

-     * @param int $count The comment count.

-     * @param int $post_id The post ID.

-     * @todo $post is unreachable since the function return the count before that variable.

-     * @return bool|null|string The comment count.

-     */

-    function geodir_fix_comment_count($count, $post_id)

-    {

-        if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

-            global $post;

-            $post_types = geodir_get_posttypes();

-

-            if (in_array(get_post_type($post_id), $post_types)) {

-                $review_count = geodir_get_review_count_total($post_id);

-                return $review_count;

-

-                if ($post && isset($post->rating_count)) {

-                    return $post->rating_count;

-                } else {

-                    return geodir_get_comments_number($post_id);

-                }

-            } else {

-                return $count;

-            }

-        } else {

-            return $count;

-        }

-    }

+	/**

+	 * Fix comment count by not listing replies as reviews

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post The current post object.

+	 * @param int $count The comment count.

+	 * @param int $post_id The post ID.

+	 * @todo $post is unreachable since the function return the count before that variable.

+	 * @return bool|null|string The comment count.

+	 */

+	function geodir_fix_comment_count($count, $post_id)

+	{

+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {

+			global $post;

+			$post_types = geodir_get_posttypes();

+

+			if (in_array(get_post_type($post_id), $post_types)) {

+				$review_count = geodir_get_review_count_total($post_id);

+				return $review_count;

+

+				if ($post && isset($post->rating_count)) {

+					return $post->rating_count;

+				} else {

+					return geodir_get_comments_number($post_id);

+				}

+			} else {

+				return $count;

+			}

+		} else {

+			return $count;

+		}

+	}

 }

 

 /**

@@ -911,11 +911,11 @@ 
  */

 function geodir_get_rating_stars($rating, $post_id, $small = false)

 {

-    $a_rating = $rating / 5 * 100;

+	$a_rating = $rating / 5 * 100;

 

-    if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

-    } else {

+	if ($small) {

+		$r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+	} else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

@@ -933,8 +933,8 @@ 
 			}

 			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

 		}

-    }

-    return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

+	}

+	return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

 }

 

 /**

@@ -948,23 +948,23 @@ 
 function geodir_is_reviews_show($pageview = '')

 {

 

-    $active_tabs = get_option('geodir_detail_page_tabs_excluded');

-

-    $is_display = true;

-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))

-        $is_display = false;

-

-    /**

-     * Filter to change display value.

-     *

-     * You can use this filter to change the is_display value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $is_display Display ratings when set to true.

-     * @param string $pageview The view template. Ex: listview, gridview etc.

-     */

-    return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

+	$active_tabs = get_option('geodir_detail_page_tabs_excluded');

+

+	$is_display = true;

+	if (!empty($active_tabs) && in_array('reviews', $active_tabs))

+		$is_display = false;

+

+	/**

+	 * Filter to change display value.

+	 *

+	 * You can use this filter to change the is_display value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $is_display Display ratings when set to true.

+	 * @param string $pageview The view template. Ex: listview, gridview etc.

+	 */

+	return apply_filters('geodir_is_reviews_show', $is_display, $pageview);

 }

 

 

@@ -972,9 +972,9 @@ 
  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

 if(function_exists('dsq_can_replace')) {

-    remove_filter('comments_template', 'dsq_comments_template');

-    add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+	remove_filter('comments_template', 'dsq_comments_template');

+	add_filter('comments_template', 'dsq_comments_template', 100);

+	add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

 }

 

 

@@ -988,13 +988,13 @@ 
  * @return string `1` if active `0` if disabled.

  */

 function geodir_option_disqus_active($disqus_active){

-    global $post;

-    $all_postypes = geodir_get_posttypes();

+	global $post;

+	$all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

-        $disqus_active = '0';

-    }

+	if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+		$disqus_active = '0';

+	}

 

-    return $disqus_active;

+	return $disqus_active;

 }

 

Spacing +39 added lines, -39 removed lines

@@ -68,10 +68,10 @@ 
 function geodir_comment_rating_meta($comment)

 {

     $post_type = get_post_type($comment->comment_post_ID);

-	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0) {

+	if (in_array($post_type, (array) geodir_get_posttypes()) && (int) $comment->comment_parent == 0) {

 		$rating = geodir_get_commentoverall($comment->comment_ID);

 		

-		if ((int)get_option('geodir_reviewrating_enable_font_awesome') == 1) {

+		if ((int) get_option('geodir_reviewrating_enable_font_awesome') == 1) {

 			$star_texts = array();

 			$star_texts[] = __('Terrible', 'geodirectory');

 			$star_texts[] = __('Poor', 'geodirectory');

@@ -82,13 +82,13 @@ 
 			echo geodir_font_awesome_rating_form_html('', $star_texts, $rating);

 		} else {			

 			if ($rating) {

-				echo '<div class="gd_rating" data-average="' . $rating . '" data-id="5">';

+				echo '<div class="gd_rating" data-average="'.$rating.'" data-id="5">';

 

 			} else {

 				echo '<div class="gd_rating" data-average="0" data-id="5"></div>';

 			}

 		}

-		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="' . $rating . '"  />';

+		echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="'.$rating.'"  />';

 	}

 }

 

@@ -139,7 +139,7 @@ 
 function geodir_comment_replaylink($link)

 {

 

-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';

+    $link = '<div class="gd_comment_replaylink">'.$link.'</div>';

 

     return $link;

 }

@@ -156,7 +156,7 @@ 
 function geodir_cancle_replaylink($link)

 {

 

-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';

+    $link = '<span class="gd-cancel-replaylink">'.$link.'</span>';

 

     return $link;

 }

@@ -193,10 +193,10 @@ 
     if (isset($_REQUEST['geodir_overallrating'])) {

         $overall_rating = $_REQUEST['geodir_overallrating'];

         

-		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+		if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("INSERT INTO ".GEODIR_REVIEW_TABLE." SET

 					post_id		= %d,

 					post_type = %s,

 					post_title	= %s,

@@ -283,7 +283,7 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

     if ($comment_id) {

 

@@ -291,7 +291,7 @@ 
 

         if (isset($old_rating)) {

 

-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+            $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content = %s 

@@ -333,18 +333,18 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

     if (isset($_REQUEST['geodir_overallrating'])) {

 

         $overall_rating = $_REQUEST['geodir_overallrating'];

 

-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {

+        if (isset($comment_info->comment_parent) && (int) $comment_info->comment_parent == 0) {

             $overall_rating = $overall_rating > 0 ? $overall_rating : '0';

 

             if (isset($old_rating)) {

 

-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET

+                $sqlqry = $wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET

 						overall_rating = %f,

 						status		= %s,

 						comment_content	= %s 

@@ -382,7 +382,7 @@ 
 

     $wpdb->query(

         $wpdb->prepare(

-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",

+            "DELETE FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d",

             array($comment_id)

         )

     );

@@ -405,7 +405,7 @@ 
     if (!empty($comment))

         $rating = geodir_get_commentoverall($comment->comment_ID);

     if ($rating != 0 && !is_admin()) {

-        return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';

+        return '<div><div class="gd-rating-text">'.__('Overall Rating', 'geodirectory').': <div class="rating">'.$rating.'</div></div>'.geodir_get_rating_stars($rating, $comment->comment_ID).'</div><div class="description">'.$content.'</div>';

     } else

         return $content;

 

@@ -429,18 +429,18 @@ 
     if (!$post_type) {

         $post_type = get_post_type($post_id);

     }

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

     $post_newrating = geodir_get_post_rating($post_id, 1);

     $post_newrating_count = geodir_get_review_count_total($post_id);

 

 

     //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $detail_table . " SET

+                "UPDATE ".$detail_table." SET

 						overall_rating = %f,

 						rating_count = %f

 						where post_id = %d",

@@ -459,7 +459,7 @@ 
      * @package GeoDirectory

      * @param int $post_id The post ID.

      */

-    do_action('geodir_update_postrating',$post_id);

+    do_action('geodir_update_postrating', $post_id);

 

 }

 

@@ -480,13 +480,13 @@ 
     global $wpdb, $plugin_prefix;

 

     $post_type = get_post_type($post_id);

-    $detail_table = $plugin_prefix . $post_type . '_detail';

+    $detail_table = $plugin_prefix.$post_type.'_detail';

 

-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {

+    if ($wpdb->get_var("SHOW TABLES LIKE '".$detail_table."'") == $detail_table) {

 

         $post_ratings = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",

+                "SELECT overall_rating FROM ".$detail_table." WHERE post_id = %d",

                 array($post_id)

             )

         );

@@ -520,7 +520,7 @@ 
 

     $reatings = $wpdb->get_row(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -548,7 +548,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT SUM(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -575,7 +575,7 @@ 
     global $wpdb;

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE user_id = %d AND status=1 AND overall_rating>0",

             array($user_id)

         )

     );

@@ -613,7 +613,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COALESCE(avg(overall_rating),0) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -641,7 +641,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -670,7 +670,7 @@ 
 

     $results = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",

+            "SELECT COUNT(overall_rating) FROM ".GEODIR_REVIEW_TABLE." WHERE post_id = %d AND status=1 AND overall_rating>0",

             array($post_id)

         )

     );

@@ -699,7 +699,7 @@ 
 

     $reatings = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",

+            "SELECT overall_rating FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id = %d",

             array($comment_id)

         )

     );

@@ -749,7 +749,7 @@ 
     if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business

         $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available

         if (!$template) {

-            $template = dirname(__FILE__) . '/reviews.php';

+            $template = dirname(__FILE__).'/reviews.php';

         }

         return $template;

     }

@@ -821,7 +821,7 @@ 
                         printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',

                             get_comment_author_link(),

                             // If current post author is also comment author, make it known visually.

-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''

+                            ($comment->user_id === $post->post_author) ? '<span>'.__('Post author', 'geodirectory').'</span>' : ''

                         );

                         echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";

                         printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',

@@ -914,24 +914,24 @@ 
     $a_rating = $rating / 5 * 100;

 

     if ($small) {

-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';

+        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: '.$a_rating.'%;"></div><div class="geodir_Star_small"></div></div></div>';

     } else {

 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {

 			// Show rating stars from review rating manager

 			$r_html = geodir_reviewrating_draw_overall_rating($rating);

 		} else {

-			$rating_img = '<img alt="rating icon" src="' . get_option('geodir_default_rating_star_icon') . '" />';

+			$rating_img = '<img alt="rating icon" src="'.get_option('geodir_default_rating_star_icon').'" />';

 			

 			/* fix rating star for safari */

 			$star_width = 23 * 5;

 			//global $is_safari, $is_iphone, $ios, $is_chrome;

 			//$attach_style = ( $is_safari || $is_iphone || $ios || $is_chrome ) && $star_width > 0 ? 'width:' . $star_width . 'px;max-width:none' : '';

 			if ($star_width > 0) {

-				$attach_style = 'max-width:' . $star_width . 'px';

+				$attach_style = 'max-width:'.$star_width.'px';

 			} else {

 				$attach_style = '';

 			}

-			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';

+			$r_html = '<div class="geodir-rating" style="'.$attach_style.'"><div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$post_id.'"><div class="geodir_RatingAverage" style="width: '.$a_rating.'%;"></div><div class="geodir_Star">'.$rating_img.$rating_img.$rating_img.$rating_img.$rating_img.'</div></div></div>';

 		}

     }

     return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);

@@ -971,10 +971,10 @@ 
 /*

  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types

  */

-if(function_exists('dsq_can_replace')) {

+if (function_exists('dsq_can_replace')) {

     remove_filter('comments_template', 'dsq_comments_template');

     add_filter('comments_template', 'dsq_comments_template', 100);

-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);

+    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active', 10, 1);

 }

 

 

@@ -987,11 +987,11 @@ 
  * @param string $disqus_active Hook called before DB call for option so this is empty.

  * @return string `1` if active `0` if disabled.

  */

-function geodir_option_disqus_active($disqus_active){

+function geodir_option_disqus_active($disqus_active) {

     global $post;

     $all_postypes = geodir_get_posttypes();

 

-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){

+    if (isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

         $disqus_active = '0';

     }