GeoDirectory / geodirectory

geodirectory-admin/option-pages/create_field.php

Braces +12 added lines, -8 removed lines

@@ -35,23 +35,26 @@ 
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {
@@ -77,8 +80,9 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {

Indentation +65 added lines, -65 removed lines

@@ -16,100 +16,100 @@
 
 $field_ids = array();
 if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) {
-    foreach ($_REQUEST['licontainer'] as $lic_id) {
-        $field_ids[] = sanitize_text_field($lic_id);
-    }
+	foreach ($_REQUEST['licontainer'] as $lic_id) {
+		$field_ids[] = sanitize_text_field($lic_id);
+	}
 }
 
 /* ------- check nonce field ------- */
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    echo godir_set_field_order($field_ids);
+	echo godir_set_field_order($field_ids);
 }
 
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    $response = godir_set_sort_field_order($field_ids);
-    if (is_array($response)) {
-        wp_send_json($response);
-    } else {
-        echo $response;
-    }
+	$response = godir_set_sort_field_order($field_ids);
+	if (is_array($response)) {
+		wp_send_json($response);
+	} else {
+		echo $response;
+	}
 }
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_field_delete($field_id);
+	echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_sort_field_delete($field_id);
+	echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+	} else {
+		echo $return;
+	}
 }
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_sort_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        $default = false;
-        geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_sort_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		$default = false;
+		geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
+	} else {
+		echo $return;
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -37,23 +37,23 @@ 
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_sort_field_delete($field_id);
@@ -61,11 +61,11 @@ 
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey]) || $pkey=='default_value') {
+        if (is_array($_REQUEST[$pkey]) || $pkey == 'default_value') {
             $tags = 'skip_field';
         } else {
             $tags = '';
@@ -80,7 +80,7 @@ 
 
     if (is_int($return)) {
         $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+        geodir_custom_field_adminhtml($field_type, $lastid, 'submit', $field_type_key);
     } else {
         echo $return;
     }
@@ -88,7 +88,7 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {

geodirectory-admin/admin_db_install.php

Braces +6 added lines, -2 removed lines

@@ -23,8 +23,12 @@
 

         $collate = '';

         if ($wpdb->has_cap('collation')) {

-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

+            if (!empty($wpdb->charset)) {
+            	$collate = "DEFAULT CHARACTER SET $wpdb->charset";
+            }
+            if (!empty($wpdb->collate)) {
+            	$collate .= " COLLATE $wpdb->collate";
+            }
         }

 

 		/**

Spacing +24 added lines, -24 removed lines

@@ -32,35 +32,35 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');

 

 

 // rename tables if we need to

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_countries'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_countries TO ".$wpdb->prefix."geodir_countries");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_fields'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_custom_fields TO ".$wpdb->prefix."geodir_custom_fields");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_icon'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_post_icon TO ".$wpdb->prefix."geodir_post_icon");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_attachments'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_attachments TO ".$wpdb->prefix."geodir_attachments");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_review'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_post_review TO ".$wpdb->prefix."geodir_post_review");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_sort_fields'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO ".$wpdb->prefix."geodir_custom_sort_fields");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_gd_place_detail'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO ".$wpdb->prefix."geodir_gd_place_detail");

         }

 

 

         // Table for storing Countries

-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

+        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE ".GEODIR_COUNTRIES_TABLE." (

 						CountryId smallint AUTO_INCREMENT NOT NULL ,

 						Country varchar (50) NOT NULL ,

 						FIPS104 varchar (2) NOT NULL ,

@@ -89,11 +89,11 @@ 
         dbDelta($GEODIR_COUNTRIES_TABLE);

 

 

-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

+        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM ".GEODIR_COUNTRIES_TABLE."");

 

         if ($country_table_empty == 0) {

 

-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

+            $countries_insert = "INSERT INTO ".GEODIR_COUNTRIES_TABLE." (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),

 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),

 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -382,7 +382,7 @@ 
 

         // Table for storing location attribute - these are user defined

 

-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

+        $icon_table = "CREATE TABLE ".GEODIR_ICON_TABLE." (

 						id int NOT NULL AUTO_INCREMENT,

 						post_id int( 10 ) NOT NULL,

 						post_title varchar(254) NOT NULL,

@@ -403,7 +403,7 @@ 
 

         // Table for storing post custom fields - these are user defined

 

-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

+        $post_custom_fields = "CREATE TABLE ".GEODIR_CUSTOM_FIELDS_TABLE." (

 							  id int(11) NOT NULL AUTO_INCREMENT,

 							  post_type varchar(100) NULL,

 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -448,7 +448,7 @@ 
         dbDelta($post_custom_fields);

 

         // Table for storing place attribute - these are user defined

-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

+        $post_detail = "CREATE TABLE ".$plugin_prefix."gd_place_detail (

 						post_id int(11) NOT NULL,

 						post_title text NULL DEFAULT NULL,

 						post_status varchar(20) NULL DEFAULT NULL,

@@ -489,7 +489,7 @@ 
 

         // Table for storing place images - these are user defined

 

-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

+        $attechment_table = "CREATE TABLE ".GEODIR_ATTACHMENT_TABLE." (

 						ID int(11) NOT NULL AUTO_INCREMENT,

 						post_id int(11) NOT NULL,

 						user_id int(11) DEFAULT NULL,

@@ -516,7 +516,7 @@ 
         dbDelta($attechment_table);

 

 

-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

+        $custom_sort_fields_table = "CREATE TABLE ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_type varchar(255) NOT NULL,

 			data_type varchar(255) NOT NULL,

@@ -545,7 +545,7 @@ 
         dbDelta($custom_sort_fields_table);

 

 

-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

+            $review_table = "CREATE TABLE ".GEODIR_REVIEW_TABLE." (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_id int(11) DEFAULT NULL,

 			post_title varchar( 255 ) NULL DEFAULT NULL,

Indentation +155 added lines, -155 removed lines

@@ -6,26 +6,26 @@ 
  * @package GeoDirectory

  */

 if (!function_exists('geodir_create_tables')) {

-    /**

-     * Creates custom db tables for storing GeoDirectory plugin data.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix GeoDirectory plugin table prefix.

-     */

-    function geodir_create_tables()

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $wpdb->hide_errors();

-

-        $collate = '';

-        if ($wpdb->has_cap('collation')) {

-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

-        }

+	/**

+	 * Creates custom db tables for storing GeoDirectory plugin data.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix GeoDirectory plugin table prefix.

+	 */

+	function geodir_create_tables()

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$wpdb->hide_errors();

+

+		$collate = '';

+		if ($wpdb->has_cap('collation')) {

+			if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

+			if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

+		}

 

 		/**

 		 * Include any functions needed for upgrades.

@@ -36,31 +36,31 @@ 
 

 

 // rename tables if we need to

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

-        }

-

-

-        // Table for storing Countries

-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

+		}

+

+

+		// Table for storing Countries

+		$GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

 						CountryId smallint AUTO_INCREMENT NOT NULL ,

 						Country varchar (50) NOT NULL ,

 						FIPS104 varchar (2) NOT NULL ,

@@ -79,21 +79,21 @@ 
 						Comment varchar (255) NULL ,

 						PRIMARY KEY  (CountryId)) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the country DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);

-        dbDelta($GEODIR_COUNTRIES_TABLE);

+		/**

+		 * Filter the SQL query that creates/updates the country DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);

+		dbDelta($GEODIR_COUNTRIES_TABLE);

 

 

-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

+		$country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

 

-        if ($country_table_empty == 0) {

+		if ($country_table_empty == 0) {

 

-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

+			$countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),

 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),

 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -368,21 +368,21 @@ 
 	(277, 'Caribbean Netherlands', '--', 'BQ', 'BES', '535', 'BQ', '--', 'Central America and the Caribbean', '--', '--', 'United States dollar', 'USD', 21133, 'Caribbean Netherlands', ''),

 	(278, 'Kosovo', 'XK', 'XK', '--', '--', 'XK', 'Pristina', 'Europe', '--', '--', 'Euro', 'EUR', 1859203, 'Caribbean Netherlands', 'Kosovo')";

 

-            /**

-             * Filter the SQL query that inserts the country DB table data.

-             *

-             * @since 1.0.0

-             * @param string $sql The SQL insert query string.

-             */

-            $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);

-            $wpdb->query($countries_insert);

+			/**

+			 * Filter the SQL query that inserts the country DB table data.

+			 *

+			 * @since 1.0.0

+			 * @param string $sql The SQL insert query string.

+			 */

+			$countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);

+			$wpdb->query($countries_insert);

 

-        }

+		}

 

 

