Passed
Pull Request — master (#228)
by Viruthagiri
10:20
created
geodirectory-admin/option-pages/general_settings_array.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 
123 123
     array('type' => 'sectionend', 'id' => 'general_options'),
124 124
 
125
-));/* General Options End*/
125
+)); /* General Options End*/
126 126
 
127 127
 /**
128 128
  * Filter GD Google Analytic Settings array.
Please login to merge, or discard this patch.
geodirectory-admin/option-pages/notifications_settings_array.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         'id' => 'geodir_post_submited_success_email_subject_admin',
130 130
         'type' => 'text',
131 131
         'css' => 'min-width:300px;',
132
-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings
132
+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings
133 133
     ),
134 134
     array(
135 135
         'name' => '',
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
         'id' => 'geodir_post_submited_success_email_content_admin',
138 138
         'css' => 'width:500px; height: 150px;',
139 139
         'type' => 'textarea',
140
-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')
140
+        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>', 'geodirectory')
141 141
     ),
142 142
 
143 143
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         'id' => 'geodir_post_submited_success_email_subject',
155 155
         'type' => 'text',
156 156
         'css' => 'min-width:300px;',
157
-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings
157
+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings
158 158
     ),
159 159
     array(
160 160
         'name' => '',
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         'id' => 'geodir_post_submited_success_email_content',
163 163
         'css' => 'width:500px; height: 150px;',
164 164
         'type' => 'textarea',
165
-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')
165
+        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>', 'geodirectory')
166 166
     ),
167 167
 
168 168
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         'id' => 'geodir_forgot_password_content',
181 181
         'css' => 'width:500px; height: 150px;',
182 182
         'type' => 'textarea',
183
-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')
183
+        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')
184 184
     ),
185 185
 
186 186
     array(
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
         'id' => 'geodir_registration_success_email_content',
198 198
         'css' => 'width:500px; height: 150px;',
199 199
         'type' => 'textarea',
200
-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')
200
+        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')
201 201
     ),
202 202
     array(
203 203
         'name' => __('Listing published email', 'geodirectory'),
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
         'id' => 'geodir_email_friend_content',
237 237
         'css' => 'width:500px; height: 150px;',
238 238
         'type' => 'textarea',
239
-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')
239
+        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>", 'geodirectory')
240 240
     ),
241 241
 
242 242
     array(
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
         'id' => 'geodir_email_enquiry_content',
254 254
         'css' => 'width:500px; height: 150px;',
255 255
         'type' => 'textarea',
256
-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')
256
+        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')
257 257
     ),
258 258
 
259 259
     array('type' => 'sectionend', 'id' => 'other_emails'),
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
         'id' => 'geodir_post_added_success_msg_content',
270 270
         'css' => 'width:500px; height: 150px;',
271 271
         'type' => 'textarea',
272
-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')
272
+        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>', 'geodirectory')
273 273
     ),
274 274
 
275 275
 
Please login to merge, or discard this patch.
geodirectory-admin/option-pages/title_meta_settings_array.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 $gd_wpseo_use = '';
12 12
 if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
13
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
13
+    $gd_wpseo_use = "<b style='color:red;'>" . __('Please use the WPSEO settings instead.', 'geodirectory') . "</b><br />";
14 14
 }
15 15
 
16 16
 /**
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
 
29 29
 
30
-    array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
30
+    array('name' => $gd_wpseo_use . __('Available Variables', 'geodirectory'),
31 31
         'desc' => __('%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%search_term%%, %%search_near%%, %%name%%', 'geodirectory'),
32 32
         'type' => 'sectionstart',
33 33
         'id' => 'geodir_meta_vars'),
Please login to merge, or discard this patch.
geodirectory-functions/cat-meta-functions/Tax-meta-class.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
         {
804 804
 
805 805
             if (!is_array($meta))
806
-                $meta = (array)$meta;
806
+                $meta = (array) $meta;
807 807
 
808 808
             $this->show_field_begin($field, $meta);
809 809
             echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
@@ -827,7 +827,7 @@  discard block
 block discarded – undo
827 827
         {
828 828
 
829 829
             if (!is_array($meta))
830
-                $meta = (array)$meta;
830
+                $meta = (array) $meta;
831 831
 
832 832
             $this->show_field_begin($field, $meta);
833 833
             foreach ($field['options'] as $key => $value) {
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
             global $post;
891 891
 
892 892
             if (!is_array($meta))
893
-                $meta = (array)$meta;
893
+                $meta = (array) $meta;
894 894
 
895 895
             $this->show_field_begin($field, $meta);
896 896
             echo "{$field['desc']}<br />";
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
         {
1014 1014
 
1015 1015
             if (!is_array($meta))
1016
-                $meta = (array)$meta;
1016
+                $meta = (array) $meta;
1017 1017
 
1018 1018
             $this->show_field_begin($field, $meta);
1019 1019
 
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
1073 1073
         {
1074 1074
             global $post;
1075 1075
 
1076
-            if (!is_array($meta)) $meta = (array)$meta;
1076
+            if (!is_array($meta)) $meta = (array) $meta;
1077 1077
             $this->show_field_begin($field, $meta);
1078 1078
             $options = $field['options'];
1079 1079
             $posts = get_posts($options['args']);
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
         {
1112 1112
             global $post;
1113 1113
 
1114
-            if (!is_array($meta)) $meta = (array)$meta;
1114
+            if (!is_array($meta)) $meta = (array) $meta;
1115 1115
             $this->show_field_begin($field, $meta);
1116 1116
             $options = $field['options'];
1117 1117
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1370,7 +1370,7 @@  discard block
 block discarded – undo
1370 1370
                 if (!is_wp_error($id)) {
1371 1371
 
1372 1372
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
1373
-                    add_post_meta($term_id, $name, $id, false);    // save file's url in meta fields
1373
+                    add_post_meta($term_id, $name, $id, false); // save file's url in meta fields
1374 1374
 
1375 1375
                 } // End if
1376 1376
 
@@ -1415,7 +1415,7 @@  discard block
 block discarded – undo
1415 1415
                 if (!is_wp_error($id)) {
1416 1416
 
1417 1417
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
1418
-                    return $id;    // return file's url in meta fields
1418
+                    return $id; // return file's url in meta fields
1419 1419
                 } // End if
1420 1420
             } // End foreach
1421 1421
         }
@@ -1430,9 +1430,9 @@  discard block
 block discarded – undo
1430 1430
         {
1431 1431
 
1432 1432
             // Default values for meta box
1433
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
1433
+            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array) $this->_meta_box);
1434 1434
 
1435
-            if(is_array($this->_fields)) {
1435
+            if (is_array($this->_fields)) {
1436 1436
                 // Default values for fields
1437 1437
                 foreach ($this->_fields as &$field) {
1438 1438
                     $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
@@ -1452,7 +1452,7 @@  discard block
 block discarded – undo
1452 1452
          */
