GeoDirectory / geodirectory

geodirectory.php

Braces +41 added lines, -13 removed lines

@@ -79,43 +79,71 @@
 /**

  * Do not store any revisions (except the one autosave per post).

  */

-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);

+if (!defined('WP_POST_REVISIONS')) {
+	define('WP_POST_REVISIONS', 0);
+}
 

 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
+}
 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) {
+	define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
+}
 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
+}
 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) {
+	define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
+}
 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
+	define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
+}
 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) {
+	define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
+}
 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
+	define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
+}
 

 /*

  * Define our Google Analytic app settings

  */

-if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');

-if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case

-if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');

-if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly

+if (!defined('GEODIR_GA_CLIENTID')) {
+	define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
+}
+if (!defined('GEODIR_GA_CLIENTSECRET')) {
+	define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C');
+}
+//don't worry - this don't need to be secret in our case

+if (!defined('GEODIR_GA_REDIRECT')) {
+	define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
+}
+if (!defined('GEODIR_GA_SCOPE')) {
+	define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');
+}
+//.readonly

 

 

 /*

  * Localisation items.

  */

-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
+	define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
+}
 

 // Load geodirectory plugin textdomain.

 add_action( 'init', 'geodir_load_textdomain' );

geodirectory_template_tags.php

Braces +38 added lines, -20 removed lines

@@ -254,7 +254,7 @@ 
         </script>

 

 <?php

-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

+    } elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){

         echo stripslashes(get_option('geodir_ga_tracking_code'));

     }

 

@@ -281,13 +281,14 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

-        return $url;

-    else if (is_admin())

-        return str_replace('#asyncload', '', $url);

-    else

-        return str_replace('#asyncload', '', $url)."' async='async";

-}

+    if (strpos($url, '#asyncload')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#asyncload', '', $url);
+    } else {
+            return str_replace('#asyncload', '', $url)."' async='async";
+    }
+    }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

 /**

@@ -354,8 +355,10 @@ 
 

     $half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.

-        return;

+    if (geodir_is_page('home')) {
+    	// dont apply default  pagination for geodirectory home page.

+        return;
+    }
 

     if (!is_single()) {

         if (function_exists('geodir_location_geo_home_link')) {

@@ -475,11 +478,21 @@ 
     }

     $dist_dif = 1000;

 

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

+    if ($dist <= 5000) {
+    	$dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+    	$dist_dif = 100;
+    }
+    if ($dist <= 500) {
+    	$dist_dif = 50;
+    }
+    if ($dist <= 100) {
+    	$dist_dif = 10;
+    }
+    if ($dist <= 50) {
+    	$dist_dif = 5;
+    }
 

     ?>

     <script type="text/javascript">

@@ -541,18 +554,23 @@ 
 {

 

     $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 

     $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
 

     ?>

 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if($search_location = geodir_get_default_location()) {
+	echo $search_location->city ;
+}
+?>';

         var latlng;

         var address;

         var dist = 0;

geodirectory-admin/admin_functions.php

Braces +230 added lines, -127 removed lines

@@ -184,8 +184,9 @@ 
 

         $thumb_img_arr = array();

 

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
+        }
 

         $totImg = '';

         $image_limit = '';

@@ -236,7 +237,9 @@ 
     {

         global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+        if (current_user_can('manage_options')) {
+        	$menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
+        }
 

         add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

@@ -300,7 +303,9 @@ 
      */

     function geodir_admin_custom_menu_order()

     {

-        if (!current_user_can('manage_options')) return false;

+        if (!current_user_can('manage_options')) {
+        	return false;
+        }
         return true;

     }

 }

@@ -331,10 +336,11 @@ 
 			case 'fail':

 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

-				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

-				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+				if ($gderr == 21) {
+							    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
+				} else {
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
+				}
                 break;

         }

     }