-        // Table for storing location attribute - these are user defined

+		// Table for storing location attribute - these are user defined

 

-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

+		$icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

 						id int NOT NULL AUTO_INCREMENT,

 						post_id int( 10 ) NOT NULL,

 						post_title varchar(254) NOT NULL,

@@ -391,19 +391,19 @@ 
 						PRIMARY KEY  (id)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the post_icon DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);

+		/**

+		 * Filter the SQL query that creates/updates the post_icon DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);

 

-        dbDelta($icon_table);

+		dbDelta($icon_table);

 

-        // Table for storing post custom fields - these are user defined

+		// Table for storing post custom fields - these are user defined

 

-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

+		$post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

 							  id int(11) NOT NULL AUTO_INCREMENT,

 							  post_type varchar(100) NULL,

 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -439,18 +439,18 @@ 
 							  PRIMARY KEY  (id)

 							  ) $collate";

 

-        /**

-         * Filter the SQL query that creates/updates the custom_fields DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);

+		/**

+		 * Filter the SQL query that creates/updates the custom_fields DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);

 

-        dbDelta($post_custom_fields);

+		dbDelta($post_custom_fields);

 

-        // Table for storing place attribute - these are user defined

-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

+		// Table for storing place attribute - these are user defined

+		$post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

 						post_id int(11) NOT NULL,

 						post_title text NULL DEFAULT NULL,

 						post_status varchar(20) NULL DEFAULT NULL,

@@ -477,22 +477,22 @@ 
 						PRIMARY KEY  (post_id)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the post_detail DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);

+		/**

+		 * Filter the SQL query that creates/updates the post_detail DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);

 

-        dbDelta($post_detail);

+		dbDelta($post_detail);

 

-        // alter post_title

-        //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");

+		// alter post_title

+		//$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");

 

-        // Table for storing place images - these are user defined

+		// Table for storing place images - these are user defined

 

-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

+		$attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

 						ID int(11) NOT NULL AUTO_INCREMENT,

 						post_id int(11) NOT NULL,

 						user_id int(11) DEFAULT NULL,

@@ -508,18 +508,18 @@ 
 						PRIMARY KEY  (ID)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the attachments DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);

+		/**

+		 * Filter the SQL query that creates/updates the attachments DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);

 

-        dbDelta($attechment_table);

+		dbDelta($attechment_table);

 

 

-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

+		$custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_type varchar(255) NOT NULL,

 			data_type varchar(255) NOT NULL,

@@ -537,18 +537,18 @@ 
 			PRIMARY KEY  (id)

 			) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);

+		/**

+		 * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);

 

-        dbDelta($custom_sort_fields_table);

+		dbDelta($custom_sort_fields_table);

 

 

-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

+			$review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_id int(11) DEFAULT NULL,

 			post_title varchar( 255 ) NULL DEFAULT NULL,

@@ -572,51 +572,51 @@ 
 			PRIMARY KEY  (id)

 			) $collate  ";

 

-            /**

-             * Filter the SQL query that creates the review DB table structure.

-             *

-             * @since 1.0.0

-             * @param string $sql The SQL insert query string.

-             */

-            $review_table = apply_filters('geodir_before_review_table_create', $review_table);

-            dbDelta($review_table);

+			/**

+			 * Filter the SQL query that creates the review DB table structure.

+			 *

+			 * @since 1.0.0

+			 * @param string $sql The SQL insert query string.

+			 */

+			$review_table = apply_filters('geodir_before_review_table_create', $review_table);

+			dbDelta($review_table);

 

 

 

-        // Alter terms table

-        $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");

-        if (!$term_icon_column) {

-            $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");

-        }

+		// Alter terms table

+		$term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");

+		if (!$term_icon_column) {

+			$wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");

+		}

 

-        //require_once(geodir_plugin_path() . '/upgrade.php');

+		//require_once(geodir_plugin_path() . '/upgrade.php');

 

 

-    }

+	}

 } // END MAIN FUNCTION geodir_tables_install

 

 if (!function_exists('geodir_create_default_fields')) {

-    /**

-     * Inserts default custom fields table data into database.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_create_default_fields()

-    {

-

-        $fields = geodir_default_custom_fields('gd_place');

-

-        /**

-         * Filter the array of default custom fields DB table data.

-         *

-         * @since 1.0.0

-         * @param string $fields The default custom fields as an array.

-         */

-        $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);

-        foreach ($fields as $field_index => $field) {

-            geodir_custom_field_save($field);

-

-        }

-    }

+	/**

+	 * Inserts default custom fields table data into database.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_create_default_fields()

+	{

+

+		$fields = geodir_default_custom_fields('gd_place');

+

+		/**

+		 * Filter the array of default custom fields DB table data.

+		 *

+		 * @since 1.0.0

+		 * @param string $fields The default custom fields as an array.

+		 */

+		$fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);

+		foreach ($fields as $field_index => $field) {

+			geodir_custom_field_save($field);

+

+		}

+	}

 }
\ No newline at end of file

geodirectory-admin/option-pages/permalink_settings_array.php

Indentation +178 added lines, -178 removed lines