1453 1453
         public function has_field($type)
1454 1454
         {
1455
-            if(is_array($this->_fields)) {
1455
+            if (is_array($this->_fields)) {
1456 1456
                 foreach ($this->_fields as $field) {
1457 1457
                     if ($type == $field['type'])
1458 1458
                         return true;
@@ -2020,12 +2020,12 @@  discard block
 block discarded – undo
2020 2020
                 $post_type = $taxObject->object_type[0];
2021 2021
             }
2022 2022
 
2023
-            if($post_type=='post'){$post_type='';}
2024
-            if($post_type){$post_type = $post_type.'_';}
2023
+            if ($post_type == 'post') {$post_type = ''; }
2024
+            if ($post_type) {$post_type = $post_type . '_'; }
2025 2025
 
2026 2026
             $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
2027 2027
 
2028
-            $m = get_option('tax_meta_' . $post_type  . $t_id);
2028
+            $m = get_option('tax_meta_' . $post_type . $t_id);
2029 2029
             if (isset($m[$key])) {
2030 2030
                 return $m[$key];
2031 2031
             } else {
@@ -2042,15 +2042,15 @@  discard block
 block discarded – undo
2042 2042
                 $post_type = $taxObject->object_type[0];
2043 2043
             }
2044 2044
 
2045
-            if($post_type=='post'){$post_type='';}
2046
-            if($post_type){$post_type = $post_type.'_';}
2045
+            if ($post_type == 'post') {$post_type = ''; }
2046
+            if ($post_type) {$post_type = $post_type . '_'; }
2047 2047
 
2048
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
2048
+            $m = get_option('tax_meta_' . $post_type . $term_id);
2049 2049
 
2050 2050
             if (isset($m[$key])) {
2051 2051
                 unset($m[$key]);
2052 2052
             }
2053
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
2053
+            update_option('tax_meta_' . $post_type . $term_id, $m);
2054 2054
         }
2055 2055
 
2056 2056
         //update meta
@@ -2062,13 +2062,13 @@  discard block
 block discarded – undo
2062 2062
                 $post_type = $taxObject->object_type[0];
2063 2063
             }
2064 2064
 
2065
-            if($post_type=='post'){$post_type='';}
2066
-            if($post_type){$post_type = $post_type.'_';}
2065
+            if ($post_type == 'post') {$post_type = ''; }
2066
+            if ($post_type) {$post_type = $post_type . '_'; }
2067 2067
 
2068
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
2068
+            $m = get_option('tax_meta_' . $post_type . $term_id);
2069 2069
 
2070 2070
             $m[$key] = $value;
2071
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
2071
+            update_option('tax_meta_' . $post_type . $term_id, $m);
2072 2072
 
2073 2073
             /**
2074 2074
              * Called after the tax meta is updated.
@@ -2103,12 +2103,12 @@  discard block
 block discarded – undo
2103 2103
             $post_type = $taxObject->object_type[0];
2104 2104
         }
2105 2105
 
2106
-        if($post_type=='post'){$post_type='';}
2107
-        if($post_type){$post_type = $post_type.'_';}
2106
+        if ($post_type == 'post') {$post_type = ''; }
2107
+        if ($post_type) {$post_type = $post_type . '_'; }
2108 2108
 
2109 2109
         $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
2110 2110
 
2111
-        $m = get_option('tax_meta_' . $post_type  . $t_id);
2111
+        $m = get_option('tax_meta_' . $post_type . $t_id);
2112 2112
         if (isset($m[$key])) {
2113 2113
             return $m[$key];
2114 2114
         } else {
@@ -2125,15 +2125,15 @@  discard block
 block discarded – undo
2125 2125
         $taxObject = get_taxonomy($_REQUEST['taxonomy']);
2126 2126
         $post_type = $taxObject->object_type[0];
2127 2127
 
2128
-        if($post_type=='post'){$post_type='';}
2129
-        if($post_type){$post_type = $post_type.'_';}
2128
+        if ($post_type == 'post') {$post_type = ''; }
2129
+        if ($post_type) {$post_type = $post_type . '_'; }
2130 2130
 
2131 2131
         $m = get_option('tax_meta_' . $post_type . $term_id);
2132 2132
 
2133 2133
         if (isset($m[$key])) {
2134 2134
             unset($m[$key]);
2135 2135
         }
2136
-        update_option('tax_meta_' . $post_type  . $term_id, $m);
2136
+        update_option('tax_meta_' . $post_type . $term_id, $m);
2137 2137
     }
2138 2138
 }
2139 2139
 
@@ -2147,10 +2147,10 @@  discard block
 block discarded – undo
2147 2147
             $post_type = $taxObject->object_type[0];
2148 2148
         }
2149 2149
 
2150
-        if($post_type=='post'){$post_type='';}
2151
-        if($post_type){$post_type = $post_type.'_';}
2150
+        if ($post_type == 'post') {$post_type = ''; }
2151
+        if ($post_type) {$post_type = $post_type . '_'; }
2152 2152
 
2153
-        $m = get_option('tax_meta_' . $post_type  . $term_id);
2153
+        $m = get_option('tax_meta_' . $post_type . $term_id);
2154 2154
 
2155 2155
         $m[$key] = $value;
2156 2156
         update_option('tax_meta_' . $post_type . $term_id, $m);
Please login to merge, or discard this patch.
geodirectory-functions/cat-meta-functions/cat_meta.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
      */
25 25
 
26 26
     $config = array(
27
-        'id' => 'demo_meta_box',                    // meta box id, unique per meta box
28
-        'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
29
-        'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
30
-        'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
31
-        'fields' => array(),                        // list of meta fields (can be added by field arrays)
32
-        'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
27
+        'id' => 'demo_meta_box', // meta box id, unique per meta box
28
+        'title' => __('Demo Meta Box', 'geodirectory'), // meta box title
29
+        'pages' => geodir_get_taxonomies(), // taxonomy name, accept categories, post_tag and custom taxonomies
30
+        'context' => 'normal', // where the meta box appear: normal (default), advanced, side; optional
31
+        'fields' => array(), // list of meta fields (can be added by field arrays)
32
+        'local_images' => false, // Use local or hosted images (meta box images for add/remove)
33 33
         'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
34 34
     );
35 35
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
      *
50 50
      * @since 1.5.7
51 51
      */
52
-        apply_filters('geodir_cat_schemas',array(
52
+        apply_filters('geodir_cat_schemas', array(
53 53
             '' => __('Default (LocalBusiness)', 'geodirectory'),
54 54
             'AccountingService' => 'AccountingService',
55 55
             'Attorney' => 'Attorney',
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 
215 215
             $file_info = pathinfo($term_icon_url['src']);
216 216
 
217
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
217
+            if (isset($file_info['dirname']) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
218 218
                 $sub_dir = $file_info['dirname'];
219
-            else{$sub_dir = '';}
219
+            else {$sub_dir = ''; }
220 220
 
221 221
             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
222 222
             $uploads_baseurl = $uploads['baseurl'];
@@ -268,8 +268,8 @@  discard block
 block discarded – undo
268 268
                             jQuery("#addtag iframe").contents().find("body").html('');
269 269
                             jQuery('#addtag [rel="ct_cat_default_img"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
270 270
                             jQuery('#addtag [rel="ct_cat_icon"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
271
-                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image','geodirectory');?>');
272
-                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image','geodirectory');?>');
271
+                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
272
+                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
273 273
                         }
274 274
                     }, 1000);
275 275
 
Please login to merge, or discard this patch.
geodirectory-functions/compatibility/Avada.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  */
19 19
 function gd_strip_breadcrumb_wrappers($breadcrumb)
20 20
 {
21
-    $breadcrumb = str_replace(array("<li>","</li>"), "", $breadcrumb);
21
+    $breadcrumb = str_replace(array("<li>", "</li>"), "", $breadcrumb);
22 22
     $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '<ul class="fusion-breadcrumbs"><li>', $breadcrumb);
23 23
     $breadcrumb = str_replace('</ul></div>', '</li></ul>', $breadcrumb);
24 24
     return $breadcrumb;
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     return $separator;
40 40
 }
41 41
 
42
-add_action('avada_override_current_page_title_bar','gd_avada_current_page_title_bar_change');
42
+add_action('avada_override_current_page_title_bar', 'gd_avada_current_page_title_bar_change');
43 43
 /**
44 44
  * new title bar functions for gd pages.
45 45
  *
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 {
52 52
     if (geodir_is_geodir_page()) {
53 53
         gd_avada_current_page_title_bar();
54
-    }else{
55
-        avada_current_page_title_bar( $c_pageID );
54
+    } else {
55
+        avada_current_page_title_bar($c_pageID);
56 56
     }
57 57
 
58 58
 }
Please login to merge, or discard this patch.
geodirectory-functions/compatibility/X.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
             // 8. Get shop title.
308 308
             //
309 309
 
310
-            GLOBAL $post,$wp;
310
+            GLOBAL $post, $wp;
311 311
 
312 312
             if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
313 313
                 geodir_breadcrumb();
@@ -315,13 +315,13 @@  discard block
 block discarded – undo
315 315
 
316 316
                 $stack = x_get_stack();
317 317
                 $delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
318
-                $home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
319
-                $home_link = home_url();                                                            // 3
320
-                $current_before = '<span class="current">';                                              // 4
321
-                $current_after = '</span>';                                                             // 5
322
-                $page_title = get_the_title();                                                       // 6
323
-                $blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
324
-                $shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
318
+                $home_text = '<span class="home"><i class="x-icon-home"></i></span>'; // 2
319
+                $home_link = home_url(); // 3
320
+                $current_before = '<span class="current">'; // 4
321
+                $current_after = '</span>'; // 5
322
+                $page_title = get_the_title(); // 6
323
+                $blog_title = get_the_title(get_option('page_for_posts', true)); // 7
324
+                $shop_title = get_theme_mod('x_' . $stack . '_shop_title'); // 8
325 325
 
326 326
                 if (function_exists('woocommerce_get_page_id')) {
327 327
                     $shop_url = x_get_shop_link();
Please login to merge, or discard this patch.
geodirectory-functions/custom_field_html.php 1 patch
Spacing   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
             ?>
62 62
 
63 63
             <b style="cursor:pointer;"
64
-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>
64
+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title); ?></b>
65 65
         <?php
66 66
         } else {
67 67
             ?>
68 68
             <b style="cursor:pointer;"
69
-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' ' . $field_admin_title . ' (' . $field_type . ')');?></b>
69
+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' ' . $field_admin_title . ' (' . $field_type . ')'); ?></b>
70 70
         <?php
71 71
         }
72 72
         ?>
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
                 ?>
173 173
 
174 174
                 <tr>
175
-                    <td><strong><?php _e('HTML variable name :', 'geodirectory');?></strong></td>
175
+                    <td><strong><?php _e('HTML variable name :', 'geodirectory'); ?></strong></td>
176 176
                     <td align="left">
177 177
                         <input type="text" name="htmlvar_name" id="htmlvar_name"
178 178
                                value="<?php if (isset($field_info->htmlvar_name)) {
@@ -180,10 +180,10 @@  discard block
 block discarded – undo
180 180
                                }?>" <?php if ($default) {
181 181
                             echo 'readonly="readonly"';
182 182
                         }?> />
183
-                        <br/> <span><?php _e('HTML variable name must not be blank', 'geodirectory');?></span>
184
-                        <br/> <span><?php _e('This should be a unique name', 'geodirectory');?></span>
183
+                        <br/> <span><?php _e('HTML variable name must not be blank', 'geodirectory'); ?></span>
184
+                        <br/> <span><?php _e('This should be a unique name', 'geodirectory'); ?></span>
185 185
                         <br/>
186
-                        <span><?php _e('HTML variable name not use spaces, special characters', 'geodirectory');?></span>
186
+                        <span><?php _e('HTML variable name not use spaces, special characters', 'geodirectory'); ?></span>
187 187
                     </td>
188 188
                 </tr>
189 189
             <?php } ?>
@@ -202,19 +202,19 @@  discard block
 block discarded – undo
202 202
 				$default_value = isset($field_info->default_value) ? $field_info->default_value : '';
203 203
 			?>
204 204
 			<tr>
205
-				<td><strong><?php _e('Default value :', 'geodirectory');?></strong></td>
205
+				<td><strong><?php _e('Default value :', 'geodirectory'); ?></strong></td>
206 206
 				<td align="left">
207 207
 				<?php if ($field_type == 'checkbox') { ?>
208 208
 				<select name="default_value" id="default_value">
209 209
 					<option value=""><?php _e('Unchecked', 'geodirectory'); ?></option>
210
-					<option value="1" <?php selected(true, (int)$default_value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>
210
+					<option value="1" <?php selected(true, (int) $default_value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>
211 211
 				</select>
212 212
 				<?php } else if ($field_type == 'email') { ?>
213
-				<input type="email" name="default_value" placeholder="<?php _e('[email protected]', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($default_value);?>" /><br/>
214
-				<span><?php _e('Enter the default value. Ex: [email protected]', 'geodirectory');?></span>
213
+				<input type="email" name="default_value" placeholder="<?php _e('[email protected]', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($default_value); ?>" /><br/>
214
+				<span><?php _e('Enter the default value. Ex: [email protected]', 'geodirectory'); ?></span>
215 215
 				<?php } else { ?>
216
-				<input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($default_value);?>" /><br/>
217
-				<span><?php _e('Enter the default value (for "link" this will be used as the link text)', 'geodirectory');?></span>
216
+				<input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($default_value); ?>" /><br/>
217
+				<span><?php _e('Enter the default value (for "link" this will be used as the link text)', 'geodirectory'); ?></span>
218 218
 				<?php } ?>
219 219
 				</td>
220 220
 			</tr>
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
                 </td>
380 380
             </tr>
381 381
 
382
-            <?php if ($field_type == 'text'){?>
382
+            <?php if ($field_type == 'text') {?>
383 383
             <tr>
384 384
                 <td><strong><?php _e('Validation Pattern:', 'geodirectory'); ?></strong></td>
385 385
                 <td align="left">
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
             </tr>
410 410
             <?php } ?>
411 411
 
412
-            <tr <?php echo (!$display_on_listing ? 'style="display:none"' : '') ;?>>
412
+            <tr <?php echo (!$display_on_listing ? 'style="display:none"' : ''); ?>>
413 413
                 <td><strong><?php _e('Show on listing page ? :', 'geodirectory'); ?></strong></td>
414 414
                 <td align="left">
415 415
                     <select name="show_on_listing" id="show_on_listing">
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
                 case 'taxonomy': {
469 469
                     ?>
470 470
                     <tr>
471
-                        <td><strong><?php _e('Select taxonomy:', 'geodirectory');?></strong></td>
471
+                        <td><strong><?php _e('Select taxonomy:', 'geodirectory'); ?></strong></td>
472 472
                         <td align="left">
473 473
                             <select name="htmlvar_name" id="htmlvar_name">
474 474
                                 <?php
@@ -478,40 +478,40 @@  discard block
 block discarded – undo
478 478
                                     ?>
479 479
                                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
480 480
                                         echo 'selected="selected"';
481
-                                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
481
+                                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php
482 482
                                 }
483 483
                                 ?>
484 484
                             </select>
485 485
 
486 486
                             <br/>
487
-                            <span><?php _e('Selected taxonomy name use as field name index. ex:-( post_category[gd_placecategory] )', 'geodirectory');?></span>
487
+                            <span><?php _e('Selected taxonomy name use as field name index. ex:-( post_category[gd_placecategory] )', 'geodirectory'); ?></span>
488 488
                         </td>
489 489
                     </tr>
490 490
 
491 491
                     <tr>
492
-                        <td><strong><?php _e('Category display type :', 'geodirectory');?></strong></td>
492
+                        <td><strong><?php _e('Category display type :', 'geodirectory'); ?></strong></td>
493 493
                         <td align="left">
494 494
 
495 495
                             <select name="cat_display_type" id="cat_display_type">
496 496
                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
497 497
                                     echo 'selected="selected"';
498
-                                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
498
+                                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>
499 499
                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
500 500
                                     echo 'selected="selected"';
501
-                                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
501
+                                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
502 502
                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
503 503
                                     echo 'selected="selected"';
504
-                                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
504
+                                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>
505 505
                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
506 506
                                     echo 'selected="selected"';
507
-                                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
507
+                                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
508 508
                                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
509 509
                                     echo 'selected="selected"';
510
-                                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
510
+                                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
511 511
                             </select>
512 512
 
513 513
                             <br/>
514
-                            <span><?php _e('Show categories list as select,multiselect,checkbox or radio', 'geodirectory');?></span>
514
+                            <span><?php _e('Show categories list as select,multiselect,checkbox or radio', 'geodirectory'); ?></span>
515 515
                         </td>
516 516
                     </tr>
517 517
                 <?php } // end of additional field for taxonomy field type
@@ -532,92 +532,92 @@  discard block
 block discarded – undo
532 532
                     do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
533 533
 
534 534
                     <tr>
535
-                        <td><strong><?php _e('Display zip/post code :', 'geodirectory');?></strong></td>
535
+                        <td><strong><?php _e('Display zip/post code :', 'geodirectory'); ?></strong></td>
536 536
                         <td align="left">
537 537
                             <input type="checkbox" name="extra[show_zip]" id="show_zip"
538 538
                                    value="1" <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
539 539
                                 echo 'checked="checked"';
540 540
                             }?>/>
541
-                            <span><?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?></span>
541
+                            <span><?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?></span>
542 542
                         </td>
543 543
                     </tr>
544 544
 
545 545
                     <tr>
546
-                        <td><strong><?php _e('Zip/Post code label :', 'geodirectory');?></strong></td>
546
+                        <td><strong><?php _e('Zip/Post code label :', 'geodirectory'); ?></strong></td>
547 547
                         <td align="left">
548 548
                             <input type="text" name="extra[zip_lable]" id="zip_lable"
549 549
                                    value="<?php if (isset($address['zip_lable'])) {
550 550
                                        echo esc_attr($address['zip_lable']);
551 551
                                    }?>"/>
552
-                            <span><?php _e('Enter zip/post code field label in address section.', 'geodirectory');?></span>
552
+                            <span><?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?></span>
553 553
                         </td>
554 554
                     </tr>
555 555
 
556 556
                     <tr style="display:none;">
557
-                        <td><strong><?php _e('Display map :', 'geodirectory');?></strong></td>
557
+                        <td><strong><?php _e('Display map :', 'geodirectory'); ?></strong></td>
558 558
                         <td align="left">
559 559
                             <input type="checkbox" name="extra[show_map]" id="show_map"
560 560
                                    value="1" <?php if (isset($address['show_map']) && $address['show_map'] == '1') {
561 561
                                 echo 'checked="checked"';
562 562
                             }?>/>
563
-                            <span><?php _e('Select if you want to `set address on map` field in address section.', 'geodirectory');?></span>
563
+                            <span><?php _e('Select if you want to `set address on map` field in address section.', 'geodirectory'); ?></span>
564 564
                         </td>
565 565
                     </tr>
566 566
 
567 567
                     <tr>
568
-                        <td><strong><?php _e('Map button label :', 'geodirectory');?></strong></td>
568
+                        <td><strong><?php _e('Map button label :', 'geodirectory'); ?></strong></td>
569 569
                         <td align="left">
570 570
                             <input type="text" name="extra[map_lable]" id="map_lable"
571 571
                                    value="<?php if (isset($address['map_lable'])) {
572 572
                                        echo esc_attr($address['map_lable']);
573 573
                                    }?>"/>
574
-                            <span><?php _e('Enter text for  `set address on map` button in address section.', 'geodirectory');?></span>
574
+                            <span><?php _e('Enter text for  `set address on map` button in address section.', 'geodirectory'); ?></span>
575 575
                         </td>
576 576
                     </tr>
577 577
 
578 578
                     <tr>
579
-                        <td><strong><?php _e('Use user zoom level:', 'geodirectory');?></strong></td>
579
+                        <td><strong><?php _e('Use user zoom level:', 'geodirectory'); ?></strong></td>
580 580
                         <td align="left">
581 581
                             <input type="checkbox" name="extra[show_mapzoom]" id="show_mapzoom"
582 582
                                    value="1" <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
583 583
                                 echo 'checked="checked"';
584 584
                             }?>/>
585
-                            <span><?php _e('Select if you want to use the user defined map zoom level.', 'geodirectory');?></span>
585
+                            <span><?php _e('Select if you want to use the user defined map zoom level.', 'geodirectory'); ?></span>
586 586
                         </td>
587 587
                     </tr>
588 588
 
589 589
                     <tr>
590
-                        <td><strong><?php _e('Display map view:', 'geodirectory');?></strong></td>
590
+                        <td><strong><?php _e('Display map view:', 'geodirectory'); ?></strong></td>
591 591
                         <td align="left">
592 592
                             <input type="checkbox" name="extra[show_mapview]" id="show_mapview"
593 593
                                    value="1" <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
594 594
                                 echo 'checked="checked"';
595 595
                             }?>/>
596
-                            <span><?php _e('Select if you want to `set default map` options in address section.', 'geodirectory');?></span>
596
+                            <span><?php _e('Select if you want to `set default map` options in address section.', 'geodirectory'); ?></span>
597 597
                         </td>
598 598
                     </tr>
599 599
 
600 600
 
601 601
                     <tr>
602
-                        <td><strong><?php _e('Map view label :', 'geodirectory');?></strong></td>
602
+                        <td><strong><?php _e('Map view label :', 'geodirectory'); ?></strong></td>
603 603
                         <td align="left">
604 604
                             <input type="text" name="extra[mapview_lable]" id="mapview_lable"
605 605
                                    value="<?php if (isset($address['mapview_lable'])) {
606 606
                                        echo esc_attr($address['mapview_lable']);
607 607
                                    }?>"/>
608
-                            <span><?php _e('Enter mapview field label in address section.', 'geodirectory');?></span>
608
+                            <span><?php _e('Enter mapview field label in address section.', 'geodirectory'); ?></span>
609 609
                         </td>
610 610
                     </tr>
611 611
                     <tr>
612 612
                         <td>
613
-                            <strong><?php _e('Show latitude and longitude from front-end :', 'geodirectory');?></strong>
613
+                            <strong><?php _e('Show latitude and longitude from front-end :', 'geodirectory'); ?></strong>
614 614
                         </td>
615 615
                         <td align="left">
616 616
                             <input type="checkbox" name="extra[show_latlng]" id="show_latlng"
617 617
                                    value="1" <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
618 618
                                 echo 'checked="checked"';
619 619
                             }?>/>
620
-                            <span><?php _e('Select if you want to show latitude and logatude fields in address section from front-end.', 'geodirectory');?></span>
620
+                            <span><?php _e('Select if you want to show latitude and logatude fields in address section from front-end.', 'geodirectory'); ?></span>
621 621
                         </td>
622 622
                     </tr>
623 623
                 <?php } // end of extra fields for address field type
@@ -629,41 +629,41 @@  discard block
 block discarded – undo
629 629
 
630 630
                         ?>
631 631
                         <tr>
632
-                            <td><strong><?php _e('Multiselect display type :', 'geodirectory');?></strong></td>
632
+                            <td><strong><?php _e('Multiselect display type :', 'geodirectory'); ?></strong></td>
633 633
                             <td align="left">
634 634
 
635 635
                                 <select name="multi_display_type" id="multi_display_type">
636 636
                                     <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
637 637
                                         echo 'selected="selected"';
638
-                                    }?> value="select"><?php _e('Select', 'geodirectory');?></option>
638
+                                    }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
639 639
                                     <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
640 640
                                         echo 'selected="selected"';
641
-                                    }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
641
+                                    }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
642 642
                                     <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
643 643
                                         echo 'selected="selected"';
644
-                                    }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
644
+                                    }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
645 645
                                 </select>
646 646
 
647 647
                                 <br/>
648
-                                <span><?php _e('Show multiselect list as multiselect,checkbox or radio', 'geodirectory');?></span>
648
+                                <span><?php _e('Show multiselect list as multiselect,checkbox or radio', 'geodirectory'); ?></span>
649 649
                             </td>
650 650
                         </tr>
651 651
                     <?php
652 652
                     }
653 653
                     ?>
654 654
                     <tr>
655
-                        <td><strong><?php _e('Option Values :', 'geodirectory');?></strong></td>
655
+                        <td><strong><?php _e('Option Values :', 'geodirectory'); ?></strong></td>
656 656
                         <td align="left">
657 657
                             <input type="text" name="option_values" id="option_values"
658 658
                                    value="<?php if (isset($field_info->option_values)) {
659 659
                                        echo esc_attr($field_info->option_values);
660 660
                                    }?>"/>
661 661
                             <br/>
662
-                            <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>
662
+                            <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>
663 663
                             <br/>
664
-                            <span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>
664
+                            <span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>
665 665
                             <br/>
666
-                            <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>
666
+                            <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>
667 667
                             <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>
668 668
                                 <br/>
669 669
                                 <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>
@@ -681,12 +681,12 @@  discard block
 block discarded – undo
681 681
                     }
682 682
                     ?>
683 683
                     <tr>
684
-                        <td><strong><?php _e('Date Format :', 'geodirectory');?></strong></td>
684
+                        <td><strong><?php _e('Date Format :', 'geodirectory'); ?></strong></td>
685 685
                         <td align="left" style="overflow:inherit;">
686 686
                             <input type="text" name="extra[date_format]" id="date_format"
687 687
                                    value="<?php if (isset($extra['date_format'])) {
688 688
                                        echo esc_attr($extra['date_format']);
689
-                                   }else{echo "mm/dd/yy";}?>"/>
689
+                                   } else {echo "mm/dd/yy"; }?>"/>
690 690
 
691 691
                             <div style="position:relative; cursor:pointer;">
692 692
                         <span onclick="jQuery('#show_dateformat').toggle();">
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
 
765 765
                             </div>
766 766
                             <br/>
767
-                            <span><?php _e('Enter the date format.', 'geodirectory');?></span>
767
+                            <span><?php _e('Enter the date format.', 'geodirectory'); ?></span>
768 768
                         </td>
769 769
                     </tr>
770 770
                 <?php
@@ -777,20 +777,20 @@  discard block
 block discarded – undo
777 777
 					$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
778 778
 					?>
779 779
 					<tr>
780
-					  <td><strong><?php _e('Allowed file types:', 'geodirectory');?></strong></td>
780
+					  <td><strong><?php _e('Allowed file types:', 'geodirectory'); ?></strong></td>
781 781
 						<td align="left">
782 782
 							<select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">
783
-								<option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>
784
-								<?php foreach ( $allowed_file_types as $format => $types ) { ?>
785
-								<optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">
786
-									<?php foreach ( $types as $ext => $type ) { ?>
787
-									<option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>
783
+								<option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>
784
+								<?php foreach ($allowed_file_types as $format => $types) { ?>
785
+								<optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">
786
+									<?php foreach ($types as $ext => $type) { ?>
787
+									<option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.' . $ext; ?></option>
788 788
 									<?php } ?>
789 789
 								</optgroup>
790 790
 								<?php } ?>
791 791
 							</select>			
792 792
 							<br />
793
-							<span><?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', GEODIRPAYMENT_TEXTDOMAIN);?></span>				
793
+							<span><?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', GEODIRPAYMENT_TEXTDOMAIN); ?></span>				
794 794
 						</td>
795 795
 					</tr>
796 796
 					<?php 
@@ -805,28 +805,28 @@  discard block
 block discarded – undo
805 805
                 </tr>
806 806
 
807 807
                 <tr>
808
-                    <td><strong><?php _e('Upload icon:', 'geodirectory');?></strong></td>
808
+                    <td><strong><?php _e('Upload icon:', 'geodirectory'); ?></strong></td>
809 809
                     <td align="left">
810 810
                         <input type="text" name="field_icon" id="field_icon"
811 811
                                value="<?php if (isset($field_info->field_icon)) {
812 812
                                    echo $field_info->field_icon;
813 813
                                }?>"/>
814 814
                     <span>
815
-                        <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>
815
+                        <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>
816 816
                     </span>
817 817
                     </td>
818 818
                     </td>
819 819
                 </tr>
820 820
 
821 821
                 <tr>
822
-                    <td><strong><?php _e('Css class:', 'geodirectory');?></strong></td>
822
+                    <td><strong><?php _e('Css class:', 'geodirectory'); ?></strong></td>
823 823
                     <td align="left">
824 824
                         <input type="text" name="css_class" id="css_class"
825 825
                                value="<?php if (isset($field_info->css_class)) {
826 826
                                    echo esc_attr($field_info->css_class);
827 827
                                }?>"/>
828 828
                     <span>
829
-                        <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>
829
+                        <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>
830 830
                     </span>
831 831
                     </td>
832 832
                     </td>
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
888 888
                      * @since 1.0.0
889 889
                      * @param object $field_info The current fields info.
890 890
                      */
891
-                    do_action('geodir_advance_custom_fields', $field_info);?>
891
+                    do_action('geodir_advance_custom_fields', $field_info); ?>
892 892
 
893 893
                     <?php /*if(!in_array($field_type,array() )){?>
894 894
 				<tr>
@@ -907,10 +907,10 @@  discard block
 block discarded – undo
907 907
                 <td>&nbsp;</td>
908 908
                 <td align="left">
909 909
 
910
-                    <input type="button" class="button" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
910
+                    <input type="button" class="button" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
911 911
                            onclick="save_field('<?php echo esc_attr($result_str); ?>')"/>
912 912
                     <?php if (!$default): ?>
913
-                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
913
+                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
914 914
                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"
915 915
                                                             class="button_n"/></a>
916 916
                     <?php endif; ?>
Please login to merge, or discard this patch.
geodirectory-functions/geodir-class-session.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 // Exit if accessed directly.
3
-if (!defined( 'ABSPATH' ) ) exit;
3
+if (!defined('ABSPATH')) exit;
4 4
 
5 5
 /**
6 6
  * Geodir_Session Class.
@@ -46,36 +46,36 @@  discard block
 block discarded – undo
46 46
 	public function __construct() {
47 47
 		$this->use_php_sessions = $this->use_php_sessions();
48 48
 
49
-		if ( $this->use_php_sessions ) {
50
-			if ( is_multisite() ) {
49
+		if ($this->use_php_sessions) {
50
+			if (is_multisite()) {
51 51
 				$this->prefix = '_' . get_current_blog_id();
52 52
 			}
53 53
 
54 54
 			// Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
55
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
55
+			add_action('init', array($this, 'maybe_start_session'), -2);
56 56
 		} else {
57 57
 			// Use WP_Session (default)
58
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
59
-				define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
58
+			if (!defined('WP_SESSION_COOKIE')) {
59
+				define('WP_SESSION_COOKIE', 'geodir_wp_session');
60 60
 			}
61 61
 
62
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
62
+			if (!class_exists('Recursive_ArrayAccess')) {
63 63
 				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-recursive-arrayaccess.php';
64 64
 			}
65 65
 
66
-			if ( !class_exists( 'WP_Session' ) ) {
66
+			if (!class_exists('WP_Session')) {
67 67
 				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-wp-session.php';
68 68
 				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/wp-session.php';
69 69
 			}
70 70
 
71
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
72
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
71
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
72
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
73 73
 		}
74 74
 
75
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
76
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
75
+		if (empty($this->session) && !$this->use_php_sessions) {
76
+			add_action('plugins_loaded', array($this, 'init'), -1);
77 77
 		} else {
78
-			add_action( 'init', array( $this, 'init' ), -1 );
78
+			add_action('init', array($this, 'init'), -1);
79 79
 		}
80 80
 	}
81 81
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 * @return void
88 88
 	 */
89 89
 	public function init() {
90
-		if ( $this->use_php_sessions ) {
91
-			$this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
90
+		if ($this->use_php_sessions) {
91
+			$this->session = isset($_SESSION['gd' . $this->prefix]) && is_array($_SESSION['gd' . $this->prefix]) ? $_SESSION['gd' . $this->prefix] : array();
92 92
 		} else {
93 93
 			$this->session = WP_Session::get_instance();
94 94
 		}
@@ -115,9 +115,9 @@  discard block
 block discarded – undo
115 115
 	 * @param string $key Session key
116 116
 	 * @return string Session variable
117 117
 	 */
118
-	public function get( $key ) {
119
-		$key = sanitize_key( $key );
120
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
118
+	public function get($key) {
119
+		$key = sanitize_key($key);
120
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
121 121
 	}
122 122
 
123 123
 	/**
@@ -129,20 +129,20 @@  discard block
 block discarded – undo
129 129
 	 * @param integer $value Session variable
130 130
 	 * @return string Session variable
131 131
 	 */
132
-	public function set( $key, $value ) {
133
-		$key = sanitize_key( $key );
132
+	public function set($key, $value) {
133
+		$key = sanitize_key($key);
134 134
 
135
-		if ( is_array( $value ) ) {
136
-			$this->session[ $key ] = maybe_serialize( $value );
135
+		if (is_array($value)) {
136
+			$this->session[$key] = maybe_serialize($value);
137 137
 		} else {
138
-			$this->session[ $key ] = $value;
138
+			$this->session[$key] = $value;
139 139
 		}
140 140
 
141
-		if ( $this->use_php_sessions ) {
142
-			$_SESSION['gd' . $this->prefix ] = $this->session;
141
+		if ($this->use_php_sessions) {
142
+			$_SESSION['gd' . $this->prefix] = $this->session;
143 143
 		}
144 144
 
145
-		return $this->session[ $key ];
145
+		return $this->session[$key];
146 146
 	}
147 147
 	
148 148
 	/**
@@ -154,29 +154,29 @@  discard block
 block discarded – undo
154 154
 	 * @param integer $value Session variable.
155 155
 	 * @return string Session variable.
156 156
 	 */
157
-	public function un_set( $key ) {
158
-		if ( empty( $key ) ) {
157
+	public function un_set($key) {
158
+		if (empty($key)) {
159 159
 			return false;
160 160
 		}
161 161
 		
162
-		if ( is_array( $key ) ) {
162
+		if (is_array($key)) {
163 163
 			foreach ($key as $index) {
164
-				$index = sanitize_key( $index );
164
+				$index = sanitize_key($index);
165 165
 			
166
-				if ( $index && isset( $this->session[ $index ] ) ) {
167
-					unset( $this->session[ $index ] );
166
+				if ($index && isset($this->session[$index])) {
167
+					unset($this->session[$index]);
168 168
 				}
169 169
 			}
170 170
 		} else {
171
-			$key = sanitize_key( $key );
171
+			$key = sanitize_key($key);
172 172
 			
173
-			if ( isset( $this->session[ $key ] ) ) {
174
-				unset( $this->session[ $key ] );
173
+			if (isset($this->session[$key])) {
174
+				unset($this->session[$key]);
175 175
 			}
176 176
 		}
177 177
 
178
-		if ( $this->use_php_sessions ) {
179
-			$_SESSION['gd' . $this->prefix ] = $this->session;
178
+		if ($this->use_php_sessions) {
179
+			$_SESSION['gd' . $this->prefix] = $this->session;
180 180
 		}
181 181
 
182 182
 		return true;
@@ -191,14 +191,14 @@  discard block
 block discarded – undo
191 191
 	 * @param integer $value Session variable.
192 192
 	 * @return string Session variable.
193 193
 	 */
194
-	public function is_set( $key ) {
195
-		$key = sanitize_key( $key );
194
+	public function is_set($key) {
195
+		$key = sanitize_key($key);
196 196
 		
197
-		if ( empty( $key ) ) {
197
+		if (empty($key)) {
198 198
 			return false;
199 199
 		}
200 200
 
201
-		if ( isset( $this->session[ $key ] ) ) {
201
+		if (isset($this->session[$key])) {
202 202
 			return true;
203 203
 		}
204 204
 
@@ -213,8 +213,8 @@  discard block
 block discarded – undo
213 213
 	 * @param int $exp Default expiration (1 hour)
214 214
 	 * @return int
215 215
 	 */
216
-	public function set_expiration_variant_time( $exp ) {
217
-		return ( 30 * 60 * 23 );
216
+	public function set_expiration_variant_time($exp) {
217
+		return (30 * 60 * 23);
218 218
 	}
219 219
 
220 220
 	/**
@@ -225,8 +225,8 @@  discard block
 block discarded – undo
225 225
 	 * @param int $exp Default expiration (1 hour)
226 226
 	 * @return int
227 227
 	 */
228
-	public function set_expiration_time( $exp ) {
229
-		return ( 30 * 60 * 24 );
228
+	public function set_expiration_time($exp) {
229
+		return (30 * 60 * 24);
230 230
 	}
231 231
 
232 232
 	/**
@@ -244,18 +244,18 @@  discard block
 block discarded – undo
244 244
 		$ret = false;
245 245
 
246 246
 		// If the database variable is already set, no need to run autodetection
247
-		$geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
247
+		$geodir_use_php_sessions = (bool) get_option('geodir_use_php_sessions');
248 248
 
249
-		if (!$geodir_use_php_sessions ) {
249
+		if (!$geodir_use_php_sessions) {
250 250
 			// Attempt to detect if the server supports PHP sessions
251
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
252
-				$this->set( 'geodir_use_php_sessions', 1 );
251
+			if (function_exists('session_start') && !ini_get('safe_mode')) {
252
+				$this->set('geodir_use_php_sessions', 1);
253 253
 				
254
-				if ( $this->get( 'geodir_use_php_sessions' ) ) {
254
+				if ($this->get('geodir_use_php_sessions')) {
255 255
 					$ret = true;
256 256
 
257 257
 					// Set the database option
258
-					update_option( 'geodir_use_php_sessions', true );
258
+					update_option('geodir_use_php_sessions', true);
259 259
 				}
260 260
 			}
261 261
 		} else {
@@ -263,20 +263,20 @@  discard block
 block discarded – undo
263 263
 		}
264 264
 
265 265
 		// Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
266
-		if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
266
+		if (defined('GEODIR_USE_PHP_SESSIONS') && GEODIR_USE_PHP_SESSIONS) {
267 267
 			$ret = true;
268
-		} else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
268
+		} else if (defined('GEODIR_USE_PHP_SESSIONS') && !GEODIR_USE_PHP_SESSIONS) {
269 269
 			$ret = false;
270 270
 		}
271 271
 
272
-		return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
272
+		return (bool) apply_filters('geodir_use_php_sessions', $ret);
273 273
 	}
274 274
 
275 275
 	/**
276 276
 	 * Starts a new session if one hasn't started yet.
277 277
 	 */
278 278
 	public function maybe_start_session() {
279
-		if ( !session_id() && !headers_sent() ) {
279
+		if (!session_id() && !headers_sent()) {
280 280
 			session_start();
281 281
 		}
282 282
 	}
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 	public function use_cart_cookie() {
291 291
 		$ret = true;
292 292
 
293
-		if ( defined( 'GEODIR_USE_CART_COOKIE' ) && ! GEODIR_USE_CART_COOKIE ) {
293
+		if (defined('GEODIR_USE_CART_COOKIE') && !GEODIR_USE_CART_COOKIE) {
294 294
 			$ret = false;
295 295
 		}
296 296
 
297
-		return (bool) apply_filters( 'geodir_use_cart_cookie', $ret );
297
+		return (bool) apply_filters('geodir_use_cart_cookie', $ret);
298 298
 	}
299 299
 }
300 300
 
Please login to merge, or discard this patch.