@@ -385,8 +391,12 @@ 
         include_once('option-pages/' . $current_tab . '_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -398,8 +408,9 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+        if (!empty($geodir_settings[$current_tab])) {
+                    geodir_update_options($geodir_settings[$current_tab]);
+        }
 

         /**

          * Called after GeoDirectory options settings are updated.

@@ -447,11 +458,14 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+    if ((!isset($_POST) || !$_POST) && !$dummy) {
+    	return false;
+    }
 

     foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+        if ($dummy && isset($value['std'])) {
+                    $_POST[$value['id']] = $value['std'];
+        }
 

 

         if (isset($value['type']) && $value['type'] == 'checkbox') :

@@ -460,25 +474,23 @@ 
                 update_option($value['id'], $_POST[$value['id']]);

             } else {

                 update_option($value['id'], 0);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+            } elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

             if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

                 update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

                 update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

                 if (isset($_POST[$value['id'] . '_crop'])) :

                     update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

+                else {
+                	:

+                    update_option($value['id'] . '_crop', 0);
+                }
                 endif;

             } else {

                 update_option($value['id'] . '_width', $value['std']);

                 update_option($value['id'] . '_height', $value['std']);

                 update_option($value['id'] . '_crop', 1);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'map') :

+            } elseif (isset($value['type']) && $value['type'] == 'map') :

             $post_types = array();

             $categories = array();

 

@@ -523,8 +535,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 update_option($value['id'], '');

@@ -540,8 +553,10 @@ 
                 foreach ($uploadedfile as $key => $uplaod):

                     if ($key == 'name'):

                         $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

+                    else {
+                    	:

+                        $uplaods[$key] = $uplaod;
+                    }
                     endif;

                 endforeach;

 

@@ -551,8 +566,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 $upload_overrides = array('test_form' => false);

@@ -567,10 +583,12 @@ 
             endif;

 

 

-        else :

+        else {
+        	:

             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

+                $theme = wp_get_theme();
+        }
                 update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

             }

 

@@ -582,8 +600,9 @@ 
 

         endif;

     }

-    if ($dummy)

-        $_POST = array();

+    if ($dummy) {
+            $_POST = array();
+    }
     return true;

 

 }

@@ -729,9 +748,12 @@ 
         $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

             'categorys' => __('Categories', 'geodirectory'));

 

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+        if (($offset = array_search('author', array_keys($columns))) === false) {
+        	// if the key doesn't exist

         {

-            $offset = 0; // should we prepend $array with $data?

+            $offset = 0;
+        }
+        // should we prepend $array with $data?

             $offset = count($columns); // or should we append $array with $data? lets pick this one...

         }

 

@@ -791,11 +813,13 @@ 
                     $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

+                if (empty($expire_date)) {
+                                    echo __('Unknown', 'geodirectory');
+                }
                 /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

+                else {
+                                    echo $expire_date . $date_diff_text;
+                }
                 break;

 

             /* If displaying the 'categorys' column. */

@@ -868,21 +892,26 @@ 
 

     $geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+            return;
+    }
 

     if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

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

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+        if (isset($_REQUEST['_status'])) {
+                    geodir_change_post_status($post_id, $_REQUEST['_status']);
+        }
 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

         geodir_save_listing($_REQUEST);

     }

@@ -907,10 +936,18 @@ 
     $tab_id = '';

     $i = 0;

     foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

+        if (!isset($value['name'])) {
+        	$value['name'] = '';
+        }
+        if (!isset($value['class'])) {
+        	$value['class'] = '';
+        }
+        if (!isset($value['css'])) {
+        	$value['css'] = '';
+        }
+        if (!isset($value['std'])) {
+        	$value['std'] = '';
+        }
         $desc = '';

         switch ($value['type']) :

             case 'dummy_installer':

@@ -926,11 +963,13 @@ 
 

                 $i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+                if (isset($value['id']) && $value['id']) {
+                                    $tab_id = $value['id'];
+                }
 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
+                }
 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -961,10 +1000,12 @@ 
                 break;

 

             case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
+                }
+                if (isset($value['name']) && $value['name']) {
+                                    echo '<h3>' . $value['name'] . $desc . '</h3>';
+                }
                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -972,7 +1013,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