@@ -16,184 +16,184 @@
  */
 $geodir_settings['permalink_settings'] = apply_filters('geodir_permalink_settings', array(
 
-    /* Listing Permalink Settings start */
-    array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
-
-
-    array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_permalink'),
-
-    array(
-        'name' => __('Add location in urls', 'geodirectory'),
-        'desc' => __('Add location slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_add_location_url',
-        'type' => 'checkbox',
-        'std' => '1',
-        'checkboxgroup' => 'start'
-    ),
-
-    array(
-        'name' => __('Add full location in listing urls', 'geodirectory'),
-        'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'value' => 'all',
-        'std' => 'all',
-        'radiogroup' => ''
-    ),
-
-	array(
-        'name' => __('Add country and city slug in listing urls', 'geodirectory'),
-        'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'country_city',
-        'radiogroup' => ''
-    ),
-	array(
-        'name' => __('Add region and city slug in listing urls', 'geodirectory'),
-        'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'region_city',
-        'radiogroup' => ''
-    ),
-    array(
-        'name' => __('Add only city in listing urls', 'geodirectory'),
-        'desc' => __('Add city slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'city',
-        'radiogroup' => 'end'
-    ),
-
-
-
-    array(
-        'name' => __('Add category in listing urls', 'geodirectory'),
-        'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
-        'id' => 'geodir_add_categories_url',
-        'type' => 'checkbox',
-        'std' => '1',
-    ),
-
-    array(
-        'name' => __('Listing url prefix', 'geodirectory'),
-        'desc' => __('Listing prefix to show in url', 'geodirectory'),
-        'id' => 'geodir_listing_prefix',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'places'
-    ),
-
-    array(
-        'name' => __('Location url prefix', 'geodirectory'),
-        'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
-        'id' => 'geodir_location_prefix',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'location' // Default value to show home top section
-    ),
-
-    array(
-        'name' => __('Location and category url separator', 'geodirectory'),
-        'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
-        'id' => 'geodir_listingurl_separator',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'C' // Default value to show home top section
-    ),
-
-    array(
-        'name' => __('Listing detail url separator', 'geodirectory'),
-        'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
-        'id' => 'geodir_detailurl_separator',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'info' // Default value to show home top section
-    ),
-
-
-    array('type' => 'sectionend', 'id' => 'geodir_permalink'),
-
-    array('name' => __('GeoDirectory Pages', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pages'),
-
-    array(
-        'name' => __('GD Home page', 'geodirectory'),
-        'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
-        'id' => 'geodir_home_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Add listing page', 'geodirectory'),
-        'desc' => __('Select the page to use for adding listings', 'geodirectory'),
-        'id' => 'geodir_add_listing_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Listing preview page', 'geodirectory'),
-        'desc' => __('Select the page to use for listing preview', 'geodirectory'),
-        'id' => 'geodir_preview_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Listing success page', 'geodirectory'),
-        'desc' => __('Select the page to use for listing success', 'geodirectory'),
-        'id' => 'geodir_success_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Location page', 'geodirectory'),
-        'desc' => __('Select the page to use for locations', 'geodirectory'),
-        'id' => 'geodir_location_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Terms and Conditions page', 'geodirectory'),
-        'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
-        'id' => 'geodir_term_condition_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Info page', 'geodirectory'),
-        'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
-        'id' => 'geodir_info_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Login page', 'geodirectory'),
-        'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
-        'id' => 'geodir_login_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-
-    array('type' => 'sectionend', 'id' => 'geodir_pages'),
-
-    /* Listing Detail Permalink Settings End */
+	/* Listing Permalink Settings start */
+	array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
+
+
+	array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_permalink'),
+
+	array(
+		'name' => __('Add location in urls', 'geodirectory'),
+		'desc' => __('Add location slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_add_location_url',
+		'type' => 'checkbox',
+		'std' => '1',
+		'checkboxgroup' => 'start'
+	),
+
+	array(
+		'name' => __('Add full location in listing urls', 'geodirectory'),
+		'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'value' => 'all',
+		'std' => 'all',
+		'radiogroup' => ''
+	),
+
+	array(
+		'name' => __('Add country and city slug in listing urls', 'geodirectory'),
+		'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'country_city',
+		'radiogroup' => ''
+	),
+	array(
+		'name' => __('Add region and city slug in listing urls', 'geodirectory'),
+		'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'region_city',
+		'radiogroup' => ''
+	),
+	array(
+		'name' => __('Add only city in listing urls', 'geodirectory'),
+		'desc' => __('Add city slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'city',
+		'radiogroup' => 'end'
+	),
+
+
+
+	array(
+		'name' => __('Add category in listing urls', 'geodirectory'),
+		'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
+		'id' => 'geodir_add_categories_url',
+		'type' => 'checkbox',
+		'std' => '1',
+	),
+
+	array(
+		'name' => __('Listing url prefix', 'geodirectory'),
+		'desc' => __('Listing prefix to show in url', 'geodirectory'),
+		'id' => 'geodir_listing_prefix',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'places'
+	),
+
+	array(
+		'name' => __('Location url prefix', 'geodirectory'),
+		'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
+		'id' => 'geodir_location_prefix',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'location' // Default value to show home top section
+	),
+
+	array(
+		'name' => __('Location and category url separator', 'geodirectory'),
+		'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
+		'id' => 'geodir_listingurl_separator',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'C' // Default value to show home top section
+	),
+
+	array(
+		'name' => __('Listing detail url separator', 'geodirectory'),
+		'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
+		'id' => 'geodir_detailurl_separator',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'info' // Default value to show home top section
+	),
+
+
+	array('type' => 'sectionend', 'id' => 'geodir_permalink'),
+
+	array('name' => __('GeoDirectory Pages', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pages'),
+
+	array(
+		'name' => __('GD Home page', 'geodirectory'),
+		'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
+		'id' => 'geodir_home_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Add listing page', 'geodirectory'),
+		'desc' => __('Select the page to use for adding listings', 'geodirectory'),
+		'id' => 'geodir_add_listing_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Listing preview page', 'geodirectory'),
+		'desc' => __('Select the page to use for listing preview', 'geodirectory'),
+		'id' => 'geodir_preview_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Listing success page', 'geodirectory'),
+		'desc' => __('Select the page to use for listing success', 'geodirectory'),
+		'id' => 'geodir_success_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Location page', 'geodirectory'),
+		'desc' => __('Select the page to use for locations', 'geodirectory'),
+		'id' => 'geodir_location_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Terms and Conditions page', 'geodirectory'),
+		'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
+		'id' => 'geodir_term_condition_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Info page', 'geodirectory'),
+		'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
+		'id' => 'geodir_info_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Login page', 'geodirectory'),
+		'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
+		'id' => 'geodir_login_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+
+	array('type' => 'sectionend', 'id' => 'geodir_pages'),
+
+	/* Listing Detail Permalink Settings End */
 
 
 )); // End Design settings

geodirectory-functions/compatibility/Divi.php

Indentation +9 added lines, -9 removed lines

@@ -18,11 +18,11 @@ 
  */
 function geodir_divi_signup_body_class($classes)
 {
-    if (geodir_is_page('login')) {
-        $classes = str_replace('et_right_sidebar', 'et_full_width_page', $classes);
-        $classes[] = 'divi-gd-signup';
-    }
-    return $classes;
+	if (geodir_is_page('login')) {
+		$classes = str_replace('et_right_sidebar', 'et_full_width_page', $classes);
+		$classes[] = 'divi-gd-signup';
+	}
+	return $classes;
 }
 
 add_action('geodir_wrapper_close', 'geodir_divi_action_wrapper_close', 11);
@@ -34,8 +34,8 @@ 
  */
 function geodir_divi_action_wrapper_close()
 {
-    if (geodir_is_page('login')) {
-        // We need to close extra divs generated by WRAPPER BEFORE MAIN CONTENT (below) because there is no sidebar on this page
-        echo '</div></div>';
-    }
+	if (geodir_is_page('login')) {
+		// We need to close extra divs generated by WRAPPER BEFORE MAIN CONTENT (below) because there is no sidebar on this page
+		echo '</div></div>';
+	}
 }
\ No newline at end of file

geodirectory-functions/compatibility/Multi_News.php

Braces +4 added lines, -2 removed lines

@@ -126,8 +126,10 @@
     $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
     if (preg_match_all("/$regexp/siU", $crums, $matches)) {
         return $matches[0];
-    } else return '';
-}
+    } else {
+    	return '';
+    }
+    }
 
 
 /**

Indentation +87 added lines, -87 removed lines

@@ -16,36 +16,36 @@ 
  */
 function multi_news_action_calls()
 {
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
-
-    //ADD BREADCRUMS
-    add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
-
-
-    // fix breadcrums
-    add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-
-    add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
-    add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+
+	//ADD BREADCRUMS
+	add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	//add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
+
+
+	// fix breadcrums
+	add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	// remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+
+	add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
+	add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
 }
 
 /**
@@ -57,11 +57,11 @@ 
  */
 function gd_mn_extra_wrap($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '<div class="site-content page-wrap">';
-    } elseif ($page == 'signup-page') {
-        echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
-    }
+	if ($page == 'add-listing-page') {
+		echo '<div class="site-content page-wrap">';
+	} elseif ($page == 'signup-page') {
+		echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
+	}
 
 }
 
@@ -75,9 +75,9 @@ 
  */
 function gd_mn_extra_wrap_end($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '</div>';
-    }
+	if ($page == 'add-listing-page') {
+		echo '</div>';
+	}
 
 }
 