+                }
                 echo '<table class="form-table">' . "\n\n";

 

                 break;

@@ -984,7 +1027,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
+                }
                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +1038,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
+                }
                 break;

             case 'text':

                 ?>

@@ -1065,17 +1112,32 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_width')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_height')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') {
+	checked(get_option($value['id'] . '_crop'), 1);
+} else {
+	checked(1);
+}
+?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1089,17 +1151,22 @@ 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

                             $geodir_select_value = '';

                             if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($option_value != '' && $option_value == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($value['std'] == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             }

                             ?>

                             <option

@@ -1124,8 +1191,14 @@ 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) {
+	echo $value['placeholder_text'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1152,7 +1225,10 @@ 
                 <td class="forminp">

                     <input type="file" name="<?php echo esc_attr($value['id']); ?>"

                            id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>"

-                           class="<?php if (isset($value['class'])) echo $value['class']; ?>"/>

+                           class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"/>

                     <?php if (get_option($value['id'])) { ?>

                         <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove"

                                id="<?php echo esc_attr($value['id']); ?>_remove" value="0">

@@ -1233,13 +1309,15 @@ 
                                 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

                             );

                             $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

+                            if (empty($geodir_default_map_language)) {
+                                                            $geodir_default_map_language = 'en';
+                            }
                             foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

+                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) {
+                                                                    $geodir_default_language_selected = "selected='selected'";
+                                } else {
+                                                                    $geodir_default_language_selected = '';
+                                }
 

                                 ?>

                                 <option

@@ -1259,14 +1337,16 @@ 
                             <?php

                             $post_types = geodir_get_posttypes('array');

                             $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

+                            if (empty($geodir_default_map_search_pt)) {
+                                                            $geodir_default_map_search_pt = 'gd_place';
+                            }
                             if (is_array($post_types)) {

                                 foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

+                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) {
+                                                                            $geodir_search_pt_selected = "selected='selected'";
+                                    } else {
+                                                                            $geodir_search_pt_selected = '';
+                                    }
 

                                     ?>

                                     <option

@@ -1386,7 +1466,7 @@ 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1406,10 +1486,18 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) {
+	echo $value['args'] . ' ';
+}
+?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

                         <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

-                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

+                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) {
+	echo esc_textarea(stripslashes(get_option($value['id'])));
+} else {
+	echo esc_textarea($value['std']);
+}
+?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

@@ -1421,10 +1509,11 @@ 
                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+                    if (get_option($value['id'])) {
+                                            $content = stripslashes(get_option($value['id']));
+                    } else {
+                                            $content = $value['std'];
+                    }
 

                     $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

@@ -1464,7 +1553,9 @@ 
                     'echo' => false,

                     'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+                if (isset($value['args'])) {
+                	$args = wp_parse_args($value['args'], $args);
+                }
 

                 ?>

                 <tr valign="top" class="single_select_page">

@@ -1483,8 +1574,10 @@ 
                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

+                else {
+                	:

+                    $country = $country_setting;
+                }
                     $state = '*';

                 endif;

                 ?>

@@ -1511,8 +1604,10 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                        if ($countries) {
+                        	foreach ($countries as $key => $val) :

+                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
+                        }
                         endforeach;

                         ?>

                     </select>

@@ -1747,8 +1842,9 @@ 
         endforeach;

     endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+    if (!empty($place_img_array)) {
+            $curImages = implode(',', $place_img_array);
+    }
 

 

     // adjust values here

@@ -2094,16 +2190,17 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

-	elseif (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

+    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) {
+    		$post_type = get_post_type($_REQUEST['post']);
+    } elseif ($post && isset($post->post_type)) {
+    		$post_type = $post->post_type;
+    } elseif ($typenow) {
+			$post_type = $typenow;
+	} elseif ($current_screen && isset($current_screen->post_type)) {
+			$post_type = $current_screen->post_type;
+	} elseif (isset($_REQUEST['post_type'])) {
+			$post_type = sanitize_key($_REQUEST['post_type']);
+	}
 

 

 	return $post_type;