@@ -91,13 +91,13 @@ 
 function gd_mn_replace_breadcrums()
 {
 
-    if (mom_option('breadcrumb') != 0) { ?>
+	if (mom_option('breadcrumb') != 0) { ?>
         <?php if (mom_option('cats_bread')) {
-            $cclass = '';
-            if (mom_option('cat_slider') == false) {
-                $cclass = 'post-crumbs ';
-            }
-            ?>
+			$cclass = '';
+			if (mom_option('cat_slider') == false) {
+				$cclass = 'post-crumbs ';
+			}
+			?>
             <div class="<?php echo $cclass; ?>entry-crumbs" xmlns:v="http://rdf.data-vocabulary.org/#">
 
                 <?php mom_breadcrumb(); ?>
@@ -119,14 +119,14 @@ 
  */
 function gd_get_breadcrum_links()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $crums = ob_get_contents();
-    ob_get_clean();
-    $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
-    if (preg_match_all("/$regexp/siU", $crums, $matches)) {
-        return $matches[0];
-    } else return '';
+	ob_start();
+	geodir_breadcrumb();
+	$crums = ob_get_contents();
+	ob_get_clean();
+	$regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
+	if (preg_match_all("/$regexp/siU", $crums, $matches)) {
+		return $matches[0];
+	} else return '';
 }
 
 
@@ -140,30 +140,30 @@ 
  */
 function gd_breadcrumbs_plus_items($items)
 {   //print_r($items);exit;
-    $bits = array();
-    $pieces = gd_get_breadcrum_links();
-    //unset($pieces[0]);
-    $bits = $pieces;
+	$bits = array();
+	$pieces = gd_get_breadcrum_links();
+	//unset($pieces[0]);
+	$bits = $pieces;
 
-    $title = $items['last'];
-    if (is_page_geodir_home() || geodir_is_page('location')) {
+	$title = $items['last'];
+	if (is_page_geodir_home() || geodir_is_page('location')) {
 
-    } elseif (geodir_is_page('listing')) {
+	} elseif (geodir_is_page('listing')) {
 
-    } elseif (geodir_is_page('detail')) {
-        ob_start();
-        geodir_action_page_title();
-        $title = ob_get_contents();
-        ob_end_clean();
-    } elseif (geodir_is_page('search')) {
-    } elseif (geodir_is_page('author')) {
-    }
+	} elseif (geodir_is_page('detail')) {
+		ob_start();
+		geodir_action_page_title();
+		$title = ob_get_contents();
+		ob_end_clean();
+	} elseif (geodir_is_page('search')) {
+	} elseif (geodir_is_page('author')) {
+	}
 
-    $title = strip_tags($title);
-    $items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
+	$title = strip_tags($title);
+	$items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
 
 
-    return $items;
+	return $items;
 }
 
 
@@ -179,28 +179,28 @@ 
  */
 function gd_breadcrumbs_plus_items_add($items, $bits, $last)
 {
-    //$pieces = explode("</div>", $items[0]);
-    if (is_array($bits)) {
-        $items = array();
-        $pieces = '';
-        foreach ($bits as $bit) {
-            $pieces .= $bit;
-        }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
-        if (isset($last) && $last) {
-            $items['last'] = $last;
-        }
-    }
-
-    //print_r($items);
-    return $items;
+	//$pieces = explode("</div>", $items[0]);
+	if (is_array($bits)) {
+		$items = array();
+		$pieces = '';
+		foreach ($bits as $bit) {
+			$pieces .= $bit;
+		}
+		$items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+		if (isset($last) && $last) {
+			$items['last'] = $last;
+		}
+	}
+
+	//print_r($items);
+	return $items;
 
 }
 
 add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 function gd_multinews_mobile_menu_caret($html){
-    $html .= '<i class="responsive-caret"></i>';
-    return $html;
+	$html .= '<i class="responsive-caret"></i>';
+	return $html;
 
 }

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         foreach ($bits as $bit) {
             $pieces .= $bit;
         }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">'.$pieces."</div>";
         if (isset($last) && $last) {
             $items['last'] = $last;
         }
@@ -197,9 +197,9 @@ 
 
 }
 
-add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
-add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
-function gd_multinews_mobile_menu_caret($html){
+add_filter('geodir_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1);
+add_filter('geodir_location_switcher_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1);
+function gd_multinews_mobile_menu_caret($html) {
     $html .= '<i class="responsive-caret"></i>';
     return $html;
 

geodirectory-templates/geodir-signup.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  * If user is not signed in, redirect home.
  */
 if (get_current_user_id()) {
-    wp_redirect(home_url(), 302);
-    exit;
+	wp_redirect(home_url(), 302);
+	exit;
 }
 
 // call header

geodirectory-templates/preview-success.php

Indentation +31 added lines, -31 removed lines

@@ -15,29 +15,29 @@ 
     <?php

 

 

-    global $wpdb;

+	global $wpdb;

 

-    $post_id = $_REQUEST['pid'];

-    $post_info = get_post($post_id);

+	$post_id = $_REQUEST['pid'];

+	$post_info = get_post($post_id);

 

-    $posted_date = $post_info->post_date;

-    $productlink = get_permalink($post_id);

-    $siteName = get_bloginfo('name');

-    $siteurl = home_url();

-    $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+	$posted_date = $post_info->post_date;

+	$productlink = get_permalink($post_id);

+	$siteName = get_bloginfo('name');

+	$siteurl = home_url();

+	$siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

 

-    $loginurl = geodir_login_url();

-    $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+	$loginurl = geodir_login_url();

+	$loginurl_link = '<a href="' . $loginurl . '">login</a>';

 

-    $post_author = $post_info->post_author;

+	$post_author = $post_info->post_author;

 

-    $user_info = get_userdata($post_author);

-    $username = $user_info->user_login;

-    $user_email = $user_info->user_email;

+	$user_info = get_userdata($post_author);

+	$username = $user_info->user_login;

+	$user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+	$message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

 

-    /*

+	/*

      * Filter the success page message before variable replacements.

      *

      * @since 1.5.7

@@ -45,13 +45,13 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

 

-    $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

-    $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

-    $message = str_replace($search_array, $replace_array, $message);

+	$search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

+	$replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

+	$message = str_replace($search_array, $replace_array, $message);

 

-    /*

+	/*

      * Filter the success page message after variable replacements.

      *

      * @since 1.5.7

@@ -59,15 +59,15 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

 

 

 

-    ?>

+	?>

 

     <?php

 

-    /*

+	/*

      * Action called before the success page message wrapper.

      *

      * @since 1.5.7

@@ -75,11 +75,11 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

-    echo '<h5 class="geodir_information">';

-    echo $message;

-    echo '</h5>';

-    /*

+	do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+	echo '<h5 class="geodir_information">';

+	echo $message;

+	echo '</h5>';

+	/*

      * Action called after the success page message wrapper.

      *

      * @since 1.5.7

@@ -87,8 +87,8 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+	do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

 

-    ?>

+	?>

 

 </div>
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -24,10 +24,10 @@ 
     $productlink = get_permalink($post_id);

     $siteName = get_bloginfo('name');

     $siteurl = home_url();

-    $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+    $siteurl_link = '<a href="'.$siteurl.'">'.$siteurl.'</a>';

 

     $loginurl = geodir_login_url();

-    $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+    $loginurl_link = '<a href="'.$loginurl.'">login</a>';

 

     $post_author = $post_info->post_author;

 

@@ -35,7 +35,7 @@ 
     $username = $user_info->user_login;

     $user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')), 'geodirectory'));

 

     /*

      * Filter the success page message before variable replacements.

@@ -45,7 +45,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message, $post_info, $user_info);

 

     $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

     $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

@@ -59,7 +59,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message, $post_info, $user_info);

 

 

 

@@ -75,7 +75,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+    do_action('geodir_before_success_page_msg_wrapper', $message, $post_info, $user_info);

     echo '<h5 class="geodir_information">';

     echo $message;

     echo '</h5>';

@@ -87,7 +87,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+    do_action('geodir_after_success_page_msg_wrapper', $message, $post_info, $user_info);

 

     ?>

 

geodirectory-widgets/geodirectory_popular_widget.php

Braces +37 added lines, -14 removed lines

@@ -190,10 +190,11 @@ 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);

         $instance['list_sort'] = strip_tags($new_instance['list_sort']);

         $instance['character_count'] = $new_instance['character_count'];

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 

         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

         $instance['show_special_only'] = isset($new_instance['show_special_only']) && $new_instance['show_special_only'] ? 1 : 0;

@@ -319,8 +320,9 @@ 
 

                 $all_postypes = geodir_get_posttypes();

 

-                if (!in_array($post_type, $all_postypes))

-                    $post_type = 'gd_place';

+                if (!in_array($post_type, $all_postypes)) {
+                                    $post_type = 'gd_place';
+                }
 

                 $category_taxonomy = geodir_get_taxonomies($post_type);

                 $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

@@ -335,8 +337,9 @@ 
                     } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) {

                         $selected = '';

-                        if (is_array($category) && in_array($category_obj->term_id, $category))

-                            echo $selected = 'selected="selected"';

+                        if (is_array($category) && in_array($category_obj->term_id, $category)) {
+                                                    echo $selected = 'selected="selected"';
+                        }
 

                         ?>

 

@@ -350,7 +353,12 @@ 
 

                 <input type="hidden" name="<?php echo $this->get_field_name('category_title'); ?>"

                        id="<?php echo $this->get_field_id('category_title'); ?>"

-                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory');?>"/>

+                       value="<?php if ($category_title != '') {
+	echo $category_title;
+} else {
+	echo __('All', 'geodirectory');
+}
+?>"/>

 

             </label>

         </p>

@@ -453,7 +461,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

                 <?php _e('Enable Location Filter:', 'geodirectory');?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

@@ -461,7 +472,10 @@ 
             <label for="<?php echo $this->get_field_id('show_featured_only'); ?>">

                 <?php _e('Show only featured listings:', 'geodirectory');?> <input type="checkbox"

                                                                                             id="<?php echo $this->get_field_id('show_featured_only'); ?>"

-                                                                                            name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"';?>

+                                                                                            name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                             value="1"/>

             </label>

         </p>

@@ -469,7 +483,10 @@ 
             <label for="<?php echo $this->get_field_id('show_special_only'); ?>">

                 <?php _e('Show only listings with special offers:', 'geodirectory');?> <input type="checkbox"

                                                                                                        id="<?php echo $this->get_field_id('show_special_only'); ?>"

-                                                                                                       name="<?php echo $this->get_field_name('show_special_only'); ?>" <?php if ($show_special_only) echo 'checked="checked"';?>

+                                                                                                       name="<?php echo $this->get_field_name('show_special_only'); ?>" <?php if ($show_special_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                                        value="1"/>

             </label>

         </p>

@@ -477,7 +494,10 @@ 
             <label for="<?php echo $this->get_field_id('with_pics_only'); ?>">

                 <?php _e('Show only listings with pics:', 'geodirectory');?> <input type="checkbox"

                                                                                              id="<?php echo $this->get_field_id('with_pics_only'); ?>"

-                                                                                             name="<?php echo $this->get_field_name('with_pics_only'); ?>" <?php if ($with_pics_only) echo 'checked="checked"';?>

+                                                                                             name="<?php echo $this->get_field_name('with_pics_only'); ?>" <?php if ($with_pics_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                              value="1"/>

             </label>

         </p>

@@ -485,7 +505,10 @@ 
             <label for="<?php echo $this->get_field_id('with_videos_only'); ?>">

                 <?php _e('Show only listings with videos:', 'geodirectory');?> <input type="checkbox"

                                                                                                id="<?php echo $this->get_field_id('with_videos_only'); ?>"

-                                                                                               name="<?php echo $this->get_field_name('with_videos_only'); ?>" <?php if ($with_videos_only) echo 'checked="checked"';?>

+                                                                                               name="<?php echo $this->get_field_name('with_videos_only'); ?>" <?php if ($with_videos_only) {
+	echo 'checked="checked"';
+}
+?>

                                                                                                value="1"/>

             </label>

         </p>

Indentation +204 added lines, -204 removed lines

@@ -14,83 +14,83 @@ 
  */

 class geodir_popular_post_category extends WP_Widget

 {

-    /**

-     * Register the popular post category widget.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-     */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_popular_post_category', 'description' => __('GD > Popular Post Category', 'geodirectory'));

-        parent::__construct(

-            'popular_post_category', // Base ID

-            __('GD > Popular Post Category', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

-

-    /**

-     * Front-end display content for popular post category widget.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     *

-     * @param array $args     Widget arguments.

-     * @param array $instance Saved values from database.

-     */

-    public function widget($args, $instance)

-    {

-        geodir_popular_post_category_output($args, $instance);

-    }

-

-    /**

-     * Sanitize popular post category widget form values as they are saved.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added default_post_type parameter.

-     * @since 1.6.9 Added parent_only parameter.

-     *

-     * @param array $new_instance Values just sent to be saved.

-     * @param array $old_instance Previously saved values from database.

-     *

-     * @return array Updated safe values to be saved.

-     */ 

-    public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $category_limit = (int)$new_instance['category_limit'];

-        $instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

-        $instance['default_post_type'] = isset($new_instance['default_post_type']) ? $new_instance['default_post_type'] : '';

-        $instance['parent_only'] = !empty($new_instance['parent_only']) ? true : false;

-        return $instance;

-    }

-

-    /**

-     * Back-end popular post category widget settings form.

-     *

-     * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added option to set default post type.

-     * @since 1.6.9 Added option to show parent categories only.

-     *

-     * @param array $instance Previously saved values from database.

-     */

-    public function form($instance) 

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

-

-        $title = strip_tags($instance['title']);

-        $category_limit = (int)$instance['category_limit'];

-        $category_limit = $category_limit > 0 ? $category_limit : 15;

-        $default_post_type = isset($instance['default_post_type']) ? $instance['default_post_type'] : '';

-        $parent_only = !empty($instance['parent_only']) ? true: false;

+	/**

+	 * Register the popular post category widget.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 */

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_popular_post_category', 'description' => __('GD > Popular Post Category', 'geodirectory'));

+		parent::__construct(

+			'popular_post_category', // Base ID

+			__('GD > Popular Post Category', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

+

+	/**

+	 * Front-end display content for popular post category widget.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Declare function public.

+	 *

+	 * @param array $args     Widget arguments.

+	 * @param array $instance Saved values from database.

+	 */

+	public function widget($args, $instance)

+	{

+		geodir_popular_post_category_output($args, $instance);

+	}

+

+	/**

+	 * Sanitize popular post category widget form values as they are saved.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added default_post_type parameter.

+	 * @since 1.6.9 Added parent_only parameter.

+	 *

+	 * @param array $new_instance Values just sent to be saved.

+	 * @param array $old_instance Previously saved values from database.

+	 *

+	 * @return array Updated safe values to be saved.

+	 */ 

+	public function update($new_instance, $old_instance)

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$category_limit = (int)$new_instance['category_limit'];

+		$instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

+		$instance['default_post_type'] = isset($new_instance['default_post_type']) ? $new_instance['default_post_type'] : '';

+		$instance['parent_only'] = !empty($new_instance['parent_only']) ? true : false;

+		return $instance;

+	}

+

+	/**

+	 * Back-end popular post category widget settings form.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added option to set default post type.

+	 * @since 1.6.9 Added option to show parent categories only.

+	 *

+	 * @param array $instance Previously saved values from database.

+	 */

+	public function form($instance) 

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

+

+		$title = strip_tags($instance['title']);

+		$category_limit = (int)$instance['category_limit'];

+		$category_limit = $category_limit > 0 ? $category_limit : 15;

+		$default_post_type = isset($instance['default_post_type']) ? $instance['default_post_type'] : '';

+		$parent_only = !empty($instance['parent_only']) ? true: false;

         

-        $post_type_options = geodir_get_posttypes('options');

-        ?>

+		$post_type_options = geodir_get_posttypes('options');

+		?>

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>"/>

@@ -116,7 +116,7 @@ 
             <label for="<?php echo $this->get_field_id('parent_only'); ?>"><?php _e( 'Show parent categories only', 'geodirectory' ); ?></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_popular_post_category

 

 register_widget('geodir_popular_post_category');

@@ -130,40 +130,40 @@ 
 class geodir_popular_postview extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the popular posts widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_popular_post_view', 'description' => __('GD > Popular Post View', 'geodirectory'));

-        parent::__construct(

-            'popular_post_view', // Base ID

-            __('GD > Popular Post View', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_popular_post_view', 'description' => __('GD > Popular Post View', 'geodirectory'));

+		parent::__construct(

+			'popular_post_view', // Base ID

+			__('GD > Popular Post View', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for popular posts widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        geodir_popular_postview_output($args, $instance);

-    }

+	{

+		geodir_popular_postview_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize popular posts widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -171,99 +171,99 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-

-        if ($new_instance['title'] == '') {

-            $title = geodir_ucwords(strip_tags($new_instance['category_title']));

-            //$instance['title'] = $title;

-        }

-        $instance['title'] = strip_tags($new_instance['title']);

-

-        $instance['post_type'] = strip_tags($new_instance['post_type']);

-        //$instance['category'] = strip_tags($new_instance['category']);

-        $instance['category'] = isset($new_instance['category']) ? $new_instance['category'] : '';

-        $instance['category_title'] = strip_tags($new_instance['category_title']);

-        $instance['post_number'] = strip_tags($new_instance['post_number']);

-        $instance['layout'] = strip_tags($new_instance['layout']);

-        $instance['listing_width'] = strip_tags($new_instance['listing_width']);

-        $instance['list_sort'] = strip_tags($new_instance['list_sort']);

-        $instance['character_count'] = $new_instance['character_count'];

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

-

-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        $instance['show_special_only'] = isset($new_instance['show_special_only']) && $new_instance['show_special_only'] ? 1 : 0;

-        $instance['with_pics_only'] = isset($new_instance['with_pics_only']) && $new_instance['with_pics_only'] ? 1 : 0;

-        $instance['with_videos_only'] = isset($new_instance['with_videos_only']) && $new_instance['with_videos_only'] ? 1 : 0;

-        $instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+

+		if ($new_instance['title'] == '') {

+			$title = geodir_ucwords(strip_tags($new_instance['category_title']));

+			//$instance['title'] = $title;

+		}

+		$instance['title'] = strip_tags($new_instance['title']);

+

+		$instance['post_type'] = strip_tags($new_instance['post_type']);

+		//$instance['category'] = strip_tags($new_instance['category']);

+		$instance['category'] = isset($new_instance['category']) ? $new_instance['category'] : '';

+		$instance['category_title'] = strip_tags($new_instance['category_title']);

+		$instance['post_number'] = strip_tags($new_instance['post_number']);

+		$instance['layout'] = strip_tags($new_instance['layout']);

+		$instance['listing_width'] = strip_tags($new_instance['listing_width']);

+		$instance['list_sort'] = strip_tags($new_instance['list_sort']);

+		$instance['character_count'] = $new_instance['character_count'];

+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

+		else

+			$instance['add_location_filter'] = '0';

+

+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

+		$instance['show_special_only'] = isset($new_instance['show_special_only']) && $new_instance['show_special_only'] ? 1 : 0;

+		$instance['with_pics_only'] = isset($new_instance['with_pics_only']) && $new_instance['with_pics_only'] ? 1 : 0;

+		$instance['with_videos_only'] = isset($new_instance['with_videos_only']) && $new_instance['with_videos_only'] ? 1 : 0;

+		$instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end popular posts widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

-            array('title' => '',

-                'post_type' => '',

-                'category' => array(),

-                'category_title' => '',

-                'list_sort' => '',

-                'list_order' => '',

-                'post_number' => '5',

-                'layout' => 'gridview_onehalf',

-                'listing_width' => '',

-                'add_location_filter' => '1',

-                'character_count' => '20',

-                'show_featured_only' => '',

-                'show_special_only' => '',

-                'with_pics_only' => '',

-                'with_videos_only' => '',

-                'use_viewing_post_type' => ''

-            )

-        );

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance,

+			array('title' => '',

+				'post_type' => '',

+				'category' => array(),

+				'category_title' => '',

+				'list_sort' => '',

+				'list_order' => '',

+				'post_number' => '5',

+				'layout' => 'gridview_onehalf',

+				'listing_width' => '',

+				'add_location_filter' => '1',

+				'character_count' => '20',

+				'show_featured_only' => '',

+				'show_special_only' => '',

+				'with_pics_only' => '',

+				'with_videos_only' => '',

+				'use_viewing_post_type' => ''

+			)

+		);

 

-        $title = strip_tags($instance['title']);

+		$title = strip_tags($instance['title']);

 

-        $post_type = strip_tags($instance['post_type']);

+		$post_type = strip_tags($instance['post_type']);

 

-        $category = $instance['category'];

+		$category = $instance['category'];

 

-        $category_title = strip_tags($instance['category_title']);

+		$category_title = strip_tags($instance['category_title']);

 

-        $list_sort = strip_tags($instance['list_sort']);

+		$list_sort = strip_tags($instance['list_sort']);

 

-        $list_order = strip_tags($instance['list_order']);

+		$list_order = strip_tags($instance['list_order']);

 

-        $post_number = strip_tags($instance['post_number']);

+		$post_number = strip_tags($instance['post_number']);

 

-        $layout = strip_tags($instance['layout']);

+		$layout = strip_tags($instance['layout']);

 

-        $listing_width = strip_tags($instance['listing_width']);

+		$listing_width = strip_tags($instance['listing_width']);

 

-        $add_location_filter = strip_tags($instance['add_location_filter']);

+		$add_location_filter = strip_tags($instance['add_location_filter']);

 

-        $character_count = $instance['character_count'];

+		$character_count = $instance['character_count'];

 

-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

-        $show_special_only = isset($instance['show_special_only']) && $instance['show_special_only'] ? true : false;

-        $with_pics_only = isset($instance['with_pics_only']) && $instance['with_pics_only'] ? true : false;

-        $with_videos_only = isset($instance['with_videos_only']) && $instance['with_videos_only'] ? true : false;

-        $use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;

+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

+		$show_special_only = isset($instance['show_special_only']) && $instance['show_special_only'] ? true : false;

+		$with_pics_only = isset($instance['with_pics_only']) && $instance['with_pics_only'] ? true : false;

+		$with_videos_only = isset($instance['with_videos_only']) && $instance['with_videos_only'] ? true : false;

+		$use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;

 

-        ?>

+		?>

 

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

@@ -298,9 +298,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>

 

                         <option <?php if ($post_type == $postypes_obj) {

-                            echo 'selected="selected"';

-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

-                            echo ucfirst($extvalue[1]); ?></option>

+							echo 'selected="selected"';

+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

+							echo ucfirst($extvalue[1]); ?></option>

 

                     <?php } ?>

 

@@ -315,30 +315,30 @@ 
 

                 <?php

 

-                $post_type = ($post_type != '') ? $post_type : 'gd_place';

+				$post_type = ($post_type != '') ? $post_type : 'gd_place';

 

-                $all_postypes = geodir_get_posttypes();

+				$all_postypes = geodir_get_posttypes();

 

-                if (!in_array($post_type, $all_postypes))

-                    $post_type = 'gd_place';

+				if (!in_array($post_type, $all_postypes))

+					$post_type = 'gd_place';

 

-                $category_taxonomy = geodir_get_taxonomies($post_type);

-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

+				$category_taxonomy = geodir_get_taxonomies($post_type);

+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

 

-                ?>

+				?>

 

                 <select multiple="multiple" class="widefat" name="<?php echo $this->get_field_name('category'); ?>[]"

                         onchange="geodir_popular_widget_cat_title(this)">

 

                     <option <?php if (!is_array($category) || (is_array($category) && in_array('0', $category))) {

-                        echo 'selected="selected"';

-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) {

-                        $selected = '';

-                        if (is_array($category) && in_array($category_obj->term_id, $category))

-                            echo $selected = 'selected="selected"';

+						$selected = '';

+						if (is_array($category) && in_array($category_obj->term_id, $category))

+							echo $selected = 'selected="selected"';

 

-                        ?>

+						?>

 

                         <option <?php echo $selected; ?>

                             value="<?php echo $category_obj->term_id; ?>"><?php echo ucfirst($category_obj->name); ?></option>

@@ -363,28 +363,28 @@ 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">

 

                     <option <?php if ($list_sort == 'az') {

-                        echo 'selected="selected"';

-                    } ?> value="az"><?php _e('A-Z', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="az"><?php _e('A-Z', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'latest') {

-                        echo 'selected="selected"';

-                    } ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'featured') {

-                        echo 'selected="selected"';

-                    } ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'high_review') {

-                        echo 'selected="selected"';

-                    } ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'high_rating') {

-                        echo 'selected="selected"';

-                    } ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'random') {

-                        echo 'selected="selected"';

-                    } ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>

 

                 </select>

             </label>

@@ -407,24 +407,24 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"

                         name="<?php echo $this->get_field_name('layout'); ?>">

                     <option <?php if ($layout == 'gridview_onehalf') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onethird') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onefourth') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onefifth') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'list') {

-                        echo 'selected="selected"';

-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>

 

                 </select>

             </label>

@@ -494,8 +494,8 @@ 
                 for="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"><?php _e('Use current viewing post type:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"

                        name="<?php echo $this->get_field_name('use_viewing_post_type'); ?>" <?php if ($use_viewing_post_type) {

-                    echo 'checked="checked"';

-                } ?>  value="1"/>

+					echo 'checked="checked"';

+				} ?>  value="1"/>

             </label>

         </p>

 

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

 

     <?php

-    }

+	}

 } // class geodir_popular_postview

 

 register_widget('geodir_popular_postview');
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -61,7 +61,7 @@ 
         //save the widget

         $instance = $old_instance;

         $instance['title'] = strip_tags($new_instance['title']);

-        $category_limit = (int)$new_instance['category_limit'];

+        $category_limit = (int) $new_instance['category_limit'];

         $instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

         $instance['default_post_type'] = isset($new_instance['default_post_type']) ? $new_instance['default_post_type'] : '';

         $instance['parent_only'] = !empty($new_instance['parent_only']) ? true : false;

@@ -81,13 +81,13 @@ 
     public function form($instance) 

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => '', 'parent_only' => false));

 

         $title = strip_tags($instance['title']);

-        $category_limit = (int)$instance['category_limit'];

+        $category_limit = (int) $instance['category_limit'];

         $category_limit = $category_limit > 0 ? $category_limit : 15;

         $default_post_type = isset($instance['default_post_type']) ? $instance['default_post_type'] : '';

-        $parent_only = !empty($instance['parent_only']) ? true: false;

+        $parent_only = !empty($instance['parent_only']) ? true : false;

         

         $post_type_options = geodir_get_posttypes('options');

         ?>

@@ -97,23 +97,23 @@ 
             </label>

         </p>

         <p>

-            <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Default post type to use (if not set by page)', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Default post type to use (if not set by page)', 'geodirectory'); ?>

                 <select class="widefat" id="<?php echo $this->get_field_id('default_post_type'); ?>" name="<?php echo $this->get_field_name('default_post_type'); ?>">

                 <?php foreach ($post_type_options as $name => $title) { ?>

-                    <option value="<?php echo $name;?>" <?php selected($name, $default_post_type);?>><?php echo $title; ?></option>

+                    <option value="<?php echo $name; ?>" <?php selected($name, $default_post_type); ?>><?php echo $title; ?></option>

                 <?php } ?>

                 </select>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('category_limit'); ?>"><?php _e('Customize categories count to appear by default:', 'geodirectory'); ?>

-                <input class="widefat" id="<?php echo $this->get_field_id('category_limit'); ?>" name="<?php echo $this->get_field_name('category_limit'); ?>" type="text" value="<?php echo (int)esc_attr($category_limit); ?>"/>

+                <input class="widefat" id="<?php echo $this->get_field_id('category_limit'); ?>" name="<?php echo $this->get_field_name('category_limit'); ?>" type="text" value="<?php echo (int) esc_attr($category_limit); ?>"/>

                 <p class="description" style="padding:0"><?php _e('After categories count reaches this limit option More Categories / Less Categoris will be displayed to show/hide categories. Default: 15', 'geodirectory'); ?></p>

             </label>

         </p>

         <p>

-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('parent_only'); ?>" name="<?php echo $this->get_field_name('parent_only'); ?>"<?php checked( $parent_only ); ?> value="1" />

-            <label for="<?php echo $this->get_field_id('parent_only'); ?>"><?php _e( 'Show parent categories only', 'geodirectory' ); ?></label>

+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('parent_only'); ?>" name="<?php echo $this->get_field_name('parent_only'); ?>"<?php checked($parent_only); ?> value="1" />

+            <label for="<?php echo $this->get_field_id('parent_only'); ?>"><?php _e('Show parent categories only', 'geodirectory'); ?></label>

         </p>

     <?php

     }

@@ -215,7 +215,7 @@ 
 	public function form($instance)

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

+        $instance = wp_parse_args((array) $instance,

             array('title' => '',

                 'post_type' => '',

                 'category' => array(),

@@ -266,9 +266,9 @@ 
         ?>

 

         <p>

-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

                 <small>(%posttype_singular_label% ,

-                    %posttype_plural_label% <?php _e('can be used', 'geodirectory');?>)

+                    %posttype_plural_label% <?php _e('can be used', 'geodirectory'); ?>)

                 </small>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

@@ -279,7 +279,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>

 

                 <?php $postypes = geodir_get_posttypes();

 				/**

@@ -311,7 +311,7 @@ 
 

         <p id="post_type_cats">

             <label

-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>

 

                 <?php

 

@@ -350,14 +350,14 @@ 
 

                 <input type="hidden" name="<?php echo $this->get_field_name('category_title'); ?>"

                        id="<?php echo $this->get_field_id('category_title'); ?>"

-                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory');?>"/>

+                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory'); ?>"/>

 

             </label>

         </p>

 

         <p>

             <label

-                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"

                         name="<?php echo $this->get_field_name('list_sort'); ?>">

@@ -393,7 +393,7 @@ 
         <p>

 

             <label

-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"

                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"

@@ -403,7 +403,7 @@ 
 

         <p>

             <label for="<?php echo $this->get_field_id('layout'); ?>">

-                <?php _e('Layout:', 'geodirectory');?>

+                <?php _e('Layout:', 'geodirectory'); ?>

                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"

                         name="<?php echo $this->get_field_name('layout'); ?>">

                     <option <?php if ($layout == 'gridview_onehalf') {

@@ -432,7 +432,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('listing_width'); ?>"

                        name="<?php echo $this->get_field_name('listing_width'); ?>" type="text"

@@ -442,7 +442,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"

                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"

                        value="<?php echo esc_attr($character_count); ?>"/>

@@ -451,41 +451,41 @@ 
 

         <p>

             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

-                <?php _e('Enable Location Filter:', 'geodirectory');?>

+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>

                        value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('show_featured_only'); ?>">

-                <?php _e('Show only featured listings:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only featured listings:', 'geodirectory'); ?> <input type="checkbox"

                                                                                             id="<?php echo $this->get_field_id('show_featured_only'); ?>"

-                                                                                            name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"';?>

+                                                                                            name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>

                                                                                             value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('show_special_only'); ?>">

-                <?php _e('Show only listings with special offers:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with special offers:', 'geodirectory'); ?> <input type="checkbox"

                                                                                                        id="<?php echo $this->get_field_id('show_special_only'); ?>"

-                                                                                                       name="<?php echo $this->get_field_name('show_special_only'); ?>" <?php if ($show_special_only) echo 'checked="checked"';?>

+                                                                                                       name="<?php echo $this->get_field_name('show_special_only'); ?>" <?php if ($show_special_only) echo 'checked="checked"'; ?>

                                                                                                        value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('with_pics_only'); ?>">

-                <?php _e('Show only listings with pics:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with pics:', 'geodirectory'); ?> <input type="checkbox"

                                                                                              id="<?php echo $this->get_field_id('with_pics_only'); ?>"

-                                                                                             name="<?php echo $this->get_field_name('with_pics_only'); ?>" <?php if ($with_pics_only) echo 'checked="checked"';?>

+                                                                                             name="<?php echo $this->get_field_name('with_pics_only'); ?>" <?php if ($with_pics_only) echo 'checked="checked"'; ?>

                                                                                              value="1"/>

             </label>

         </p>

         <p>

             <label for="<?php echo $this->get_field_id('with_videos_only'); ?>">

-                <?php _e('Show only listings with videos:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with videos:', 'geodirectory'); ?> <input type="checkbox"

                                                                                                id="<?php echo $this->get_field_id('with_videos_only'); ?>"

-                                                                                               name="<?php echo $this->get_field_name('with_videos_only'); ?>" <?php if ($with_videos_only) echo 'checked="checked"';?>

+                                                                                               name="<?php echo $this->get_field_name('with_videos_only'); ?>" <?php if ($with_videos_only) echo 'checked="checked"'; ?>

                                                                                                value="1"/>

             </label>

         </p>

@@ -531,7 +531,7 @@ 
 

             }

 

-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>

+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>

             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();

 

             <?php } ?>

geodirectory-widgets/geodirectory_reviews_widget.php

Indentation +49 added lines, -49 removed lines

@@ -14,37 +14,37 @@ 
  */

 class geodir_recent_reviews_widget extends WP_Widget

 {

-    /**

+	/**

 	 * Register the recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

-        parent::__construct(

-            'geodir_recent_reviews', // Base ID

-            __('GD > Recent Reviews', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

+		parent::__construct(

+			'geodir_recent_reviews', // Base ID

+			__('GD > Recent Reviews', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        // prints the widget

-        extract($args, EXTR_SKIP);

+	{

+		// prints the widget

+		extract($args, EXTR_SKIP);

 

-        /** This filter is documented in geodirectory_widgets.php */

-        $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+		/** This filter is documented in geodirectory_widgets.php */

+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 		

 		/**

 		 * Filter the number of reviews to display.

@@ -63,35 +63,35 @@ 
 		 * @param int $g_size Height and width of the avatar image in pixels. Default 30.

 		 */

 		$g_size = apply_filters('geodir_recent_reviews_g_size', 30);

-        /**

-         * Filter the excerpt length

-         *

-         * @since 1.0.0

-         *

-         * @param int $excerpt_length Excerpt length. Default 100.

-         */

-        $excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

-        $comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

+		/**

+		 * Filter the excerpt length

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param int $excerpt_length Excerpt length. Default 100.

+		 */

+		$excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

+		$comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

 

-        if ($comments_li) {

-            echo $before_widget;

-            ?>

+		if ($comments_li) {

+			echo $before_widget;

+			?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

-                } ?>

+					echo $before_title . $title . $after_title;

+				} ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

             <?php

-            echo $after_widget;

-        }

-    }

+			echo $after_widget;

+		}

+	}

 

 	/**

 	 * Sanitize recent reviews widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -99,29 +99,29 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $instance['count'] = strip_tags($new_instance['count']);

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$instance['count'] = strip_tags($new_instance['count']);

+		return $instance;

+	}

     

 	/**

 	 * Back-end recent reviews widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

-        $title = strip_tags($instance['title']);

-        $count = strip_tags($instance['count']);

-        ?>

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+		$title = strip_tags($instance['title']);

+		$count = strip_tags($instance['count']);

+		?>

         <p><label for="<?php echo $this->get_field_id('title'); ?>">Widget Title: <input class="widefat"

                                                                                          id="<?php echo $this->get_field_id('title'); ?>"

                                                                                          name="<?php echo $this->get_field_name('title'); ?>"

@@ -135,7 +135,7 @@ 
                                                                                              value="<?php echo esc_attr($count); ?>"/></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_recent_reviews_widget

 

 register_widget('geodir_recent_reviews_widget');
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
             ?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

+                    echo $before_title.$title.$after_title;

                 } ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

@@ -118,7 +118,7 @@ 
 	public function form($instance)

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

         $title = strip_tags($instance['title']);

         $count = strip_tags($instance['count']);

         ?>