@@ -2163,9 +2260,10 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

-}

+    if(in_array($post_type, $post_types)) {
+            echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
+    }
+    }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

 

@@ -5367,8 +5465,9 @@ 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+    if ( ! post_type_exists( $post_type ) ) {
+            return new stdClass;
+    }
         

     $table = $plugin_prefix . $post_type . '_detail';

 

@@ -6203,7 +6302,9 @@ 
 

     if ($page_found) :

         // Page exists

-        if (!$option_value) update_option($option, $page_found);

+        if (!$option_value) {
+        	update_option($option, $page_found);
+        }
         return;

     endif;

 

@@ -6578,7 +6679,7 @@ 
         $accounts = geodir_ga_get_analytics_accounts();

         if(is_array($accounts)){

             $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);

-        }elseif(get_option('geodir_ga_account_id')){

+        } elseif(get_option('geodir_ga_account_id')){

             $accounts = array();

             $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';

         }

@@ -6599,14 +6700,16 @@ 
 

     

     # Create a new Gdata call

-    if ( trim(get_option('geodir_ga_auth_code')) != '' )

-        $stats = new GDGoogleAnalyticsStats();

-    else

-        return false;

+    if ( trim(get_option('geodir_ga_auth_code')) != '' ) {
+            $stats = new GDGoogleAnalyticsStats();
+    } else {
+            return false;
+    }
 

     # Check if Google sucessfully logged in

-    if ( ! $stats->checkLogin() )

-        return false;

+    if ( ! $stats->checkLogin() ) {
+            return false;
+    }
 

     # Get a list of accounts

     $accounts = $stats->getAllProfiles();

@@ -6617,8 +6720,8 @@ 
     if ( count($accounts) > 0 ){

         update_option('geodir_gd_uids',$accounts);

         return $accounts;

+    } else {
+            return false;
+    }
     }

-    else

-        return false;

-}

 

geodirectory-admin/class.analytics.stats.php

Braces +22 added lines, -22 removed lines

@@ -48,8 +48,7 @@ 
 
             try {
                     $this->analytics = new Google_AnalyticsService($this->client);
-                }
-            catch (Google_ServiceException $e)
+                } catch (Google_ServiceException $e)
                 {
                     print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
 					return false;
@@ -65,8 +64,7 @@ 
 				try
                 {
                     $this->client->setAccessToken($ga_google_authtoken);
-				}
-				catch( Google_AuthException $e )
+				} catch( Google_AuthException $e )
                 {
                     print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -76,18 +74,18 @@ 
 
                     return false;
                 }
-            }
-            else
+            } else
             {
                 $authCode = get_option('geodir_ga_auth_code');
 
-                if (empty($authCode)) return false;
+                if (empty($authCode)) {
+                	return false;
+                }
 
                 try
                 {
                     $accessToken = $this->client->authenticate($authCode);
-                }
-                catch( Exception $e )
+                } catch( Exception $e )
                 {
                     print '(cas:72) GeoDirectory was unable to authenticate you with
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -102,8 +100,7 @@ 
                 {
                     $this->client->setAccessToken($accessToken);
                     update_option('geodir_ga_auth_token', $accessToken);
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -124,19 +121,22 @@ 
             $webproperty_id = get_option('geodir_ga_account_id');
             list($pre, $account_id, $post) = explode('-',$webproperty_id);
 
-            if (empty($webproperty_id)) return false;
+            if (empty($webproperty_id)) {
+            	return false;
+            }
 
             try {
                 $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
-            }
-            catch (Google_ServiceException $e)
+            } catch (Google_ServiceException $e)
             {
                 print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
                 return false;
             }
 
             $profile_id = $profiles->items[0]->id;
-            if (empty($profile_id)) return false;
+            if (empty($profile_id)) {
+            	return false;
+            }
 
             $account_array = array();
             array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
@@ -149,8 +149,7 @@ 
             
             try {
                     $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
-                }
-                catch (Google_ServiceException $e)
+                } catch (Google_ServiceException $e)
                 {
                     print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
                 }
@@ -262,7 +261,7 @@ 
 				$metric,
 				$params
 			);
-		}else{
+		} else{
 			return $analytics->data_ga->get(
 				'ga:'.$filtered_id,
 				$startDate,
@@ -286,10 +285,11 @@ 
 	 **/
 	function verifyStartDate($date)
 	{
-		if ( strtotime($date) > strtotime('2005-01-01') )
-			return $date;
-		else
-			return '2005-01-01';
+		if ( strtotime($date) > strtotime('2005-01-01') ) {
+					return $date;
+		} else {
+					return '2005-01-01';
+		}
 	}
 
 } // END class	
\ No newline at end of file

geodirectory-admin/google-api-php-client/src/external/URITemplateParser.php

Braces +3 added lines, -1 removed lines

@@ -143,7 +143,9 @@
           }
           $part .= $val;
         }
-        if (! $exp->one_var_defined) $part = '';
+        if (! $exp->one_var_defined) {
+        	$part = '';
+        }
         $this->expansion = str_replace($exp->expression, $part, $this->expansion);
       }
 

geodirectory-admin/google-api-php-client/src/service/Google_ServiceResource.php

Braces +1 added lines, -2 removed lines

@@ -196,8 +196,7 @@
     foreach ($o as $k => $v) {
       if ($v === null || strstr($k, "\0*\0__")) {
         unset($o[$k]);
-      }
-      elseif (is_object($v) || is_array($v)) {
+      } elseif (is_object($v) || is_array($v)) {
         $this->stripNull($o[$k]);
       }
     }

geodirectory-admin/google-api-php-client/src/service/Google_MediaFileUpload.php

Braces +4 added lines, -4 removed lines

@@ -119,9 +119,7 @@ 
       // This is a simple media upload.
       $payload['content-type'] = $mimeType;
       $payload['postBody'] = $data;
-    }
-
-    elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
+    } elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
       // This is a multipart/related upload.
       $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
       $boundary = str_replace('"', '', $boundary);
@@ -148,7 +146,9 @@ 
    * @visible For testing.
    */
   public static function processFileUpload($file, $mime) {
-    if (!$file) return array();
+    if (!$file) {
+    	return array();
+    }
     if (substr($file, 0, 1) != '@') {
       $file = '@' . $file;
     }

geodirectory-functions/google_analytics.php

Braces +8 added lines, -12 removed lines

@@ -74,28 +74,25 @@ 
         $start_date = date('Y-m-d', strtotime("-6 day"));

         $end_date = date('Y-m-d');

         $dimensions = "ga:date,ga:nthDay";

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){

         $start_date = date('Y-m-d', strtotime("-13 day"));

         $end_date = date('Y-m-d', strtotime("-7 day"));

         $dimensions = "ga:date,ga:nthDay";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){

         $start_date = date('Y')."-01-01";

         $end_date = date('Y-m-d');

         $dimensions = "ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){

         $start_date = date('Y', strtotime("-1 year"))."-01-01";

         $end_date = date('Y', strtotime("-1 year"))."-12-31";

         $dimensions = "ga:month,ga:nthMonth";

-    }

-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){

         $start_date = "14daysAgo";

         $end_date = "yesterday";

         $dimensions = "ga:country";

         $sort = "ga:pageviews";

         $limit  = 5;

-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){

         $metrics = "rt:activeUsers";

         $realtime = true;

     }

@@ -126,8 +123,7 @@ 
     # Get the metrics needed to build the visits graph;

     try {

         $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);

-    }

-    catch (Exception $e) {

+    } catch (Exception $e) {

         print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();

     }

 

@@ -148,7 +144,7 @@ 
     if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid

 

     return $at;

-    }else{//else get new access token

+    } else{//else get new access token

 

         $refresh_at = get_option('gd_ga_refresh_token');

         if(!$refresh_at){

@@ -171,7 +167,7 @@ 
             update_option('gd_ga_access_token', $parts->access_token);

             return $parts->access_token;

 

-        }else{

+        } else{

             echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;

         }