GeoDirectory /
geodirectory
@@ -112,10 +112,11 @@ discard block |
||
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
|
| 115 | - if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) |
|
| 116 | - geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']); |
|
| 117 | - else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) |
|
| 118 | - geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']); |
|
| 115 | + if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) { |
|
| 116 | + geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']); |
|
| 117 | + } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) { |
|
| 118 | + geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']); |
|
| 119 | + } |
|
| 119 | 120 | } |
| 120 | 121 | |
| 121 | 122 | if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
|
@@ -137,12 +138,13 @@ discard block |
||
| 137 | 138 | if (current_user_can('manage_options')) {
|
| 138 | 139 | switch ($_REQUEST['geodir_autofill']): |
| 139 | 140 | case "geodir_dummy_delete" : |
| 140 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
|
| 141 | - return; |
|
| 141 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) { |
|
| 142 | + return; |
|
| 143 | + } |
|
| 142 | 144 | |
| 143 | 145 | $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : ''; |
| 144 | - if (isset($_REQUEST['posttype'])) |
|
| 145 | - /** |
|
| 146 | + if (isset($_REQUEST['posttype'])) { |
|
| 147 | + /** |
|
| 146 | 148 | * Used to delete the dummy post data per post type. |
| 147 | 149 | * |
| 148 | 150 | * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype']. |
@@ -151,11 +153,13 @@ discard block |
||
| 151 | 153 | * @param string $posttype The post type to insert. |
| 152 | 154 | * @param string $datatype The type of dummy data to insert. |
| 153 | 155 | */ |
| 154 | - do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
|
|
| 156 | + do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype); |
|
| 157 | + } |
|
| 155 | 158 | break; |
| 156 | 159 | case "geodir_dummy_insert" : |
| 157 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
|
| 158 | - return; |
|
| 160 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) { |
|
| 161 | + return; |
|
| 162 | + } |
|
| 159 | 163 | |
| 160 | 164 | global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2; |
| 161 | 165 | $city_bound_lat1 = $_REQUEST['city_bound_lat1']; |
@@ -254,8 +258,9 @@ discard block |
||
| 254 | 258 | } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
| 255 | 259 | $redirect_to = get_permalink(geodir_add_listing_page_id()); |
| 256 | 260 | $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
|
| 257 | - } else |
|
| 258 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 261 | + } else { |
|
| 262 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 263 | + } |
|
| 259 | 264 | |
| 260 | 265 | wp_redirect($redirect_to); |
| 261 | 266 | } else {
|
@@ -268,9 +273,9 @@ discard block |
||
| 268 | 273 | |
| 269 | 274 | $gd_session->un_set('listing');
|
| 270 | 275 | |
| 271 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) |
|
| 272 | - wp_redirect(get_permalink($_REQUEST['pid'])); |
|
| 273 | - else {
|
|
| 276 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) { |
|
| 277 | + wp_redirect(get_permalink($_REQUEST['pid'])); |
|
| 278 | + } else {
|
|
| 274 | 279 | geodir_remove_temp_images(); |
| 275 | 280 | wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
|
| 276 | 281 | } |
@@ -298,8 +303,9 @@ discard block |
||
| 298 | 303 | } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
| 299 | 304 | $redirect_to = get_permalink(geodir_add_listing_page_id()); |
| 300 | 305 | $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
|
| 301 | - } else |
|
| 302 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 306 | + } else { |
|
| 307 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 308 | + } |
|
| 303 | 309 | |
| 304 | 310 | $gd_session->un_set('listing');
|
| 305 | 311 | wp_redirect($redirect_to); |
@@ -320,8 +326,9 @@ discard block |
||
| 320 | 326 | $lastid = wp_delete_post($_REQUEST['pid']); |
| 321 | 327 | } |
| 322 | 328 | |
| 323 | - if ($lastid && !is_wp_error($lastid)) |
|
| 324 | - wp_redirect($_SERVER['HTTP_REFERER']); |
|
| 329 | + if ($lastid && !is_wp_error($lastid)) { |
|
| 330 | + wp_redirect($_SERVER['HTTP_REFERER']); |
|
| 331 | + } |
|
| 325 | 332 | |
| 326 | 333 | //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
|
| 327 | 334 | } |
@@ -16,22 +16,22 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | function geodir_on_wp_loaded() |
| 18 | 18 | {
|
| 19 | - /** |
|
| 20 | - * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms. |
|
| 21 | - * |
|
| 22 | - * @since 1.0.0 |
|
| 23 | - */ |
|
| 24 | - do_action('giodir_handle_request_plugins_loaded');
|
|
| 25 | - global $wpdb; |
|
| 19 | + /** |
|
| 20 | + * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms. |
|
| 21 | + * |
|
| 22 | + * @since 1.0.0 |
|
| 23 | + */ |
|
| 24 | + do_action('giodir_handle_request_plugins_loaded');
|
|
| 25 | + global $wpdb; |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
|
|
| 29 | - geodir_send_inquiry($_REQUEST); // function in custom_functions.php |
|
| 28 | + if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
|
|
| 29 | + geodir_send_inquiry($_REQUEST); // function in custom_functions.php |
|
| 30 | 30 | |
| 31 | - } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
|
|
| 32 | - geodir_send_friend($_REQUEST); // function in custom_functions.php |
|
| 31 | + } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
|
|
| 32 | + geodir_send_friend($_REQUEST); // function in custom_functions.php |
|
| 33 | 33 | |
| 34 | - } |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | 36 | } |
| 37 | 37 | |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | function geodir_on_wp() |
| 46 | 46 | {
|
| 47 | - if(geodir_is_page('login')) {
|
|
| 48 | - geodir_user_signup(); |
|
| 49 | - } |
|
| 47 | + if(geodir_is_page('login')) {
|
|
| 48 | + geodir_user_signup(); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | |
@@ -60,36 +60,36 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | function geodir_on_init() |
| 62 | 62 | {
|
| 63 | - /** |
|
| 64 | - * Called on the wp_init WP hook at the start of the geodir_on_init() function. |
|
| 65 | - * |
|
| 66 | - * @since 1.0.0 |
|
| 67 | - */ |
|
| 68 | - do_action('giodir_handle_request');
|
|
| 69 | - global $wpdb; |
|
| 63 | + /** |
|
| 64 | + * Called on the wp_init WP hook at the start of the geodir_on_init() function. |
|
| 65 | + * |
|
| 66 | + * @since 1.0.0 |
|
| 67 | + */ |
|
| 68 | + do_action('giodir_handle_request');
|
|
| 69 | + global $wpdb; |
|
| 70 | 70 | |
| 71 | 71 | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | - if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
|
|
| 75 | - show_admin_bar(false); |
|
| 76 | - } |
|
| 74 | + if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
|
|
| 75 | + show_admin_bar(false); |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | 78 | |
| 79 | - if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
|
|
| 80 | - /** |
|
| 81 | - * Contains map marker functions. |
|
| 82 | - * |
|
| 83 | - * @since 1.0.0 |
|
| 84 | - * @package GeoDirectory |
|
| 85 | - */ |
|
| 86 | - include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php'); |
|
| 87 | - die; |
|
| 88 | - } |
|
| 79 | + if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
|
|
| 80 | + /** |
|
| 81 | + * Contains map marker functions. |
|
| 82 | + * |
|
| 83 | + * @since 1.0.0 |
|
| 84 | + * @package GeoDirectory |
|
| 85 | + */ |
|
| 86 | + include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php'); |
|
| 87 | + die; |
|
| 88 | + } |
|
| 89 | 89 | |
| 90 | - if ( class_exists( 'WPSEO_Frontend' ) && !is_admin() ) {
|
|
| 91 | - add_action( 'template_redirect', 'geodir_remove_yoast_seo_metas' ); |
|
| 92 | - } |
|
| 90 | + if ( class_exists( 'WPSEO_Frontend' ) && !is_admin() ) {
|
|
| 91 | + add_action( 'template_redirect', 'geodir_remove_yoast_seo_metas' ); |
|
| 92 | + } |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | |
@@ -106,328 +106,328 @@ discard block |
||
| 106 | 106 | * @todo check if nonce is required here and if so add one. |
| 107 | 107 | */ |
| 108 | 108 | function geodir_ajax_handler() {
|
| 109 | - global $wpdb, $gd_session,$post; |
|
| 109 | + global $wpdb, $gd_session,$post; |
|
| 110 | 110 | |
| 111 | - if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
|
|
| 111 | + if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
|
|
| 112 | 112 | $gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
|
| 113 | - echo '1'; |
|
| 114 | - } |
|
| 115 | - |
|
| 116 | - if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
|
|
| 117 | - if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) |
|
| 118 | - geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']); |
|
| 119 | - else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) |
|
| 120 | - geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']); |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
|
|
| 124 | - if (current_user_can('manage_options')) {
|
|
| 125 | - /** |
|
| 126 | - * Contains admin ajax handling functions. |
|
| 127 | - * |
|
| 128 | - * @since 1.0.0 |
|
| 129 | - * @package GeoDirectory |
|
| 130 | - */ |
|
| 131 | - include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php'); |
|
| 132 | - } else {
|
|
| 133 | - wp_redirect(geodir_login_url()); |
|
| 134 | - gd_die(); |
|
| 135 | - } |
|
| 136 | - } |
|
| 137 | - |
|
| 138 | - if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
|
|
| 139 | - if (current_user_can('manage_options')) {
|
|
| 140 | - switch ($_REQUEST['geodir_autofill']): |
|
| 141 | - case "geodir_dummy_delete" : |
|
| 142 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
|
| 143 | - return; |
|
| 144 | - |
|
| 145 | - $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : ''; |
|
| 146 | - if (isset($_REQUEST['posttype'])) |
|
| 147 | - /** |
|
| 148 | - * Used to delete the dummy post data per post type. |
|
| 149 | - * |
|
| 150 | - * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype']. |
|
| 151 | - * |
|
| 152 | - * @since 1.6.11 |
|
| 153 | - * @param string $posttype The post type to insert. |
|
| 154 | - * @param string $datatype The type of dummy data to insert. |
|
| 155 | - */ |
|
| 156 | - do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
|
|
| 157 | - break; |
|
| 158 | - case "geodir_dummy_insert" : |
|
| 159 | - if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
|
| 160 | - return; |
|
| 161 | - |
|
| 162 | - global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2; |
|
| 163 | - $city_bound_lat1 = $_REQUEST['city_bound_lat1']; |
|
| 164 | - $city_bound_lng1 = $_REQUEST['city_bound_lng1']; |
|
| 165 | - $city_bound_lat2 = $_REQUEST['city_bound_lat2']; |
|
| 166 | - $city_bound_lng2 = $_REQUEST['city_bound_lng2']; |
|
| 167 | - |
|
| 168 | - if (isset($_REQUEST['posttype'])){
|
|
| 169 | - /** |
|
| 170 | - * Used to insert the dummy post data per post type. |
|
| 171 | - * |
|
| 172 | - * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype']. |
|
| 173 | - * |
|
| 174 | - * @since 1.6.11 |
|
| 175 | - * @param string $posttype The post type to insert. |
|
| 176 | - * @param string $datatype The type of dummy data to insert. |
|
| 177 | - * @param int $post_index The item number to insert. |
|
| 178 | - */ |
|
| 179 | - do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
|
|
| 180 | - } |
|
| 181 | - |
|
| 182 | - |
|
| 183 | - break; |
|
| 184 | - endswitch; |
|
| 185 | - } else {
|
|
| 186 | - wp_redirect(geodir_login_url()); |
|
| 187 | - exit(); |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - |
|
| 191 | - if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
|
|
| 192 | - |
|
| 193 | - if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
|
|
| 194 | - $template = locate_template(array("geodirectory/popup-forms.php"));
|
|
| 195 | - if (!$template) {
|
|
| 196 | - $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php'; |
|
| 197 | - } |
|
| 198 | - require_once($template); |
|
| 199 | - } |
|
| 200 | - |
|
| 201 | - gd_die(); |
|
| 202 | - } |
|
| 203 | - |
|
| 204 | - /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
|
|
| 113 | + echo '1'; |
|
| 114 | + } |
|
| 115 | + |
|
| 116 | + if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
|
|
| 117 | + if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) |
|
| 118 | + geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']); |
|
| 119 | + else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) |
|
| 120 | + geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']); |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
|
|
| 124 | + if (current_user_can('manage_options')) {
|
|
| 125 | + /** |
|
| 126 | + * Contains admin ajax handling functions. |
|
| 127 | + * |
|
| 128 | + * @since 1.0.0 |
|
| 129 | + * @package GeoDirectory |
|
| 130 | + */ |
|
| 131 | + include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php'); |
|
| 132 | + } else {
|
|
| 133 | + wp_redirect(geodir_login_url()); |
|
| 134 | + gd_die(); |
|
| 135 | + } |
|
| 136 | + } |
|
| 137 | + |
|
| 138 | + if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
|
|
| 139 | + if (current_user_can('manage_options')) {
|
|
| 140 | + switch ($_REQUEST['geodir_autofill']): |
|
| 141 | + case "geodir_dummy_delete" : |
|
| 142 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
|
| 143 | + return; |
|
| 144 | + |
|
| 145 | + $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : ''; |
|
| 146 | + if (isset($_REQUEST['posttype'])) |
|
| 147 | + /** |
|
| 148 | + * Used to delete the dummy post data per post type. |
|
| 149 | + * |
|
| 150 | + * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype']. |
|
| 151 | + * |
|
| 152 | + * @since 1.6.11 |
|
| 153 | + * @param string $posttype The post type to insert. |
|
| 154 | + * @param string $datatype The type of dummy data to insert. |
|
| 155 | + */ |
|
| 156 | + do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
|
|
| 157 | + break; |
|
| 158 | + case "geodir_dummy_insert" : |
|
| 159 | + if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
|
| 160 | + return; |
|
| 161 | + |
|
| 162 | + global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2; |
|
| 163 | + $city_bound_lat1 = $_REQUEST['city_bound_lat1']; |
|
| 164 | + $city_bound_lng1 = $_REQUEST['city_bound_lng1']; |
|
| 165 | + $city_bound_lat2 = $_REQUEST['city_bound_lat2']; |
|
| 166 | + $city_bound_lng2 = $_REQUEST['city_bound_lng2']; |
|
| 167 | + |
|
| 168 | + if (isset($_REQUEST['posttype'])){
|
|
| 169 | + /** |
|
| 170 | + * Used to insert the dummy post data per post type. |
|
| 171 | + * |
|
| 172 | + * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype']. |
|
| 173 | + * |
|
| 174 | + * @since 1.6.11 |
|
| 175 | + * @param string $posttype The post type to insert. |
|
| 176 | + * @param string $datatype The type of dummy data to insert. |
|
| 177 | + * @param int $post_index The item number to insert. |
|
| 178 | + */ |
|
| 179 | + do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
|
|
| 180 | + } |
|
| 181 | + |
|
| 182 | + |
|
| 183 | + break; |
|
| 184 | + endswitch; |
|
| 185 | + } else {
|
|
| 186 | + wp_redirect(geodir_login_url()); |
|
| 187 | + exit(); |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + |
|
| 191 | + if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
|
|
| 192 | + |
|
| 193 | + if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
|
|
| 194 | + $template = locate_template(array("geodirectory/popup-forms.php"));
|
|
| 195 | + if (!$template) {
|
|
| 196 | + $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php'; |
|
| 197 | + } |
|
| 198 | + require_once($template); |
|
| 199 | + } |
|
| 200 | + |
|
| 201 | + gd_die(); |
|
| 202 | + } |
|
| 203 | + |
|
| 204 | + /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
|
|
| 205 | 205 | include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php'); |
| 206 | 206 | }*/ |
| 207 | 207 | |
| 208 | - if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
|
|
| 209 | - /** |
|
| 210 | - * Contains map marker functions. |
|
| 211 | - * |
|
| 212 | - * @since 1.0.0 |
|
| 213 | - * @package GeoDirectory |
|
| 214 | - */ |
|
| 215 | - include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php'); |
|
| 216 | - } |
|
| 217 | - |
|
| 218 | - if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
|
|
| 219 | - if (is_user_logged_in()) {
|
|
| 220 | - switch ($_REQUEST['ajax_action']): |
|
| 221 | - case "add" : |
|
| 222 | - geodir_add_to_favorite((int)$_REQUEST['pid']); |
|
| 223 | - break; |
|
| 224 | - case "remove" : |
|
| 225 | - geodir_remove_from_favorite((int)$_REQUEST['pid']); |
|
| 226 | - break; |
|
| 227 | - endswitch; |
|
| 228 | - } else {
|
|
| 229 | - wp_redirect(geodir_login_url()); |
|
| 230 | - exit(); |
|
| 231 | - } |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
|
|
| 235 | - |
|
| 236 | - $is_current_user_owner = true; |
|
| 237 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 238 | - $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']); |
|
| 239 | - } |
|
| 240 | - |
|
| 241 | - $request = $gd_session->get('listing');
|
|
| 242 | - |
|
| 243 | - if (is_user_logged_in() && $is_current_user_owner) {
|
|
| 244 | - |
|
| 245 | - switch ($_REQUEST['ajax_action']): |
|
| 246 | - case "add": |
|
| 247 | - case "update": |
|
| 248 | - |
|
| 249 | - if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
|
|
| 250 | - $last_id = geodir_save_listing(); |
|
| 251 | - |
|
| 252 | - if ($last_id) {
|
|
| 253 | - //$redirect_to = get_permalink( $last_id ); |
|
| 254 | - $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
|
|
| 255 | - |
|
| 256 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 257 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 258 | - $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
|
|
| 259 | - } else |
|
| 260 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 261 | - |
|
| 262 | - wp_redirect($redirect_to); |
|
| 263 | - } else {
|
|
| 264 | - $gd_session->un_set('listing');
|
|
| 265 | - wp_redirect(home_url()); |
|
| 266 | - } |
|
| 267 | - |
|
| 268 | - break; |
|
| 269 | - case "cancel" : |
|
| 270 | - |
|
| 271 | - $gd_session->un_set('listing');
|
|
| 272 | - |
|
| 273 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) |
|
| 274 | - wp_redirect(get_permalink($_REQUEST['pid'])); |
|
| 275 | - else {
|
|
| 276 | - geodir_remove_temp_images(); |
|
| 277 | - wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
|
|
| 278 | - } |
|
| 279 | - |
|
| 280 | - break; |
|
| 281 | - |
|
| 282 | - case "publish" : |
|
| 283 | - |
|
| 284 | - if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
|
|
| 285 | - |
|
| 286 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 287 | - $new_post = array(); |
|
| 288 | - $new_post['ID'] = $_REQUEST['pid']; |
|
| 289 | - |
|
| 290 | - $lastid = wp_update_post($new_post); |
|
| 291 | - |
|
| 292 | - $gd_session->un_set('listing');
|
|
| 293 | - wp_redirect(get_permalink($lastid)); |
|
| 294 | - } else {
|
|
| 295 | - $last_id = geodir_save_listing(); |
|
| 296 | - |
|
| 297 | - if ($last_id) {
|
|
| 298 | - //$redirect_to = get_permalink( $last_id ); |
|
| 299 | - $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
|
|
| 300 | - } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 301 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 302 | - $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
|
|
| 303 | - } else |
|
| 304 | - $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 305 | - |
|
| 306 | - $gd_session->un_set('listing');
|
|
| 307 | - wp_redirect($redirect_to); |
|
| 308 | - } |
|
| 309 | - } else {
|
|
| 310 | - $gd_session->un_set('listing');
|
|
| 311 | - wp_redirect(home_url()); |
|
| 312 | - } |
|
| 313 | - |
|
| 314 | - break; |
|
| 315 | - case "delete" : |
|
| 316 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 317 | - global $current_user; |
|
| 318 | - |
|
| 319 | - if (get_option('geodir_disable_perm_delete')) {
|
|
| 320 | - $lastid = wp_trash_post($_REQUEST['pid']); |
|
| 321 | - } else {
|
|
| 322 | - $lastid = wp_delete_post($_REQUEST['pid']); |
|
| 323 | - } |
|
| 324 | - |
|
| 325 | - if ($lastid && !is_wp_error($lastid)) |
|
| 326 | - wp_redirect($_SERVER['HTTP_REFERER']); |
|
| 327 | - |
|
| 328 | - //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
|
|
| 329 | - } |
|
| 330 | - break; |
|
| 331 | - endswitch; |
|
| 332 | - |
|
| 333 | - $gd_session->un_set('listing');
|
|
| 334 | - } else {
|
|
| 335 | - $gd_session->un_set('listing');
|
|
| 336 | - wp_redirect(geodir_login_url()); |
|
| 337 | - exit(); |
|
| 338 | - } |
|
| 339 | - } |
|
| 340 | - |
|
| 341 | - if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
|
|
| 342 | - /** |
|
| 343 | - * Contains registration and login functions. |
|
| 344 | - * @todo Fix the file path. |
|
| 345 | - * |
|
| 346 | - * @since 1.0.0 |
|
| 347 | - * @package GeoDirectory |
|
| 348 | - */ |
|
| 349 | - include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php'); |
|
| 350 | - } |
|
| 351 | - |
|
| 352 | - if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
|
|
| 353 | - $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
|
|
| 354 | - if (!empty($_REQUEST['parent_only'])) {
|
|
| 355 | - $args['parent'] = 0; |
|
| 356 | - } |
|
| 357 | - $terms_o = get_terms($args); |
|
| 358 | - |
|
| 359 | - // Skip terms which has no listing |
|
| 360 | - if (!empty($terms_o)) {
|
|
| 361 | - $filter_terms = array(); |
|
| 362 | - |
|
| 363 | - foreach ($terms_o as $term) {
|
|
| 364 | - if (isset($term->count) && $term->count > 0) {
|
|
| 365 | - $filter_terms[] = $term; |
|
| 366 | - } |
|
| 367 | - } |
|
| 368 | - $terms_o = $filter_terms; |
|
| 369 | - } |
|
| 370 | - |
|
| 371 | - $terms = geodir_sort_terms($terms_o, 'count'); |
|
| 372 | - geodir_helper_cat_list_output($terms, intval($_REQUEST['limit'])); |
|
| 373 | - exit(); |
|
| 374 | - } |
|
| 208 | + if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
|
|
| 209 | + /** |
|
| 210 | + * Contains map marker functions. |
|
| 211 | + * |
|
| 212 | + * @since 1.0.0 |
|
| 213 | + * @package GeoDirectory |
|
| 214 | + */ |
|
| 215 | + include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php'); |
|
| 216 | + } |
|
| 217 | + |
|
| 218 | + if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
|
|
| 219 | + if (is_user_logged_in()) {
|
|
| 220 | + switch ($_REQUEST['ajax_action']): |
|
| 221 | + case "add" : |
|
| 222 | + geodir_add_to_favorite((int)$_REQUEST['pid']); |
|
| 223 | + break; |
|
| 224 | + case "remove" : |
|
| 225 | + geodir_remove_from_favorite((int)$_REQUEST['pid']); |
|
| 226 | + break; |
|
| 227 | + endswitch; |
|
| 228 | + } else {
|
|
| 229 | + wp_redirect(geodir_login_url()); |
|
| 230 | + exit(); |
|
| 231 | + } |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
|
|
| 235 | + |
|
| 236 | + $is_current_user_owner = true; |
|
| 237 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 238 | + $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']); |
|
| 239 | + } |
|
| 240 | + |
|
| 241 | + $request = $gd_session->get('listing');
|
|
| 242 | + |
|
| 243 | + if (is_user_logged_in() && $is_current_user_owner) {
|
|
| 244 | + |
|
| 245 | + switch ($_REQUEST['ajax_action']): |
|
| 246 | + case "add": |
|
| 247 | + case "update": |
|
| 248 | + |
|
| 249 | + if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
|
|
| 250 | + $last_id = geodir_save_listing(); |
|
| 251 | + |
|
| 252 | + if ($last_id) {
|
|
| 253 | + //$redirect_to = get_permalink( $last_id ); |
|
| 254 | + $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
|
|
| 255 | + |
|
| 256 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 257 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 258 | + $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
|
|
| 259 | + } else |
|
| 260 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 261 | + |
|
| 262 | + wp_redirect($redirect_to); |
|
| 263 | + } else {
|
|
| 264 | + $gd_session->un_set('listing');
|
|
| 265 | + wp_redirect(home_url()); |
|
| 266 | + } |
|
| 267 | + |
|
| 268 | + break; |
|
| 269 | + case "cancel" : |
|
| 270 | + |
|
| 271 | + $gd_session->un_set('listing');
|
|
| 272 | + |
|
| 273 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) |
|
| 274 | + wp_redirect(get_permalink($_REQUEST['pid'])); |
|
| 275 | + else {
|
|
| 276 | + geodir_remove_temp_images(); |
|
| 277 | + wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
|
|
| 278 | + } |
|
| 279 | + |
|
| 280 | + break; |
|
| 281 | + |
|
| 282 | + case "publish" : |
|
| 283 | + |
|
| 284 | + if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
|
|
| 285 | + |
|
| 286 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 287 | + $new_post = array(); |
|
| 288 | + $new_post['ID'] = $_REQUEST['pid']; |
|
| 289 | + |
|
| 290 | + $lastid = wp_update_post($new_post); |
|
| 291 | + |
|
| 292 | + $gd_session->un_set('listing');
|
|
| 293 | + wp_redirect(get_permalink($lastid)); |
|
| 294 | + } else {
|
|
| 295 | + $last_id = geodir_save_listing(); |
|
| 296 | + |
|
| 297 | + if ($last_id) {
|
|
| 298 | + //$redirect_to = get_permalink( $last_id ); |
|
| 299 | + $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
|
|
| 300 | + } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 301 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 302 | + $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
|
|
| 303 | + } else |
|
| 304 | + $redirect_to = get_permalink(geodir_add_listing_page_id()); |
|
| 305 | + |
|
| 306 | + $gd_session->un_set('listing');
|
|
| 307 | + wp_redirect($redirect_to); |
|
| 308 | + } |
|
| 309 | + } else {
|
|
| 310 | + $gd_session->un_set('listing');
|
|
| 311 | + wp_redirect(home_url()); |
|
| 312 | + } |
|
| 313 | + |
|
| 314 | + break; |
|
| 315 | + case "delete" : |
|
| 316 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 317 | + global $current_user; |
|
| 318 | + |
|
| 319 | + if (get_option('geodir_disable_perm_delete')) {
|
|
| 320 | + $lastid = wp_trash_post($_REQUEST['pid']); |
|
| 321 | + } else {
|
|
| 322 | + $lastid = wp_delete_post($_REQUEST['pid']); |
|
| 323 | + } |
|
| 324 | + |
|
| 325 | + if ($lastid && !is_wp_error($lastid)) |
|
| 326 | + wp_redirect($_SERVER['HTTP_REFERER']); |
|
| 327 | + |
|
| 328 | + //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
|
|
| 329 | + } |
|
| 330 | + break; |
|
| 331 | + endswitch; |
|
| 332 | + |
|
| 333 | + $gd_session->un_set('listing');
|
|
| 334 | + } else {
|
|
| 335 | + $gd_session->un_set('listing');
|
|
| 336 | + wp_redirect(geodir_login_url()); |
|
| 337 | + exit(); |
|
| 338 | + } |
|
| 339 | + } |
|
| 340 | + |
|
| 341 | + if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
|
|
| 342 | + /** |
|
| 343 | + * Contains registration and login functions. |
|
| 344 | + * @todo Fix the file path. |
|
| 345 | + * |
|
| 346 | + * @since 1.0.0 |
|
| 347 | + * @package GeoDirectory |
|
| 348 | + */ |
|
| 349 | + include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php'); |
|
| 350 | + } |
|
| 351 | + |
|
| 352 | + if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
|
|
| 353 | + $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
|
|
| 354 | + if (!empty($_REQUEST['parent_only'])) {
|
|
| 355 | + $args['parent'] = 0; |
|
| 356 | + } |
|
| 357 | + $terms_o = get_terms($args); |
|
| 358 | + |
|
| 359 | + // Skip terms which has no listing |
|
| 360 | + if (!empty($terms_o)) {
|
|
| 361 | + $filter_terms = array(); |
|
| 362 | + |
|
| 363 | + foreach ($terms_o as $term) {
|
|
| 364 | + if (isset($term->count) && $term->count > 0) {
|
|
| 365 | + $filter_terms[] = $term; |
|
| 366 | + } |
|
| 367 | + } |
|
| 368 | + $terms_o = $filter_terms; |
|
| 369 | + } |
|
| 370 | + |
|
| 371 | + $terms = geodir_sort_terms($terms_o, 'count'); |
|
| 372 | + geodir_helper_cat_list_output($terms, intval($_REQUEST['limit'])); |
|
| 373 | + exit(); |
|
| 374 | + } |
|
| 375 | 375 | |
| 376 | - if ( !empty($_REQUEST['geodir_ajax'] ) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml() ) {
|
|
| 377 | - if ( !empty( $_REQUEST['_nonce'] ) && wp_verify_nonce( $_REQUEST['_nonce'], 'geodir_duplicate_nonce' ) ) {
|
|
| 378 | - $json = array(); |
|
| 379 | - $json['success'] = false; |
|
| 376 | + if ( !empty($_REQUEST['geodir_ajax'] ) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml() ) {
|
|
| 377 | + if ( !empty( $_REQUEST['_nonce'] ) && wp_verify_nonce( $_REQUEST['_nonce'], 'geodir_duplicate_nonce' ) ) {
|
|
| 378 | + $json = array(); |
|
| 379 | + $json['success'] = false; |
|
| 380 | 380 | |
| 381 | - $post_id = !empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0; |
|
| 382 | - $langs = !empty( $_REQUEST['dups'] ) ? explode( ',', sanitize_text_field( $_REQUEST['dups'] ) ) : array(); |
|
| 381 | + $post_id = !empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0; |
|
| 382 | + $langs = !empty( $_REQUEST['dups'] ) ? explode( ',', sanitize_text_field( $_REQUEST['dups'] ) ) : array(); |
|
| 383 | 383 | |
| 384 | - if ( !empty( $post_id ) && !empty( $langs ) ) {
|
|
| 385 | - if ( geodir_wpml_allowed_to_duplicate( $post_id ) ) {
|
|
| 386 | - global $sitepress; |
|
| 384 | + if ( !empty( $post_id ) && !empty( $langs ) ) {
|
|
| 385 | + if ( geodir_wpml_allowed_to_duplicate( $post_id ) ) {
|
|
| 386 | + global $sitepress; |
|
| 387 | 387 | |
| 388 | - $element_type = 'post_' . get_post_type( $post_id ); |
|
| 389 | - $master_post_id = $sitepress->get_original_element_id( $post_id, $element_type ); |
|
| 388 | + $element_type = 'post_' . get_post_type( $post_id ); |
|
| 389 | + $master_post_id = $sitepress->get_original_element_id( $post_id, $element_type ); |
|
| 390 | 390 | |
| 391 | - if ( $master_post_id == $post_id ) {
|
|
| 392 | - $_REQUEST['icl_ajx_action'] = 'make_duplicates'; |
|
| 391 | + if ( $master_post_id == $post_id ) {
|
|
| 392 | + $_REQUEST['icl_ajx_action'] = 'make_duplicates'; |
|
| 393 | 393 | |
| 394 | - foreach ( $langs as $lang ) {
|
|
| 395 | - $return = $sitepress->make_duplicate( $master_post_id, $lang ); |
|
| 396 | - } |
|
| 397 | - $json['success'] = true; |
|
| 398 | - } else {
|
|
| 399 | - $json['error'] = __( 'Translation can be done from original listing only.', 'geodirectory' ); |
|
| 400 | - } |
|
| 401 | - } else {
|
|
| 402 | - $json['error'] = __( 'You are not allowed to translate this listing.', 'geodirectory' ); |
|
| 403 | - } |
|
| 404 | - } |
|
| 394 | + foreach ( $langs as $lang ) {
|
|
| 395 | + $return = $sitepress->make_duplicate( $master_post_id, $lang ); |
|
| 396 | + } |
|
| 397 | + $json['success'] = true; |
|
| 398 | + } else {
|
|
| 399 | + $json['error'] = __( 'Translation can be done from original listing only.', 'geodirectory' ); |
|
| 400 | + } |
|
| 401 | + } else {
|
|
| 402 | + $json['error'] = __( 'You are not allowed to translate this listing.', 'geodirectory' ); |
|
| 403 | + } |
|
| 404 | + } |
|
| 405 | 405 | |
| 406 | - wp_send_json( $json ); |
|
| 407 | - } |
|
| 408 | - } |
|
| 406 | + wp_send_json( $json ); |
|
| 407 | + } |
|
| 408 | + } |
|
| 409 | 409 | |
| 410 | - gd_die(); |
|
| 410 | + gd_die(); |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | |
| 414 | 414 | function geodir_show_ga_stats(){
|
| 415 | - if (isset($_REQUEST['ga_start'])) {
|
|
| 416 | - $ga_start = $_REQUEST['ga_start']; |
|
| 417 | - } else {
|
|
| 418 | - $ga_start = ''; |
|
| 419 | - } |
|
| 420 | - if (isset($_REQUEST['ga_end'])) {
|
|
| 421 | - $ga_end = $_REQUEST['ga_end']; |
|
| 422 | - } else {
|
|
| 423 | - $ga_end = ''; |
|
| 424 | - } |
|
| 425 | - try {
|
|
| 426 | - geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end); |
|
| 427 | - } catch (Exception $e) {
|
|
| 428 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 429 | - } |
|
| 430 | - die; |
|
| 415 | + if (isset($_REQUEST['ga_start'])) {
|
|
| 416 | + $ga_start = $_REQUEST['ga_start']; |
|
| 417 | + } else {
|
|
| 418 | + $ga_start = ''; |
|
| 419 | + } |
|
| 420 | + if (isset($_REQUEST['ga_end'])) {
|
|
| 421 | + $ga_end = $_REQUEST['ga_end']; |
|
| 422 | + } else {
|
|
| 423 | + $ga_end = ''; |
|
| 424 | + } |
|
| 425 | + try {
|
|
| 426 | + geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end); |
|
| 427 | + } catch (Exception $e) {
|
|
| 428 | + geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 429 | + } |
|
| 430 | + die; |
|
| 431 | 431 | } |
| 432 | 432 | add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' ); |
| 433 | 433 | add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' ); |
| 434 | 434 | \ No newline at end of file |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | function geodir_on_wp() |
| 46 | 46 | {
|
| 47 | - if(geodir_is_page('login')) {
|
|
| 47 | + if (geodir_is_page('login')) {
|
|
| 48 | 48 | geodir_user_signup(); |
| 49 | 49 | } |
| 50 | 50 | |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | * @since 1.0.0 |
| 84 | 84 | * @package GeoDirectory |
| 85 | 85 | */ |
| 86 | - include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php'); |
|
| 86 | + include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php'); |
|
| 87 | 87 | die; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - if ( class_exists( 'WPSEO_Frontend' ) && !is_admin() ) {
|
|
| 91 | - add_action( 'template_redirect', 'geodir_remove_yoast_seo_metas' ); |
|
| 90 | + if (class_exists('WPSEO_Frontend') && !is_admin()) {
|
|
| 91 | + add_action('template_redirect', 'geodir_remove_yoast_seo_metas');
|
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | * @todo check if nonce is required here and if so add one. |
| 107 | 107 | */ |
| 108 | 108 | function geodir_ajax_handler() {
|
| 109 | - global $wpdb, $gd_session,$post; |
|
| 109 | + global $wpdb, $gd_session, $post; |
|
| 110 | 110 | |
| 111 | 111 | if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
|
| 112 | 112 | $gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
|
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @since 1.0.0 |
| 129 | 129 | * @package GeoDirectory |
| 130 | 130 | */ |
| 131 | - include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php'); |
|
| 131 | + include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php'); |
|
| 132 | 132 | } else {
|
| 133 | 133 | wp_redirect(geodir_login_url()); |
| 134 | 134 | gd_die(); |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * @param string $posttype The post type to insert. |
| 154 | 154 | * @param string $datatype The type of dummy data to insert. |
| 155 | 155 | */ |
| 156 | - do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
|
|
| 156 | + do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), $datatype);
|
|
| 157 | 157 | break; |
| 158 | 158 | case "geodir_dummy_insert" : |
| 159 | 159 | if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $city_bound_lat2 = $_REQUEST['city_bound_lat2']; |
| 166 | 166 | $city_bound_lng2 = $_REQUEST['city_bound_lng2']; |
| 167 | 167 | |
| 168 | - if (isset($_REQUEST['posttype'])){
|
|
| 168 | + if (isset($_REQUEST['posttype'])) {
|
|
| 169 | 169 | /** |
| 170 | 170 | * Used to insert the dummy post data per post type. |
| 171 | 171 | * |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | * @param string $datatype The type of dummy data to insert. |
| 177 | 177 | * @param int $post_index The item number to insert. |
| 178 | 178 | */ |
| 179 | - do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
|
|
| 179 | + do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));
|
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
|
| 194 | 194 | $template = locate_template(array("geodirectory/popup-forms.php"));
|
| 195 | 195 | if (!$template) {
|
| 196 | - $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php'; |
|
| 196 | + $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php'; |
|
| 197 | 197 | } |
| 198 | 198 | require_once($template); |
| 199 | 199 | } |
@@ -212,17 +212,17 @@ discard block |
||
| 212 | 212 | * @since 1.0.0 |
| 213 | 213 | * @package GeoDirectory |
| 214 | 214 | */ |
| 215 | - include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php'); |
|
| 215 | + include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php'); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
|
| 219 | 219 | if (is_user_logged_in()) {
|
| 220 | 220 | switch ($_REQUEST['ajax_action']): |
| 221 | 221 | case "add" : |
| 222 | - geodir_add_to_favorite((int)$_REQUEST['pid']); |
|
| 222 | + geodir_add_to_favorite((int) $_REQUEST['pid']); |
|
| 223 | 223 | break; |
| 224 | 224 | case "remove" : |
| 225 | - geodir_remove_from_favorite((int)$_REQUEST['pid']); |
|
| 225 | + geodir_remove_from_favorite((int) $_REQUEST['pid']); |
|
| 226 | 226 | break; |
| 227 | 227 | endswitch; |
| 228 | 228 | } else {
|
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | |
| 236 | 236 | $is_current_user_owner = true; |
| 237 | 237 | if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
| 238 | - $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']); |
|
| 238 | + $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | $request = $gd_session->get('listing');
|
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | * @since 1.0.0 |
| 347 | 347 | * @package GeoDirectory |
| 348 | 348 | */ |
| 349 | - include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php'); |
|
| 349 | + include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php'); |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
|
@@ -373,37 +373,37 @@ discard block |
||
| 373 | 373 | exit(); |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | - if ( !empty($_REQUEST['geodir_ajax'] ) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml() ) {
|
|
| 377 | - if ( !empty( $_REQUEST['_nonce'] ) && wp_verify_nonce( $_REQUEST['_nonce'], 'geodir_duplicate_nonce' ) ) {
|
|
| 376 | + if (!empty($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'duplicate' && geodir_is_wpml()) {
|
|
| 377 | + if (!empty($_REQUEST['_nonce']) && wp_verify_nonce($_REQUEST['_nonce'], 'geodir_duplicate_nonce')) {
|
|
| 378 | 378 | $json = array(); |
| 379 | 379 | $json['success'] = false; |
| 380 | 380 | |
| 381 | - $post_id = !empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0; |
|
| 382 | - $langs = !empty( $_REQUEST['dups'] ) ? explode( ',', sanitize_text_field( $_REQUEST['dups'] ) ) : array(); |
|
| 381 | + $post_id = !empty($_REQUEST['post_id']) ? absint($_REQUEST['post_id']) : 0; |
|
| 382 | + $langs = !empty($_REQUEST['dups']) ? explode(',', sanitize_text_field($_REQUEST['dups'])) : array();
|
|
| 383 | 383 | |
| 384 | - if ( !empty( $post_id ) && !empty( $langs ) ) {
|
|
| 385 | - if ( geodir_wpml_allowed_to_duplicate( $post_id ) ) {
|
|
| 384 | + if (!empty($post_id) && !empty($langs)) {
|
|
| 385 | + if (geodir_wpml_allowed_to_duplicate($post_id)) {
|
|
| 386 | 386 | global $sitepress; |
| 387 | 387 | |
| 388 | - $element_type = 'post_' . get_post_type( $post_id ); |
|
| 389 | - $master_post_id = $sitepress->get_original_element_id( $post_id, $element_type ); |
|
| 388 | + $element_type = 'post_'.get_post_type($post_id); |
|
| 389 | + $master_post_id = $sitepress->get_original_element_id($post_id, $element_type); |
|
| 390 | 390 | |
| 391 | - if ( $master_post_id == $post_id ) {
|
|
| 391 | + if ($master_post_id == $post_id) {
|
|
| 392 | 392 | $_REQUEST['icl_ajx_action'] = 'make_duplicates'; |
| 393 | 393 | |
| 394 | - foreach ( $langs as $lang ) {
|
|
| 395 | - $return = $sitepress->make_duplicate( $master_post_id, $lang ); |
|
| 394 | + foreach ($langs as $lang) {
|
|
| 395 | + $return = $sitepress->make_duplicate($master_post_id, $lang); |
|
| 396 | 396 | } |
| 397 | 397 | $json['success'] = true; |
| 398 | 398 | } else {
|
| 399 | - $json['error'] = __( 'Translation can be done from original listing only.', 'geodirectory' ); |
|
| 399 | + $json['error'] = __('Translation can be done from original listing only.', 'geodirectory');
|
|
| 400 | 400 | } |
| 401 | 401 | } else {
|
| 402 | - $json['error'] = __( 'You are not allowed to translate this listing.', 'geodirectory' ); |
|
| 402 | + $json['error'] = __('You are not allowed to translate this listing.', 'geodirectory');
|
|
| 403 | 403 | } |
| 404 | 404 | } |
| 405 | 405 | |
| 406 | - wp_send_json( $json ); |
|
| 406 | + wp_send_json($json); |
|
| 407 | 407 | } |
| 408 | 408 | } |
| 409 | 409 | |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | |
| 414 | -function geodir_show_ga_stats(){
|
|
| 414 | +function geodir_show_ga_stats() {
|
|
| 415 | 415 | if (isset($_REQUEST['ga_start'])) {
|
| 416 | 416 | $ga_start = $_REQUEST['ga_start']; |
| 417 | 417 | } else {
|
@@ -425,9 +425,9 @@ discard block |
||
| 425 | 425 | try {
|
| 426 | 426 | geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end); |
| 427 | 427 | } catch (Exception $e) {
|
| 428 | - geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) ); |
|
| 428 | + geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
|
|
| 429 | 429 | } |
| 430 | 430 | die; |
| 431 | 431 | } |
| 432 | -add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' ); |
|
| 433 | -add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' ); |
|
| 434 | 432 | \ No newline at end of file |
| 433 | +add_action('wp_ajax_gdga', 'geodir_show_ga_stats');
|
|
| 434 | +add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats'); |
|
| 435 | 435 | \ No newline at end of file |
@@ -86,8 +86,9 @@ discard block |
||
| 86 | 86 | add_filter('query_vars', 'geodir_add_location_var');
|
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | -if (get_option('permalink_structure') != '')
|
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 89 | +if (get_option('permalink_structure') != '') { |
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core'); |
|
| 91 | +} |
|
| 91 | 92 | |
| 92 | 93 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 94 | |
@@ -420,8 +421,9 @@ discard block |
||
| 420 | 421 | */ |
| 421 | 422 | do_action('geodir_after_social_sharing_buttons');
|
| 422 | 423 | $content_html = ob_get_clean(); |
| 423 | - if (trim($content_html) != '') |
|
| 424 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 424 | + if (trim($content_html) != '') { |
|
| 425 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 426 | + } |
|
| 425 | 427 | if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
| 426 | 428 | /** |
| 427 | 429 | * Filter the geodir_social_sharing_buttons() function content. |
@@ -477,8 +479,9 @@ discard block |
||
| 477 | 479 | */ |
| 478 | 480 | do_action('geodir_after_edit_post_link');
|
| 479 | 481 | $content_html = ob_get_clean(); |
| 480 | - if (trim($content_html) != '') |
|
| 481 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 482 | + if (trim($content_html) != '') { |
|
| 483 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 484 | + } |
|
| 482 | 485 | if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
| 483 | 486 | /** |
| 484 | 487 | * Filter the geodir_edit_post_link() function content. |
@@ -1052,8 +1055,9 @@ discard block |
||
| 1052 | 1055 | */ |
| 1053 | 1056 | do_action('geodir_after_google_analytics');
|
| 1054 | 1057 | $content_html = ob_get_clean(); |
| 1055 | - if (trim($content_html) != '') |
|
| 1056 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1058 | + if (trim($content_html) != '') { |
|
| 1059 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1060 | + } |
|
| 1057 | 1061 | if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
| 1058 | 1062 | /** |
| 1059 | 1063 | * Filter the geodir_edit_post_link() function content. |
@@ -1190,8 +1194,9 @@ discard block |
||
| 1190 | 1194 | do_action('geodir_after_detail_page_more_info');
|
| 1191 | 1195 | |
| 1192 | 1196 | $content_html = ob_get_clean(); |
| 1193 | - if (trim($content_html) != '') |
|
| 1194 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1197 | + if (trim($content_html) != '') { |
|
| 1198 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1199 | + } |
|
| 1195 | 1200 | if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
| 1196 | 1201 | /** |
| 1197 | 1202 | * Filter the output html for function geodir_detail_page_more_info(). |
@@ -1311,8 +1316,9 @@ discard block |
||
| 1311 | 1316 | $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
| 1312 | 1317 | |
| 1313 | 1318 | foreach ($arr_alert_msg as $key => $value) {
|
| 1314 | - if (!is_scalar($value)) |
|
| 1315 | - continue; |
|
| 1319 | + if (!is_scalar($value)) { |
|
| 1320 | + continue; |
|
| 1321 | + } |
|
| 1316 | 1322 | $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
| 1317 | 1323 | } |
| 1318 | 1324 | |
@@ -1368,17 +1374,19 @@ discard block |
||
| 1368 | 1374 | global $geodir_sidebars; |
| 1369 | 1375 | global $sidebars_widgets; |
| 1370 | 1376 | |
| 1371 | - if (!is_array($sidebars_widgets)) |
|
| 1372 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1377 | + if (!is_array($sidebars_widgets)) { |
|
| 1378 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1379 | + } |
|
| 1373 | 1380 | $geodir_old_sidebars = array(); |
| 1374 | 1381 | |
| 1375 | 1382 | if (is_array($geodir_sidebars)) {
|
| 1376 | 1383 | foreach ($geodir_sidebars as $val) {
|
| 1377 | 1384 | if (is_array($sidebars_widgets)) {
|
| 1378 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1379 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1380 | - else |
|
| 1381 | - $geodir_old_sidebars[$val] = array(); |
|
| 1385 | + if (array_key_exists($val, $sidebars_widgets)) { |
|
| 1386 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1387 | + } else { |
|
| 1388 | + $geodir_old_sidebars[$val] = array(); |
|
| 1389 | + } |
|
| 1382 | 1390 | } |
| 1383 | 1391 | } |
| 1384 | 1392 | } |
@@ -1399,16 +1407,19 @@ discard block |
||
| 1399 | 1407 | {
|
| 1400 | 1408 | global $sidebars_widgets; |
| 1401 | 1409 | |
| 1402 | - if (!is_array($sidebars_widgets)) |
|
| 1403 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1410 | + if (!is_array($sidebars_widgets)) { |
|
| 1411 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1412 | + } |
|
| 1404 | 1413 | |
| 1405 | 1414 | if (is_array($sidebars_widgets)) {
|
| 1406 | 1415 | $geodir_old_sidebars = get_option('geodir_sidebars');
|
| 1407 | 1416 | if (is_array($geodir_old_sidebars)) {
|
| 1408 | 1417 | foreach ($geodir_old_sidebars as $key => $val) {
|
| 1409 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1418 | + if(0 === strpos($key, 'geodir_')) { |
|
| 1419 | + // if gd widget |
|
| 1410 | 1420 | {
|
| 1411 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1421 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1422 | + } |
|
| 1412 | 1423 | } |
| 1413 | 1424 | |
| 1414 | 1425 | |
@@ -1544,20 +1555,25 @@ discard block |
||
| 1544 | 1555 | } |
| 1545 | 1556 | } |
| 1546 | 1557 | |
| 1547 | - if ($tab == 'post_info') |
|
| 1548 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1558 | + if ($tab == 'post_info') { |
|
| 1559 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1560 | + } |
|
| 1549 | 1561 | |
| 1550 | - if ($tab == 'post_images') |
|
| 1551 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1562 | + if ($tab == 'post_images') { |
|
| 1563 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1564 | + } |
|
| 1552 | 1565 | |
| 1553 | - if ($tab == 'post_video') |
|
| 1554 | - $is_display = (!empty($video)) ? true : false; |
|
| 1566 | + if ($tab == 'post_video') { |
|
| 1567 | + $is_display = (!empty($video)) ? true : false; |
|
| 1568 | + } |
|
| 1555 | 1569 | |
| 1556 | - if ($tab == 'special_offers') |
|
| 1557 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1570 | + if ($tab == 'special_offers') { |
|
| 1571 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1572 | + } |
|
| 1558 | 1573 | |
| 1559 | - if ($tab == 'reviews') |
|
| 1560 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1574 | + if ($tab == 'reviews') { |
|
| 1575 | + $is_display = (geodir_is_page('detail')) ? true : false; |
|
| 1576 | + } |
|
| 1561 | 1577 | |
| 1562 | 1578 | if ($tab == 'related_listing') {
|
| 1563 | 1579 | $message = __('No listings found which match your selection.', 'geodirectory');
|
@@ -1791,11 +1807,13 @@ discard block |
||
| 1791 | 1807 | $region_slug = $default_location->region_slug; |
| 1792 | 1808 | $city_slug = $default_location->city_slug; |
| 1793 | 1809 | |
| 1794 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1795 | - return $slug_exists = true; |
|
| 1810 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) { |
|
| 1811 | + return $slug_exists = true; |
|
| 1812 | + } |
|
| 1796 | 1813 | |
| 1797 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1798 | - return $slug_exists = true; |
|
| 1814 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id)))) { |
|
| 1815 | + return $slug_exists = true; |
|
| 1816 | + } |
|
| 1799 | 1817 | |
| 1800 | 1818 | return $slug_exists; |
| 1801 | 1819 | } |
@@ -1837,40 +1855,31 @@ discard block |
||
| 1837 | 1855 | if(geodir_is_page('home')){
|
| 1838 | 1856 | $gd_page = 'home'; |
| 1839 | 1857 | $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
| 1840 | - } |
|
| 1841 | - elseif(geodir_is_page('detail')){
|
|
| 1858 | + } elseif(geodir_is_page('detail')){
|
|
| 1842 | 1859 | $gd_page = 'detail'; |
| 1843 | 1860 | $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
| 1844 | - } |
|
| 1845 | - elseif(geodir_is_page('pt')){
|
|
| 1861 | + } elseif(geodir_is_page('pt')){
|
|
| 1846 | 1862 | $gd_page = 'pt'; |
| 1847 | 1863 | $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
| 1848 | - } |
|
| 1849 | - elseif(geodir_is_page('listing')){
|
|
| 1864 | + } elseif(geodir_is_page('listing')){
|
|
| 1850 | 1865 | $gd_page = 'listing'; |
| 1851 | 1866 | $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
| 1852 | - } |
|
| 1853 | - elseif(geodir_is_page('location')){
|
|
| 1867 | + } elseif(geodir_is_page('location')){
|
|
| 1854 | 1868 | $gd_page = 'location'; |
| 1855 | 1869 | $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
| 1856 | - } |
|
| 1857 | - elseif(geodir_is_page('search')){
|
|
| 1870 | + } elseif(geodir_is_page('search')){
|
|
| 1858 | 1871 | $gd_page = 'search'; |
| 1859 | 1872 | $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
| 1860 | - } |
|
| 1861 | - elseif(geodir_is_page('add-listing')){
|
|
| 1873 | + } elseif(geodir_is_page('add-listing')){
|
|
| 1862 | 1874 | $gd_page = 'add-listing'; |
| 1863 | 1875 | $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
| 1864 | - } |
|
| 1865 | - elseif(geodir_is_page('author')){
|
|
| 1876 | + } elseif(geodir_is_page('author')){
|
|
| 1866 | 1877 | $gd_page = 'author'; |
| 1867 | 1878 | $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
| 1868 | - } |
|
| 1869 | - elseif(geodir_is_page('login')){
|
|
| 1879 | + } elseif(geodir_is_page('login')){
|
|
| 1870 | 1880 | $gd_page = 'login'; |
| 1871 | 1881 | $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
| 1872 | - } |
|
| 1873 | - elseif(geodir_is_page('listing-success')){
|
|
| 1882 | + } elseif(geodir_is_page('listing-success')){
|
|
| 1874 | 1883 | $gd_page = 'listing-success'; |
| 1875 | 1884 | $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
| 1876 | 1885 | } |
@@ -1948,11 +1957,13 @@ discard block |
||
| 1948 | 1957 | |
| 1949 | 1958 | if (!get_option('geodir_remove_url_seperator')) {
|
| 1950 | 1959 | |
| 1951 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1952 | - delete_option('geodir_listingurl_separator');
|
|
| 1960 | + if (get_option('geodir_listingurl_separator')) { |
|
| 1961 | + delete_option('geodir_listingurl_separator'); |
|
| 1962 | + } |
|
| 1953 | 1963 | |
| 1954 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1955 | - delete_option('geodir_detailurl_separator');
|
|
| 1964 | + if (get_option('geodir_detailurl_separator')) { |
|
| 1965 | + delete_option('geodir_detailurl_separator'); |
|
| 1966 | + } |
|
| 1956 | 1967 | |
| 1957 | 1968 | flush_rewrite_rules(false); |
| 1958 | 1969 | |
@@ -1976,8 +1987,9 @@ discard block |
||
| 1976 | 1987 | {
|
| 1977 | 1988 | foreach ($permalink_arr as $key => $value) {
|
| 1978 | 1989 | |
| 1979 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1980 | - unset($permalink_arr[$key]); |
|
| 1990 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') { |
|
| 1991 | + unset($permalink_arr[$key]); |
|
| 1992 | + } |
|
| 1981 | 1993 | |
| 1982 | 1994 | } |
| 1983 | 1995 | |
@@ -2112,16 +2124,18 @@ discard block |
||
| 2112 | 2124 | |
| 2113 | 2125 | $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
| 2114 | 2126 | |
| 2115 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2116 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2127 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') { |
|
| 2128 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2129 | + } |
|
| 2117 | 2130 | } |
| 2118 | 2131 | |
| 2119 | 2132 | if (array_key_exists('special_offers', $tabs_arr)) {
|
| 2120 | 2133 | |
| 2121 | 2134 | $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
| 2122 | 2135 | |
| 2123 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2124 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2136 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') { |
|
| 2137 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2138 | + } |
|
| 2125 | 2139 | } |
| 2126 | 2140 | |
| 2127 | 2141 | } |
@@ -2176,8 +2190,9 @@ discard block |
||
| 2176 | 2190 | |
| 2177 | 2191 | $all_postypes = geodir_get_posttypes(); |
| 2178 | 2192 | |
| 2179 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2180 | - return false; |
|
| 2193 | + if (!in_array($post_type, $all_postypes) || !is_admin()) { |
|
| 2194 | + return false; |
|
| 2195 | + } |
|
| 2181 | 2196 | |
| 2182 | 2197 | $uploads = wp_upload_dir(); |
| 2183 | 2198 | |
@@ -2251,8 +2266,9 @@ discard block |
||
| 2251 | 2266 | $file_info = pathinfo($attach->file); |
| 2252 | 2267 | |
| 2253 | 2268 | $sub_dir = ''; |
| 2254 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2255 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2269 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') { |
|
| 2270 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2271 | + } |
|
| 2256 | 2272 | |
| 2257 | 2273 | $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
| 2258 | 2274 | $uploads_path = $uploads['basedir']; |
@@ -2273,8 +2289,9 @@ discard block |
||
| 2273 | 2289 | |
| 2274 | 2290 | if (!empty($attachment_data)) {
|
| 2275 | 2291 | |
| 2276 | - if ($attachment_data->ID) |
|
| 2277 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2292 | + if ($attachment_data->ID) { |
|
| 2293 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID); |
|
| 2294 | + } |
|
| 2278 | 2295 | |
| 2279 | 2296 | } else {
|
| 2280 | 2297 | |
@@ -2470,7 +2487,7 @@ discard block |
||
| 2470 | 2487 | $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
| 2471 | 2488 | $variables_array['value'] = ''; |
| 2472 | 2489 | $variables_array['value'] = $post->{$type['htmlvar_name']};
|
| 2473 | - }else{
|
|
| 2490 | + } else{
|
|
| 2474 | 2491 | $i = 0; |
| 2475 | 2492 | $fieldset_count++; |
| 2476 | 2493 | $field_set_start = 1; |
@@ -2171,7 +2171,7 @@ discard block |
||
| 2171 | 2171 | * @global object $wpdb WordPress Database object. |
| 2172 | 2172 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 2173 | 2173 | * @param int $attachment_id Attachment ID. |
| 2174 | - * @return bool|void Returns false on failure. |
|
| 2174 | + * @return false|null Returns false on failure. |
|
| 2175 | 2175 | */ |
| 2176 | 2176 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2177 | 2177 | {
|
@@ -2344,6 +2344,7 @@ discard block |
||
| 2344 | 2344 | * @global object $wpdb WordPress Database object. |
| 2345 | 2345 | * @global object $current_user Current user object. |
| 2346 | 2346 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 2347 | + * @param string $user_id |
|
| 2347 | 2348 | * @return array User listing count for each post type. |
| 2348 | 2349 | */ |
| 2349 | 2350 | function geodir_user_post_listing_count($user_id=null) |
@@ -2680,7 +2681,7 @@ discard block |
||
| 2680 | 2681 | * @since 1.6.16 |
| 2681 | 2682 | * @package GeoDirectory |
| 2682 | 2683 | * @param array $classes The class array of the HTML element. |
| 2683 | - * @return array Modified class array. |
|
| 2684 | + * @return string[] Modified class array. |
|
| 2684 | 2685 | */ |
| 2685 | 2686 | function geodir_body_class_active_map($classes = array()) {
|
| 2686 | 2687 | $classes[] = 'gd-map-' . geodir_map_name(); |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function geodir_get_ajax_url() |
| 21 | 21 | {
|
| 22 | - return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 22 | + return admin_url('admin-ajax.php?action=geodir_ajax_action');
|
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | ///////////////////// |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | add_filter('query_vars', 'geodir_add_geodir_page_var');
|
| 88 | 88 | add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8
|
| 89 | 89 | if (get_option('permalink_structure') != '')
|
| 90 | - add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 90 | + add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
|
|
| 91 | 91 | |
| 92 | 92 | add_filter('parse_query', 'geodir_modified_query');
|
| 93 | 93 | |
@@ -154,14 +154,14 @@ discard block |
||
| 154 | 154 | /* POST AND LOOP ACTIONS */ |
| 155 | 155 | //////////////////////// |
| 156 | 156 | if (!is_admin()) {
|
| 157 | - add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | - add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | - /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | - add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | - add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | - add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | - add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | - add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 157 | + add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtual page from everywhere
|
|
| 158 | + add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);
|
|
| 159 | + /** Exclude Virtual Pages From Pages List **/ |
|
| 160 | + add_action('pre_get_posts', 'set_listing_request', 0);
|
|
| 161 | + add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);
|
|
| 162 | + add_filter('excerpt_more', 'geodir_excerpt_more', 1000);
|
|
| 163 | + add_filter('excerpt_length', 'geodir_excerpt_length', 1000);
|
|
| 164 | + add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter
|
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_unset_prev_theme_nav_location($newname) |
| 225 | 225 | {
|
| 226 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | - if ($geodir_theme_location) {
|
|
| 228 | - update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | - } else {
|
|
| 230 | - update_option('geodir_theme_location_nav', '');
|
|
| 231 | - } |
|
| 226 | + $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 227 | + if ($geodir_theme_location) {
|
|
| 228 | + update_option('geodir_theme_location_nav', $geodir_theme_location);
|
|
| 229 | + } else {
|
|
| 230 | + update_option('geodir_theme_location_nav', '');
|
|
| 231 | + } |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /// add action for theme switch to blank previous theme navigation location setting |
@@ -249,32 +249,32 @@ discard block |
||
| 249 | 249 | */ |
| 250 | 250 | function geodir_add_post_filters() |
| 251 | 251 | {
|
| 252 | - /** |
|
| 253 | - * Contains all function for filtering listing. |
|
| 254 | - * |
|
| 255 | - * @since 1.0.0 |
|
| 256 | - * @package GeoDirectory |
|
| 257 | - */ |
|
| 258 | - include_once('geodirectory-functions/listing_filters.php');
|
|
| 252 | + /** |
|
| 253 | + * Contains all function for filtering listing. |
|
| 254 | + * |
|
| 255 | + * @since 1.0.0 |
|
| 256 | + * @package GeoDirectory |
|
| 257 | + */ |
|
| 258 | + include_once('geodirectory-functions/listing_filters.php');
|
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | |
| 262 | 262 | if (!function_exists('geodir_init_defaults')) {
|
| 263 | - /** |
|
| 264 | - * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 265 | - * |
|
| 266 | - * @since 1.0.0 |
|
| 267 | - * @package GeoDirectory |
|
| 268 | - */ |
|
| 269 | - function geodir_init_defaults() |
|
| 270 | - {
|
|
| 271 | - if (function_exists('geodir_register_defaults')) {
|
|
| 263 | + /** |
|
| 264 | + * Calls the function to register the GeoDirectory default CPT and taxonomies. |
|
| 265 | + * |
|
| 266 | + * @since 1.0.0 |
|
| 267 | + * @package GeoDirectory |
|
| 268 | + */ |
|
| 269 | + function geodir_init_defaults() |
|
| 270 | + {
|
|
| 271 | + if (function_exists('geodir_register_defaults')) {
|
|
| 272 | 272 | |
| 273 | - geodir_register_defaults(); |
|
| 273 | + geodir_register_defaults(); |
|
| 274 | 274 | |
| 275 | - } |
|
| 275 | + } |
|
| 276 | 276 | |
| 277 | - } |
|
| 277 | + } |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | |
@@ -296,26 +296,26 @@ discard block |
||
| 296 | 296 | // CALLED ON 'sidebars_widgets' FILTER |
| 297 | 297 | |
| 298 | 298 | if (!function_exists('geodir_restrict_widget')) {
|
| 299 | - /** |
|
| 300 | - * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 301 | - * |
|
| 302 | - * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 303 | - * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 304 | - * @since 1.0.0 |
|
| 305 | - * @package GeoDirectory |
|
| 306 | - */ |
|
| 307 | - function geodir_restrict_widget() |
|
| 308 | - {
|
|
| 309 | - global $is_listing, $is_single_place; |
|
| 299 | + /** |
|
| 300 | + * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page. |
|
| 301 | + * |
|
| 302 | + * @global bool $is_listing Sets the global value to true if on a GD category page. False if not. |
|
| 303 | + * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not. |
|
| 304 | + * @since 1.0.0 |
|
| 305 | + * @package GeoDirectory |
|
| 306 | + */ |
|
| 307 | + function geodir_restrict_widget() |
|
| 308 | + {
|
|
| 309 | + global $is_listing, $is_single_place; |
|
| 310 | 310 | |
| 311 | - // set is listing |
|
| 312 | - (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 311 | + // set is listing |
|
| 312 | + (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;
|
|
| 313 | 313 | |
| 314 | - // set is single place |
|
| 315 | - (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 314 | + // set is single place |
|
| 315 | + (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;
|
|
| 316 | 316 | |
| 317 | 317 | |
| 318 | - } |
|
| 318 | + } |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | |
@@ -336,31 +336,31 @@ discard block |
||
| 336 | 336 | */ |
| 337 | 337 | function geodir_detail_page_sidebar_content_sorting() |
| 338 | 338 | {
|
| 339 | - $arr_detail_page_sidebar_content = |
|
| 340 | - /** |
|
| 341 | - * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 342 | - * |
|
| 343 | - * This filter can be used to remove sections of the details page sidebar, |
|
| 344 | - * add new sections or rearrange the order of the sections. |
|
| 345 | - * |
|
| 346 | - * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 347 | - * @since 1.0.0 |
|
| 348 | - */ |
|
| 349 | - apply_filters('geodir_detail_page_sidebar_content',
|
|
| 350 | - array('geodir_social_sharing_buttons',
|
|
| 351 | - 'geodir_detail_page_google_analytics', |
|
| 352 | - 'geodir_edit_post_link', |
|
| 353 | - 'geodir_detail_page_review_rating', |
|
| 354 | - 'geodir_detail_page_more_info' |
|
| 355 | - ) // end of array |
|
| 356 | - ); // end of apply filter |
|
| 357 | - if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 358 | - foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 359 | - if (function_exists($content_function)) {
|
|
| 360 | - add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 361 | - } |
|
| 362 | - } |
|
| 363 | - } |
|
| 339 | + $arr_detail_page_sidebar_content = |
|
| 340 | + /** |
|
| 341 | + * An array of functions to be called to be displayed on the details (post) page sidebar. |
|
| 342 | + * |
|
| 343 | + * This filter can be used to remove sections of the details page sidebar, |
|
| 344 | + * add new sections or rearrange the order of the sections. |
|
| 345 | + * |
|
| 346 | + * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.
|
|
| 347 | + * @since 1.0.0 |
|
| 348 | + */ |
|
| 349 | + apply_filters('geodir_detail_page_sidebar_content',
|
|
| 350 | + array('geodir_social_sharing_buttons',
|
|
| 351 | + 'geodir_detail_page_google_analytics', |
|
| 352 | + 'geodir_edit_post_link', |
|
| 353 | + 'geodir_detail_page_review_rating', |
|
| 354 | + 'geodir_detail_page_more_info' |
|
| 355 | + ) // end of array |
|
| 356 | + ); // end of apply filter |
|
| 357 | + if (!empty($arr_detail_page_sidebar_content)) {
|
|
| 358 | + foreach ($arr_detail_page_sidebar_content as $content_function) {
|
|
| 359 | + if (function_exists($content_function)) {
|
|
| 360 | + add_action('geodir_detail_page_sidebar', $content_function);
|
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | + } |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);
|
@@ -375,14 +375,14 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | function geodir_add_to_favourite_link() |
| 377 | 377 | {
|
| 378 | - global $post, $preview; |
|
| 379 | - if (!$preview && geodir_is_page('detail')) {
|
|
| 380 | - ?> |
|
| 378 | + global $post, $preview; |
|
| 379 | + if (!$preview && geodir_is_page('detail')) {
|
|
| 380 | + ?> |
|
| 381 | 381 | <p class="edit_link"> |
| 382 | 382 | <?php geodir_favourite_html($post->post_author, $post->ID); ?> |
| 383 | 383 | </p> |
| 384 | 384 | <?php |
| 385 | - } |
|
| 385 | + } |
|
| 386 | 386 | } |
| 387 | 387 | |
| 388 | 388 | /** |
@@ -396,41 +396,41 @@ discard block |
||
| 396 | 396 | */ |
| 397 | 397 | function geodir_social_sharing_buttons() |
| 398 | 398 | {
|
| 399 | - global $preview; |
|
| 400 | - ob_start(); // Start buffering; |
|
| 401 | - /** |
|
| 402 | - * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 403 | - * |
|
| 404 | - * @since 1.0.0 |
|
| 405 | - */ |
|
| 406 | - do_action('geodir_before_social_sharing_buttons');
|
|
| 407 | - if (!$preview) {
|
|
| 408 | - ?> |
|
| 399 | + global $preview; |
|
| 400 | + ob_start(); // Start buffering; |
|
| 401 | + /** |
|
| 402 | + * This action is called before the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 403 | + * |
|
| 404 | + * @since 1.0.0 |
|
| 405 | + */ |
|
| 406 | + do_action('geodir_before_social_sharing_buttons');
|
|
| 407 | + if (!$preview) {
|
|
| 408 | + ?> |
|
| 409 | 409 | <div class="likethis"> |
| 410 | 410 | <?php geodir_twitter_tweet_button(); ?> |
| 411 | 411 | <?php geodir_fb_like_button(); ?> |
| 412 | 412 | <?php geodir_google_plus_button(); ?> |
| 413 | 413 | </div> |
| 414 | 414 | <?php |
| 415 | - }// end of if, if its a preview or not |
|
| 416 | - |
|
| 417 | - /** |
|
| 418 | - * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 419 | - * |
|
| 420 | - * @since 1.0.0 |
|
| 421 | - */ |
|
| 422 | - do_action('geodir_after_social_sharing_buttons');
|
|
| 423 | - $content_html = ob_get_clean(); |
|
| 424 | - if (trim($content_html) != '') |
|
| 425 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 426 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 427 | - /** |
|
| 428 | - * Filter the geodir_social_sharing_buttons() function content. |
|
| 429 | - * |
|
| 430 | - * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 431 | - */ |
|
| 432 | - echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 433 | - } |
|
| 415 | + }// end of if, if its a preview or not |
|
| 416 | + |
|
| 417 | + /** |
|
| 418 | + * This action is called after the social buttons twitter,facebook and google plus are output in a containing div. |
|
| 419 | + * |
|
| 420 | + * @since 1.0.0 |
|
| 421 | + */ |
|
| 422 | + do_action('geodir_after_social_sharing_buttons');
|
|
| 423 | + $content_html = ob_get_clean(); |
|
| 424 | + if (trim($content_html) != '') |
|
| 425 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 426 | + if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 427 | + /** |
|
| 428 | + * Filter the geodir_social_sharing_buttons() function content. |
|
| 429 | + * |
|
| 430 | + * @param string $content_html The output html of the geodir_social_sharing_buttons() function. |
|
| 431 | + */ |
|
| 432 | + echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);
|
|
| 433 | + } |
|
| 434 | 434 | |
| 435 | 435 | |
| 436 | 436 | } |
@@ -448,46 +448,46 @@ discard block |
||
| 448 | 448 | */ |
| 449 | 449 | function geodir_edit_post_link() |
| 450 | 450 | {
|
| 451 | - global $post, $preview; |
|
| 452 | - ob_start(); // Start buffering; |
|
| 453 | - /** |
|
| 454 | - * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 455 | - * |
|
| 456 | - * @since 1.0.0 |
|
| 457 | - */ |
|
| 458 | - do_action('geodir_before_edit_post_link');
|
|
| 459 | - if (!$preview) {
|
|
| 460 | - $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 451 | + global $post, $preview; |
|
| 452 | + ob_start(); // Start buffering; |
|
| 453 | + /** |
|
| 454 | + * This is called before the edit post link html in the function geodir_edit_post_link() |
|
| 455 | + * |
|
| 456 | + * @since 1.0.0 |
|
| 457 | + */ |
|
| 458 | + do_action('geodir_before_edit_post_link');
|
|
| 459 | + if (!$preview) {
|
|
| 460 | + $is_current_user_owner = geodir_listing_belong_to_current_user(); |
|
| 461 | 461 | |
| 462 | - if ($is_current_user_owner) {
|
|
| 463 | - $post_id = $post->ID; |
|
| 462 | + if ($is_current_user_owner) {
|
|
| 463 | + $post_id = $post->ID; |
|
| 464 | 464 | |
| 465 | - if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 466 | - $post_id = (int)$_REQUEST['pid']; |
|
| 467 | - } |
|
| 465 | + if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
|
| 466 | + $post_id = (int)$_REQUEST['pid']; |
|
| 467 | + } |
|
| 468 | 468 | |
| 469 | - $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 470 | - $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 471 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 472 | - } |
|
| 473 | - }// end of if, if its a preview or not |
|
| 474 | - /** |
|
| 475 | - * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 476 | - * |
|
| 477 | - * @since 1.0.0 |
|
| 478 | - */ |
|
| 479 | - do_action('geodir_after_edit_post_link');
|
|
| 480 | - $content_html = ob_get_clean(); |
|
| 481 | - if (trim($content_html) != '') |
|
| 482 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 483 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 484 | - /** |
|
| 485 | - * Filter the geodir_edit_post_link() function content. |
|
| 486 | - * |
|
| 487 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 488 | - */ |
|
| 489 | - echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 490 | - } |
|
| 469 | + $postlink = get_permalink(geodir_add_listing_page_id()); |
|
| 470 | + $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
|
| 471 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 472 | + } |
|
| 473 | + }// end of if, if its a preview or not |
|
| 474 | + /** |
|
| 475 | + * This is called after the edit post link html in the function geodir_edit_post_link() |
|
| 476 | + * |
|
| 477 | + * @since 1.0.0 |
|
| 478 | + */ |
|
| 479 | + do_action('geodir_after_edit_post_link');
|
|
| 480 | + $content_html = ob_get_clean(); |
|
| 481 | + if (trim($content_html) != '') |
|
| 482 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 483 | + if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 484 | + /** |
|
| 485 | + * Filter the geodir_edit_post_link() function content. |
|
| 486 | + * |
|
| 487 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 488 | + */ |
|
| 489 | + echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);
|
|
| 490 | + } |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | /** |
@@ -501,42 +501,42 @@ discard block |
||
| 501 | 501 | */ |
| 502 | 502 | function geodir_detail_page_google_analytics() |
| 503 | 503 | {
|
| 504 | - global $post,$preview; |
|
| 505 | - if($preview){return '';}
|
|
| 506 | - $package_info = array(); |
|
| 507 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 504 | + global $post,$preview; |
|
| 505 | + if($preview){return '';}
|
|
| 506 | + $package_info = array(); |
|
| 507 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 508 | 508 | |
| 509 | - $id = trim(get_option('geodir_ga_account_id'));
|
|
| 509 | + $id = trim(get_option('geodir_ga_account_id'));
|
|
| 510 | 510 | |
| 511 | - if (!$id) {
|
|
| 512 | - return; //if no Google Analytics ID then bail. |
|
| 513 | - } |
|
| 511 | + if (!$id) {
|
|
| 512 | + return; //if no Google Analytics ID then bail. |
|
| 513 | + } |
|
| 514 | 514 | |
| 515 | - ob_start(); // Start buffering; |
|
| 516 | - /** |
|
| 517 | - * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 518 | - * |
|
| 519 | - * @since 1.0.0 |
|
| 520 | - */ |
|
| 521 | - do_action('geodir_before_google_analytics');
|
|
| 515 | + ob_start(); // Start buffering; |
|
| 516 | + /** |
|
| 517 | + * This is called before the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 518 | + * |
|
| 519 | + * @since 1.0.0 |
|
| 520 | + */ |
|
| 521 | + do_action('geodir_before_google_analytics');
|
|
| 522 | 522 | |
| 523 | - $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 524 | - /** |
|
| 525 | - * Filter the time interval to check & refresh new users results. |
|
| 526 | - * |
|
| 527 | - * @since 1.5.9 |
|
| 528 | - * |
|
| 529 | - * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 530 | - */ |
|
| 531 | - $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 532 | - $refresh_time = absint($refresh_time * 1000); |
|
| 523 | + $refresh_time = get_option('geodir_ga_refresh_time', 5);
|
|
| 524 | + /** |
|
| 525 | + * Filter the time interval to check & refresh new users results. |
|
| 526 | + * |
|
| 527 | + * @since 1.5.9 |
|
| 528 | + * |
|
| 529 | + * @param int $refresh_time Time interval to check & refresh new users results. |
|
| 530 | + */ |
|
| 531 | + $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);
|
|
| 532 | + $refresh_time = absint($refresh_time * 1000); |
|
| 533 | 533 | |
| 534 | - $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 534 | + $hide_refresh = get_option('geodir_ga_auto_refresh');
|
|
| 535 | 535 | |
| 536 | - $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 537 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 538 | - $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 539 | - ?> |
|
| 536 | + $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
|
| 537 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 538 | + $page_url = urlencode($_SERVER['REQUEST_URI']); |
|
| 539 | + ?> |
|
| 540 | 540 | <script type="text/javascript"> |
| 541 | 541 | var gd_gaTimeOut; |
| 542 | 542 | var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
@@ -788,15 +788,15 @@ discard block |
||
| 788 | 788 | var labels = results[1].rows.map(function(row) { return +row[0]; });
|
| 789 | 789 | |
| 790 | 790 | <?php |
| 791 | - // Here we list the shorthand days of the week so it can be used in translation. |
|
| 792 | - __("Mon",'geodirectory');
|
|
| 793 | - __("Tue",'geodirectory');
|
|
| 794 | - __("Wed",'geodirectory');
|
|
| 795 | - __("Thu",'geodirectory');
|
|
| 796 | - __("Fri",'geodirectory');
|
|
| 797 | - __("Sat",'geodirectory');
|
|
| 798 | - __("Sun",'geodirectory');
|
|
| 799 | - ?> |
|
| 791 | + // Here we list the shorthand days of the week so it can be used in translation. |
|
| 792 | + __("Mon",'geodirectory');
|
|
| 793 | + __("Tue",'geodirectory');
|
|
| 794 | + __("Wed",'geodirectory');
|
|
| 795 | + __("Thu",'geodirectory');
|
|
| 796 | + __("Fri",'geodirectory');
|
|
| 797 | + __("Sat",'geodirectory');
|
|
| 798 | + __("Sun",'geodirectory');
|
|
| 799 | + ?> |
|
| 800 | 800 | |
| 801 | 801 | labels = [ |
| 802 | 802 | "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
@@ -1045,24 +1045,24 @@ discard block |
||
| 1045 | 1045 | </span> |
| 1046 | 1046 | |
| 1047 | 1047 | <?php |
| 1048 | - } |
|
| 1049 | - /** |
|
| 1050 | - * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1051 | - * |
|
| 1052 | - * @since 1.0.0 |
|
| 1053 | - */ |
|
| 1054 | - do_action('geodir_after_google_analytics');
|
|
| 1055 | - $content_html = ob_get_clean(); |
|
| 1056 | - if (trim($content_html) != '') |
|
| 1057 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1058 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1059 | - /** |
|
| 1060 | - * Filter the geodir_edit_post_link() function content. |
|
| 1061 | - * |
|
| 1062 | - * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1063 | - */ |
|
| 1064 | - echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1065 | - } |
|
| 1048 | + } |
|
| 1049 | + /** |
|
| 1050 | + * This is called after the edit post link html in the function geodir_detail_page_google_analytics() |
|
| 1051 | + * |
|
| 1052 | + * @since 1.0.0 |
|
| 1053 | + */ |
|
| 1054 | + do_action('geodir_after_google_analytics');
|
|
| 1055 | + $content_html = ob_get_clean(); |
|
| 1056 | + if (trim($content_html) != '') |
|
| 1057 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1058 | + if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1059 | + /** |
|
| 1060 | + * Filter the geodir_edit_post_link() function content. |
|
| 1061 | + * |
|
| 1062 | + * @param string $content_html The output html of the geodir_edit_post_link() function. |
|
| 1063 | + */ |
|
| 1064 | + echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);
|
|
| 1065 | + } |
|
| 1066 | 1066 | } |
| 1067 | 1067 | |
| 1068 | 1068 | /** |
@@ -1079,94 +1079,94 @@ discard block |
||
| 1079 | 1079 | */ |
| 1080 | 1080 | function geodir_detail_page_review_rating() |
| 1081 | 1081 | {
|
| 1082 | - global $post, $preview, $post_images; |
|
| 1082 | + global $post, $preview, $post_images; |
|
| 1083 | 1083 | |
| 1084 | - if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1085 | - return; |
|
| 1086 | - } |
|
| 1087 | - ob_start(); // Start buffering; |
|
| 1088 | - /** |
|
| 1089 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1090 | - * |
|
| 1091 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1092 | - * |
|
| 1093 | - * @since 1.0.0 |
|
| 1094 | - */ |
|
| 1095 | - do_action('geodir_before_detail_page_review_rating');
|
|
| 1096 | - |
|
| 1097 | - $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1098 | - $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1099 | - |
|
| 1100 | - if ($post_avgratings != 0 && !$preview) {
|
|
| 1101 | - /** |
|
| 1102 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1103 | - * |
|
| 1104 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1105 | - * |
|
| 1106 | - * @since 1.0.0 |
|
| 1107 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1108 | - * @param int $post->ID Current post ID. |
|
| 1109 | - */ |
|
| 1110 | - do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1111 | - |
|
| 1112 | - $html = '<p style=" float:left;">'; |
|
| 1113 | - $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1114 | - $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1115 | - $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1084 | + if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1085 | + return; |
|
| 1086 | + } |
|
| 1087 | + ob_start(); // Start buffering; |
|
| 1088 | + /** |
|
| 1089 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1090 | + * |
|
| 1091 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1092 | + * |
|
| 1093 | + * @since 1.0.0 |
|
| 1094 | + */ |
|
| 1095 | + do_action('geodir_before_detail_page_review_rating');
|
|
| 1096 | + |
|
| 1097 | + $comment_count = geodir_get_review_count_total($post->ID); |
|
| 1098 | + $post_avgratings = geodir_get_post_rating($post->ID); |
|
| 1099 | + |
|
| 1100 | + if ($post_avgratings != 0 && !$preview) {
|
|
| 1101 | + /** |
|
| 1102 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1103 | + * |
|
| 1104 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1105 | + * |
|
| 1106 | + * @since 1.0.0 |
|
| 1107 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1108 | + * @param int $post->ID Current post ID. |
|
| 1109 | + */ |
|
| 1110 | + do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1111 | + |
|
| 1112 | + $html = '<p style=" float:left;">'; |
|
| 1113 | + $html .= geodir_get_rating_stars($post_avgratings, $post->ID); |
|
| 1114 | + $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">'; |
|
| 1115 | + $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings; |
|
| 1116 | 1116 | |
| 1117 | 1117 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1118 | 1118 | |
| 1119 | 1119 | $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
| 1120 | 1120 | |
| 1121 | - $html .= '<span class="item">'; |
|
| 1122 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1121 | + $html .= '<span class="item">'; |
|
| 1122 | + $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1123 | 1123 | |
| 1124 | - if ($post_images) {
|
|
| 1125 | - foreach ($post_images as $img) {
|
|
| 1126 | - $post_img = $img->src; |
|
| 1127 | - break; |
|
| 1128 | - } |
|
| 1129 | - } |
|
| 1130 | - |
|
| 1131 | - if (isset($post_img) && $post_img) {
|
|
| 1132 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1133 | - } |
|
| 1134 | - |
|
| 1135 | - $html .= '</span>'; |
|
| 1136 | - |
|
| 1137 | - echo $html .= '</div>'; |
|
| 1138 | - /** |
|
| 1139 | - * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1140 | - * |
|
| 1141 | - * This is called inside the check for an actual rating and the check for preview page. |
|
| 1142 | - * |
|
| 1143 | - * @since 1.0.0 |
|
| 1144 | - * @param float $post_avgratings Average rating for the current post. |
|
| 1145 | - * @param int $post->ID Current post ID. |
|
| 1146 | - */ |
|
| 1147 | - do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1148 | - } |
|
| 1149 | - /** |
|
| 1150 | - * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1151 | - * |
|
| 1152 | - * This is called outside the check for an actual rating and the check for preview page. |
|
| 1153 | - * |
|
| 1154 | - * @since 1.0.0 |
|
| 1155 | - */ |
|
| 1156 | - do_action('geodir_after_detail_page_review_rating');
|
|
| 1157 | - $content_html = ob_get_clean(); |
|
| 1158 | - if (trim($content_html) != '') {
|
|
| 1159 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1160 | - } |
|
| 1161 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1162 | - /** |
|
| 1163 | - * Filter the geodir_detail_page_review_rating() function content. |
|
| 1164 | - * |
|
| 1165 | - * @since 1.0.0 |
|
| 1166 | - * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1167 | - */ |
|
| 1168 | - echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1169 | - } |
|
| 1124 | + if ($post_images) {
|
|
| 1125 | + foreach ($post_images as $img) {
|
|
| 1126 | + $post_img = $img->src; |
|
| 1127 | + break; |
|
| 1128 | + } |
|
| 1129 | + } |
|
| 1130 | + |
|
| 1131 | + if (isset($post_img) && $post_img) {
|
|
| 1132 | + $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1133 | + } |
|
| 1134 | + |
|
| 1135 | + $html .= '</span>'; |
|
| 1136 | + |
|
| 1137 | + echo $html .= '</div>'; |
|
| 1138 | + /** |
|
| 1139 | + * This is called after the rating html in the function geodir_detail_page_review_rating(). |
|
| 1140 | + * |
|
| 1141 | + * This is called inside the check for an actual rating and the check for preview page. |
|
| 1142 | + * |
|
| 1143 | + * @since 1.0.0 |
|
| 1144 | + * @param float $post_avgratings Average rating for the current post. |
|
| 1145 | + * @param int $post->ID Current post ID. |
|
| 1146 | + */ |
|
| 1147 | + do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);
|
|
| 1148 | + } |
|
| 1149 | + /** |
|
| 1150 | + * This is called before the rating html in the function geodir_detail_page_review_rating(). |
|
| 1151 | + * |
|
| 1152 | + * This is called outside the check for an actual rating and the check for preview page. |
|
| 1153 | + * |
|
| 1154 | + * @since 1.0.0 |
|
| 1155 | + */ |
|
| 1156 | + do_action('geodir_after_detail_page_review_rating');
|
|
| 1157 | + $content_html = ob_get_clean(); |
|
| 1158 | + if (trim($content_html) != '') {
|
|
| 1159 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1160 | + } |
|
| 1161 | + if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1162 | + /** |
|
| 1163 | + * Filter the geodir_detail_page_review_rating() function content. |
|
| 1164 | + * |
|
| 1165 | + * @since 1.0.0 |
|
| 1166 | + * @param string $content_html The output html of the geodir_detail_page_review_rating() function. |
|
| 1167 | + */ |
|
| 1168 | + echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);
|
|
| 1169 | + } |
|
| 1170 | 1170 | } |
| 1171 | 1171 | |
| 1172 | 1172 | /** |
@@ -1178,35 +1178,35 @@ discard block |
||
| 1178 | 1178 | */ |
| 1179 | 1179 | function geodir_detail_page_more_info() |
| 1180 | 1180 | {
|
| 1181 | - ob_start(); // Start buffering; |
|
| 1182 | - /** |
|
| 1183 | - * This is called before the info section html. |
|
| 1184 | - * |
|
| 1185 | - * @since 1.0.0 |
|
| 1186 | - */ |
|
| 1187 | - do_action('geodir_before_detail_page_more_info');
|
|
| 1188 | - if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1189 | - echo $geodir_post_detail_fields; |
|
| 1190 | - } |
|
| 1191 | - /** |
|
| 1192 | - * This is called after the info section html. |
|
| 1193 | - * |
|
| 1194 | - * @since 1.0.0 |
|
| 1195 | - */ |
|
| 1196 | - do_action('geodir_after_detail_page_more_info');
|
|
| 1197 | - |
|
| 1198 | - $content_html = ob_get_clean(); |
|
| 1199 | - if (trim($content_html) != '') |
|
| 1200 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1201 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1202 | - /** |
|
| 1203 | - * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1204 | - * |
|
| 1205 | - * @since 1.0.0 |
|
| 1206 | - * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1207 | - */ |
|
| 1208 | - echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1209 | - } |
|
| 1181 | + ob_start(); // Start buffering; |
|
| 1182 | + /** |
|
| 1183 | + * This is called before the info section html. |
|
| 1184 | + * |
|
| 1185 | + * @since 1.0.0 |
|
| 1186 | + */ |
|
| 1187 | + do_action('geodir_before_detail_page_more_info');
|
|
| 1188 | + if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {
|
|
| 1189 | + echo $geodir_post_detail_fields; |
|
| 1190 | + } |
|
| 1191 | + /** |
|
| 1192 | + * This is called after the info section html. |
|
| 1193 | + * |
|
| 1194 | + * @since 1.0.0 |
|
| 1195 | + */ |
|
| 1196 | + do_action('geodir_after_detail_page_more_info');
|
|
| 1197 | + |
|
| 1198 | + $content_html = ob_get_clean(); |
|
| 1199 | + if (trim($content_html) != '') |
|
| 1200 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1201 | + if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1202 | + /** |
|
| 1203 | + * Filter the output html for function geodir_detail_page_more_info(). |
|
| 1204 | + * |
|
| 1205 | + * @since 1.0.0 |
|
| 1206 | + * @param string $content_html The output html of the geodir_detail_page_more_info() function. |
|
| 1207 | + */ |
|
| 1208 | + echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);
|
|
| 1209 | + } |
|
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | 1212 | |
@@ -1220,15 +1220,15 @@ discard block |
||
| 1220 | 1220 | */ |
| 1221 | 1221 | function geodir_localize_all_js_msg() |
| 1222 | 1222 | {// check_ajax_referer function is used to make sure no files are uploaded remotely but it will fail if used between https and non https so we do the check below of the urls
|
| 1223 | - if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1225 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1226 | - $ajax_url = admin_url('admin-ajax.php');
|
|
| 1227 | - } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1228 | - $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1229 | - } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1230 | - $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1231 | - } |
|
| 1223 | + if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1224 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1225 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1226 | + $ajax_url = admin_url('admin-ajax.php');
|
|
| 1227 | + } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
|
|
| 1228 | + $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
|
|
| 1229 | + } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
|
|
| 1230 | + $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
|
|
| 1231 | + } |
|
| 1232 | 1232 | |
| 1233 | 1233 | /** |
| 1234 | 1234 | * Filter the allowed image type extensions for post images. |
@@ -1238,60 +1238,60 @@ discard block |
||
| 1238 | 1238 | */ |
| 1239 | 1239 | $allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));
|
| 1240 | 1240 | |
| 1241 | - $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1242 | - $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1243 | - $default_marker_width = $default_marker_size['w']; |
|
| 1244 | - $default_marker_height = $default_marker_size['h']; |
|
| 1241 | + $default_marker_icon = get_option('geodir_default_marker_icon');
|
|
| 1242 | + $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));
|
|
| 1243 | + $default_marker_width = $default_marker_size['w']; |
|
| 1244 | + $default_marker_height = $default_marker_size['h']; |
|
| 1245 | 1245 | |
| 1246 | - $arr_alert_msg = array( |
|
| 1247 | - 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1248 | - 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1249 | - 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1250 | - 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1251 | - 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1252 | - 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1253 | - //start not show alert msg |
|
| 1254 | - 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1255 | - 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1256 | - 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1257 | - 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1258 | - 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1259 | - // end not show alert msg |
|
| 1260 | - 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1261 | - 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1262 | - //start not show alert msg |
|
| 1263 | - 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1264 | - 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1265 | - 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1266 | - 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1267 | - 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1268 | - 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1269 | - 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1270 | - 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1271 | - 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1272 | - 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1273 | - 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1274 | - 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1275 | - 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1276 | - 'geodir_default_marker_w' => $default_marker_width, |
|
| 1277 | - 'geodir_default_marker_h' => $default_marker_height, |
|
| 1278 | - 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1279 | - 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1280 | - 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1281 | - 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1282 | - 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1283 | - 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1284 | - 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1285 | - 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1286 | - /* on/off dragging for phone devices */ |
|
| 1287 | - 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1288 | - 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1289 | - 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1290 | - 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1291 | - 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1292 | - 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1293 | - 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1294 | - 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1246 | + $arr_alert_msg = array( |
|
| 1247 | + 'geodir_plugin_url' => geodir_plugin_url(), |
|
| 1248 | + 'geodir_admin_ajax_url' => $ajax_url, |
|
| 1249 | + 'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),
|
|
| 1250 | + 'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),
|
|
| 1251 | + 'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),
|
|
| 1252 | + 'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),
|
|
| 1253 | + //start not show alert msg |
|
| 1254 | + 'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),
|
|
| 1255 | + 'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),
|
|
| 1256 | + 'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),
|
|
| 1257 | + 'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),
|
|
| 1258 | + 'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),
|
|
| 1259 | + // end not show alert msg |
|
| 1260 | + 'my_place_listing_del' => __('Are you sure you wish to delete this listing?', 'geodirectory'),
|
|
| 1261 | + 'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),
|
|
| 1262 | + //start not show alert msg |
|
| 1263 | + 'rating_error_msg' => __('Error : please retry', 'geodirectory'),
|
|
| 1264 | + 'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),
|
|
| 1265 | + 'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),
|
|
| 1266 | + 'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),
|
|
| 1267 | + 'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),
|
|
| 1268 | + 'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),
|
|
| 1269 | + 'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),
|
|
| 1270 | + 'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),
|
|
| 1271 | + 'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),
|
|
| 1272 | + 'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),
|
|
| 1273 | + 'geodir_field_id_required' => __('This field is required.', 'geodirectory'),
|
|
| 1274 | + 'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),
|
|
| 1275 | + 'geodir_default_marker_icon' => $default_marker_icon, |
|
| 1276 | + 'geodir_default_marker_w' => $default_marker_width, |
|
| 1277 | + 'geodir_default_marker_h' => $default_marker_height, |
|
| 1278 | + 'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG, |
|
| 1279 | + 'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG, |
|
| 1280 | + 'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),
|
|
| 1281 | + 'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),
|
|
| 1282 | + 'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),
|
|
| 1283 | + 'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),
|
|
| 1284 | + 'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),
|
|
| 1285 | + 'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),
|
|
| 1286 | + /* on/off dragging for phone devices */ |
|
| 1287 | + 'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,
|
|
| 1288 | + 'geodir_is_mobile' => wp_is_mobile() ? true : false, |
|
| 1289 | + 'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),
|
|
| 1290 | + 'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),
|
|
| 1291 | + 'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),
|
|
| 1292 | + 'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),
|
|
| 1293 | + 'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),
|
|
| 1294 | + 'geodir_action_remove' => __('Remove', 'geodirectory'),
|
|
| 1295 | 1295 | 'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),
|
| 1296 | 1296 | 'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),
|
| 1297 | 1297 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
@@ -1299,40 +1299,40 @@ discard block |
||
| 1299 | 1299 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1300 | 1300 | 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
| 1301 | 1301 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1302 | - 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1303 | - 'geodir_map_name' => geodir_map_name(), |
|
| 1304 | - 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1305 | - 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1306 | - 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1307 | - 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1308 | - 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1309 | - 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1310 | - 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1311 | - 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1312 | - 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1313 | - 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1314 | - ); |
|
| 1315 | - |
|
| 1316 | - /** |
|
| 1317 | - * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1318 | - * |
|
| 1319 | - * With this filter you can add, remove or change translated JS strings. |
|
| 1320 | - * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1321 | - * |
|
| 1322 | - * @since 1.0.0 |
|
| 1323 | - */ |
|
| 1324 | - $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1325 | - |
|
| 1326 | - foreach ($arr_alert_msg as $key => $value) {
|
|
| 1327 | - if (!is_scalar($value)) |
|
| 1328 | - continue; |
|
| 1329 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1330 | - } |
|
| 1302 | + 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
|
| 1303 | + 'geodir_map_name' => geodir_map_name(), |
|
| 1304 | + 'osmStart' => __('Start', 'geodirectory'),
|
|
| 1305 | + 'osmVia' => __('Via {viaNumber}', 'geodirectory'),
|
|
| 1306 | + 'osmEnd' => __('Enter Your Location', 'geodirectory'),
|
|
| 1307 | + 'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),
|
|
| 1308 | + 'geoMyLocation' => __('My Location', 'geodirectory'),
|
|
| 1309 | + 'geoErrUNKNOWN_ERROR' => addslashes(__('Unable to find your location', 'geodirectory')),
|
|
| 1310 | + 'geoErrPERMISSION_DENINED' => addslashes(__('Permission denied in finding your location', 'geodirectory')),
|
|
| 1311 | + 'geoErrPOSITION_UNAVAILABLE' => addslashes(__('Your location is currently unknown', 'geodirectory')),
|
|
| 1312 | + 'geoErrBREAK' => addslashes(__('Attempt to find location took too long', 'geodirectory')),
|
|
| 1313 | + 'geoErrDEFAULT' => addslashes(__('Location detection not supported in browser', 'geodirectory')),
|
|
| 1314 | + ); |
|
| 1315 | + |
|
| 1316 | + /** |
|
| 1317 | + * Filters the translated JS strings from function geodir_localize_all_js_msg(). |
|
| 1318 | + * |
|
| 1319 | + * With this filter you can add, remove or change translated JS strings. |
|
| 1320 | + * You should add your own translations to this if you are building an addon rather than adding another script block. |
|
| 1321 | + * |
|
| 1322 | + * @since 1.0.0 |
|
| 1323 | + */ |
|
| 1324 | + $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);
|
|
| 1331 | 1325 | |
| 1332 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1333 | - echo '<script>'; |
|
| 1334 | - echo $script; |
|
| 1335 | - echo '</script>'; |
|
| 1326 | + foreach ($arr_alert_msg as $key => $value) {
|
|
| 1327 | + if (!is_scalar($value)) |
|
| 1328 | + continue; |
|
| 1329 | + $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1330 | + } |
|
| 1331 | + |
|
| 1332 | + $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1333 | + echo '<script>'; |
|
| 1334 | + echo $script; |
|
| 1335 | + echo '</script>'; |
|
| 1336 | 1336 | } |
| 1337 | 1337 | |
| 1338 | 1338 | add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);
|
@@ -1348,11 +1348,11 @@ discard block |
||
| 1348 | 1348 | */ |
| 1349 | 1349 | function geodir_admin_bar_site_menu($wp_admin_bar) |
| 1350 | 1350 | {
|
| 1351 | - if (get_option("geodir_installed")) {
|
|
| 1352 | - if (current_user_can('manage_options')) {
|
|
| 1353 | - $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1354 | - } |
|
| 1355 | - } |
|
| 1351 | + if (get_option("geodir_installed")) {
|
|
| 1352 | + if (current_user_can('manage_options')) {
|
|
| 1353 | + $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));
|
|
| 1354 | + } |
|
| 1355 | + } |
|
| 1356 | 1356 | } |
| 1357 | 1357 | |
| 1358 | 1358 | add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/
|
@@ -1378,25 +1378,25 @@ discard block |
||
| 1378 | 1378 | */ |
| 1379 | 1379 | function geodir_store_sidebars() |
| 1380 | 1380 | {
|
| 1381 | - global $geodir_sidebars; |
|
| 1382 | - global $sidebars_widgets; |
|
| 1383 | - |
|
| 1384 | - if (!is_array($sidebars_widgets)) |
|
| 1385 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1386 | - $geodir_old_sidebars = array(); |
|
| 1387 | - |
|
| 1388 | - if (is_array($geodir_sidebars)) {
|
|
| 1389 | - foreach ($geodir_sidebars as $val) {
|
|
| 1390 | - if (is_array($sidebars_widgets)) {
|
|
| 1391 | - if (array_key_exists($val, $sidebars_widgets)) |
|
| 1392 | - $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1393 | - else |
|
| 1394 | - $geodir_old_sidebars[$val] = array(); |
|
| 1395 | - } |
|
| 1396 | - } |
|
| 1397 | - } |
|
| 1398 | - update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1399 | - geodir_option_version_backup('geodir_sidebars');
|
|
| 1381 | + global $geodir_sidebars; |
|
| 1382 | + global $sidebars_widgets; |
|
| 1383 | + |
|
| 1384 | + if (!is_array($sidebars_widgets)) |
|
| 1385 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1386 | + $geodir_old_sidebars = array(); |
|
| 1387 | + |
|
| 1388 | + if (is_array($geodir_sidebars)) {
|
|
| 1389 | + foreach ($geodir_sidebars as $val) {
|
|
| 1390 | + if (is_array($sidebars_widgets)) {
|
|
| 1391 | + if (array_key_exists($val, $sidebars_widgets)) |
|
| 1392 | + $geodir_old_sidebars[$val] = $sidebars_widgets[$val]; |
|
| 1393 | + else |
|
| 1394 | + $geodir_old_sidebars[$val] = array(); |
|
| 1395 | + } |
|
| 1396 | + } |
|
| 1397 | + } |
|
| 1398 | + update_option('geodir_sidebars', $geodir_old_sidebars);
|
|
| 1399 | + geodir_option_version_backup('geodir_sidebars');
|
|
| 1400 | 1400 | |
| 1401 | 1401 | } |
| 1402 | 1402 | |
@@ -1410,28 +1410,28 @@ discard block |
||
| 1410 | 1410 | */ |
| 1411 | 1411 | function geodir_restore_sidebars() |
| 1412 | 1412 | {
|
| 1413 | - global $sidebars_widgets; |
|
| 1414 | - |
|
| 1415 | - if (!is_array($sidebars_widgets)) |
|
| 1416 | - $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1417 | - |
|
| 1418 | - if (is_array($sidebars_widgets)) {
|
|
| 1419 | - $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1420 | - if (is_array($geodir_old_sidebars)) {
|
|
| 1421 | - foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1422 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1423 | - {
|
|
| 1424 | - $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1425 | - } |
|
| 1413 | + global $sidebars_widgets; |
|
| 1426 | 1414 | |
| 1415 | + if (!is_array($sidebars_widgets)) |
|
| 1416 | + $sidebars_widgets = wp_get_sidebars_widgets(); |
|
| 1427 | 1417 | |
| 1428 | - } |
|
| 1429 | - } |
|
| 1418 | + if (is_array($sidebars_widgets)) {
|
|
| 1419 | + $geodir_old_sidebars = get_option('geodir_sidebars');
|
|
| 1420 | + if (is_array($geodir_old_sidebars)) {
|
|
| 1421 | + foreach ($geodir_old_sidebars as $key => $val) {
|
|
| 1422 | + if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1423 | + {
|
|
| 1424 | + $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
|
| 1425 | + } |
|
| 1430 | 1426 | |
| 1431 | - } |
|
| 1432 | 1427 | |
| 1433 | - update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1434 | - update_option('geodir_sidebars', '');
|
|
| 1428 | + } |
|
| 1429 | + } |
|
| 1430 | + |
|
| 1431 | + } |
|
| 1432 | + |
|
| 1433 | + update_option('sidebars_widgets', $sidebars_widgets);
|
|
| 1434 | + update_option('geodir_sidebars', '');
|
|
| 1435 | 1435 | } |
| 1436 | 1436 | |
| 1437 | 1437 | add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');
|
@@ -1444,9 +1444,9 @@ discard block |
||
| 1444 | 1444 | */ |
| 1445 | 1445 | function geodir_after_listing_post_gridview() |
| 1446 | 1446 | {
|
| 1447 | - global $gridview_columns; |
|
| 1447 | + global $gridview_columns; |
|
| 1448 | 1448 | |
| 1449 | - $gridview_columns = ''; |
|
| 1449 | + $gridview_columns = ''; |
|
| 1450 | 1450 | |
| 1451 | 1451 | } |
| 1452 | 1452 | |
@@ -1474,11 +1474,11 @@ discard block |
||
| 1474 | 1474 | */ |
| 1475 | 1475 | function so_handle_038($url, $original_url, $_context) |
| 1476 | 1476 | {
|
| 1477 | - if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1478 | - $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1479 | - } |
|
| 1477 | + if (strstr($url, "maps.google.com/maps/api/js") !== false) {
|
|
| 1478 | + $url = str_replace("&", "&", $url); // or $url = $original_url
|
|
| 1479 | + } |
|
| 1480 | 1480 | |
| 1481 | - return $url; |
|
| 1481 | + return $url; |
|
| 1482 | 1482 | } |
| 1483 | 1483 | |
| 1484 | 1484 | |
@@ -1494,34 +1494,34 @@ discard block |
||
| 1494 | 1494 | function geodir_after_main_form_fields() {
|
| 1495 | 1495 | global $gd_session; |
| 1496 | 1496 | |
| 1497 | - if (get_option('geodir_accept_term_condition')) {
|
|
| 1498 | - global $post; |
|
| 1499 | - $term_condition = ''; |
|
| 1500 | - if (isset($_REQUEST['backandedit'])) {
|
|
| 1501 | - $post = (object)$gd_session->get('listing');
|
|
| 1502 | - $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1503 | - } |
|
| 1504 | - |
|
| 1505 | - ?> |
|
| 1497 | + if (get_option('geodir_accept_term_condition')) {
|
|
| 1498 | + global $post; |
|
| 1499 | + $term_condition = ''; |
|
| 1500 | + if (isset($_REQUEST['backandedit'])) {
|
|
| 1501 | + $post = (object)$gd_session->get('listing');
|
|
| 1502 | + $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
|
| 1503 | + } |
|
| 1504 | + |
|
| 1505 | + ?> |
|
| 1506 | 1506 | <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix"> |
| 1507 | 1507 | <label> </label> |
| 1508 | 1508 | |
| 1509 | 1509 | <div class="geodir_taxonomy_field" style="float:left; width:70%;"> |
| 1510 | 1510 | <span style="display:block"> |
| 1511 | 1511 | <input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {
|
| 1512 | - echo 'checked="checked"'; |
|
| 1513 | - } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1512 | + echo 'checked="checked"'; |
|
| 1513 | + } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
|
| 1514 | 1514 | class="geodir_textfield" value="1" |
| 1515 | 1515 | style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
| 1516 | 1516 | </span> |
| 1517 | 1517 | </div> |
| 1518 | 1518 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
| 1519 | - _e($required_msg, 'geodirectory'); |
|
| 1520 | - } ?></span> |
|
| 1519 | + _e($required_msg, 'geodirectory'); |
|
| 1520 | + } ?></span> |
|
| 1521 | 1521 | </div> |
| 1522 | 1522 | <?php |
| 1523 | 1523 | |
| 1524 | - } |
|
| 1524 | + } |
|
| 1525 | 1525 | } |
| 1526 | 1526 | |
| 1527 | 1527 | |
@@ -1546,42 +1546,42 @@ discard block |
||
| 1546 | 1546 | */ |
| 1547 | 1547 | function geodir_detail_page_tab_is_display($is_display, $tab) |
| 1548 | 1548 | {
|
| 1549 | - global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1549 | + global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields; |
|
| 1550 | 1550 | |
| 1551 | - if ($tab == 'post_profile') {
|
|
| 1552 | - /** This action is documented in geodirectory_template_actions.php */ |
|
| 1553 | - $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1551 | + if ($tab == 'post_profile') {
|
|
| 1552 | + /** This action is documented in geodirectory_template_actions.php */ |
|
| 1553 | + $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
|
| 1554 | 1554 | |
| 1555 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1556 | - $is_display = false; |
|
| 1557 | - } |
|
| 1558 | - } |
|
| 1555 | + if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1556 | + $is_display = false; |
|
| 1557 | + } |
|
| 1558 | + } |
|
| 1559 | 1559 | |
| 1560 | - if ($tab == 'post_info') |
|
| 1561 | - $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1560 | + if ($tab == 'post_info') |
|
| 1561 | + $is_display = (!empty($geodir_post_detail_fields)) ? true : false; |
|
| 1562 | 1562 | |
| 1563 | - if ($tab == 'post_images') |
|
| 1564 | - $is_display = (!empty($post_images)) ? true : false; |
|
| 1563 | + if ($tab == 'post_images') |
|
| 1564 | + $is_display = (!empty($post_images)) ? true : false; |
|
| 1565 | 1565 | |
| 1566 | - if ($tab == 'post_video') |
|
| 1567 | - $is_display = (!empty($video)) ? true : false; |
|
| 1566 | + if ($tab == 'post_video') |
|
| 1567 | + $is_display = (!empty($video)) ? true : false; |
|
| 1568 | 1568 | |
| 1569 | - if ($tab == 'special_offers') |
|
| 1570 | - $is_display = (!empty($special_offers)) ? true : false; |
|
| 1569 | + if ($tab == 'special_offers') |
|
| 1570 | + $is_display = (!empty($special_offers)) ? true : false; |
|
| 1571 | 1571 | |
| 1572 | - if ($tab == 'reviews') |
|
| 1573 | - $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1572 | + if ($tab == 'reviews') |
|
| 1573 | + $is_display = (geodir_is_page('detail')) ? true : false;
|
|
| 1574 | 1574 | |
| 1575 | - if ($tab == 'related_listing') {
|
|
| 1576 | - $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1575 | + if ($tab == 'related_listing') {
|
|
| 1576 | + $message = __('No listings found which match your selection.', 'geodirectory');
|
|
| 1577 | 1577 | |
| 1578 | - /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1579 | - $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1578 | + /** This action is documented in geodirectory-functions/template_functions.php */ |
|
| 1579 | + $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);
|
|
| 1580 | 1580 | |
| 1581 | - $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1582 | - } |
|
| 1581 | + $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;
|
|
| 1582 | + } |
|
| 1583 | 1583 | |
| 1584 | - return $is_display; |
|
| 1584 | + return $is_display; |
|
| 1585 | 1585 | } |
| 1586 | 1586 | |
| 1587 | 1587 | |
@@ -1597,69 +1597,69 @@ discard block |
||
| 1597 | 1597 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 1598 | 1598 | */ |
| 1599 | 1599 | function geodir_changes_in_custom_fields_table() {
|
| 1600 | - global $wpdb, $plugin_prefix; |
|
| 1600 | + global $wpdb, $plugin_prefix; |
|
| 1601 | 1601 | |
| 1602 | 1602 | // Remove unused virtual page |
| 1603 | 1603 | $listings_page_id = (int)get_option('geodir_listing_page');
|
| 1604 | 1604 | if ($listings_page_id) {
|
| 1605 | 1605 | $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
| 1606 | - delete_option('geodir_listing_page');
|
|
| 1606 | + delete_option('geodir_listing_page');
|
|
| 1607 | 1607 | } |
| 1608 | 1608 | |
| 1609 | - if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1610 | - $wpdb->query( |
|
| 1611 | - $wpdb->prepare( |
|
| 1612 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1613 | - array('1', '1', 'admin')
|
|
| 1614 | - ) |
|
| 1615 | - ); |
|
| 1609 | + if (!get_option('geodir_changes_in_custom_fields_table')) {
|
|
| 1610 | + $wpdb->query( |
|
| 1611 | + $wpdb->prepare( |
|
| 1612 | + "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1613 | + array('1', '1', 'admin')
|
|
| 1614 | + ) |
|
| 1615 | + ); |
|
| 1616 | 1616 | |
| 1617 | 1617 | |
| 1618 | - /* --- terms meta value set --- */ |
|
| 1618 | + /* --- terms meta value set --- */ |
|
| 1619 | 1619 | |
| 1620 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1620 | + update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1621 | 1621 | |
| 1622 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1622 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1623 | 1623 | |
| 1624 | - if (!empty($options_data)) {
|
|
| 1624 | + if (!empty($options_data)) {
|
|
| 1625 | 1625 | |
| 1626 | - foreach ($options_data as $optobj) {
|
|
| 1626 | + foreach ($options_data as $optobj) {
|
|
| 1627 | 1627 | |
| 1628 | - $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1628 | + $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
|
| 1629 | 1629 | |
| 1630 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1630 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1631 | 1631 | |
| 1632 | - if (!empty($taxonomies_data)) {
|
|
| 1632 | + if (!empty($taxonomies_data)) {
|
|
| 1633 | 1633 | |
| 1634 | - foreach ($taxonomies_data as $taxobj) {
|
|
| 1634 | + foreach ($taxonomies_data as $taxobj) {
|
|
| 1635 | 1635 | |
| 1636 | - $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1637 | - $post_type = $taxObject->object_type[0]; |
|
| 1636 | + $taxObject = get_taxonomy($taxobj->taxonomy); |
|
| 1637 | + $post_type = $taxObject->object_type[0]; |
|
| 1638 | 1638 | |
| 1639 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1639 | + $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1640 | 1640 | |
| 1641 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1641 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1642 | 1642 | |
| 1643 | - if ($duplicate_data) {
|
|
| 1643 | + if ($duplicate_data) {
|
|
| 1644 | 1644 | |
| 1645 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1645 | + $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1646 | 1646 | |
| 1647 | - } else {
|
|
| 1647 | + } else {
|
|
| 1648 | 1648 | |
| 1649 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1649 | + $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1650 | 1650 | |
| 1651 | - } |
|
| 1651 | + } |
|
| 1652 | 1652 | |
| 1653 | - } |
|
| 1653 | + } |
|
| 1654 | 1654 | |
| 1655 | - } |
|
| 1655 | + } |
|
| 1656 | 1656 | |
| 1657 | - } |
|
| 1658 | - } |
|
| 1657 | + } |
|
| 1658 | + } |
|
| 1659 | 1659 | |
| 1660 | - update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1660 | + update_option('geodir_changes_in_custom_fields_table', '1');
|
|
| 1661 | 1661 | |
| 1662 | - } |
|
| 1662 | + } |
|
| 1663 | 1663 | |
| 1664 | 1664 | } |
| 1665 | 1665 | |
@@ -1678,24 +1678,24 @@ discard block |
||
| 1678 | 1678 | function geodir_location_slug_check($slug) |
| 1679 | 1679 | {
|
| 1680 | 1680 | |
| 1681 | - global $wpdb, $table_prefix; |
|
| 1681 | + global $wpdb, $table_prefix; |
|
| 1682 | 1682 | |
| 1683 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1683 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1684 | 1684 | |
| 1685 | - if ($slug_exists) {
|
|
| 1685 | + if ($slug_exists) {
|
|
| 1686 | 1686 | |
| 1687 | - $suffix = 1; |
|
| 1688 | - do {
|
|
| 1689 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1690 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1691 | - $suffix++; |
|
| 1692 | - } while ($location_slug_check && $suffix < 100); |
|
| 1687 | + $suffix = 1; |
|
| 1688 | + do {
|
|
| 1689 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1690 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1691 | + $suffix++; |
|
| 1692 | + } while ($location_slug_check && $suffix < 100); |
|
| 1693 | 1693 | |
| 1694 | - $slug = $alt_location_name; |
|
| 1694 | + $slug = $alt_location_name; |
|
| 1695 | 1695 | |
| 1696 | - } |
|
| 1696 | + } |
|
| 1697 | 1697 | |
| 1698 | - return $slug; |
|
| 1698 | + return $slug; |
|
| 1699 | 1699 | |
| 1700 | 1700 | } |
| 1701 | 1701 | |
@@ -1720,42 +1720,42 @@ discard block |
||
| 1720 | 1720 | function geodir_update_term_slug($term_id, $tt_id, $taxonomy) |
| 1721 | 1721 | {
|
| 1722 | 1722 | |
| 1723 | - global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1723 | + global $wpdb, $plugin_prefix, $table_prefix; |
|
| 1724 | 1724 | |
| 1725 | - $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1725 | + $tern_data = get_term_by('id', $term_id, $taxonomy);
|
|
| 1726 | 1726 | |
| 1727 | - $slug = $tern_data->slug; |
|
| 1727 | + $slug = $tern_data->slug; |
|
| 1728 | 1728 | |
| 1729 | - /** |
|
| 1730 | - * Filter if a term slug exists. |
|
| 1731 | - * |
|
| 1732 | - * @since 1.0.0 |
|
| 1733 | - * @package GeoDirectory |
|
| 1734 | - * @param bool $bool Default: false. |
|
| 1735 | - * @param string $slug The term slug. |
|
| 1736 | - * @param int $term_id The term ID. |
|
| 1737 | - */ |
|
| 1738 | - $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1729 | + /** |
|
| 1730 | + * Filter if a term slug exists. |
|
| 1731 | + * |
|
| 1732 | + * @since 1.0.0 |
|
| 1733 | + * @package GeoDirectory |
|
| 1734 | + * @param bool $bool Default: false. |
|
| 1735 | + * @param string $slug The term slug. |
|
| 1736 | + * @param int $term_id The term ID. |
|
| 1737 | + */ |
|
| 1738 | + $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);
|
|
| 1739 | 1739 | |
| 1740 | - if ($slug_exists) {
|
|
| 1740 | + if ($slug_exists) {
|
|
| 1741 | 1741 | |
| 1742 | - $suffix = 1; |
|
| 1743 | - do {
|
|
| 1744 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1742 | + $suffix = 1; |
|
| 1743 | + do {
|
|
| 1744 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1745 | 1745 | |
| 1746 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1747 | - $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1746 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 1747 | + $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
|
| 1748 | 1748 | |
| 1749 | - $suffix++; |
|
| 1750 | - } while ($term_slug_check && $suffix < 100); |
|
| 1749 | + $suffix++; |
|
| 1750 | + } while ($term_slug_check && $suffix < 100); |
|
| 1751 | 1751 | |
| 1752 | - $slug = $new_slug; |
|
| 1752 | + $slug = $new_slug; |
|
| 1753 | 1753 | |
| 1754 | - //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1754 | + //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
|
| 1755 | 1755 | |
| 1756 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1756 | + $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1757 | 1757 | |
| 1758 | - } |
|
| 1758 | + } |
|
| 1759 | 1759 | |
| 1760 | 1760 | // Update tag in detail table. |
| 1761 | 1761 | $taxonomy_obj = get_taxonomy($taxonomy); |
@@ -1796,21 +1796,21 @@ discard block |
||
| 1796 | 1796 | function geodir_term_slug_is_exists($slug_exists, $slug, $term_id) |
| 1797 | 1797 | {
|
| 1798 | 1798 | |
| 1799 | - global $wpdb, $table_prefix; |
|
| 1799 | + global $wpdb, $table_prefix; |
|
| 1800 | 1800 | |
| 1801 | - $default_location = geodir_get_default_location(); |
|
| 1801 | + $default_location = geodir_get_default_location(); |
|
| 1802 | 1802 | |
| 1803 | - $country_slug = $default_location->country_slug; |
|
| 1804 | - $region_slug = $default_location->region_slug; |
|
| 1805 | - $city_slug = $default_location->city_slug; |
|
| 1803 | + $country_slug = $default_location->country_slug; |
|
| 1804 | + $region_slug = $default_location->region_slug; |
|
| 1805 | + $city_slug = $default_location->city_slug; |
|
| 1806 | 1806 | |
| 1807 | - if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1808 | - return $slug_exists = true; |
|
| 1807 | + if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
|
| 1808 | + return $slug_exists = true; |
|
| 1809 | 1809 | |
| 1810 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1811 | - return $slug_exists = true; |
|
| 1810 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1811 | + return $slug_exists = true; |
|
| 1812 | 1812 | |
| 1813 | - return $slug_exists; |
|
| 1813 | + return $slug_exists; |
|
| 1814 | 1814 | } |
| 1815 | 1815 | |
| 1816 | 1816 | |
@@ -1830,75 +1830,75 @@ discard block |
||
| 1830 | 1830 | */ |
| 1831 | 1831 | function geodir_custom_page_title($title = '', $sep = '') |
| 1832 | 1832 | {
|
| 1833 | - global $wp; |
|
| 1834 | - if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1835 | - return $title; |
|
| 1836 | - } |
|
| 1833 | + global $wp; |
|
| 1834 | + if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
|
|
| 1835 | + return $title; |
|
| 1836 | + } |
|
| 1837 | 1837 | |
| 1838 | - if ($sep == '') {
|
|
| 1839 | - /** |
|
| 1840 | - * Filter the page title separator. |
|
| 1841 | - * |
|
| 1842 | - * @since 1.0.0 |
|
| 1843 | - * @package GeoDirectory |
|
| 1844 | - * @param string $sep The separator, default: `|`. |
|
| 1845 | - */ |
|
| 1846 | - $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1847 | - } |
|
| 1838 | + if ($sep == '') {
|
|
| 1839 | + /** |
|
| 1840 | + * Filter the page title separator. |
|
| 1841 | + * |
|
| 1842 | + * @since 1.0.0 |
|
| 1843 | + * @package GeoDirectory |
|
| 1844 | + * @param string $sep The separator, default: `|`. |
|
| 1845 | + */ |
|
| 1846 | + $sep = apply_filters('geodir_page_title_separator', '|');
|
|
| 1847 | + } |
|
| 1848 | 1848 | |
| 1849 | 1849 | |
| 1850 | - $gd_page = ''; |
|
| 1851 | - if(geodir_is_page('home')){
|
|
| 1852 | - $gd_page = 'home'; |
|
| 1853 | - $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1854 | - } |
|
| 1855 | - elseif(geodir_is_page('detail')){
|
|
| 1856 | - $gd_page = 'detail'; |
|
| 1857 | - $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1858 | - } |
|
| 1859 | - elseif(geodir_is_page('pt')){
|
|
| 1860 | - $gd_page = 'pt'; |
|
| 1861 | - $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1862 | - } |
|
| 1863 | - elseif(geodir_is_page('listing')){
|
|
| 1864 | - $gd_page = 'listing'; |
|
| 1865 | - $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1866 | - } |
|
| 1867 | - elseif(geodir_is_page('location')){
|
|
| 1868 | - $gd_page = 'location'; |
|
| 1869 | - $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1870 | - } |
|
| 1871 | - elseif(geodir_is_page('search')){
|
|
| 1872 | - $gd_page = 'search'; |
|
| 1873 | - $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1874 | - } |
|
| 1875 | - elseif(geodir_is_page('add-listing')){
|
|
| 1876 | - $gd_page = 'add-listing'; |
|
| 1877 | - $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1878 | - } |
|
| 1879 | - elseif(geodir_is_page('author')){
|
|
| 1880 | - $gd_page = 'author'; |
|
| 1881 | - $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1882 | - } |
|
| 1883 | - elseif(geodir_is_page('login')){
|
|
| 1884 | - $gd_page = 'login'; |
|
| 1885 | - $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1886 | - } |
|
| 1887 | - elseif(geodir_is_page('listing-success')){
|
|
| 1888 | - $gd_page = 'listing-success'; |
|
| 1889 | - $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1890 | - } |
|
| 1850 | + $gd_page = ''; |
|
| 1851 | + if(geodir_is_page('home')){
|
|
| 1852 | + $gd_page = 'home'; |
|
| 1853 | + $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
|
| 1854 | + } |
|
| 1855 | + elseif(geodir_is_page('detail')){
|
|
| 1856 | + $gd_page = 'detail'; |
|
| 1857 | + $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
|
| 1858 | + } |
|
| 1859 | + elseif(geodir_is_page('pt')){
|
|
| 1860 | + $gd_page = 'pt'; |
|
| 1861 | + $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
|
| 1862 | + } |
|
| 1863 | + elseif(geodir_is_page('listing')){
|
|
| 1864 | + $gd_page = 'listing'; |
|
| 1865 | + $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
|
| 1866 | + } |
|
| 1867 | + elseif(geodir_is_page('location')){
|
|
| 1868 | + $gd_page = 'location'; |
|
| 1869 | + $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
|
| 1870 | + } |
|
| 1871 | + elseif(geodir_is_page('search')){
|
|
| 1872 | + $gd_page = 'search'; |
|
| 1873 | + $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
|
| 1874 | + } |
|
| 1875 | + elseif(geodir_is_page('add-listing')){
|
|
| 1876 | + $gd_page = 'add-listing'; |
|
| 1877 | + $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
|
| 1878 | + } |
|
| 1879 | + elseif(geodir_is_page('author')){
|
|
| 1880 | + $gd_page = 'author'; |
|
| 1881 | + $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
|
| 1882 | + } |
|
| 1883 | + elseif(geodir_is_page('login')){
|
|
| 1884 | + $gd_page = 'login'; |
|
| 1885 | + $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
|
| 1886 | + } |
|
| 1887 | + elseif(geodir_is_page('listing-success')){
|
|
| 1888 | + $gd_page = 'listing-success'; |
|
| 1889 | + $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
|
| 1890 | + } |
|
| 1891 | 1891 | |
| 1892 | 1892 | |
| 1893 | - /** |
|
| 1894 | - * Filter page meta title to replace variables. |
|
| 1895 | - * |
|
| 1896 | - * @since 1.5.4 |
|
| 1897 | - * @param string $title The page title including variables. |
|
| 1898 | - * @param string $gd_page The GeoDirectory page type if any. |
|
| 1899 | - * @param string $sep The title separator symbol. |
|
| 1900 | - */ |
|
| 1901 | - return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1893 | + /** |
|
| 1894 | + * Filter page meta title to replace variables. |
|
| 1895 | + * |
|
| 1896 | + * @since 1.5.4 |
|
| 1897 | + * @param string $title The page title including variables. |
|
| 1898 | + * @param string $gd_page The GeoDirectory page type if any. |
|
| 1899 | + * @param string $sep The title separator symbol. |
|
| 1900 | + */ |
|
| 1901 | + return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);
|
|
| 1902 | 1902 | |
| 1903 | 1903 | } |
| 1904 | 1904 | |
@@ -1914,36 +1914,36 @@ discard block |
||
| 1914 | 1914 | function geodir_set_post_attachment() |
| 1915 | 1915 | {
|
| 1916 | 1916 | |
| 1917 | - if (!get_option('geodir_set_post_attachments')) {
|
|
| 1917 | + if (!get_option('geodir_set_post_attachments')) {
|
|
| 1918 | 1918 | |
| 1919 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1920 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1919 | + require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1920 | + require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1921 | 1921 | |
| 1922 | - $all_postypes = geodir_get_posttypes(); |
|
| 1922 | + $all_postypes = geodir_get_posttypes(); |
|
| 1923 | 1923 | |
| 1924 | - foreach($all_postypes as $post_type){
|
|
| 1925 | - $args = array( |
|
| 1926 | - 'posts_per_page' => -1, |
|
| 1927 | - 'post_type' => $post_type, |
|
| 1928 | - 'post_status' => 'publish'); |
|
| 1924 | + foreach($all_postypes as $post_type){
|
|
| 1925 | + $args = array( |
|
| 1926 | + 'posts_per_page' => -1, |
|
| 1927 | + 'post_type' => $post_type, |
|
| 1928 | + 'post_status' => 'publish'); |
|
| 1929 | 1929 | |
| 1930 | - $posts_array = get_posts($args); |
|
| 1930 | + $posts_array = get_posts($args); |
|
| 1931 | 1931 | |
| 1932 | - if (!empty($posts_array)) {
|
|
| 1932 | + if (!empty($posts_array)) {
|
|
| 1933 | 1933 | |
| 1934 | - foreach ($posts_array as $post) {
|
|
| 1934 | + foreach ($posts_array as $post) {
|
|
| 1935 | 1935 | |
| 1936 | - geodir_set_wp_featured_image($post->ID); |
|
| 1936 | + geodir_set_wp_featured_image($post->ID); |
|
| 1937 | 1937 | |
| 1938 | - } |
|
| 1938 | + } |
|
| 1939 | 1939 | |
| 1940 | - } |
|
| 1941 | - } |
|
| 1940 | + } |
|
| 1941 | + } |
|
| 1942 | 1942 | |
| 1943 | 1943 | |
| 1944 | - update_option('geodir_set_post_attachments', '1');
|
|
| 1944 | + update_option('geodir_set_post_attachments', '1');
|
|
| 1945 | 1945 | |
| 1946 | - } |
|
| 1946 | + } |
|
| 1947 | 1947 | |
| 1948 | 1948 | } |
| 1949 | 1949 | |
@@ -1960,19 +1960,19 @@ discard block |
||
| 1960 | 1960 | function geodir_remove_url_seperator() |
| 1961 | 1961 | {
|
| 1962 | 1962 | |
| 1963 | - if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1963 | + if (!get_option('geodir_remove_url_seperator')) {
|
|
| 1964 | 1964 | |
| 1965 | - if (get_option('geodir_listingurl_separator'))
|
|
| 1966 | - delete_option('geodir_listingurl_separator');
|
|
| 1965 | + if (get_option('geodir_listingurl_separator'))
|
|
| 1966 | + delete_option('geodir_listingurl_separator');
|
|
| 1967 | 1967 | |
| 1968 | - if (get_option('geodir_detailurl_separator'))
|
|
| 1969 | - delete_option('geodir_detailurl_separator');
|
|
| 1968 | + if (get_option('geodir_detailurl_separator'))
|
|
| 1969 | + delete_option('geodir_detailurl_separator');
|
|
| 1970 | 1970 | |
| 1971 | - flush_rewrite_rules(false); |
|
| 1971 | + flush_rewrite_rules(false); |
|
| 1972 | 1972 | |
| 1973 | - update_option('geodir_remove_url_seperator', '1');
|
|
| 1973 | + update_option('geodir_remove_url_seperator', '1');
|
|
| 1974 | 1974 | |
| 1975 | - } |
|
| 1975 | + } |
|
| 1976 | 1976 | |
| 1977 | 1977 | } |
| 1978 | 1978 | |
@@ -1988,19 +1988,19 @@ discard block |
||
| 1988 | 1988 | */ |
| 1989 | 1989 | function geodir_remove_url_seperator_form_permalink_settings($permalink_arr) |
| 1990 | 1990 | {
|
| 1991 | - foreach ($permalink_arr as $key => $value) {
|
|
| 1991 | + foreach ($permalink_arr as $key => $value) {
|
|
| 1992 | 1992 | |
| 1993 | - if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1994 | - unset($permalink_arr[$key]); |
|
| 1993 | + if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') |
|
| 1994 | + unset($permalink_arr[$key]); |
|
| 1995 | 1995 | |
| 1996 | - } |
|
| 1996 | + } |
|
| 1997 | 1997 | |
| 1998 | - return $permalink_arr; |
|
| 1998 | + return $permalink_arr; |
|
| 1999 | 1999 | |
| 2000 | 2000 | } |
| 2001 | 2001 | |
| 2002 | 2002 | if (!is_admin()) {
|
| 2003 | - add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2003 | + add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');
|
|
| 2004 | 2004 | } |
| 2005 | 2005 | /** |
| 2006 | 2006 | * Set status from draft to publish. |
@@ -2013,16 +2013,16 @@ discard block |
||
| 2013 | 2013 | */ |
| 2014 | 2014 | function geodir_set_status_draft_to_publish_for_own_post($post) |
| 2015 | 2015 | {
|
| 2016 | - $user_id = get_current_user_id(); |
|
| 2016 | + $user_id = get_current_user_id(); |
|
| 2017 | 2017 | |
| 2018 | - if(!$user_id){return $post;}
|
|
| 2018 | + if(!$user_id){return $post;}
|
|
| 2019 | 2019 | |
| 2020 | - $gd_post_types = geodir_get_posttypes(); |
|
| 2020 | + $gd_post_types = geodir_get_posttypes(); |
|
| 2021 | 2021 | |
| 2022 | - if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2023 | - $post[0]->post_status = 'publish'; |
|
| 2024 | - } |
|
| 2025 | - return $post; |
|
| 2022 | + if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {
|
|
| 2023 | + $post[0]->post_status = 'publish'; |
|
| 2024 | + } |
|
| 2025 | + return $post; |
|
| 2026 | 2026 | } |
| 2027 | 2027 | |
| 2028 | 2028 | |
@@ -2114,33 +2114,33 @@ discard block |
||
| 2114 | 2114 | */ |
| 2115 | 2115 | function geodir_detail_page_tab_headings_change($tabs_arr) |
| 2116 | 2116 | {
|
| 2117 | - global $wpdb; |
|
| 2117 | + global $wpdb; |
|
| 2118 | 2118 | |
| 2119 | - $post_type = geodir_get_current_posttype(); |
|
| 2119 | + $post_type = geodir_get_current_posttype(); |
|
| 2120 | 2120 | |
| 2121 | - $all_postypes = geodir_get_posttypes(); |
|
| 2121 | + $all_postypes = geodir_get_posttypes(); |
|
| 2122 | 2122 | |
| 2123 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2123 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {
|
|
| 2124 | 2124 | |
| 2125 | - if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2125 | + if (array_key_exists('post_video', $tabs_arr)) {
|
|
| 2126 | 2126 | |
| 2127 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2127 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2128 | 2128 | |
| 2129 | - if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2130 | - $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2131 | - } |
|
| 2129 | + if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
|
| 2130 | + $tabs_arr['post_video']['heading_text'] = $field_title; |
|
| 2131 | + } |
|
| 2132 | 2132 | |
| 2133 | - if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2133 | + if (array_key_exists('special_offers', $tabs_arr)) {
|
|
| 2134 | 2134 | |
| 2135 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2135 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2136 | 2136 | |
| 2137 | - if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2138 | - $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2139 | - } |
|
| 2137 | + if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
|
| 2138 | + $tabs_arr['special_offers']['heading_text'] = $field_title; |
|
| 2139 | + } |
|
| 2140 | 2140 | |
| 2141 | - } |
|
| 2141 | + } |
|
| 2142 | 2142 | |
| 2143 | - return $tabs_arr; |
|
| 2143 | + return $tabs_arr; |
|
| 2144 | 2144 | |
| 2145 | 2145 | } |
| 2146 | 2146 | |
@@ -2153,10 +2153,10 @@ discard block |
||
| 2153 | 2153 | */ |
| 2154 | 2154 | function geodir_remove_template_redirect_actions() |
| 2155 | 2155 | {
|
| 2156 | - if (geodir_is_page('login')){
|
|
| 2157 | - remove_all_actions('template_redirect');
|
|
| 2158 | - remove_action('init', 'avia_modify_front', 10);
|
|
| 2159 | - } |
|
| 2156 | + if (geodir_is_page('login')){
|
|
| 2157 | + remove_all_actions('template_redirect');
|
|
| 2158 | + remove_action('init', 'avia_modify_front', 10);
|
|
| 2159 | + } |
|
| 2160 | 2160 | } |
| 2161 | 2161 | |
| 2162 | 2162 | |
@@ -2178,51 +2178,51 @@ discard block |
||
| 2178 | 2178 | function geodirectory_before_featured_image_delete($attachment_id) |
| 2179 | 2179 | {
|
| 2180 | 2180 | |
| 2181 | - global $wpdb, $plugin_prefix; |
|
| 2181 | + global $wpdb, $plugin_prefix; |
|
| 2182 | 2182 | |
| 2183 | - $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2183 | + $post_id = get_post_field('post_parent', $attachment_id);
|
|
| 2184 | 2184 | |
| 2185 | - $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2185 | + $attachment_url = wp_get_attachment_url($attachment_id); |
|
| 2186 | 2186 | |
| 2187 | - if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2187 | + if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {
|
|
| 2188 | 2188 | |
| 2189 | - $post_type = get_post_type($post_id); |
|
| 2189 | + $post_type = get_post_type($post_id); |
|
| 2190 | 2190 | |
| 2191 | - $all_postypes = geodir_get_posttypes(); |
|
| 2191 | + $all_postypes = geodir_get_posttypes(); |
|
| 2192 | 2192 | |
| 2193 | - if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2194 | - return false; |
|
| 2193 | + if (!in_array($post_type, $all_postypes) || !is_admin()) |
|
| 2194 | + return false; |
|
| 2195 | 2195 | |
| 2196 | - $uploads = wp_upload_dir(); |
|
| 2196 | + $uploads = wp_upload_dir(); |
|
| 2197 | 2197 | |
| 2198 | - $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2198 | + $split_img_path = explode($uploads['baseurl'], $attachment_url); |
|
| 2199 | 2199 | |
| 2200 | - $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2200 | + $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
|
| 2201 | 2201 | |
| 2202 | - $wpdb->query( |
|
| 2203 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2204 | - array($post_id, $split_img_file_path) |
|
| 2205 | - ) |
|
| 2206 | - ); |
|
| 2202 | + $wpdb->query( |
|
| 2203 | + $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2204 | + array($post_id, $split_img_file_path) |
|
| 2205 | + ) |
|
| 2206 | + ); |
|
| 2207 | 2207 | |
| 2208 | - $attachment_data = $wpdb->get_row( |
|
| 2209 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2210 | - array($post_id) |
|
| 2211 | - ) |
|
| 2212 | - ); |
|
| 2208 | + $attachment_data = $wpdb->get_row( |
|
| 2209 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2210 | + array($post_id) |
|
| 2211 | + ) |
|
| 2212 | + ); |
|
| 2213 | 2213 | |
| 2214 | - if (!empty($attachment_data)) {
|
|
| 2215 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2216 | - } |
|
| 2214 | + if (!empty($attachment_data)) {
|
|
| 2215 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2216 | + } |
|
| 2217 | 2217 | |
| 2218 | 2218 | |
| 2219 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2219 | + $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2220 | 2220 | |
| 2221 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2221 | + $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2222 | 2222 | |
| 2223 | - geodir_set_wp_featured_image($post_id); |
|
| 2223 | + geodir_set_wp_featured_image($post_id); |
|
| 2224 | 2224 | |
| 2225 | - } |
|
| 2225 | + } |
|
| 2226 | 2226 | |
| 2227 | 2227 | } |
| 2228 | 2228 | |
@@ -2240,79 +2240,79 @@ discard block |
||
| 2240 | 2240 | function geodir_temp_set_post_attachment() |
| 2241 | 2241 | {
|
| 2242 | 2242 | |
| 2243 | - global $wpdb, $plugin_prefix; |
|
| 2243 | + global $wpdb, $plugin_prefix; |
|
| 2244 | 2244 | |
| 2245 | - $all_postypes = geodir_get_posttypes(); |
|
| 2245 | + $all_postypes = geodir_get_posttypes(); |
|
| 2246 | 2246 | |
| 2247 | - foreach ($all_postypes as $posttype) {
|
|
| 2247 | + foreach ($all_postypes as $posttype) {
|
|
| 2248 | 2248 | |
| 2249 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2249 | + $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2250 | 2250 | |
| 2251 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2251 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2252 | 2252 | |
| 2253 | - if (!empty($get_post_data)) {
|
|
| 2253 | + if (!empty($get_post_data)) {
|
|
| 2254 | 2254 | |
| 2255 | - foreach ($get_post_data as $data) {
|
|
| 2255 | + foreach ($get_post_data as $data) {
|
|
| 2256 | 2256 | |
| 2257 | - $post_id = $data->post_id; |
|
| 2257 | + $post_id = $data->post_id; |
|
| 2258 | 2258 | |
| 2259 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2259 | + $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2260 | 2260 | |
| 2261 | - if (!empty($attachment_data)) {
|
|
| 2261 | + if (!empty($attachment_data)) {
|
|
| 2262 | 2262 | |
| 2263 | - foreach ($attachment_data as $attach) {
|
|
| 2263 | + foreach ($attachment_data as $attach) {
|
|
| 2264 | 2264 | |
| 2265 | - $file_info = pathinfo($attach->file); |
|
| 2265 | + $file_info = pathinfo($attach->file); |
|
| 2266 | 2266 | |
| 2267 | - $sub_dir = ''; |
|
| 2268 | - if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2269 | - $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2267 | + $sub_dir = ''; |
|
| 2268 | + if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') |
|
| 2269 | + $sub_dir = stripslashes_deep($file_info['dirname']); |
|
| 2270 | 2270 | |
| 2271 | - $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2272 | - $uploads_path = $uploads['basedir']; |
|
| 2271 | + $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs |
|
| 2272 | + $uploads_path = $uploads['basedir']; |
|
| 2273 | 2273 | |
| 2274 | - $file_name = $file_info['basename']; |
|
| 2274 | + $file_name = $file_info['basename']; |
|
| 2275 | 2275 | |
| 2276 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2276 | + $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2277 | 2277 | |
| 2278 | - if (!file_exists($img_arr['path'])) {
|
|
| 2278 | + if (!file_exists($img_arr['path'])) {
|
|
| 2279 | 2279 | |
| 2280 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2280 | + $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2281 | 2281 | |
| 2282 | - } |
|
| 2282 | + } |
|
| 2283 | 2283 | |
| 2284 | - } |
|
| 2284 | + } |
|
| 2285 | 2285 | |
| 2286 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2286 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2287 | 2287 | |
| 2288 | - if (!empty($attachment_data)) {
|
|
| 2288 | + if (!empty($attachment_data)) {
|
|
| 2289 | 2289 | |
| 2290 | - if ($attachment_data->ID) |
|
| 2291 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2290 | + if ($attachment_data->ID) |
|
| 2291 | + $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2292 | 2292 | |
| 2293 | - } else {
|
|
| 2293 | + } else {
|
|
| 2294 | 2294 | |
| 2295 | - if (has_post_thumbnail($post_id)) {
|
|
| 2295 | + if (has_post_thumbnail($post_id)) {
|
|
| 2296 | 2296 | |
| 2297 | - $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2297 | + $post_thumbnail_id = get_post_thumbnail_id($post_id); |
|
| 2298 | 2298 | |
| 2299 | - wp_delete_attachment($post_thumbnail_id); |
|
| 2299 | + wp_delete_attachment($post_thumbnail_id); |
|
| 2300 | 2300 | |
| 2301 | - } |
|
| 2301 | + } |
|
| 2302 | 2302 | |
| 2303 | - } |
|
| 2303 | + } |
|
| 2304 | 2304 | |
| 2305 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2305 | + $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2306 | 2306 | |
| 2307 | - geodir_set_wp_featured_image($post_id); |
|
| 2307 | + geodir_set_wp_featured_image($post_id); |
|
| 2308 | 2308 | |
| 2309 | - } |
|
| 2309 | + } |
|
| 2310 | 2310 | |
| 2311 | - } |
|
| 2311 | + } |
|
| 2312 | 2312 | |
| 2313 | - } |
|
| 2313 | + } |
|
| 2314 | 2314 | |
| 2315 | - } |
|
| 2315 | + } |
|
| 2316 | 2316 | |
| 2317 | 2317 | } |
| 2318 | 2318 | |
@@ -2330,9 +2330,9 @@ discard block |
||
| 2330 | 2330 | function geodir_default_rating_star_icon() |
| 2331 | 2331 | {
|
| 2332 | 2332 | |
| 2333 | - if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2334 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2335 | - } |
|
| 2333 | + if (!get_option('geodir_default_rating_star_icon')) {
|
|
| 2334 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2335 | + } |
|
| 2336 | 2336 | |
| 2337 | 2337 | } |
| 2338 | 2338 | |
@@ -2350,27 +2350,27 @@ discard block |
||
| 2350 | 2350 | */ |
| 2351 | 2351 | function geodir_user_post_listing_count($user_id=null) |
| 2352 | 2352 | {
|
| 2353 | - global $wpdb, $plugin_prefix, $current_user; |
|
| 2354 | - if(!$user_id){
|
|
| 2355 | - $user_id = $current_user->ID; |
|
| 2356 | - } |
|
| 2353 | + global $wpdb, $plugin_prefix, $current_user; |
|
| 2354 | + if(!$user_id){
|
|
| 2355 | + $user_id = $current_user->ID; |
|
| 2356 | + } |
|
| 2357 | 2357 | |
| 2358 | - $user_id = $current_user->ID; |
|
| 2359 | - $all_postypes = geodir_get_posttypes(); |
|
| 2360 | - $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2358 | + $user_id = $current_user->ID; |
|
| 2359 | + $all_postypes = geodir_get_posttypes(); |
|
| 2360 | + $all_posts = get_option('geodir_listing_link_user_dashboard');
|
|
| 2361 | 2361 | |
| 2362 | - $user_listing = array(); |
|
| 2363 | - if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2364 | - foreach ($all_posts as $ptype) {
|
|
| 2365 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2362 | + $user_listing = array(); |
|
| 2363 | + if (is_array($all_posts) && !empty($all_posts)) {
|
|
| 2364 | + foreach ($all_posts as $ptype) {
|
|
| 2365 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2366 | 2366 | |
| 2367 | - if ($total_posts > 0) {
|
|
| 2368 | - $user_listing[$ptype] = $total_posts; |
|
| 2369 | - } |
|
| 2370 | - } |
|
| 2371 | - } |
|
| 2367 | + if ($total_posts > 0) {
|
|
| 2368 | + $user_listing[$ptype] = $total_posts; |
|
| 2369 | + } |
|
| 2370 | + } |
|
| 2371 | + } |
|
| 2372 | 2372 | |
| 2373 | - return $user_listing; |
|
| 2373 | + return $user_listing; |
|
| 2374 | 2374 | } |
| 2375 | 2375 | |
| 2376 | 2376 | |
@@ -2390,189 +2390,189 @@ discard block |
||
| 2390 | 2390 | */ |
| 2391 | 2391 | function geodir_detail_page_custom_field_tab($tabs_arr) |
| 2392 | 2392 | {
|
| 2393 | - global $post; |
|
| 2394 | - |
|
| 2395 | - $post_type = geodir_get_current_posttype(); |
|
| 2396 | - $all_postypes = geodir_get_posttypes(); |
|
| 2397 | - |
|
| 2398 | - if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2399 | - $package_info = array(); |
|
| 2400 | - $package_info = geodir_post_package_info($package_info, $post); |
|
| 2401 | - $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2402 | - $fields_location = 'owntab'; |
|
| 2403 | - |
|
| 2404 | - $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2405 | - //remove video and special offers if it is already set to show |
|
| 2406 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2407 | - $unset_video = true; |
|
| 2408 | - } |
|
| 2409 | - |
|
| 2410 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2411 | - $unset_special_offers = true; |
|
| 2412 | - } |
|
| 2413 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2414 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2415 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2416 | - unset($custom_fields[$key]); |
|
| 2417 | - } |
|
| 2418 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2419 | - unset($custom_fields[$key]); |
|
| 2420 | - } |
|
| 2421 | - } |
|
| 2422 | - } |
|
| 2393 | + global $post; |
|
| 2423 | 2394 | |
| 2395 | + $post_type = geodir_get_current_posttype(); |
|
| 2396 | + $all_postypes = geodir_get_posttypes(); |
|
| 2424 | 2397 | |
| 2425 | - if (!empty($custom_fields)) {
|
|
| 2426 | - $parse_custom_fields = array(); |
|
| 2427 | - foreach ($custom_fields as $field) {
|
|
| 2428 | - $field = stripslashes_deep($field); // strip slashes |
|
| 2429 | - $type = $field; |
|
| 2430 | - $field_name = $field['htmlvar_name']; |
|
| 2431 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2432 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2433 | - } |
|
| 2398 | + if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {
|
|
| 2399 | + $package_info = array(); |
|
| 2400 | + $package_info = geodir_post_package_info($package_info, $post); |
|
| 2401 | + $post_package_id = !empty($package_info->pid) ? $package_info->pid : ''; |
|
| 2402 | + $fields_location = 'owntab'; |
|
| 2434 | 2403 | |
| 2435 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2436 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2437 | - continue; |
|
| 2438 | - } |
|
| 2439 | - |
|
| 2440 | - $parse_custom_fields[] = $field; |
|
| 2441 | - } |
|
| 2442 | - } |
|
| 2443 | - $custom_fields = $parse_custom_fields; |
|
| 2444 | - } |
|
| 2445 | - //print_r($custom_fields); |
|
| 2446 | - if (!empty($custom_fields)) {
|
|
| 2404 | + $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
|
| 2405 | + //remove video and special offers if it is already set to show |
|
| 2406 | + if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2407 | + $unset_video = true; |
|
| 2408 | + } |
|
| 2447 | 2409 | |
| 2448 | - global $field_set_start; |
|
| 2410 | + if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2411 | + $unset_special_offers = true; |
|
| 2412 | + } |
|
| 2413 | + if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2414 | + foreach($custom_fields as $key => $custom_field){
|
|
| 2415 | + if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2416 | + unset($custom_fields[$key]); |
|
| 2417 | + } |
|
| 2418 | + if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2419 | + unset($custom_fields[$key]); |
|
| 2420 | + } |
|
| 2421 | + } |
|
| 2422 | + } |
|
| 2449 | 2423 | |
| 2450 | - $post = stripslashes_deep($post); // strip slashes |
|
| 2451 | - |
|
| 2452 | - $field_set_start = 0; |
|
| 2453 | - $fieldset_count = 0; |
|
| 2454 | - $fieldset = ''; |
|
| 2455 | - $total_fields = count($custom_fields); |
|
| 2456 | - $count_field = 0; |
|
| 2457 | - $fieldset_arr = array(); |
|
| 2458 | - $i = 0; |
|
| 2459 | - $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2460 | - |
|
| 2461 | - foreach ($custom_fields as $field) {
|
|
| 2462 | - $count_field++; |
|
| 2463 | - $field_name = $field['htmlvar_name']; |
|
| 2464 | - if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2465 | - $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2466 | - } |
|
| 2467 | 2424 | |
| 2468 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2469 | - $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2470 | - $site_title = trim($field['site_title']); |
|
| 2471 | - $type = $field; |
|
| 2472 | - $variables_array = array(); |
|
| 2425 | + if (!empty($custom_fields)) {
|
|
| 2426 | + $parse_custom_fields = array(); |
|
| 2427 | + foreach ($custom_fields as $field) {
|
|
| 2428 | + $field = stripslashes_deep($field); // strip slashes |
|
| 2429 | + $type = $field; |
|
| 2430 | + $field_name = $field['htmlvar_name']; |
|
| 2431 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2432 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2433 | + } |
|
| 2473 | 2434 | |
| 2474 | - if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2475 | - continue; |
|
| 2476 | - } |
|
| 2435 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2436 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2437 | + continue; |
|
| 2438 | + } |
|
| 2477 | 2439 | |
| 2478 | - if ($type['type'] != 'fieldset') {
|
|
| 2479 | - $i++; |
|
| 2480 | - $variables_array['post_id'] = $post->ID; |
|
| 2481 | - $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2482 | - $variables_array['value'] = ''; |
|
| 2483 | - $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 2484 | - }else{
|
|
| 2485 | - $i = 0; |
|
| 2486 | - $fieldset_count++; |
|
| 2487 | - $field_set_start = 1; |
|
| 2488 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2489 | - $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2490 | - } |
|
| 2440 | + $parse_custom_fields[] = $field; |
|
| 2441 | + } |
|
| 2442 | + } |
|
| 2443 | + $custom_fields = $parse_custom_fields; |
|
| 2444 | + } |
|
| 2445 | + //print_r($custom_fields); |
|
| 2446 | + if (!empty($custom_fields)) {
|
|
| 2491 | 2447 | |
| 2448 | + global $field_set_start; |
|
| 2492 | 2449 | |
| 2493 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2494 | - $type = stripslashes_deep($type); // strip slashes |
|
| 2495 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2496 | - $html = ''; |
|
| 2497 | - $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2498 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2499 | - $field_icon = geodir_field_icon_proccess($type); |
|
| 2500 | - $filed_type = $type['type']; |
|
| 2501 | - |
|
| 2502 | - /** |
|
| 2503 | - * Filter the output for custom fields. |
|
| 2504 | - * |
|
| 2505 | - * Here we can remove or add new functions depending on the field type. |
|
| 2506 | - * |
|
| 2507 | - * @param string $html The html to be filtered (blank). |
|
| 2508 | - * @param string $fields_location The location the field is to be show. |
|
| 2509 | - * @param array $type The array of field values. |
|
| 2510 | - */ |
|
| 2511 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2512 | - |
|
| 2513 | - |
|
| 2514 | - /** |
|
| 2515 | - * Filter custom field output in tab. |
|
| 2516 | - * |
|
| 2517 | - * @since 1.5.6 |
|
| 2518 | - * |
|
| 2519 | - * @param string $html_var The HTML variable name for the field. |
|
| 2520 | - * @param string $html Custom field unfiltered HTML. |
|
| 2521 | - * @param array $variables_array Custom field variables array. |
|
| 2522 | - */ |
|
| 2523 | - $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2524 | - |
|
| 2525 | - $fieldset_html = ''; |
|
| 2526 | - if ($field_set_start == 1) {
|
|
| 2527 | - $add_html = false; |
|
| 2528 | - if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2529 | - if ($fieldset != '') {
|
|
| 2530 | - $add_html = true; |
|
| 2531 | - $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2532 | - $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2533 | - } |
|
| 2534 | - $fieldset_html = $fieldset; |
|
| 2535 | - $fieldset = ''; |
|
| 2536 | - } else {
|
|
| 2537 | - $fieldset .= $html; |
|
| 2538 | - if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2539 | - $add_html = true; |
|
| 2540 | - $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2541 | - $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2542 | - $fieldset_html = $fieldset; |
|
| 2543 | - } |
|
| 2544 | - } |
|
| 2545 | - |
|
| 2546 | - if ($add_html) {
|
|
| 2547 | - $tabs_arr[$htmlvar_name] = array( |
|
| 2548 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2549 | - 'is_active_tab' => false, |
|
| 2550 | - /** |
|
| 2551 | - * Filter if a custom field should be displayed on the details page tab. |
|
| 2552 | - * |
|
| 2553 | - * @since 1.0.0 |
|
| 2554 | - * @param string $htmlvar_name The field HTML var name. |
|
| 2555 | - */ |
|
| 2556 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2557 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2558 | - ); |
|
| 2559 | - } |
|
| 2560 | - } else {
|
|
| 2561 | - if ($html != '') {
|
|
| 2562 | - $tabs_arr[$html_var] = array( |
|
| 2563 | - 'heading_text' => __($label, 'geodirectory'), |
|
| 2564 | - 'is_active_tab' => false, |
|
| 2565 | - /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2566 | - 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2567 | - 'tab_content' => $html |
|
| 2568 | - ); |
|
| 2569 | - } |
|
| 2570 | - } |
|
| 2571 | - } |
|
| 2572 | - } |
|
| 2573 | - } |
|
| 2574 | - } |
|
| 2575 | - return $tabs_arr; |
|
| 2450 | + $post = stripslashes_deep($post); // strip slashes |
|
| 2451 | + |
|
| 2452 | + $field_set_start = 0; |
|
| 2453 | + $fieldset_count = 0; |
|
| 2454 | + $fieldset = ''; |
|
| 2455 | + $total_fields = count($custom_fields); |
|
| 2456 | + $count_field = 0; |
|
| 2457 | + $fieldset_arr = array(); |
|
| 2458 | + $i = 0; |
|
| 2459 | + $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL; |
|
| 2460 | + |
|
| 2461 | + foreach ($custom_fields as $field) {
|
|
| 2462 | + $count_field++; |
|
| 2463 | + $field_name = $field['htmlvar_name']; |
|
| 2464 | + if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {
|
|
| 2465 | + $post->{$field_name} = $_REQUEST[$field_name];
|
|
| 2466 | + } |
|
| 2467 | + |
|
| 2468 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2469 | + $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
|
| 2470 | + $site_title = trim($field['site_title']); |
|
| 2471 | + $type = $field; |
|
| 2472 | + $variables_array = array(); |
|
| 2473 | + |
|
| 2474 | + if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
|
| 2475 | + continue; |
|
| 2476 | + } |
|
| 2477 | + |
|
| 2478 | + if ($type['type'] != 'fieldset') {
|
|
| 2479 | + $i++; |
|
| 2480 | + $variables_array['post_id'] = $post->ID; |
|
| 2481 | + $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
|
| 2482 | + $variables_array['value'] = ''; |
|
| 2483 | + $variables_array['value'] = $post->{$type['htmlvar_name']};
|
|
| 2484 | + }else{
|
|
| 2485 | + $i = 0; |
|
| 2486 | + $fieldset_count++; |
|
| 2487 | + $field_set_start = 1; |
|
| 2488 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2489 | + $fieldset_arr[$fieldset_count]['label'] = $label; |
|
| 2490 | + } |
|
| 2491 | + |
|
| 2492 | + |
|
| 2493 | + if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2494 | + $type = stripslashes_deep($type); // strip slashes |
|
| 2495 | + if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2496 | + $html = ''; |
|
| 2497 | + $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
|
| 2498 | + if($html_var=='post'){$html_var='post_address';}
|
|
| 2499 | + $field_icon = geodir_field_icon_proccess($type); |
|
| 2500 | + $filed_type = $type['type']; |
|
| 2501 | + |
|
| 2502 | + /** |
|
| 2503 | + * Filter the output for custom fields. |
|
| 2504 | + * |
|
| 2505 | + * Here we can remove or add new functions depending on the field type. |
|
| 2506 | + * |
|
| 2507 | + * @param string $html The html to be filtered (blank). |
|
| 2508 | + * @param string $fields_location The location the field is to be show. |
|
| 2509 | + * @param array $type The array of field values. |
|
| 2510 | + */ |
|
| 2511 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2512 | + |
|
| 2513 | + |
|
| 2514 | + /** |
|
| 2515 | + * Filter custom field output in tab. |
|
| 2516 | + * |
|
| 2517 | + * @since 1.5.6 |
|
| 2518 | + * |
|
| 2519 | + * @param string $html_var The HTML variable name for the field. |
|
| 2520 | + * @param string $html Custom field unfiltered HTML. |
|
| 2521 | + * @param array $variables_array Custom field variables array. |
|
| 2522 | + */ |
|
| 2523 | + $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);
|
|
| 2524 | + |
|
| 2525 | + $fieldset_html = ''; |
|
| 2526 | + if ($field_set_start == 1) {
|
|
| 2527 | + $add_html = false; |
|
| 2528 | + if ($type['type'] == 'fieldset' && $fieldset_count > 1) {
|
|
| 2529 | + if ($fieldset != '') {
|
|
| 2530 | + $add_html = true; |
|
| 2531 | + $label = $fieldset_arr[$fieldset_count - 1]['label']; |
|
| 2532 | + $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name']; |
|
| 2533 | + } |
|
| 2534 | + $fieldset_html = $fieldset; |
|
| 2535 | + $fieldset = ''; |
|
| 2536 | + } else {
|
|
| 2537 | + $fieldset .= $html; |
|
| 2538 | + if ($total_fields == $count_field && $fieldset != '') {
|
|
| 2539 | + $add_html = true; |
|
| 2540 | + $label = $fieldset_arr[$fieldset_count]['label']; |
|
| 2541 | + $htmlvar_name = $fieldset_arr[$fieldset_count]['htmlvar_name']; |
|
| 2542 | + $fieldset_html = $fieldset; |
|
| 2543 | + } |
|
| 2544 | + } |
|
| 2545 | + |
|
| 2546 | + if ($add_html) {
|
|
| 2547 | + $tabs_arr[$htmlvar_name] = array( |
|
| 2548 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2549 | + 'is_active_tab' => false, |
|
| 2550 | + /** |
|
| 2551 | + * Filter if a custom field should be displayed on the details page tab. |
|
| 2552 | + * |
|
| 2553 | + * @since 1.0.0 |
|
| 2554 | + * @param string $htmlvar_name The field HTML var name. |
|
| 2555 | + */ |
|
| 2556 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
|
| 2557 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2558 | + ); |
|
| 2559 | + } |
|
| 2560 | + } else {
|
|
| 2561 | + if ($html != '') {
|
|
| 2562 | + $tabs_arr[$html_var] = array( |
|
| 2563 | + 'heading_text' => __($label, 'geodirectory'), |
|
| 2564 | + 'is_active_tab' => false, |
|
| 2565 | + /** This action is documented in geodirectory_hooks_actions.php */ |
|
| 2566 | + 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),
|
|
| 2567 | + 'tab_content' => $html |
|
| 2568 | + ); |
|
| 2569 | + } |
|
| 2570 | + } |
|
| 2571 | + } |
|
| 2572 | + } |
|
| 2573 | + } |
|
| 2574 | + } |
|
| 2575 | + return $tabs_arr; |
|
| 2576 | 2576 | } |
| 2577 | 2577 | |
| 2578 | 2578 | /* display add listing page for wpml */ |
@@ -2596,39 +2596,39 @@ discard block |
||
| 2596 | 2596 | */ |
| 2597 | 2597 | function geodir_add_post_status_author_page() |
| 2598 | 2598 | {
|
| 2599 | - global $wpdb, $post; |
|
| 2600 | - |
|
| 2601 | - $html = ''; |
|
| 2602 | - if (get_current_user_id()) {
|
|
| 2603 | - |
|
| 2604 | - $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2605 | - if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2606 | - |
|
| 2607 | - // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2608 | - $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2609 | - $status = "<strong>(";
|
|
| 2610 | - $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2611 | - if ($real_status == 'publish') {
|
|
| 2612 | - $status .= __('Published', 'geodirectory');
|
|
| 2613 | - } else {
|
|
| 2614 | - $status .= __('Not published', 'geodirectory');
|
|
| 2615 | - $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2616 | - } |
|
| 2617 | - $status .= ")</strong>"; |
|
| 2599 | + global $wpdb, $post; |
|
| 2600 | + |
|
| 2601 | + $html = ''; |
|
| 2602 | + if (get_current_user_id()) {
|
|
| 2603 | + |
|
| 2604 | + $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));
|
|
| 2605 | + if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {
|
|
| 2606 | + |
|
| 2607 | + // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them. |
|
| 2608 | + $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");
|
|
| 2609 | + $status = "<strong>(";
|
|
| 2610 | + $status_icon = '<i class="fa fa-play"></i>'; |
|
| 2611 | + if ($real_status == 'publish') {
|
|
| 2612 | + $status .= __('Published', 'geodirectory');
|
|
| 2613 | + } else {
|
|
| 2614 | + $status .= __('Not published', 'geodirectory');
|
|
| 2615 | + $status_icon = '<i class="fa fa-pause"></i>'; |
|
| 2616 | + } |
|
| 2617 | + $status .= ")</strong>"; |
|
| 2618 | 2618 | |
| 2619 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2620 | - } |
|
| 2621 | - } |
|
| 2619 | + $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2620 | + } |
|
| 2621 | + } |
|
| 2622 | 2622 | |
| 2623 | - if ($html != '') {
|
|
| 2624 | - /** |
|
| 2625 | - * Filter the post status text on the author page. |
|
| 2626 | - * |
|
| 2627 | - * @since 1.0.0 |
|
| 2628 | - * @param string $html The HTML of the status. |
|
| 2629 | - */ |
|
| 2630 | - echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2631 | - } |
|
| 2623 | + if ($html != '') {
|
|
| 2624 | + /** |
|
| 2625 | + * Filter the post status text on the author page. |
|
| 2626 | + * |
|
| 2627 | + * @since 1.0.0 |
|
| 2628 | + * @param string $html The HTML of the status. |
|
| 2629 | + */ |
|
| 2630 | + echo apply_filters('geodir_filter_status_text_on_author_page', $html);
|
|
| 2631 | + } |
|
| 2632 | 2632 | |
| 2633 | 2633 | |
| 2634 | 2634 | } |
@@ -2642,9 +2642,9 @@ discard block |
||
| 2642 | 2642 | * @package GeoDirectory |
| 2643 | 2643 | */ |
| 2644 | 2644 | function geodir_init_no_rating() {
|
| 2645 | - if (geodir_rating_disabled_post_types()) {
|
|
| 2646 | - add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2647 | - } |
|
| 2645 | + if (geodir_rating_disabled_post_types()) {
|
|
| 2646 | + add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);
|
|
| 2647 | + } |
|
| 2648 | 2648 | } |
| 2649 | 2649 | |
| 2650 | 2650 | /** |
@@ -2658,22 +2658,22 @@ discard block |
||
| 2658 | 2658 | * @return array Modified sort options array. |
| 2659 | 2659 | */ |
| 2660 | 2660 | function geodir_no_rating_get_sort_options($options, $post_type = '') {
|
| 2661 | - if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2662 | - $new_options = array(); |
|
| 2661 | + if (!empty($post_type) && geodir_cpt_has_rating_disabled($post_type)) {
|
|
| 2662 | + $new_options = array(); |
|
| 2663 | 2663 | |
| 2664 | - if (!empty($options)) {
|
|
| 2665 | - foreach ($options as $option) {
|
|
| 2666 | - if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2667 | - continue; |
|
| 2668 | - } |
|
| 2669 | - $new_options[] = $option; |
|
| 2670 | - } |
|
| 2664 | + if (!empty($options)) {
|
|
| 2665 | + foreach ($options as $option) {
|
|
| 2666 | + if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {
|
|
| 2667 | + continue; |
|
| 2668 | + } |
|
| 2669 | + $new_options[] = $option; |
|
| 2670 | + } |
|
| 2671 | 2671 | |
| 2672 | - $options = $new_options; |
|
| 2673 | - } |
|
| 2674 | - } |
|
| 2672 | + $options = $new_options; |
|
| 2673 | + } |
|
| 2674 | + } |
|
| 2675 | 2675 | |
| 2676 | - return $options; |
|
| 2676 | + return $options; |
|
| 2677 | 2677 | } |
| 2678 | 2678 | |
| 2679 | 2679 | /** |
@@ -2685,9 +2685,9 @@ discard block |
||
| 2685 | 2685 | * @return array Modified class array. |
| 2686 | 2686 | */ |
| 2687 | 2687 | function geodir_body_class_active_map($classes = array()) {
|
| 2688 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2688 | + $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2689 | 2689 | |
| 2690 | - return $classes; |
|
| 2690 | + return $classes; |
|
| 2691 | 2691 | } |
| 2692 | 2692 | add_filter('body_class', 'geodir_body_class_active_map', 100);
|
| 2693 | 2693 | |
@@ -2700,9 +2700,9 @@ discard block |
||
| 2700 | 2700 | * @return string Modified class string. |
| 2701 | 2701 | */ |
| 2702 | 2702 | function geodir_admin_body_class_active_map($class = '') {
|
| 2703 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2703 | + $class .= ' gd-map-' . geodir_map_name(); |
|
| 2704 | 2704 | |
| 2705 | - return $class; |
|
| 2705 | + return $class; |
|
| 2706 | 2706 | } |
| 2707 | 2707 | add_filter('admin_body_class', 'geodir_admin_body_class_active_map', 100);
|
| 2708 | 2708 | |
@@ -2720,36 +2720,36 @@ discard block |
||
| 2720 | 2720 | * @return array Translation texts. |
| 2721 | 2721 | */ |
| 2722 | 2722 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2723 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2724 | - |
|
| 2725 | - $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2726 | - |
|
| 2727 | - /** |
|
| 2728 | - * Filters the geodirectory option names that requires to add for translation. |
|
| 2729 | - * |
|
| 2730 | - * @since 1.5.7 |
|
| 2731 | - * @package GeoDirectory |
|
| 2732 | - * |
|
| 2733 | - * @param array $gd_options Array of option names. |
|
| 2734 | - */ |
|
| 2735 | - $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2736 | - $gd_options = array_unique($gd_options); |
|
| 2737 | - |
|
| 2738 | - if (!empty($gd_options)) {
|
|
| 2739 | - foreach ($gd_options as $gd_option) {
|
|
| 2740 | - if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2741 | - $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2723 | + $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2724 | + |
|
| 2725 | + $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
|
| 2726 | + |
|
| 2727 | + /** |
|
| 2728 | + * Filters the geodirectory option names that requires to add for translation. |
|
| 2729 | + * |
|
| 2730 | + * @since 1.5.7 |
|
| 2731 | + * @package GeoDirectory |
|
| 2732 | + * |
|
| 2733 | + * @param array $gd_options Array of option names. |
|
| 2734 | + */ |
|
| 2735 | + $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);
|
|
| 2736 | + $gd_options = array_unique($gd_options); |
|
| 2737 | + |
|
| 2738 | + if (!empty($gd_options)) {
|
|
| 2739 | + foreach ($gd_options as $gd_option) {
|
|
| 2740 | + if ($gd_option != '' && $option_value = get_option($gd_option)) {
|
|
| 2741 | + $option_value = is_string($option_value) ? stripslashes_deep($option_value) : ''; |
|
| 2742 | 2742 | |
| 2743 | - if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2744 | - $translation_texts[] = stripslashes_deep($option_value); |
|
| 2745 | - } |
|
| 2746 | - } |
|
| 2747 | - } |
|
| 2748 | - } |
|
| 2743 | + if ($option_value != '' && !in_array($option_value, $translation_texts)) {
|
|
| 2744 | + $translation_texts[] = stripslashes_deep($option_value); |
|
| 2745 | + } |
|
| 2746 | + } |
|
| 2747 | + } |
|
| 2748 | + } |
|
| 2749 | 2749 | |
| 2750 | - $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2750 | + $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts; |
|
| 2751 | 2751 | |
| 2752 | - return $translation_texts; |
|
| 2752 | + return $translation_texts; |
|
| 2753 | 2753 | } |
| 2754 | 2754 | |
| 2755 | 2755 | add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');
|
@@ -2763,15 +2763,15 @@ discard block |
||
| 2763 | 2763 | |
| 2764 | 2764 | add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);
|
| 2765 | 2765 | function gd_get_comments_link($comments_link, $post_id) {
|
| 2766 | - $post_type = get_post_type($post_id); |
|
| 2766 | + $post_type = get_post_type($post_id); |
|
| 2767 | 2767 | |
| 2768 | - $all_postypes = geodir_get_posttypes(); |
|
| 2769 | - if (in_array($post_type, $all_postypes)) {
|
|
| 2770 | - $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2771 | - $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2772 | - } |
|
| 2768 | + $all_postypes = geodir_get_posttypes(); |
|
| 2769 | + if (in_array($post_type, $all_postypes)) {
|
|
| 2770 | + $comments_link = str_replace('#comments', '#reviews', $comments_link);
|
|
| 2771 | + $comments_link = str_replace('#respond', '#reviews', $comments_link);
|
|
| 2772 | + } |
|
| 2773 | 2773 | |
| 2774 | - return $comments_link; |
|
| 2774 | + return $comments_link; |
|
| 2775 | 2775 | } |
| 2776 | 2776 | |
| 2777 | 2777 | |
@@ -2789,11 +2789,11 @@ discard block |
||
| 2789 | 2789 | function geodir_add_nav_menu_class( $args ) |
| 2790 | 2790 | {
|
| 2791 | 2791 | |
| 2792 | - if(isset($args['menu_class'])){
|
|
| 2793 | - $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2794 | - } |
|
| 2792 | + if(isset($args['menu_class'])){
|
|
| 2793 | + $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
|
| 2794 | + } |
|
| 2795 | 2795 | |
| 2796 | - return $args; |
|
| 2796 | + return $args; |
|
| 2797 | 2797 | } |
| 2798 | 2798 | |
| 2799 | 2799 | add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
@@ -2810,15 +2810,15 @@ discard block |
||
| 2810 | 2810 | * @return string Filtered locale ID. |
| 2811 | 2811 | */ |
| 2812 | 2812 | function geodir_wpml_filter_locale($locale) {
|
| 2813 | - global $sitepress; |
|
| 2813 | + global $sitepress; |
|
| 2814 | 2814 | |
| 2815 | - $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2815 | + $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : ''); |
|
| 2816 | 2816 | |
| 2817 | - if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2818 | - $locale = $sitepress->get_locale($current_lang); |
|
| 2819 | - } |
|
| 2817 | + if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {
|
|
| 2818 | + $locale = $sitepress->get_locale($current_lang); |
|
| 2819 | + } |
|
| 2820 | 2820 | |
| 2821 | - return $locale; |
|
| 2821 | + return $locale; |
|
| 2822 | 2822 | } |
| 2823 | 2823 | |
| 2824 | 2824 | /** |
@@ -2828,19 +2828,19 @@ discard block |
||
| 2828 | 2828 | * @package GeoDirectory |
| 2829 | 2829 | */ |
| 2830 | 2830 | function geodir_wpml_set_filter() {
|
| 2831 | - if (function_exists('icl_object_id')) {
|
|
| 2832 | - global $sitepress; |
|
| 2831 | + if (function_exists('icl_object_id')) {
|
|
| 2832 | + global $sitepress; |
|
| 2833 | 2833 | |
| 2834 | - if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2835 | - add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2836 | - } |
|
| 2834 | + if ($sitepress->get_setting('sync_comments_on_duplicates')) {
|
|
| 2835 | + add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);
|
|
| 2836 | + } |
|
| 2837 | 2837 | |
| 2838 | - add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2839 | - add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2840 | - if (is_admin()) {
|
|
| 2841 | - add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2842 | - } |
|
| 2843 | - } |
|
| 2838 | + add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
|
| 2839 | + add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2840 | + if (is_admin()) {
|
|
| 2841 | + add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2842 | + } |
|
| 2843 | + } |
|
| 2844 | 2844 | } |
| 2845 | 2845 | add_filter('plugins_loaded', 'geodir_wpml_set_filter');
|
| 2846 | 2846 | |
@@ -2853,38 +2853,38 @@ discard block |
||
| 2853 | 2853 | * @return array Filtered languages. |
| 2854 | 2854 | */ |
| 2855 | 2855 | function geodir_wpml_filter_ls_languages($languages) {
|
| 2856 | - if (geodir_is_geodir_page()) {
|
|
| 2857 | - $keep_vars = array(); |
|
| 2856 | + if (geodir_is_geodir_page()) {
|
|
| 2857 | + $keep_vars = array(); |
|
| 2858 | 2858 | |
| 2859 | - if (geodir_is_page('add-listing')) {
|
|
| 2860 | - $keep_vars = array('listing_type', 'package_id');
|
|
| 2861 | - } else if (geodir_is_page('search')) {
|
|
| 2862 | - $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2863 | - } else if (geodir_is_page('author')) {
|
|
| 2864 | - $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2865 | - } else if (geodir_is_page('login')) {
|
|
| 2866 | - $keep_vars = array('forgot', 'signup');
|
|
| 2867 | - } |
|
| 2859 | + if (geodir_is_page('add-listing')) {
|
|
| 2860 | + $keep_vars = array('listing_type', 'package_id');
|
|
| 2861 | + } else if (geodir_is_page('search')) {
|
|
| 2862 | + $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');
|
|
| 2863 | + } else if (geodir_is_page('author')) {
|
|
| 2864 | + $keep_vars = array('geodir_dashbord', 'stype', 'list');
|
|
| 2865 | + } else if (geodir_is_page('login')) {
|
|
| 2866 | + $keep_vars = array('forgot', 'signup');
|
|
| 2867 | + } |
|
| 2868 | 2868 | |
| 2869 | - if (!empty($keep_vars)) {
|
|
| 2870 | - foreach ( $languages as $code => $url) {
|
|
| 2871 | - $filter_url = $url['url']; |
|
| 2869 | + if (!empty($keep_vars)) {
|
|
| 2870 | + foreach ( $languages as $code => $url) {
|
|
| 2871 | + $filter_url = $url['url']; |
|
| 2872 | 2872 | |
| 2873 | - foreach ($keep_vars as $var) {
|
|
| 2874 | - if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2875 | - $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2876 | - $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2877 | - } |
|
| 2878 | - } |
|
| 2873 | + foreach ($keep_vars as $var) {
|
|
| 2874 | + if (isset($_GET[$var]) && !is_array($_GET[$var])) {
|
|
| 2875 | + $filter_url = remove_query_arg(array($var), $filter_url); |
|
| 2876 | + $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url); |
|
| 2877 | + } |
|
| 2878 | + } |
|
| 2879 | 2879 | |
| 2880 | - if ($filter_url != $url['url']) {
|
|
| 2881 | - $languages[$code]['url'] = $filter_url; |
|
| 2882 | - } |
|
| 2883 | - } |
|
| 2884 | - } |
|
| 2885 | - } |
|
| 2880 | + if ($filter_url != $url['url']) {
|
|
| 2881 | + $languages[$code]['url'] = $filter_url; |
|
| 2882 | + } |
|
| 2883 | + } |
|
| 2884 | + } |
|
| 2885 | + } |
|
| 2886 | 2886 | |
| 2887 | - return $languages; |
|
| 2887 | + return $languages; |
|
| 2888 | 2888 | } |
| 2889 | 2889 | add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
| 2890 | 2890 | |
@@ -2895,18 +2895,18 @@ discard block |
||
| 2895 | 2895 | * |
| 2896 | 2896 | */ |
| 2897 | 2897 | function geodir_remove_yoast_seo_metas(){
|
| 2898 | - if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2899 | - $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2898 | + if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2899 | + $wpseo = WPSEO_Frontend::get_instance(); |
|
| 2900 | 2900 | |
| 2901 | - remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2902 | - remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2903 | - remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2904 | - remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2905 | - remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2906 | - remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2901 | + remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2902 | + remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2903 | + remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2904 | + remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2905 | + remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2906 | + remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2907 | 2907 | |
| 2908 | - remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2909 | - } |
|
| 2908 | + remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2909 | + } |
|
| 2910 | 2910 | } |
| 2911 | 2911 | |
| 2912 | 2912 | /** |
@@ -2920,20 +2920,20 @@ discard block |
||
| 2920 | 2920 | * |
| 2921 | 2921 | */ |
| 2922 | 2922 | function geodir_wpml_ajax_set_guest_lang() {
|
| 2923 | - if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2924 | - if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2925 | - global $sitepress; |
|
| 2923 | + if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2924 | + if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2925 | + global $sitepress; |
|
| 2926 | 2926 | |
| 2927 | - $referer = wp_get_referer(); |
|
| 2927 | + $referer = wp_get_referer(); |
|
| 2928 | 2928 | |
| 2929 | - $current_lang = $sitepress->get_current_language(); |
|
| 2930 | - $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2929 | + $current_lang = $sitepress->get_current_language(); |
|
| 2930 | + $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2931 | 2931 | |
| 2932 | - if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2933 | - $_GET['lang'] = $referrer_lang; |
|
| 2934 | - } |
|
| 2935 | - } |
|
| 2936 | - } |
|
| 2932 | + if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2933 | + $_GET['lang'] = $referrer_lang; |
|
| 2934 | + } |
|
| 2935 | + } |
|
| 2936 | + } |
|
| 2937 | 2937 | } |
| 2938 | 2938 | add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
| 2939 | 2939 | |
@@ -2945,36 +2945,36 @@ discard block |
||
| 2945 | 2945 | * @param object $wp The WordPress object. |
| 2946 | 2946 | */ |
| 2947 | 2947 | function geodir_check_redirect($wp) {
|
| 2948 | - if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2949 | - $current_url = geodir_curPageURL(); |
|
| 2950 | - $search = 'czech-republic'; |
|
| 2951 | - $replace = 'czechia'; |
|
| 2948 | + if (is_404() || (!empty($wp->query_vars['error']) && $wp->query_vars['error'] == '404')) {
|
|
| 2949 | + $current_url = geodir_curPageURL(); |
|
| 2950 | + $search = 'czech-republic'; |
|
| 2951 | + $replace = 'czechia'; |
|
| 2952 | 2952 | |
| 2953 | - $has_slash = substr($current_url, -1); |
|
| 2954 | - if ($has_slash != "/") {
|
|
| 2955 | - $current_url .= '/'; |
|
| 2956 | - } |
|
| 2953 | + $has_slash = substr($current_url, -1); |
|
| 2954 | + if ($has_slash != "/") {
|
|
| 2955 | + $current_url .= '/'; |
|
| 2956 | + } |
|
| 2957 | 2957 | |
| 2958 | - $redirect = false; |
|
| 2959 | - if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2960 | - $redirect = true; |
|
| 2961 | - $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2962 | - } |
|
| 2958 | + $redirect = false; |
|
| 2959 | + if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2960 | + $redirect = true; |
|
| 2961 | + $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2962 | + } |
|
| 2963 | 2963 | |
| 2964 | - if ($has_slash != "/") {
|
|
| 2965 | - $current_url = trim($current_url, '/'); |
|
| 2966 | - } |
|
| 2964 | + if ($has_slash != "/") {
|
|
| 2965 | + $current_url = trim($current_url, '/'); |
|
| 2966 | + } |
|
| 2967 | 2967 | |
| 2968 | - if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2969 | - $redirect = true; |
|
| 2970 | - $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2971 | - } |
|
| 2972 | - |
|
| 2973 | - if ($redirect) {
|
|
| 2974 | - wp_redirect($current_url); |
|
| 2975 | - exit; |
|
| 2976 | - } |
|
| 2977 | - } |
|
| 2968 | + if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2969 | + $redirect = true; |
|
| 2970 | + $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2971 | + } |
|
| 2972 | + |
|
| 2973 | + if ($redirect) {
|
|
| 2974 | + wp_redirect($current_url); |
|
| 2975 | + exit; |
|
| 2976 | + } |
|
| 2977 | + } |
|
| 2978 | 2978 | } |
| 2979 | 2979 | add_action('parse_request', 'geodir_check_redirect', 101, 1);
|
| 2980 | 2980 | |
@@ -2993,31 +2993,31 @@ discard block |
||
| 2993 | 2993 | * @param string $original_slug The original post slug. |
| 2994 | 2994 | */ |
| 2995 | 2995 | function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
|
| 2996 | - global $wpdb; |
|
| 2996 | + global $wpdb; |
|
| 2997 | 2997 | |
| 2998 | - if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 2999 | - $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '" . $post_type . "category' OR taxonomy = '" . $post_type . "_tags' ) LIMIT 1", $slug ) ); |
|
| 2998 | + if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 2999 | + $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '" . $post_type . "category' OR taxonomy = '" . $post_type . "_tags' ) LIMIT 1", $slug ) ); |
|
| 3000 | 3000 | |
| 3001 | - if ( $term_slug_check ) {
|
|
| 3002 | - $suffix = 1; |
|
| 3001 | + if ( $term_slug_check ) {
|
|
| 3002 | + $suffix = 1; |
|
| 3003 | 3003 | |
| 3004 | - do {
|
|
| 3005 | - $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3004 | + do {
|
|
| 3005 | + $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3006 | 3006 | |
| 3007 | - $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '" . $post_type . "category' OR taxonomy = '" . $post_type . "_tags' ) LIMIT 1", $alt_slug ) ); |
|
| 3007 | + $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '" . $post_type . "category' OR taxonomy = '" . $post_type . "_tags' ) LIMIT 1", $alt_slug ) ); |
|
| 3008 | 3008 | |
| 3009 | - $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1", $alt_slug, $post_type, $post_ID ) ); |
|
| 3009 | + $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1", $alt_slug, $post_type, $post_ID ) ); |
|
| 3010 | 3010 | |
| 3011 | - $term_slug_check = $term_check || $post_check; |
|
| 3011 | + $term_slug_check = $term_check || $post_check; |
|
| 3012 | 3012 | |
| 3013 | - $suffix++; |
|
| 3014 | - } while ( $term_slug_check ); |
|
| 3013 | + $suffix++; |
|
| 3014 | + } while ( $term_slug_check ); |
|
| 3015 | 3015 | |
| 3016 | - $slug = $alt_slug; |
|
| 3017 | - } |
|
| 3018 | - } |
|
| 3016 | + $slug = $alt_slug; |
|
| 3017 | + } |
|
| 3018 | + } |
|
| 3019 | 3019 | |
| 3020 | - return $slug; |
|
| 3020 | + return $slug; |
|
| 3021 | 3021 | } |
| 3022 | 3022 | add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 10, 6 ); |
| 3023 | 3023 | |
@@ -3035,24 +3035,24 @@ discard block |
||
| 3035 | 3035 | * @return bool true when exists. false when not exists. |
| 3036 | 3036 | */ |
| 3037 | 3037 | function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {
|
| 3038 | - global $wpdb, $gd_term_post_type; |
|
| 3038 | + global $wpdb, $gd_term_post_type; |
|
| 3039 | 3039 | |
| 3040 | - if ( $slug_exists ) {
|
|
| 3041 | - return $slug_exists; |
|
| 3042 | - } |
|
| 3040 | + if ( $slug_exists ) {
|
|
| 3041 | + return $slug_exists; |
|
| 3042 | + } |
|
| 3043 | 3043 | |
| 3044 | - if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3045 | - $post_type = $gd_term_post_type[$term_id]; |
|
| 3046 | - } else {
|
|
| 3047 | - $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3048 | - $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3049 | - $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3050 | - } |
|
| 3044 | + if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3045 | + $post_type = $gd_term_post_type[$term_id]; |
|
| 3046 | + } else {
|
|
| 3047 | + $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3048 | + $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3049 | + $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3050 | + } |
|
| 3051 | 3051 | |
| 3052 | - if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3053 | - $slug_exists = true; |
|
| 3054 | - } |
|
| 3052 | + if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3053 | + $slug_exists = true; |
|
| 3054 | + } |
|
| 3055 | 3055 | |
| 3056 | - return $slug_exists; |
|
| 3056 | + return $slug_exists; |
|
| 3057 | 3057 | } |
| 3058 | 3058 | add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 ); |
| 3059 | 3059 | \ No newline at end of file |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | /* ON TEMPLATE INCLUDE */ |
| 137 | 137 | ///////////////////////// |
| 138 | 138 | |
| 139 | -add_filter('template_include', 'geodir_template_loader',9);
|
|
| 139 | +add_filter('template_include', 'geodir_template_loader', 9);
|
|
| 140 | 140 | |
| 141 | 141 | ///////////////////////// |
| 142 | 142 | /* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */ |
@@ -176,9 +176,9 @@ discard block |
||
| 176 | 176 | /* WP REVIEW COUNT ACTIONS */ |
| 177 | 177 | //////////////////////// |
| 178 | 178 | |
| 179 | -add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100,1);
|
|
| 179 | +add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100, 1);
|
|
| 180 | 180 | //add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);
|
| 181 | -add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);
|
|
| 181 | +add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);
|
|
| 182 | 182 | //add_action('created_term', 'geodir_term_review_count_force_update', 100);
|
| 183 | 183 | add_action('edited_term', 'geodir_term_review_count_force_update', 100);
|
| 184 | 184 | add_action('delete_term', 'geodir_term_review_count_force_update', 100);
|
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | function geodir_unset_prev_theme_nav_location($newname) |
| 225 | 225 | {
|
| 226 | - $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);
|
|
| 226 | + $geodir_theme_location = get_option('geodir_theme_location_nav_'.$newname);
|
|
| 227 | 227 | if ($geodir_theme_location) {
|
| 228 | 228 | update_option('geodir_theme_location_nav', $geodir_theme_location);
|
| 229 | 229 | } else {
|
@@ -321,8 +321,8 @@ discard block |
||
| 321 | 321 | |
| 322 | 322 | /////// GEO DIRECOTORY CUSTOM HOOKS /// |
| 323 | 323 | |
| 324 | -add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content
|
|
| 325 | -add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content
|
|
| 324 | +add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content
|
|
| 325 | +add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content
|
|
| 326 | 326 | |
| 327 | 327 | // Detail page sidebar content |
| 328 | 328 | add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);
|
@@ -422,8 +422,8 @@ discard block |
||
| 422 | 422 | do_action('geodir_after_social_sharing_buttons');
|
| 423 | 423 | $content_html = ob_get_clean(); |
| 424 | 424 | if (trim($content_html) != '') |
| 425 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>'; |
|
| 426 | - if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 425 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">'.$content_html.'</div>'; |
|
| 426 | + if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {
|
|
| 427 | 427 | /** |
| 428 | 428 | * Filter the geodir_social_sharing_buttons() function content. |
| 429 | 429 | * |
@@ -463,12 +463,12 @@ discard block |
||
| 463 | 463 | $post_id = $post->ID; |
| 464 | 464 | |
| 465 | 465 | if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
|
| 466 | - $post_id = (int)$_REQUEST['pid']; |
|
| 466 | + $post_id = (int) $_REQUEST['pid']; |
|
| 467 | 467 | } |
| 468 | 468 | |
| 469 | 469 | $postlink = get_permalink(geodir_add_listing_page_id()); |
| 470 | 470 | $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);
|
| 471 | - echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';
|
|
| 471 | + echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="'.esc_url($editlink).'">'.__('Edit this Post', 'geodirectory').'</a></p>';
|
|
| 472 | 472 | } |
| 473 | 473 | }// end of if, if its a preview or not |
| 474 | 474 | /** |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | do_action('geodir_after_edit_post_link');
|
| 480 | 480 | $content_html = ob_get_clean(); |
| 481 | 481 | if (trim($content_html) != '') |
| 482 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>'; |
|
| 483 | - if ((int)get_option('geodir_disable_user_links_section') != 1) {
|
|
| 482 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">'.$content_html.'</div>'; |
|
| 483 | + if ((int) get_option('geodir_disable_user_links_section') != 1) {
|
|
| 484 | 484 | /** |
| 485 | 485 | * Filter the geodir_edit_post_link() function content. |
| 486 | 486 | * |
@@ -501,8 +501,8 @@ discard block |
||
| 501 | 501 | */ |
| 502 | 502 | function geodir_detail_page_google_analytics() |
| 503 | 503 | {
|
| 504 | - global $post,$preview; |
|
| 505 | - if($preview){return '';}
|
|
| 504 | + global $post, $preview; |
|
| 505 | + if ($preview) {return ''; }
|
|
| 506 | 506 | $package_info = array(); |
| 507 | 507 | $package_info = geodir_post_package_info($package_info, $post); |
| 508 | 508 | |
@@ -534,14 +534,14 @@ discard block |
||
| 534 | 534 | $hide_refresh = get_option('geodir_ga_auto_refresh');
|
| 535 | 535 | |
| 536 | 536 | $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0; |
| 537 | - if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {
|
|
| 537 | + if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {
|
|
| 538 | 538 | $page_url = urlencode($_SERVER['REQUEST_URI']); |
| 539 | 539 | ?> |
| 540 | 540 | <script type="text/javascript"> |
| 541 | 541 | var gd_gaTimeOut; |
| 542 | - var gd_gaTime = parseInt('<?php echo $refresh_time;?>');
|
|
| 543 | - var gd_gaHideRefresh = <?php echo (int)$hide_refresh;?>; |
|
| 544 | - var gd_gaAutoRefresh = <?php echo $auto_refresh;?>; |
|
| 542 | + var gd_gaTime = parseInt('<?php echo $refresh_time; ?>');
|
|
| 543 | + var gd_gaHideRefresh = <?php echo (int) $hide_refresh; ?>; |
|
| 544 | + var gd_gaAutoRefresh = <?php echo $auto_refresh; ?>; |
|
| 545 | 545 | ga_data1 = false; |
| 546 | 546 | ga_data2 = false; |
| 547 | 547 | ga_data3 = false; |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | } |
| 683 | 683 | |
| 684 | 684 | function gdga_noResults() {
|
| 685 | - jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');
|
|
| 685 | + jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');
|
|
| 686 | 686 | jQuery('#gdga-legend-container').html('');
|
| 687 | 687 | } |
| 688 | 688 | |
@@ -714,18 +714,18 @@ discard block |
||
| 714 | 714 | var data2 = results[1].rows.map(function(row) { return +row[2]; });
|
| 715 | 715 | //var labelsN = results[0].rows.map(function(row) { return +row[1]; });
|
| 716 | 716 | |
| 717 | - var labels = ['<?php _e('Jan', 'geodirectory');?>',
|
|
| 718 | - '<?php _e('Feb', 'geodirectory');?>',
|
|
| 719 | - '<?php _e('Mar', 'geodirectory');?>',
|
|
| 720 | - '<?php _e('Apr', 'geodirectory');?>',
|
|
| 721 | - '<?php _e('May', 'geodirectory');?>',
|
|
| 722 | - '<?php _e('Jun', 'geodirectory');?>',
|
|
| 723 | - '<?php _e('Jul', 'geodirectory');?>',
|
|
| 724 | - '<?php _e('Aug', 'geodirectory');?>',
|
|
| 725 | - '<?php _e('Sep', 'geodirectory');?>',
|
|
| 726 | - '<?php _e('Oct', 'geodirectory');?>',
|
|
| 727 | - '<?php _e('Nov', 'geodirectory');?>',
|
|
| 728 | - '<?php _e('Dec', 'geodirectory');?>'];
|
|
| 717 | + var labels = ['<?php _e('Jan', 'geodirectory'); ?>',
|
|
| 718 | + '<?php _e('Feb', 'geodirectory'); ?>',
|
|
| 719 | + '<?php _e('Mar', 'geodirectory'); ?>',
|
|
| 720 | + '<?php _e('Apr', 'geodirectory'); ?>',
|
|
| 721 | + '<?php _e('May', 'geodirectory'); ?>',
|
|
| 722 | + '<?php _e('Jun', 'geodirectory'); ?>',
|
|
| 723 | + '<?php _e('Jul', 'geodirectory'); ?>',
|
|
| 724 | + '<?php _e('Aug', 'geodirectory'); ?>',
|
|
| 725 | + '<?php _e('Sep', 'geodirectory'); ?>',
|
|
| 726 | + '<?php _e('Oct', 'geodirectory'); ?>',
|
|
| 727 | + '<?php _e('Nov', 'geodirectory'); ?>',
|
|
| 728 | + '<?php _e('Dec', 'geodirectory'); ?>'];
|
|
| 729 | 729 | |
| 730 | 730 | // Ensure the data arrays are at least as long as the labels array. |
| 731 | 731 | // Chart.js bar charts don't (yet) accept sparse datasets. |
@@ -738,13 +738,13 @@ discard block |
||
| 738 | 738 | labels : labels, |
| 739 | 739 | datasets : [ |
| 740 | 740 | {
|
| 741 | - label: '<?php _e('Last Year', 'geodirectory');?>',
|
|
| 741 | + label: '<?php _e('Last Year', 'geodirectory'); ?>',
|
|
| 742 | 742 | fillColor : "rgba(220,220,220,0.5)", |
| 743 | 743 | strokeColor : "rgba(220,220,220,1)", |
| 744 | 744 | data : data2 |
| 745 | 745 | }, |
| 746 | 746 | {
|
| 747 | - label: '<?php _e('This Year', 'geodirectory');?>',
|
|
| 747 | + label: '<?php _e('This Year', 'geodirectory'); ?>',
|
|
| 748 | 748 | fillColor : "rgba(151,187,205,0.5)", |
| 749 | 749 | strokeColor : "rgba(151,187,205,1)", |
| 750 | 750 | data : data1 |
@@ -789,30 +789,30 @@ discard block |
||
| 789 | 789 | |
| 790 | 790 | <?php |
| 791 | 791 | // Here we list the shorthand days of the week so it can be used in translation. |
| 792 | - __("Mon",'geodirectory');
|
|
| 793 | - __("Tue",'geodirectory');
|
|
| 794 | - __("Wed",'geodirectory');
|
|
| 795 | - __("Thu",'geodirectory');
|
|
| 796 | - __("Fri",'geodirectory');
|
|
| 797 | - __("Sat",'geodirectory');
|
|
| 798 | - __("Sun",'geodirectory');
|
|
| 792 | + __("Mon", 'geodirectory');
|
|
| 793 | + __("Tue", 'geodirectory');
|
|
| 794 | + __("Wed", 'geodirectory');
|
|
| 795 | + __("Thu", 'geodirectory');
|
|
| 796 | + __("Fri", 'geodirectory');
|
|
| 797 | + __("Sat", 'geodirectory');
|
|
| 798 | + __("Sun", 'geodirectory');
|
|
| 799 | 799 | ?> |
| 800 | 800 | |
| 801 | 801 | labels = [ |
| 802 | - "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",
|
|
| 803 | - "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",
|
|
| 804 | - "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",
|
|
| 805 | - "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",
|
|
| 806 | - "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",
|
|
| 807 | - "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",
|
|
| 808 | - "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"
|
|
| 802 | + "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",
|
|
| 803 | + "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",
|
|
| 804 | + "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",
|
|
| 805 | + "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",
|
|
| 806 | + "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",
|
|
| 807 | + "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",
|
|
| 808 | + "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"
|
|
| 809 | 809 | ]; |
| 810 | 810 | |
| 811 | 811 | var data = {
|
| 812 | 812 | labels : labels, |
| 813 | 813 | datasets : [ |
| 814 | 814 | {
|
| 815 | - label: '<?php _e('Last Week', 'geodirectory');?>',
|
|
| 815 | + label: '<?php _e('Last Week', 'geodirectory'); ?>',
|
|
| 816 | 816 | fillColor : "rgba(220,220,220,0.5)", |
| 817 | 817 | strokeColor : "rgba(220,220,220,1)", |
| 818 | 818 | pointColor : "rgba(220,220,220,1)", |
@@ -820,7 +820,7 @@ discard block |
||
| 820 | 820 | data : data2 |
| 821 | 821 | }, |
| 822 | 822 | {
|
| 823 | - label: '<?php _e('This Week', 'geodirectory');?>',
|
|
| 823 | + label: '<?php _e('This Week', 'geodirectory'); ?>',
|
|
| 824 | 824 | fillColor : "rgba(151,187,205,0.5)", |
| 825 | 825 | strokeColor : "rgba(151,187,205,1)", |
| 826 | 826 | pointColor : "rgba(151,187,205,1)", |
@@ -1027,18 +1027,18 @@ discard block |
||
| 1027 | 1027 | </style> |
| 1028 | 1028 | <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script> |
| 1029 | 1029 | <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script> |
| 1030 | - <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory');?></button>
|
|
| 1030 | + <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory'); ?></button>
|
|
| 1031 | 1031 | <span id="ga_stats" class="gdga-analytics-box" style="display:none"> |
| 1032 | - <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>
|
|
| 1032 | + <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>
|
|
| 1033 | 1033 | <div id="gd-active-users-container"> |
| 1034 | - <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory');?>"></i><?php _e("Active Users:", 'geodirectory');?>
|
|
| 1034 | + <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory'); ?>"></i><?php _e("Active Users:", 'geodirectory'); ?>
|
|
| 1035 | 1035 | <b class="gd-ActiveUsers-value">0</b> |
| 1036 | 1036 | </div> |
| 1037 | 1037 | </div> |
| 1038 | 1038 | <select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;"> |
| 1039 | - <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>
|
|
| 1040 | - <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>
|
|
| 1041 | - <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>
|
|
| 1039 | + <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>
|
|
| 1040 | + <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>
|
|
| 1041 | + <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>
|
|
| 1042 | 1042 | </select> |
| 1043 | 1043 | <div class="Chartjs-figure" id="gdga-chart-container"></div> |
| 1044 | 1044 | <ol class="Chartjs-legend" id="gdga-legend-container"></ol> |
@@ -1054,8 +1054,8 @@ discard block |
||
| 1054 | 1054 | do_action('geodir_after_google_analytics');
|
| 1055 | 1055 | $content_html = ob_get_clean(); |
| 1056 | 1056 | if (trim($content_html) != '') |
| 1057 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>'; |
|
| 1058 | - if ((int)get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1057 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">'.$content_html.'</div>'; |
|
| 1058 | + if ((int) get_option('geodir_disable_google_analytics_section') != 1) {
|
|
| 1059 | 1059 | /** |
| 1060 | 1060 | * Filter the geodir_edit_post_link() function content. |
| 1061 | 1061 | * |
@@ -1081,7 +1081,7 @@ discard block |
||
| 1081 | 1081 | {
|
| 1082 | 1082 | global $post, $preview, $post_images; |
| 1083 | 1083 | |
| 1084 | - if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {
|
|
| 1084 | + if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int) $post->ID)) {
|
|
| 1085 | 1085 | return; |
| 1086 | 1086 | } |
| 1087 | 1087 | ob_start(); // Start buffering; |
@@ -1116,10 +1116,10 @@ discard block |
||
| 1116 | 1116 | |
| 1117 | 1117 | $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');
|
| 1118 | 1118 | |
| 1119 | - $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';
|
|
| 1119 | + $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="'.$post_avgratings.'">'.$post_avgratings.'</span> / <span itemprop="best" content="5">5</span> '.__("based on", 'geodirectory').' </span><span class="count" itemprop="count" content="'.$comment_count.'">'.$comment_count.' '.$reviews_text.'</span><br />';
|
|
| 1120 | 1120 | |
| 1121 | 1121 | $html .= '<span class="item">'; |
| 1122 | - $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>'; |
|
| 1122 | + $html .= '<span class="fn" itemprop="itemreviewed">'.$post->post_title.'</span>'; |
|
| 1123 | 1123 | |
| 1124 | 1124 | if ($post_images) {
|
| 1125 | 1125 | foreach ($post_images as $img) {
|
@@ -1129,7 +1129,7 @@ discard block |
||
| 1129 | 1129 | } |
| 1130 | 1130 | |
| 1131 | 1131 | if (isset($post_img) && $post_img) {
|
| 1132 | - $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />'; |
|
| 1132 | + $html .= '<br /><img src="'.$post_img.'" class="photo" alt="'.esc_attr($post->post_title).'" itemprop="photo" content="'.$post_img.'" class="photo" />'; |
|
| 1133 | 1133 | } |
| 1134 | 1134 | |
| 1135 | 1135 | $html .= '</span>'; |
@@ -1156,9 +1156,9 @@ discard block |
||
| 1156 | 1156 | do_action('geodir_after_detail_page_review_rating');
|
| 1157 | 1157 | $content_html = ob_get_clean(); |
| 1158 | 1158 | if (trim($content_html) != '') {
|
| 1159 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>'; |
|
| 1159 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">'.$content_html.'</div>'; |
|
| 1160 | 1160 | } |
| 1161 | - if ((int)get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1161 | + if ((int) get_option('geodir_disable_rating_info_section') != 1) {
|
|
| 1162 | 1162 | /** |
| 1163 | 1163 | * Filter the geodir_detail_page_review_rating() function content. |
| 1164 | 1164 | * |
@@ -1197,8 +1197,8 @@ discard block |
||
| 1197 | 1197 | |
| 1198 | 1198 | $content_html = ob_get_clean(); |
| 1199 | 1199 | if (trim($content_html) != '') |
| 1200 | - $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>'; |
|
| 1201 | - if ((int)get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1200 | + $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">'.$content_html.'</div>'; |
|
| 1201 | + if ((int) get_option('geodir_disable_listing_info_section') != 1) {
|
|
| 1202 | 1202 | /** |
| 1203 | 1203 | * Filter the output html for function geodir_detail_page_more_info(). |
| 1204 | 1204 | * |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | 'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',
|
| 1298 | 1298 | 'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),
|
| 1299 | 1299 | 'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),
|
| 1300 | - 'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
|
| 1300 | + 'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',
|
|
| 1301 | 1301 | 'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',
|
| 1302 | 1302 | 'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,
|
| 1303 | 1303 | 'geodir_map_name' => geodir_map_name(), |
@@ -1326,10 +1326,10 @@ discard block |
||
| 1326 | 1326 | foreach ($arr_alert_msg as $key => $value) {
|
| 1327 | 1327 | if (!is_scalar($value)) |
| 1328 | 1328 | continue; |
| 1329 | - $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8'); |
|
| 1329 | + $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8'); |
|
| 1330 | 1330 | } |
| 1331 | 1331 | |
| 1332 | - $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';'; |
|
| 1332 | + $script = "var geodir_all_js_msg = ".json_encode($arr_alert_msg).';'; |
|
| 1333 | 1333 | echo '<script>'; |
| 1334 | 1334 | echo $script; |
| 1335 | 1335 | echo '</script>'; |
@@ -1419,7 +1419,7 @@ discard block |
||
| 1419 | 1419 | $geodir_old_sidebars = get_option('geodir_sidebars');
|
| 1420 | 1420 | if (is_array($geodir_old_sidebars)) {
|
| 1421 | 1421 | foreach ($geodir_old_sidebars as $key => $val) {
|
| 1422 | - if(0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1422 | + if (0 === strpos($key, 'geodir_'))// if gd widget |
|
| 1423 | 1423 | {
|
| 1424 | 1424 | $sidebars_widgets[$key] = $geodir_old_sidebars[$key]; |
| 1425 | 1425 | } |
@@ -1498,7 +1498,7 @@ discard block |
||
| 1498 | 1498 | global $post; |
| 1499 | 1499 | $term_condition = ''; |
| 1500 | 1500 | if (isset($_REQUEST['backandedit'])) {
|
| 1501 | - $post = (object)$gd_session->get('listing');
|
|
| 1501 | + $post = (object) $gd_session->get('listing');
|
|
| 1502 | 1502 | $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : ''; |
| 1503 | 1503 | } |
| 1504 | 1504 | |
@@ -1512,7 +1512,7 @@ discard block |
||
| 1512 | 1512 | echo 'checked="checked"'; |
| 1513 | 1513 | } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition" |
| 1514 | 1514 | class="geodir_textfield" value="1" |
| 1515 | - style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
|
| 1515 | + style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>
|
|
| 1516 | 1516 | </span> |
| 1517 | 1517 | </div> |
| 1518 | 1518 | <span class="geodir_message_error"><?php if (isset($required_msg)) {
|
@@ -1552,7 +1552,7 @@ discard block |
||
| 1552 | 1552 | /** This action is documented in geodirectory_template_actions.php */ |
| 1553 | 1553 | $desc_limit = apply_filters('geodir_description_field_desc_limit', '');
|
| 1554 | 1554 | |
| 1555 | - if (!($desc_limit === '' || (int)$desc_limit > 0)) {
|
|
| 1555 | + if (!($desc_limit === '' || (int) $desc_limit > 0)) {
|
|
| 1556 | 1556 | $is_display = false; |
| 1557 | 1557 | } |
| 1558 | 1558 | } |
@@ -1600,16 +1600,16 @@ discard block |
||
| 1600 | 1600 | global $wpdb, $plugin_prefix; |
| 1601 | 1601 | |
| 1602 | 1602 | // Remove unused virtual page |
| 1603 | - $listings_page_id = (int)get_option('geodir_listing_page');
|
|
| 1603 | + $listings_page_id = (int) get_option('geodir_listing_page');
|
|
| 1604 | 1604 | if ($listings_page_id) {
|
| 1605 | - $wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
|
| 1605 | + $wpdb->query($wpdb->prepare("DELETE FROM ".$wpdb->posts." WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));
|
|
| 1606 | 1606 | delete_option('geodir_listing_page');
|
| 1607 | 1607 | } |
| 1608 | 1608 | |
| 1609 | 1609 | if (!get_option('geodir_changes_in_custom_fields_table')) {
|
| 1610 | 1610 | $wpdb->query( |
| 1611 | 1611 | $wpdb->prepare( |
| 1612 | - "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1612 | + "UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET is_default=%s, is_admin=%s WHERE is_default=%s", |
|
| 1613 | 1613 | array('1', '1', 'admin')
|
| 1614 | 1614 | ) |
| 1615 | 1615 | ); |
@@ -1617,9 +1617,9 @@ discard block |
||
| 1617 | 1617 | |
| 1618 | 1618 | /* --- terms meta value set --- */ |
| 1619 | 1619 | |
| 1620 | - update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1620 | + update_option('geodir_default_marker_icon', geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png');
|
|
| 1621 | 1621 | |
| 1622 | - $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1622 | + $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."options WHERE option_name LIKE %s", array('%tax_meta_%')));
|
|
| 1623 | 1623 | |
| 1624 | 1624 | if (!empty($options_data)) {
|
| 1625 | 1625 | |
@@ -1627,7 +1627,7 @@ discard block |
||
| 1627 | 1627 | |
| 1628 | 1628 | $option_val = str_replace('tax_meta_', '', $optobj->option_name);
|
| 1629 | 1629 | |
| 1630 | - $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1630 | + $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM ".$wpdb->prefix."term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));
|
|
| 1631 | 1631 | |
| 1632 | 1632 | if (!empty($taxonomies_data)) {
|
| 1633 | 1633 | |
@@ -1636,17 +1636,17 @@ discard block |
||
| 1636 | 1636 | $taxObject = get_taxonomy($taxobj->taxonomy); |
| 1637 | 1637 | $post_type = $taxObject->object_type[0]; |
| 1638 | 1638 | |
| 1639 | - $opt_value = 'tax_meta_' . $post_type . '_' . $option_val; |
|
| 1639 | + $opt_value = 'tax_meta_'.$post_type.'_'.$option_val; |
|
| 1640 | 1640 | |
| 1641 | - $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));
|
|
| 1641 | + $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM ".$wpdb->prefix."options WHERE option_name=%s", array('tax_meta_'.$option_val)));
|
|
| 1642 | 1642 | |
| 1643 | 1643 | if ($duplicate_data) {
|
| 1644 | 1644 | |
| 1645 | - $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1645 | + $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->prefix."options SET option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));
|
|
| 1646 | 1646 | |
| 1647 | 1647 | } else {
|
| 1648 | 1648 | |
| 1649 | - $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1649 | + $wpdb->query($wpdb->prepare("INSERT INTO ".$wpdb->prefix."options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));
|
|
| 1650 | 1650 | |
| 1651 | 1651 | } |
| 1652 | 1652 | |
@@ -1680,14 +1680,14 @@ discard block |
||
| 1680 | 1680 | |
| 1681 | 1681 | global $wpdb, $table_prefix; |
| 1682 | 1682 | |
| 1683 | - $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));
|
|
| 1683 | + $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($slug)));
|
|
| 1684 | 1684 | |
| 1685 | 1685 | if ($slug_exists) {
|
| 1686 | 1686 | |
| 1687 | 1687 | $suffix = 1; |
| 1688 | 1688 | do {
|
| 1689 | - $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1690 | - $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1689 | + $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix"; |
|
| 1690 | + $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($alt_location_name)));
|
|
| 1691 | 1691 | $suffix++; |
| 1692 | 1692 | } while ($location_slug_check && $suffix < 100); |
| 1693 | 1693 | |
@@ -1741,7 +1741,7 @@ discard block |
||
| 1741 | 1741 | |
| 1742 | 1742 | $suffix = 1; |
| 1743 | 1743 | do {
|
| 1744 | - $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix"; |
|
| 1744 | + $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix"; |
|
| 1745 | 1745 | |
| 1746 | 1746 | /** This action is documented in geodirectory_hooks_actions.php */ |
| 1747 | 1747 | $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);
|
@@ -1753,7 +1753,7 @@ discard block |
||
| 1753 | 1753 | |
| 1754 | 1754 | //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );
|
| 1755 | 1755 | |
| 1756 | - $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1756 | + $wpdb->query($wpdb->prepare("UPDATE ".$table_prefix."terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));
|
|
| 1757 | 1757 | |
| 1758 | 1758 | } |
| 1759 | 1759 | |
@@ -1762,18 +1762,18 @@ discard block |
||
| 1762 | 1762 | $post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL; |
| 1763 | 1763 | |
| 1764 | 1764 | $post_types = geodir_get_posttypes(); |
| 1765 | - if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {
|
|
| 1766 | - $posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));
|
|
| 1765 | + if ($post_type && in_array($post_type, $post_types) && $post_type.'_tags' == $taxonomy) {
|
|
| 1766 | + $posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM ".$wpdb->term_relationships." WHERE term_taxonomy_id = %d", array($tt_id)));
|
|
| 1767 | 1767 | |
| 1768 | 1768 | if (!empty($posts_obj)) {
|
| 1769 | 1769 | foreach ($posts_obj as $post_obj) {
|
| 1770 | 1770 | $post_id = $post_obj->object_id; |
| 1771 | 1771 | |
| 1772 | - $raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));
|
|
| 1772 | + $raw_tags = wp_get_object_terms($post_id, $post_type.'_tags', array('fields' => 'names'));
|
|
| 1773 | 1773 | $post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';
|
| 1774 | 1774 | |
| 1775 | - $listing_table = $plugin_prefix . $post_type . '_detail'; |
|
| 1776 | - $wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));
|
|
| 1775 | + $listing_table = $plugin_prefix.$post_type.'_detail'; |
|
| 1776 | + $wpdb->query($wpdb->prepare("UPDATE ".$listing_table." SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));
|
|
| 1777 | 1777 | } |
| 1778 | 1778 | } |
| 1779 | 1779 | } |
@@ -1807,7 +1807,7 @@ discard block |
||
| 1807 | 1807 | if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug) |
| 1808 | 1808 | return $slug_exists = true; |
| 1809 | 1809 | |
| 1810 | - if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1810 | + if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))
|
|
| 1811 | 1811 | return $slug_exists = true; |
| 1812 | 1812 | |
| 1813 | 1813 | return $slug_exists; |
@@ -1848,43 +1848,43 @@ discard block |
||
| 1848 | 1848 | |
| 1849 | 1849 | |
| 1850 | 1850 | $gd_page = ''; |
| 1851 | - if(geodir_is_page('home')){
|
|
| 1851 | + if (geodir_is_page('home')) {
|
|
| 1852 | 1852 | $gd_page = 'home'; |
| 1853 | 1853 | $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;
|
| 1854 | 1854 | } |
| 1855 | - elseif(geodir_is_page('detail')){
|
|
| 1855 | + elseif (geodir_is_page('detail')) {
|
|
| 1856 | 1856 | $gd_page = 'detail'; |
| 1857 | 1857 | $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;
|
| 1858 | 1858 | } |
| 1859 | - elseif(geodir_is_page('pt')){
|
|
| 1859 | + elseif (geodir_is_page('pt')) {
|
|
| 1860 | 1860 | $gd_page = 'pt'; |
| 1861 | 1861 | $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;
|
| 1862 | 1862 | } |
| 1863 | - elseif(geodir_is_page('listing')){
|
|
| 1863 | + elseif (geodir_is_page('listing')) {
|
|
| 1864 | 1864 | $gd_page = 'listing'; |
| 1865 | 1865 | $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;
|
| 1866 | 1866 | } |
| 1867 | - elseif(geodir_is_page('location')){
|
|
| 1867 | + elseif (geodir_is_page('location')) {
|
|
| 1868 | 1868 | $gd_page = 'location'; |
| 1869 | 1869 | $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;
|
| 1870 | 1870 | } |
| 1871 | - elseif(geodir_is_page('search')){
|
|
| 1871 | + elseif (geodir_is_page('search')) {
|
|
| 1872 | 1872 | $gd_page = 'search'; |
| 1873 | 1873 | $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;
|
| 1874 | 1874 | } |
| 1875 | - elseif(geodir_is_page('add-listing')){
|
|
| 1875 | + elseif (geodir_is_page('add-listing')) {
|
|
| 1876 | 1876 | $gd_page = 'add-listing'; |
| 1877 | 1877 | $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;
|
| 1878 | 1878 | } |
| 1879 | - elseif(geodir_is_page('author')){
|
|
| 1879 | + elseif (geodir_is_page('author')) {
|
|
| 1880 | 1880 | $gd_page = 'author'; |
| 1881 | 1881 | $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;
|
| 1882 | 1882 | } |
| 1883 | - elseif(geodir_is_page('login')){
|
|
| 1883 | + elseif (geodir_is_page('login')) {
|
|
| 1884 | 1884 | $gd_page = 'login'; |
| 1885 | 1885 | $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;
|
| 1886 | 1886 | } |
| 1887 | - elseif(geodir_is_page('listing-success')){
|
|
| 1887 | + elseif (geodir_is_page('listing-success')) {
|
|
| 1888 | 1888 | $gd_page = 'listing-success'; |
| 1889 | 1889 | $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;
|
| 1890 | 1890 | } |
@@ -1916,12 +1916,12 @@ discard block |
||
| 1916 | 1916 | |
| 1917 | 1917 | if (!get_option('geodir_set_post_attachments')) {
|
| 1918 | 1918 | |
| 1919 | - require_once(ABSPATH . 'wp-admin/includes/image.php'); |
|
| 1920 | - require_once(ABSPATH . 'wp-admin/includes/file.php'); |
|
| 1919 | + require_once(ABSPATH.'wp-admin/includes/image.php'); |
|
| 1920 | + require_once(ABSPATH.'wp-admin/includes/file.php'); |
|
| 1921 | 1921 | |
| 1922 | 1922 | $all_postypes = geodir_get_posttypes(); |
| 1923 | 1923 | |
| 1924 | - foreach($all_postypes as $post_type){
|
|
| 1924 | + foreach ($all_postypes as $post_type) {
|
|
| 1925 | 1925 | $args = array( |
| 1926 | 1926 | 'posts_per_page' => -1, |
| 1927 | 1927 | 'post_type' => $post_type, |
@@ -2015,7 +2015,7 @@ discard block |
||
| 2015 | 2015 | {
|
| 2016 | 2016 | $user_id = get_current_user_id(); |
| 2017 | 2017 | |
| 2018 | - if(!$user_id){return $post;}
|
|
| 2018 | + if (!$user_id) {return $post; }
|
|
| 2019 | 2019 | |
| 2020 | 2020 | $gd_post_types = geodir_get_posttypes(); |
| 2021 | 2021 | |
@@ -2124,7 +2124,7 @@ discard block |
||
| 2124 | 2124 | |
| 2125 | 2125 | if (array_key_exists('post_video', $tabs_arr)) {
|
| 2126 | 2126 | |
| 2127 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2127 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));
|
|
| 2128 | 2128 | |
| 2129 | 2129 | if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') |
| 2130 | 2130 | $tabs_arr['post_video']['heading_text'] = $field_title; |
@@ -2132,7 +2132,7 @@ discard block |
||
| 2132 | 2132 | |
| 2133 | 2133 | if (array_key_exists('special_offers', $tabs_arr)) {
|
| 2134 | 2134 | |
| 2135 | - $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2135 | + $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));
|
|
| 2136 | 2136 | |
| 2137 | 2137 | if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') |
| 2138 | 2138 | $tabs_arr['special_offers']['heading_text'] = $field_title; |
@@ -2153,7 +2153,7 @@ discard block |
||
| 2153 | 2153 | */ |
| 2154 | 2154 | function geodir_remove_template_redirect_actions() |
| 2155 | 2155 | {
|
| 2156 | - if (geodir_is_page('login')){
|
|
| 2156 | + if (geodir_is_page('login')) {
|
|
| 2157 | 2157 | remove_all_actions('template_redirect');
|
| 2158 | 2158 | remove_action('init', 'avia_modify_front', 10);
|
| 2159 | 2159 | } |
@@ -2200,25 +2200,25 @@ discard block |
||
| 2200 | 2200 | $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : ''; |
| 2201 | 2201 | |
| 2202 | 2202 | $wpdb->query( |
| 2203 | - $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",
|
|
| 2203 | + $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d AND file=%s ",
|
|
| 2204 | 2204 | array($post_id, $split_img_file_path) |
| 2205 | 2205 | ) |
| 2206 | 2206 | ); |
| 2207 | 2207 | |
| 2208 | 2208 | $attachment_data = $wpdb->get_row( |
| 2209 | - $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",
|
|
| 2209 | + $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=%d",
|
|
| 2210 | 2210 | array($post_id) |
| 2211 | 2211 | ) |
| 2212 | 2212 | ); |
| 2213 | 2213 | |
| 2214 | 2214 | if (!empty($attachment_data)) {
|
| 2215 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2215 | + $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);
|
|
| 2216 | 2216 | } |
| 2217 | 2217 | |
| 2218 | 2218 | |
| 2219 | - $table_name = $plugin_prefix . $post_type . '_detail'; |
|
| 2219 | + $table_name = $plugin_prefix.$post_type.'_detail'; |
|
| 2220 | 2220 | |
| 2221 | - $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2221 | + $wpdb->query("UPDATE ".$table_name." SET featured_image='' WHERE post_id =".$post_id);
|
|
| 2222 | 2222 | |
| 2223 | 2223 | geodir_set_wp_featured_image($post_id); |
| 2224 | 2224 | |
@@ -2246,9 +2246,9 @@ discard block |
||
| 2246 | 2246 | |
| 2247 | 2247 | foreach ($all_postypes as $posttype) {
|
| 2248 | 2248 | |
| 2249 | - $tablename = $plugin_prefix . $posttype . '_detail'; |
|
| 2249 | + $tablename = $plugin_prefix.$posttype.'_detail'; |
|
| 2250 | 2250 | |
| 2251 | - $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);
|
|
| 2251 | + $get_post_data = $wpdb->get_results("SELECT post_id FROM ".$tablename);
|
|
| 2252 | 2252 | |
| 2253 | 2253 | if (!empty($get_post_data)) {
|
| 2254 | 2254 | |
@@ -2256,7 +2256,7 @@ discard block |
||
| 2256 | 2256 | |
| 2257 | 2257 | $post_id = $data->post_id; |
| 2258 | 2258 | |
| 2259 | - $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");
|
|
| 2259 | + $attachment_data = $wpdb->get_results("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id =".$post_id." AND file!=''");
|
|
| 2260 | 2260 | |
| 2261 | 2261 | if (!empty($attachment_data)) {
|
| 2262 | 2262 | |
@@ -2273,22 +2273,22 @@ discard block |
||
| 2273 | 2273 | |
| 2274 | 2274 | $file_name = $file_info['basename']; |
| 2275 | 2275 | |
| 2276 | - $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name; |
|
| 2276 | + $img_arr['path'] = $uploads_path.$sub_dir.'/'.$file_name; |
|
| 2277 | 2277 | |
| 2278 | 2278 | if (!file_exists($img_arr['path'])) {
|
| 2279 | 2279 | |
| 2280 | - $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);
|
|
| 2280 | + $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ID=".$attach->ID);
|
|
| 2281 | 2281 | |
| 2282 | 2282 | } |
| 2283 | 2283 | |
| 2284 | 2284 | } |
| 2285 | 2285 | |
| 2286 | - $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");
|
|
| 2286 | + $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=".$post_id." GROUP BY post_id");
|
|
| 2287 | 2287 | |
| 2288 | 2288 | if (!empty($attachment_data)) {
|
| 2289 | 2289 | |
| 2290 | 2290 | if ($attachment_data->ID) |
| 2291 | - $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);
|
|
| 2291 | + $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);
|
|
| 2292 | 2292 | |
| 2293 | 2293 | } else {
|
| 2294 | 2294 | |
@@ -2302,7 +2302,7 @@ discard block |
||
| 2302 | 2302 | |
| 2303 | 2303 | } |
| 2304 | 2304 | |
| 2305 | - $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);
|
|
| 2305 | + $wpdb->query("UPDATE ".$tablename." SET featured_image='' WHERE post_id =".$post_id);
|
|
| 2306 | 2306 | |
| 2307 | 2307 | geodir_set_wp_featured_image($post_id); |
| 2308 | 2308 | |
@@ -2331,7 +2331,7 @@ discard block |
||
| 2331 | 2331 | {
|
| 2332 | 2332 | |
| 2333 | 2333 | if (!get_option('geodir_default_rating_star_icon')) {
|
| 2334 | - update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');
|
|
| 2334 | + update_option('geodir_default_rating_star_icon', geodir_plugin_url().'/geodirectory-assets/images/stars.png');
|
|
| 2335 | 2335 | } |
| 2336 | 2336 | |
| 2337 | 2337 | } |
@@ -2348,10 +2348,10 @@ discard block |
||
| 2348 | 2348 | * @global string $plugin_prefix Geodirectory plugin table prefix. |
| 2349 | 2349 | * @return array User listing count for each post type. |
| 2350 | 2350 | */ |
| 2351 | -function geodir_user_post_listing_count($user_id=null) |
|
| 2351 | +function geodir_user_post_listing_count($user_id = null) |
|
| 2352 | 2352 | {
|
| 2353 | 2353 | global $wpdb, $plugin_prefix, $current_user; |
| 2354 | - if(!$user_id){
|
|
| 2354 | + if (!$user_id) {
|
|
| 2355 | 2355 | $user_id = $current_user->ID; |
| 2356 | 2356 | } |
| 2357 | 2357 | |
@@ -2362,7 +2362,7 @@ discard block |
||
| 2362 | 2362 | $user_listing = array(); |
| 2363 | 2363 | if (is_array($all_posts) && !empty($all_posts)) {
|
| 2364 | 2364 | foreach ($all_posts as $ptype) {
|
| 2365 | - $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2365 | + $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_author=".$user_id." AND post_type='".$ptype."' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");
|
|
| 2366 | 2366 | |
| 2367 | 2367 | if ($total_posts > 0) {
|
| 2368 | 2368 | $user_listing[$ptype] = $total_posts; |
@@ -2403,19 +2403,19 @@ discard block |
||
| 2403 | 2403 | |
| 2404 | 2404 | $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location); |
| 2405 | 2405 | //remove video and special offers if it is already set to show |
| 2406 | - if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){
|
|
| 2406 | + if (isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']) {
|
|
| 2407 | 2407 | $unset_video = true; |
| 2408 | 2408 | } |
| 2409 | 2409 | |
| 2410 | - if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){
|
|
| 2410 | + if (isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']) {
|
|
| 2411 | 2411 | $unset_special_offers = true; |
| 2412 | 2412 | } |
| 2413 | - if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){
|
|
| 2414 | - foreach($custom_fields as $key => $custom_field){
|
|
| 2415 | - if($custom_field['name']=='geodir_video' && isset($unset_video)){
|
|
| 2413 | + if (isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)) {
|
|
| 2414 | + foreach ($custom_fields as $key => $custom_field) {
|
|
| 2415 | + if ($custom_field['name'] == 'geodir_video' && isset($unset_video)) {
|
|
| 2416 | 2416 | unset($custom_fields[$key]); |
| 2417 | 2417 | } |
| 2418 | - if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){
|
|
| 2418 | + if ($custom_field['name'] == 'geodir_special_offers' && isset($unset_special_offers)) {
|
|
| 2419 | 2419 | unset($custom_fields[$key]); |
| 2420 | 2420 | } |
| 2421 | 2421 | } |
@@ -2432,7 +2432,7 @@ discard block |
||
| 2432 | 2432 | $post->{$field_name} = $_REQUEST[$field_name];
|
| 2433 | 2433 | } |
| 2434 | 2434 | |
| 2435 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2435 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {
|
|
| 2436 | 2436 | if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {
|
| 2437 | 2437 | continue; |
| 2438 | 2438 | } |
@@ -2465,7 +2465,7 @@ discard block |
||
| 2465 | 2465 | $post->{$field_name} = $_REQUEST[$field_name];
|
| 2466 | 2466 | } |
| 2467 | 2467 | |
| 2468 | - if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {
|
|
| 2468 | + if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {
|
|
| 2469 | 2469 | $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title']; |
| 2470 | 2470 | $site_title = trim($field['site_title']); |
| 2471 | 2471 | $type = $field; |
@@ -2481,21 +2481,21 @@ discard block |
||
| 2481 | 2481 | $variables_array['label'] = __($type['site_title'], 'geodirectory'); |
| 2482 | 2482 | $variables_array['value'] = ''; |
| 2483 | 2483 | $variables_array['value'] = $post->{$type['htmlvar_name']};
|
| 2484 | - }else{
|
|
| 2484 | + } else {
|
|
| 2485 | 2485 | $i = 0; |
| 2486 | 2486 | $fieldset_count++; |
| 2487 | 2487 | $field_set_start = 1; |
| 2488 | - $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count; |
|
| 2488 | + $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_'.$fieldset_count; |
|
| 2489 | 2489 | $fieldset_arr[$fieldset_count]['label'] = $label; |
| 2490 | 2490 | } |
| 2491 | 2491 | |
| 2492 | 2492 | |
| 2493 | - if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
|
|
| 2493 | + if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }
|
|
| 2494 | 2494 | $type = stripslashes_deep($type); // strip slashes |
| 2495 | - if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
|
|
| 2495 | + if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }
|
|
| 2496 | 2496 | $html = ''; |
| 2497 | 2497 | $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : ''; |
| 2498 | - if($html_var=='post'){$html_var='post_address';}
|
|
| 2498 | + if ($html_var == 'post') {$html_var = 'post_address'; }
|
|
| 2499 | 2499 | $field_icon = geodir_field_icon_proccess($type); |
| 2500 | 2500 | $filed_type = $type['type']; |
| 2501 | 2501 | |
@@ -2508,7 +2508,7 @@ discard block |
||
| 2508 | 2508 | * @param string $fields_location The location the field is to be show. |
| 2509 | 2509 | * @param array $type The array of field values. |
| 2510 | 2510 | */ |
| 2511 | - $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
|
|
| 2511 | + $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);
|
|
| 2512 | 2512 | |
| 2513 | 2513 | |
| 2514 | 2514 | /** |
@@ -2554,7 +2554,7 @@ discard block |
||
| 2554 | 2554 | * @param string $htmlvar_name The field HTML var name. |
| 2555 | 2555 | */ |
| 2556 | 2556 | 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),
|
| 2557 | - 'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>' |
|
| 2557 | + 'tab_content' => '<div class="geodir-company_info field-group xxx">'.$fieldset_html.'</div>' |
|
| 2558 | 2558 | ); |
| 2559 | 2559 | } |
| 2560 | 2560 | } else {
|
@@ -2616,7 +2616,7 @@ discard block |
||
| 2616 | 2616 | } |
| 2617 | 2617 | $status .= ")</strong>"; |
| 2618 | 2618 | |
| 2619 | - $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';
|
|
| 2619 | + $html = '<span class="geodir-post-status">'.$status_icon.' <font class="geodir-status-label">'.__('Status: ', 'geodirectory').'</font>'.$status.'</span>';
|
|
| 2620 | 2620 | } |
| 2621 | 2621 | } |
| 2622 | 2622 | |
@@ -2685,7 +2685,7 @@ discard block |
||
| 2685 | 2685 | * @return array Modified class array. |
| 2686 | 2686 | */ |
| 2687 | 2687 | function geodir_body_class_active_map($classes = array()) {
|
| 2688 | - $classes[] = 'gd-map-' . geodir_map_name(); |
|
| 2688 | + $classes[] = 'gd-map-'.geodir_map_name(); |
|
| 2689 | 2689 | |
| 2690 | 2690 | return $classes; |
| 2691 | 2691 | } |
@@ -2700,7 +2700,7 @@ discard block |
||
| 2700 | 2700 | * @return string Modified class string. |
| 2701 | 2701 | */ |
| 2702 | 2702 | function geodir_admin_body_class_active_map($class = '') {
|
| 2703 | - $class .= ' gd-map-' . geodir_map_name(); |
|
| 2703 | + $class .= ' gd-map-'.geodir_map_name(); |
|
| 2704 | 2704 | |
| 2705 | 2705 | return $class; |
| 2706 | 2706 | } |
@@ -2720,7 +2720,7 @@ discard block |
||
| 2720 | 2720 | * @return array Translation texts. |
| 2721 | 2721 | */ |
| 2722 | 2722 | function geodir_load_gd_options_text_translation($translation_texts = array()) {
|
| 2723 | - $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array(); |
|
| 2723 | + $translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array(); |
|
| 2724 | 2724 | |
| 2725 | 2725 | $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');
|
| 2726 | 2726 | |
@@ -2786,17 +2786,17 @@ discard block |
||
| 2786 | 2786 | * @param array $args The array of menu arguments. |
| 2787 | 2787 | * @return array The modified arguments. |
| 2788 | 2788 | */ |
| 2789 | -function geodir_add_nav_menu_class( $args ) |
|
| 2789 | +function geodir_add_nav_menu_class($args) |
|
| 2790 | 2790 | {
|
| 2791 | 2791 | |
| 2792 | - if(isset($args['menu_class'])){
|
|
| 2792 | + if (isset($args['menu_class'])) {
|
|
| 2793 | 2793 | $args['menu_class'] = $args['menu_class']." gd-menu-z"; |
| 2794 | 2794 | } |
| 2795 | 2795 | |
| 2796 | 2796 | return $args; |
| 2797 | 2797 | } |
| 2798 | 2798 | |
| 2799 | -add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' ); |
|
| 2799 | +add_filter('wp_nav_menu_args', 'geodir_add_nav_menu_class');
|
|
| 2800 | 2800 | |
| 2801 | 2801 | /** |
| 2802 | 2802 | * Filters WordPress locale ID. |
@@ -2836,9 +2836,9 @@ discard block |
||
| 2836 | 2836 | } |
| 2837 | 2837 | |
| 2838 | 2838 | add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);
|
| 2839 | - add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 ); |
|
| 2839 | + add_action('geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1);
|
|
| 2840 | 2840 | if (is_admin()) {
|
| 2841 | - add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 ); |
|
| 2841 | + add_filter('geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1);
|
|
| 2842 | 2842 | } |
| 2843 | 2843 | } |
| 2844 | 2844 | } |
@@ -2867,7 +2867,7 @@ discard block |
||
| 2867 | 2867 | } |
| 2868 | 2868 | |
| 2869 | 2869 | if (!empty($keep_vars)) {
|
| 2870 | - foreach ( $languages as $code => $url) {
|
|
| 2870 | + foreach ($languages as $code => $url) {
|
|
| 2871 | 2871 | $filter_url = $url['url']; |
| 2872 | 2872 | |
| 2873 | 2873 | foreach ($keep_vars as $var) {
|
@@ -2886,7 +2886,7 @@ discard block |
||
| 2886 | 2886 | |
| 2887 | 2887 | return $languages; |
| 2888 | 2888 | } |
| 2889 | -add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 ); |
|
| 2889 | +add_filter('icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1);
|
|
| 2890 | 2890 | |
| 2891 | 2891 | /** |
| 2892 | 2892 | * Remove Yoast SEO hook if disabled on GD pages. |
@@ -2894,18 +2894,18 @@ discard block |
||
| 2894 | 2894 | * @since 1.6.18 |
| 2895 | 2895 | * |
| 2896 | 2896 | */ |
| 2897 | -function geodir_remove_yoast_seo_metas(){
|
|
| 2898 | - if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {
|
|
| 2897 | +function geodir_remove_yoast_seo_metas() {
|
|
| 2898 | + if (class_exists('WPSEO_Frontend') && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas()) {
|
|
| 2899 | 2899 | $wpseo = WPSEO_Frontend::get_instance(); |
| 2900 | 2900 | |
| 2901 | - remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 ); |
|
| 2902 | - remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 ); |
|
| 2903 | - remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 ); |
|
| 2904 | - remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 ); |
|
| 2905 | - remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 ); |
|
| 2906 | - remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 ); |
|
| 2901 | + remove_action('wp_head', array($wpseo, 'metadesc'), 6);
|
|
| 2902 | + remove_action('wp_head', array($wpseo, 'metakeywords'), 11);
|
|
| 2903 | + remove_filter('pre_get_document_title', array($wpseo, 'title'), 15);
|
|
| 2904 | + remove_filter('wp_title', array($wpseo, 'title'), 15, 3);
|
|
| 2905 | + remove_filter('thematic_doctitle', array($wpseo, 'title'), 15);
|
|
| 2906 | + remove_filter('woo_title', array($wpseo, 'fix_woo_title'), 99);
|
|
| 2907 | 2907 | |
| 2908 | - remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 ); |
|
| 2908 | + remove_action('template_redirect', 'wpseo_frontend_head_init', 999);
|
|
| 2909 | 2909 | } |
| 2910 | 2910 | } |
| 2911 | 2911 | |
@@ -2920,22 +2920,22 @@ discard block |
||
| 2920 | 2920 | * |
| 2921 | 2921 | */ |
| 2922 | 2922 | function geodir_wpml_ajax_set_guest_lang() {
|
| 2923 | - if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {
|
|
| 2924 | - if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {
|
|
| 2923 | + if (geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in()) {
|
|
| 2924 | + if (empty($_GET['lang']) && !(!empty($_SERVER['REQUEST_URI']) && preg_match('@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename(preg_replace('@\?.*$@', '', $_SERVER['REQUEST_URI']))))) {
|
|
| 2925 | 2925 | global $sitepress; |
| 2926 | 2926 | |
| 2927 | 2927 | $referer = wp_get_referer(); |
| 2928 | 2928 | |
| 2929 | 2929 | $current_lang = $sitepress->get_current_language(); |
| 2930 | - $referrer_lang = $sitepress->get_language_from_url( $referer ); |
|
| 2930 | + $referrer_lang = $sitepress->get_language_from_url($referer); |
|
| 2931 | 2931 | |
| 2932 | - if ( $referrer_lang && $current_lang != $referrer_lang ) {
|
|
| 2932 | + if ($referrer_lang && $current_lang != $referrer_lang) {
|
|
| 2933 | 2933 | $_GET['lang'] = $referrer_lang; |
| 2934 | 2934 | } |
| 2935 | 2935 | } |
| 2936 | 2936 | } |
| 2937 | 2937 | } |
| 2938 | -add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 ); |
|
| 2938 | +add_action('plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1);
|
|
| 2939 | 2939 | |
| 2940 | 2940 | /** |
| 2941 | 2941 | * Change country slug czech-republic to czechia and redirect. |
@@ -2956,18 +2956,18 @@ discard block |
||
| 2956 | 2956 | } |
| 2957 | 2957 | |
| 2958 | 2958 | $redirect = false; |
| 2959 | - if (strpos($current_url, '/' . $search . '/') !== false) {
|
|
| 2959 | + if (strpos($current_url, '/'.$search.'/') !== false) {
|
|
| 2960 | 2960 | $redirect = true; |
| 2961 | - $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);
|
|
| 2961 | + $current_url = preg_replace('/\/'.$search.'\//', '/'.$replace.'/', $current_url, 1);
|
|
| 2962 | 2962 | } |
| 2963 | 2963 | |
| 2964 | 2964 | if ($has_slash != "/") {
|
| 2965 | 2965 | $current_url = trim($current_url, '/'); |
| 2966 | 2966 | } |
| 2967 | 2967 | |
| 2968 | - if (strpos($current_url, 'gd_country=' . $search) !== false) {
|
|
| 2968 | + if (strpos($current_url, 'gd_country='.$search) !== false) {
|
|
| 2969 | 2969 | $redirect = true; |
| 2970 | - $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);
|
|
| 2970 | + $current_url = str_replace('gd_country='.$search, 'gd_country='.$replace, $current_url);
|
|
| 2971 | 2971 | } |
| 2972 | 2972 | |
| 2973 | 2973 | if ($redirect) {
|
@@ -2992,26 +2992,26 @@ discard block |
||
| 2992 | 2992 | * @param int $post_parent Post parent ID |
| 2993 | 2993 | * @param string $original_slug The original post slug. |
| 2994 | 2994 | */ |
| 2995 | -function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
|
|
| 2995 | +function geodir_check_post_to_term_slug($slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug) {
|
|
| 2996 | 2996 | global $wpdb; |
| 2997 | 2997 | |
| 2998 | - if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {
|
|
| 2999 | - $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '" . $post_type . "category' OR taxonomy = '" . $post_type . "_tags' ) LIMIT 1", $slug ) ); |
|
| 2998 | + if ($post_type && strpos($post_type, 'gd_') === 0) {
|
|
| 2999 | + $term_slug_check = $wpdb->get_var($wpdb->prepare("SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '".$post_type."category' OR taxonomy = '".$post_type."_tags' ) LIMIT 1", $slug));
|
|
| 3000 | 3000 | |
| 3001 | - if ( $term_slug_check ) {
|
|
| 3001 | + if ($term_slug_check) {
|
|
| 3002 | 3002 | $suffix = 1; |
| 3003 | 3003 | |
| 3004 | 3004 | do {
|
| 3005 | - $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix"; |
|
| 3005 | + $alt_slug = _truncate_post_slug($original_slug, 200 - (strlen($suffix) + 1))."-$suffix"; |
|
| 3006 | 3006 | |
| 3007 | - $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '" . $post_type . "category' OR taxonomy = '" . $post_type . "_tags' ) LIMIT 1", $alt_slug ) ); |
|
| 3007 | + $term_check = $wpdb->get_var($wpdb->prepare("SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id WHERE slug = '%s' AND ( taxonomy = '".$post_type."category' OR taxonomy = '".$post_type."_tags' ) LIMIT 1", $alt_slug));
|
|
| 3008 | 3008 | |
| 3009 | - $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1", $alt_slug, $post_type, $post_ID ) ); |
|
| 3009 | + $post_check = !$term_check && $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1", $alt_slug, $post_type, $post_ID));
|
|
| 3010 | 3010 | |
| 3011 | 3011 | $term_slug_check = $term_check || $post_check; |
| 3012 | 3012 | |
| 3013 | 3013 | $suffix++; |
| 3014 | - } while ( $term_slug_check ); |
|
| 3014 | + } while ($term_slug_check); |
|
| 3015 | 3015 | |
| 3016 | 3016 | $slug = $alt_slug; |
| 3017 | 3017 | } |
@@ -3019,7 +3019,7 @@ discard block |
||
| 3019 | 3019 | |
| 3020 | 3020 | return $slug; |
| 3021 | 3021 | } |
| 3022 | -add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 10, 6 ); |
|
| 3022 | +add_filter('wp_unique_post_slug', 'geodir_check_post_to_term_slug', 10, 6);
|
|
| 3023 | 3023 | |
| 3024 | 3024 | /** |
| 3025 | 3025 | * Check whether a post name with slug exists or not. |
@@ -3034,25 +3034,25 @@ discard block |
||
| 3034 | 3034 | * @param int $term_id The term ID. |
| 3035 | 3035 | * @return bool true when exists. false when not exists. |
| 3036 | 3036 | */ |
| 3037 | -function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {
|
|
| 3037 | +function geodir_check_term_to_post_slug($slug_exists, $slug, $term_id) {
|
|
| 3038 | 3038 | global $wpdb, $gd_term_post_type; |
| 3039 | 3039 | |
| 3040 | - if ( $slug_exists ) {
|
|
| 3040 | + if ($slug_exists) {
|
|
| 3041 | 3041 | return $slug_exists; |
| 3042 | 3042 | } |
| 3043 | 3043 | |
| 3044 | - if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {
|
|
| 3044 | + if (!empty($gd_term_post_type) && $gd_term_post_type[$term_id]) {
|
|
| 3045 | 3045 | $post_type = $gd_term_post_type[$term_id]; |
| 3046 | 3046 | } else {
|
| 3047 | - $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) ); |
|
| 3048 | - $taxonomy_obj = get_taxonomy( $taxonomy ); |
|
| 3049 | - $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3047 | + $taxonomy = $wpdb->get_var($wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id));
|
|
| 3048 | + $taxonomy_obj = get_taxonomy($taxonomy); |
|
| 3049 | + $post_type = !empty($taxonomy_obj->object_type) ? $taxonomy_obj->object_type[0] : NULL; |
|
| 3050 | 3050 | } |
| 3051 | 3051 | |
| 3052 | - if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s LIMIT 1", $slug, $post_type ) ) ) {
|
|
| 3052 | + if ($post_type && $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s LIMIT 1", $slug, $post_type))) {
|
|
| 3053 | 3053 | $slug_exists = true; |
| 3054 | 3054 | } |
| 3055 | 3055 | |
| 3056 | 3056 | return $slug_exists; |
| 3057 | 3057 | } |
| 3058 | -add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 ); |
|
| 3059 | 3058 | \ No newline at end of file |
| 3059 | +add_filter('geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3); |
|
| 3060 | 3060 | \ No newline at end of file |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | if (isset($_GET['redirect_to']) && $_GET['redirect_to'] != '') {
|
| 13 | - $redirect_to = $_GET['redirect_to']; |
|
| 13 | + $redirect_to = $_GET['redirect_to']; |
|
| 14 | 14 | } else {
|
| 15 | - //echo $_SERVER['HTTP_HOST'] ; |
|
| 16 | - $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''; |
|
| 17 | - if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {
|
|
| 18 | - $redirect_to = home_url(); |
|
| 19 | - } |
|
| 15 | + //echo $_SERVER['HTTP_HOST'] ; |
|
| 16 | + $redirect_to = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''; |
|
| 17 | + if (strpos($redirect_to, $_SERVER['HTTP_HOST']) === false) {
|
|
| 18 | + $redirect_to = home_url(); |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | } |
| 22 | 22 | |
@@ -38,37 +38,37 @@ discard block |
||
| 38 | 38 | <h4> |
| 39 | 39 | <?php |
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template. |
|
| 43 | - * |
|
| 44 | - * @since 1.0.0 |
|
| 45 | - */ |
|
| 46 | - echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);
|
|
| 41 | + /** |
|
| 42 | + * Filter the `SIGN_IN_PAGE_TITLE` title text on login form template. |
|
| 43 | + * |
|
| 44 | + * @since 1.0.0 |
|
| 45 | + */ |
|
| 46 | + echo apply_filters('geodir_login_page_title', SIGN_IN_PAGE_TITLE);
|
|
| 47 | 47 | |
| 48 | - ?> |
|
| 48 | + ?> |
|
| 49 | 49 | </h4> |
| 50 | 50 | <?php |
| 51 | - if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {
|
|
| 52 | - echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>"; |
|
| 53 | - } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {
|
|
| 54 | - echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>"; |
|
| 55 | - } |
|
| 51 | + if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {
|
|
| 52 | + echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>"; |
|
| 53 | + } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {
|
|
| 54 | + echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>"; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') |
|
| 58 | - echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>'; |
|
| 57 | + if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') |
|
| 58 | + echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>'; |
|
| 59 | 59 | |
| 60 | - do_action('geodir_login_error_messages');
|
|
| 60 | + do_action('geodir_login_error_messages');
|
|
| 61 | 61 | |
| 62 | - ?> |
|
| 62 | + ?> |
|
| 63 | 63 | <form name="cus_loginform" id="cus_loginform" method="post"> |
| 64 | 64 | |
| 65 | 65 | <div class="form_row clearfix"> |
| 66 | 66 | <input placeholder='<?php echo USERNAME_TEXT; ?>' type="text" name="log" id="user_login" |
| 67 | 67 | value="<?php global $user_login; |
| 68 | - if (!isset($user_login)) {
|
|
| 69 | - $user_login = ''; |
|
| 70 | - } |
|
| 71 | - echo esc_attr($user_login); ?>" size="20" class="textfield"/> |
|
| 68 | + if (!isset($user_login)) {
|
|
| 69 | + $user_login = ''; |
|
| 70 | + } |
|
| 71 | + echo esc_attr($user_login); ?>" size="20" class="textfield"/> |
|
| 72 | 72 | <span class="user_loginInfo"></span> |
| 73 | 73 | </div> |
| 74 | 74 | |
@@ -79,14 +79,14 @@ discard block |
||
| 79 | 79 | </div> |
| 80 | 80 | |
| 81 | 81 | <?php |
| 82 | - /** |
|
| 83 | - * This is a default WordPress action that calls any additional elements needed for any login forms. |
|
| 84 | - * |
|
| 85 | - * We use this action before the remember me checkbox on the sigin form. |
|
| 86 | - * |
|
| 87 | - * @since 1.0.0 |
|
| 88 | - */ |
|
| 89 | - do_action('login_form'); ?>
|
|
| 82 | + /** |
|
| 83 | + * This is a default WordPress action that calls any additional elements needed for any login forms. |
|
| 84 | + * |
|
| 85 | + * We use this action before the remember me checkbox on the sigin form. |
|
| 86 | + * |
|
| 87 | + * @since 1.0.0 |
|
| 88 | + */ |
|
| 89 | + do_action('login_form'); ?>
|
|
| 90 | 90 | <p class="rember"> |
| 91 | 91 | <input name="rememberme" type="checkbox" id="rememberme" value="forever" class="fl"/> |
| 92 | 92 | <?php echo REMEMBER_ON_COMPUTER_TEXT; ?> |
@@ -110,12 +110,12 @@ discard block |
||
| 110 | 110 | <input placeholder='<?php echo USERNAME_EMAIL_TEXT; ?>' type="text" name="user_login" |
| 111 | 111 | value="<?php echo esc_attr($user_login); ?>" size="20" class="user_login1 textfield"/> |
| 112 | 112 | <?php |
| 113 | - /** |
|
| 114 | - * Called before the get new password button in the login box template. |
|
| 115 | - * |
|
| 116 | - * @since 1.0.0 |
|
| 117 | - */ |
|
| 118 | - do_action('lostpassword_form'); ?>
|
|
| 113 | + /** |
|
| 114 | + * Called before the get new password button in the login box template. |
|
| 115 | + * |
|
| 116 | + * @since 1.0.0 |
|
| 117 | + */ |
|
| 118 | + do_action('lostpassword_form'); ?>
|
|
| 119 | 119 | </div> |
| 120 | 120 | <input type="submit" name="get_new_password" value="<?php echo GET_NEW_PW_TEXT; ?>" class="geodir_button"/> |
| 121 | 121 | </form> |
@@ -49,13 +49,13 @@ |
||
| 49 | 49 | </h4> |
| 50 | 50 | <?php |
| 51 | 51 | if (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'fw') {
|
| 52 | - echo "<p class=\"error_msg\"> " . INVALID_USER_FPW_MSG . " </p>"; |
|
| 52 | + echo "<p class=\"error_msg\"> ".INVALID_USER_FPW_MSG." </p>"; |
|
| 53 | 53 | } elseif (isset($_REQUEST['logemsg']) && $_REQUEST['logemsg'] == 1) {
|
| 54 | - echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>"; |
|
| 54 | + echo "<p class=\"error_msg\"> ".INVALID_USER_PW_MSG." </p>"; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') |
| 58 | - echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>'; |
|
| 58 | + echo '<p class="sucess_msg">'.PW_SEND_CONFIRM_MSG.'</p>'; |
|
| 59 | 59 | |
| 60 | 60 | do_action('geodir_login_error_messages');
|
| 61 | 61 | |
@@ -54,8 +54,9 @@ |
||
| 54 | 54 | echo "<p class=\"error_msg\"> " . INVALID_USER_PW_MSG . " </p>"; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') |
|
| 58 | - echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>'; |
|
| 57 | + if (isset($_REQUEST['checkemail']) && $_REQUEST['checkemail'] == 'confirm') { |
|
| 58 | + echo '<p class="sucess_msg">' . PW_SEND_CONFIRM_MSG . '</p>'; |
|
| 59 | + } |
|
| 59 | 60 | |
| 60 | 61 | do_action('geodir_login_error_messages');
|
| 61 | 62 | |
@@ -500,7 +500,7 @@ discard block |
||
| 500 | 500 | * @param [$issuer] the expected issues, defaults to Google |
| 501 | 501 | * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS |
| 502 | 502 | * @throws Google_Auth_Exception |
| 503 | - * @return mixed token information if valid, false if not |
|
| 503 | + * @return Google_Auth_LoginTicket token information if valid, false if not |
|
| 504 | 504 | */ |
| 505 | 505 | public function verifySignedJwtWithCerts( |
| 506 | 506 | $jwt, |
@@ -626,6 +626,7 @@ discard block |
||
| 626 | 626 | |
| 627 | 627 | /** |
| 628 | 628 | * Add a parameter to the auth params if not empty string. |
| 629 | + * @param string $name |
|
| 629 | 630 | */ |
| 630 | 631 | private function maybeAddParam($params, $name) |
| 631 | 632 | { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function __construct(Google_Client $client) |
| 59 | 59 | { |
| 60 | - $this->client = $client; |
|
| 60 | + $this->client = $client; |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -72,8 +72,8 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | public function authenticatedRequest(Google_Http_Request $request) |
| 74 | 74 | { |
| 75 | - $request = $this->sign($request); |
|
| 76 | - return $this->client->getIo()->makeRequest($request); |
|
| 75 | + $request = $this->sign($request); |
|
| 76 | + return $this->client->getIo()->makeRequest($request); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
@@ -84,52 +84,52 @@ discard block |
||
| 84 | 84 | */ |
| 85 | 85 | public function authenticate($code, $crossClient = false) |
| 86 | 86 | { |
| 87 | - if (strlen($code) == 0) { |
|
| 88 | - throw new Google_Auth_Exception("Invalid code"); |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - $arguments = array( |
|
| 92 | - 'code' => $code, |
|
| 93 | - 'grant_type' => 'authorization_code', |
|
| 94 | - 'client_id' => $this->client->getClassConfig($this, 'client_id'), |
|
| 95 | - 'client_secret' => $this->client->getClassConfig($this, 'client_secret') |
|
| 96 | - ); |
|
| 97 | - |
|
| 98 | - if ($crossClient !== true) { |
|
| 99 | - $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri'); |
|
| 100 | - } |
|
| 101 | - |
|
| 102 | - // We got here from the redirect from a successful authorization grant, |
|
| 103 | - // fetch the access token |
|
| 104 | - $request = new Google_Http_Request( |
|
| 105 | - self::OAUTH2_TOKEN_URI, |
|
| 106 | - 'POST', |
|
| 107 | - array(), |
|
| 108 | - $arguments |
|
| 109 | - ); |
|
| 110 | - $request->disableGzip(); |
|
| 111 | - $response = $this->client->getIo()->makeRequest($request); |
|
| 112 | - |
|
| 113 | - if ($response->getResponseHttpCode() == 200) { |
|
| 114 | - $this->setAccessToken($response->getResponseBody()); |
|
| 115 | - $this->token['created'] = time(); |
|
| 116 | - return $this->getAccessToken(); |
|
| 117 | - } else { |
|
| 118 | - $decodedResponse = json_decode($response->getResponseBody(), true); |
|
| 119 | - if ($decodedResponse != null && $decodedResponse['error']) { |
|
| 120 | - $errorText = $decodedResponse['error']; |
|
| 121 | - if (isset($decodedResponse['error_description'])) { |
|
| 122 | - $errorText .= ": " . $decodedResponse['error_description']; |
|
| 123 | - } |
|
| 124 | - } |
|
| 125 | - throw new Google_Auth_Exception( |
|
| 126 | - sprintf( |
|
| 127 | - "Error fetching OAuth2 access token, message: '%s'", |
|
| 128 | - $errorText |
|
| 129 | - ), |
|
| 130 | - $response->getResponseHttpCode() |
|
| 131 | - ); |
|
| 132 | - } |
|
| 87 | + if (strlen($code) == 0) { |
|
| 88 | + throw new Google_Auth_Exception("Invalid code"); |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + $arguments = array( |
|
| 92 | + 'code' => $code, |
|
| 93 | + 'grant_type' => 'authorization_code', |
|
| 94 | + 'client_id' => $this->client->getClassConfig($this, 'client_id'), |
|
| 95 | + 'client_secret' => $this->client->getClassConfig($this, 'client_secret') |
|
| 96 | + ); |
|
| 97 | + |
|
| 98 | + if ($crossClient !== true) { |
|
| 99 | + $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri'); |
|
| 100 | + } |
|
| 101 | + |
|
| 102 | + // We got here from the redirect from a successful authorization grant, |
|
| 103 | + // fetch the access token |
|
| 104 | + $request = new Google_Http_Request( |
|
| 105 | + self::OAUTH2_TOKEN_URI, |
|
| 106 | + 'POST', |
|
| 107 | + array(), |
|
| 108 | + $arguments |
|
| 109 | + ); |
|
| 110 | + $request->disableGzip(); |
|
| 111 | + $response = $this->client->getIo()->makeRequest($request); |
|
| 112 | + |
|
| 113 | + if ($response->getResponseHttpCode() == 200) { |
|
| 114 | + $this->setAccessToken($response->getResponseBody()); |
|
| 115 | + $this->token['created'] = time(); |
|
| 116 | + return $this->getAccessToken(); |
|
| 117 | + } else { |
|
| 118 | + $decodedResponse = json_decode($response->getResponseBody(), true); |
|
| 119 | + if ($decodedResponse != null && $decodedResponse['error']) { |
|
| 120 | + $errorText = $decodedResponse['error']; |
|
| 121 | + if (isset($decodedResponse['error_description'])) { |
|
| 122 | + $errorText .= ": " . $decodedResponse['error_description']; |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + throw new Google_Auth_Exception( |
|
| 126 | + sprintf( |
|
| 127 | + "Error fetching OAuth2 access token, message: '%s'", |
|
| 128 | + $errorText |
|
| 129 | + ), |
|
| 130 | + $response->getResponseHttpCode() |
|
| 131 | + ); |
|
| 132 | + } |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
@@ -141,37 +141,37 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | public function createAuthUrl($scope) |
| 143 | 143 | { |
| 144 | - $params = array( |
|
| 145 | - 'response_type' => 'code', |
|
| 146 | - 'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'), |
|
| 147 | - 'client_id' => $this->client->getClassConfig($this, 'client_id'), |
|
| 148 | - 'scope' => $scope, |
|
| 149 | - 'access_type' => $this->client->getClassConfig($this, 'access_type'), |
|
| 150 | - ); |
|
| 151 | - |
|
| 152 | - // Prefer prompt to approval prompt. |
|
| 153 | - if ($this->client->getClassConfig($this, 'prompt')) { |
|
| 154 | - $params = $this->maybeAddParam($params, 'prompt'); |
|
| 155 | - } else { |
|
| 156 | - $params = $this->maybeAddParam($params, 'approval_prompt'); |
|
| 157 | - } |
|
| 158 | - $params = $this->maybeAddParam($params, 'login_hint'); |
|
| 159 | - $params = $this->maybeAddParam($params, 'hd'); |
|
| 160 | - $params = $this->maybeAddParam($params, 'openid.realm'); |
|
| 161 | - $params = $this->maybeAddParam($params, 'include_granted_scopes'); |
|
| 162 | - |
|
| 163 | - // If the list of scopes contains plus.login, add request_visible_actions |
|
| 164 | - // to auth URL. |
|
| 165 | - $rva = $this->client->getClassConfig($this, 'request_visible_actions'); |
|
| 166 | - if (strpos($scope, 'plus.login') && strlen($rva) > 0) { |
|
| 167 | - $params['request_visible_actions'] = $rva; |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - if (isset($this->state)) { |
|
| 171 | - $params['state'] = $this->state; |
|
| 172 | - } |
|
| 173 | - |
|
| 174 | - return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&'); |
|
| 144 | + $params = array( |
|
| 145 | + 'response_type' => 'code', |
|
| 146 | + 'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'), |
|
| 147 | + 'client_id' => $this->client->getClassConfig($this, 'client_id'), |
|
| 148 | + 'scope' => $scope, |
|
| 149 | + 'access_type' => $this->client->getClassConfig($this, 'access_type'), |
|
| 150 | + ); |
|
| 151 | + |
|
| 152 | + // Prefer prompt to approval prompt. |
|
| 153 | + if ($this->client->getClassConfig($this, 'prompt')) { |
|
| 154 | + $params = $this->maybeAddParam($params, 'prompt'); |
|
| 155 | + } else { |
|
| 156 | + $params = $this->maybeAddParam($params, 'approval_prompt'); |
|
| 157 | + } |
|
| 158 | + $params = $this->maybeAddParam($params, 'login_hint'); |
|
| 159 | + $params = $this->maybeAddParam($params, 'hd'); |
|
| 160 | + $params = $this->maybeAddParam($params, 'openid.realm'); |
|
| 161 | + $params = $this->maybeAddParam($params, 'include_granted_scopes'); |
|
| 162 | + |
|
| 163 | + // If the list of scopes contains plus.login, add request_visible_actions |
|
| 164 | + // to auth URL. |
|
| 165 | + $rva = $this->client->getClassConfig($this, 'request_visible_actions'); |
|
| 166 | + if (strpos($scope, 'plus.login') && strlen($rva) > 0) { |
|
| 167 | + $params['request_visible_actions'] = $rva; |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + if (isset($this->state)) { |
|
| 171 | + $params['state'] = $this->state; |
|
| 172 | + } |
|
| 173 | + |
|
| 174 | + return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&'); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
@@ -180,38 +180,38 @@ discard block |
||
| 180 | 180 | */ |
| 181 | 181 | public function setAccessToken($token) |
| 182 | 182 | { |
| 183 | - $token = json_decode($token, true); |
|
| 184 | - if ($token == null) { |
|
| 185 | - throw new Google_Auth_Exception('Could not json decode the token'); |
|
| 186 | - } |
|
| 187 | - if (! isset($token['access_token'])) { |
|
| 188 | - throw new Google_Auth_Exception("Invalid token format"); |
|
| 189 | - } |
|
| 190 | - $this->token = $token; |
|
| 183 | + $token = json_decode($token, true); |
|
| 184 | + if ($token == null) { |
|
| 185 | + throw new Google_Auth_Exception('Could not json decode the token'); |
|
| 186 | + } |
|
| 187 | + if (! isset($token['access_token'])) { |
|
| 188 | + throw new Google_Auth_Exception("Invalid token format"); |
|
| 189 | + } |
|
| 190 | + $this->token = $token; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | public function getAccessToken() |
| 194 | 194 | { |
| 195 | - return json_encode($this->token); |
|
| 195 | + return json_encode($this->token); |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | public function getRefreshToken() |
| 199 | 199 | { |
| 200 | - if (array_key_exists('refresh_token', $this->token)) { |
|
| 201 | - return $this->token['refresh_token']; |
|
| 202 | - } else { |
|
| 203 | - return null; |
|
| 204 | - } |
|
| 200 | + if (array_key_exists('refresh_token', $this->token)) { |
|
| 201 | + return $this->token['refresh_token']; |
|
| 202 | + } else { |
|
| 203 | + return null; |
|
| 204 | + } |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | public function setState($state) |
| 208 | 208 | { |
| 209 | - $this->state = $state; |
|
| 209 | + $this->state = $state; |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds) |
| 213 | 213 | { |
| 214 | - $this->assertionCredentials = $creds; |
|
| 214 | + $this->assertionCredentials = $creds; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | /** |
@@ -222,43 +222,43 @@ discard block |
||
| 222 | 222 | */ |
| 223 | 223 | public function sign(Google_Http_Request $request) |
| 224 | 224 | { |
| 225 | - // add the developer key to the request before signing it |
|
| 226 | - if ($this->client->getClassConfig($this, 'developer_key')) { |
|
| 227 | - $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key')); |
|
| 228 | - } |
|
| 229 | - |
|
| 230 | - // Cannot sign the request without an OAuth access token. |
|
| 231 | - if (null == $this->token && null == $this->assertionCredentials) { |
|
| 232 | - return $request; |
|
| 233 | - } |
|
| 234 | - |
|
| 235 | - // Check if the token is set to expire in the next 30 seconds |
|
| 236 | - // (or has already expired). |
|
| 237 | - if ($this->isAccessTokenExpired()) { |
|
| 238 | - if ($this->assertionCredentials) { |
|
| 239 | - $this->refreshTokenWithAssertion(); |
|
| 240 | - } else { |
|
| 241 | - $this->client->getLogger()->debug('OAuth2 access token expired'); |
|
| 242 | - if (! array_key_exists('refresh_token', $this->token)) { |
|
| 243 | - $error = "The OAuth 2.0 access token has expired," |
|
| 244 | - ." and a refresh token is not available. Refresh tokens" |
|
| 245 | - ." are not returned for responses that were auto-approved."; |
|
| 246 | - |
|
| 247 | - $this->client->getLogger()->error($error); |
|
| 248 | - throw new Google_Auth_Exception($error); |
|
| 249 | - } |
|
| 250 | - $this->refreshToken($this->token['refresh_token']); |
|
| 251 | - } |
|
| 252 | - } |
|
| 253 | - |
|
| 254 | - $this->client->getLogger()->debug('OAuth2 authentication'); |
|
| 255 | - |
|
| 256 | - // Add the OAuth2 header to the request |
|
| 257 | - $request->setRequestHeaders( |
|
| 258 | - array('Authorization' => 'Bearer ' . $this->token['access_token']) |
|
| 259 | - ); |
|
| 260 | - |
|
| 261 | - return $request; |
|
| 225 | + // add the developer key to the request before signing it |
|
| 226 | + if ($this->client->getClassConfig($this, 'developer_key')) { |
|
| 227 | + $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key')); |
|
| 228 | + } |
|
| 229 | + |
|
| 230 | + // Cannot sign the request without an OAuth access token. |
|
| 231 | + if (null == $this->token && null == $this->assertionCredentials) { |
|
| 232 | + return $request; |
|
| 233 | + } |
|
| 234 | + |
|
| 235 | + // Check if the token is set to expire in the next 30 seconds |
|
| 236 | + // (or has already expired). |
|
| 237 | + if ($this->isAccessTokenExpired()) { |
|
| 238 | + if ($this->assertionCredentials) { |
|
| 239 | + $this->refreshTokenWithAssertion(); |
|
| 240 | + } else { |
|
| 241 | + $this->client->getLogger()->debug('OAuth2 access token expired'); |
|
| 242 | + if (! array_key_exists('refresh_token', $this->token)) { |
|
| 243 | + $error = "The OAuth 2.0 access token has expired," |
|
| 244 | + ." and a refresh token is not available. Refresh tokens" |
|
| 245 | + ." are not returned for responses that were auto-approved."; |
|
| 246 | + |
|
| 247 | + $this->client->getLogger()->error($error); |
|
| 248 | + throw new Google_Auth_Exception($error); |
|
| 249 | + } |
|
| 250 | + $this->refreshToken($this->token['refresh_token']); |
|
| 251 | + } |
|
| 252 | + } |
|
| 253 | + |
|
| 254 | + $this->client->getLogger()->debug('OAuth2 authentication'); |
|
| 255 | + |
|
| 256 | + // Add the OAuth2 header to the request |
|
| 257 | + $request->setRequestHeaders( |
|
| 258 | + array('Authorization' => 'Bearer ' . $this->token['access_token']) |
|
| 259 | + ); |
|
| 260 | + |
|
| 261 | + return $request; |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | /** |
@@ -268,14 +268,14 @@ discard block |
||
| 268 | 268 | */ |
| 269 | 269 | public function refreshToken($refreshToken) |
| 270 | 270 | { |
| 271 | - $this->refreshTokenRequest( |
|
| 272 | - array( |
|
| 273 | - 'client_id' => $this->client->getClassConfig($this, 'client_id'), |
|
| 274 | - 'client_secret' => $this->client->getClassConfig($this, 'client_secret'), |
|
| 275 | - 'refresh_token' => $refreshToken, |
|
| 276 | - 'grant_type' => 'refresh_token' |
|
| 277 | - ) |
|
| 278 | - ); |
|
| 271 | + $this->refreshTokenRequest( |
|
| 272 | + array( |
|
| 273 | + 'client_id' => $this->client->getClassConfig($this, 'client_id'), |
|
| 274 | + 'client_secret' => $this->client->getClassConfig($this, 'client_secret'), |
|
| 275 | + 'refresh_token' => $refreshToken, |
|
| 276 | + 'grant_type' => 'refresh_token' |
|
| 277 | + ) |
|
| 278 | + ); |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | /** |
@@ -285,83 +285,83 @@ discard block |
||
| 285 | 285 | */ |
| 286 | 286 | public function refreshTokenWithAssertion($assertionCredentials = null) |
| 287 | 287 | { |
| 288 | - if (!$assertionCredentials) { |
|
| 289 | - $assertionCredentials = $this->assertionCredentials; |
|
| 290 | - } |
|
| 291 | - |
|
| 292 | - $cacheKey = $assertionCredentials->getCacheKey(); |
|
| 293 | - |
|
| 294 | - if ($cacheKey) { |
|
| 295 | - // We can check whether we have a token available in the |
|
| 296 | - // cache. If it is expired, we can retrieve a new one from |
|
| 297 | - // the assertion. |
|
| 298 | - $token = $this->client->getCache()->get($cacheKey); |
|
| 299 | - if ($token) { |
|
| 300 | - $this->setAccessToken($token); |
|
| 301 | - } |
|
| 302 | - if (!$this->isAccessTokenExpired()) { |
|
| 303 | - return; |
|
| 304 | - } |
|
| 305 | - } |
|
| 306 | - |
|
| 307 | - $this->client->getLogger()->debug('OAuth2 access token expired'); |
|
| 308 | - $this->refreshTokenRequest( |
|
| 309 | - array( |
|
| 310 | - 'grant_type' => 'assertion', |
|
| 311 | - 'assertion_type' => $assertionCredentials->assertionType, |
|
| 312 | - 'assertion' => $assertionCredentials->generateAssertion(), |
|
| 313 | - ) |
|
| 314 | - ); |
|
| 315 | - |
|
| 316 | - if ($cacheKey) { |
|
| 317 | - // Attempt to cache the token. |
|
| 318 | - $this->client->getCache()->set( |
|
| 319 | - $cacheKey, |
|
| 320 | - $this->getAccessToken() |
|
| 321 | - ); |
|
| 322 | - } |
|
| 288 | + if (!$assertionCredentials) { |
|
| 289 | + $assertionCredentials = $this->assertionCredentials; |
|
| 290 | + } |
|
| 291 | + |
|
| 292 | + $cacheKey = $assertionCredentials->getCacheKey(); |
|
| 293 | + |
|
| 294 | + if ($cacheKey) { |
|
| 295 | + // We can check whether we have a token available in the |
|
| 296 | + // cache. If it is expired, we can retrieve a new one from |
|
| 297 | + // the assertion. |
|
| 298 | + $token = $this->client->getCache()->get($cacheKey); |
|
| 299 | + if ($token) { |
|
| 300 | + $this->setAccessToken($token); |
|
| 301 | + } |
|
| 302 | + if (!$this->isAccessTokenExpired()) { |
|
| 303 | + return; |
|
| 304 | + } |
|
| 305 | + } |
|
| 306 | + |
|
| 307 | + $this->client->getLogger()->debug('OAuth2 access token expired'); |
|
| 308 | + $this->refreshTokenRequest( |
|
| 309 | + array( |
|
| 310 | + 'grant_type' => 'assertion', |
|
| 311 | + 'assertion_type' => $assertionCredentials->assertionType, |
|
| 312 | + 'assertion' => $assertionCredentials->generateAssertion(), |
|
| 313 | + ) |
|
| 314 | + ); |
|
| 315 | + |
|
| 316 | + if ($cacheKey) { |
|
| 317 | + // Attempt to cache the token. |
|
| 318 | + $this->client->getCache()->set( |
|
| 319 | + $cacheKey, |
|
| 320 | + $this->getAccessToken() |
|
| 321 | + ); |
|
| 322 | + } |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | private function refreshTokenRequest($params) |
| 326 | 326 | { |
| 327 | - if (isset($params['assertion'])) { |
|
| 328 | - $this->client->getLogger()->info( |
|
| 329 | - 'OAuth2 access token refresh with Signed JWT assertion grants.' |
|
| 330 | - ); |
|
| 331 | - } else { |
|
| 332 | - $this->client->getLogger()->info('OAuth2 access token refresh'); |
|
| 333 | - } |
|
| 334 | - |
|
| 335 | - $http = new Google_Http_Request( |
|
| 336 | - self::OAUTH2_TOKEN_URI, |
|
| 337 | - 'POST', |
|
| 338 | - array(), |
|
| 339 | - $params |
|
| 340 | - ); |
|
| 341 | - $http->disableGzip(); |
|
| 342 | - $request = $this->client->getIo()->makeRequest($http); |
|
| 343 | - |
|
| 344 | - $code = $request->getResponseHttpCode(); |
|
| 345 | - $body = $request->getResponseBody(); |
|
| 346 | - if (200 == $code) { |
|
| 347 | - $token = json_decode($body, true); |
|
| 348 | - if ($token == null) { |
|
| 349 | - throw new Google_Auth_Exception("Could not json decode the access token"); |
|
| 350 | - } |
|
| 351 | - |
|
| 352 | - if (! isset($token['access_token']) || ! isset($token['expires_in'])) { |
|
| 353 | - throw new Google_Auth_Exception("Invalid token format"); |
|
| 354 | - } |
|
| 355 | - |
|
| 356 | - if (isset($token['id_token'])) { |
|
| 357 | - $this->token['id_token'] = $token['id_token']; |
|
| 358 | - } |
|
| 359 | - $this->token['access_token'] = $token['access_token']; |
|
| 360 | - $this->token['expires_in'] = $token['expires_in']; |
|
| 361 | - $this->token['created'] = time(); |
|
| 362 | - } else { |
|
| 363 | - throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code); |
|
| 364 | - } |
|
| 327 | + if (isset($params['assertion'])) { |
|
| 328 | + $this->client->getLogger()->info( |
|
| 329 | + 'OAuth2 access token refresh with Signed JWT assertion grants.' |
|
| 330 | + ); |
|
| 331 | + } else { |
|
| 332 | + $this->client->getLogger()->info('OAuth2 access token refresh'); |
|
| 333 | + } |
|
| 334 | + |
|
| 335 | + $http = new Google_Http_Request( |
|
| 336 | + self::OAUTH2_TOKEN_URI, |
|
| 337 | + 'POST', |
|
| 338 | + array(), |
|
| 339 | + $params |
|
| 340 | + ); |
|
| 341 | + $http->disableGzip(); |
|
| 342 | + $request = $this->client->getIo()->makeRequest($http); |
|
| 343 | + |
|
| 344 | + $code = $request->getResponseHttpCode(); |
|
| 345 | + $body = $request->getResponseBody(); |
|
| 346 | + if (200 == $code) { |
|
| 347 | + $token = json_decode($body, true); |
|
| 348 | + if ($token == null) { |
|
| 349 | + throw new Google_Auth_Exception("Could not json decode the access token"); |
|
| 350 | + } |
|
| 351 | + |
|
| 352 | + if (! isset($token['access_token']) || ! isset($token['expires_in'])) { |
|
| 353 | + throw new Google_Auth_Exception("Invalid token format"); |
|
| 354 | + } |
|
| 355 | + |
|
| 356 | + if (isset($token['id_token'])) { |
|
| 357 | + $this->token['id_token'] = $token['id_token']; |
|
| 358 | + } |
|
| 359 | + $this->token['access_token'] = $token['access_token']; |
|
| 360 | + $this->token['expires_in'] = $token['expires_in']; |
|
| 361 | + $this->token['created'] = time(); |
|
| 362 | + } else { |
|
| 363 | + throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code); |
|
| 364 | + } |
|
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | /** |
@@ -373,31 +373,31 @@ discard block |
||
| 373 | 373 | */ |
| 374 | 374 | public function revokeToken($token = null) |
| 375 | 375 | { |
| 376 | - if (!$token) { |
|
| 377 | - if (!$this->token) { |
|
| 378 | - // Not initialized, no token to actually revoke |
|
| 379 | - return false; |
|
| 380 | - } elseif (array_key_exists('refresh_token', $this->token)) { |
|
| 381 | - $token = $this->token['refresh_token']; |
|
| 382 | - } else { |
|
| 383 | - $token = $this->token['access_token']; |
|
| 384 | - } |
|
| 385 | - } |
|
| 386 | - $request = new Google_Http_Request( |
|
| 387 | - self::OAUTH2_REVOKE_URI, |
|
| 388 | - 'POST', |
|
| 389 | - array(), |
|
| 390 | - "token=$token" |
|
| 391 | - ); |
|
| 392 | - $request->disableGzip(); |
|
| 393 | - $response = $this->client->getIo()->makeRequest($request); |
|
| 394 | - $code = $response->getResponseHttpCode(); |
|
| 395 | - if ($code == 200) { |
|
| 396 | - $this->token = null; |
|
| 397 | - return true; |
|
| 398 | - } |
|
| 399 | - |
|
| 400 | - return false; |
|
| 376 | + if (!$token) { |
|
| 377 | + if (!$this->token) { |
|
| 378 | + // Not initialized, no token to actually revoke |
|
| 379 | + return false; |
|
| 380 | + } elseif (array_key_exists('refresh_token', $this->token)) { |
|
| 381 | + $token = $this->token['refresh_token']; |
|
| 382 | + } else { |
|
| 383 | + $token = $this->token['access_token']; |
|
| 384 | + } |
|
| 385 | + } |
|
| 386 | + $request = new Google_Http_Request( |
|
| 387 | + self::OAUTH2_REVOKE_URI, |
|
| 388 | + 'POST', |
|
| 389 | + array(), |
|
| 390 | + "token=$token" |
|
| 391 | + ); |
|
| 392 | + $request->disableGzip(); |
|
| 393 | + $response = $this->client->getIo()->makeRequest($request); |
|
| 394 | + $code = $response->getResponseHttpCode(); |
|
| 395 | + if ($code == 200) { |
|
| 396 | + $this->token = null; |
|
| 397 | + return true; |
|
| 398 | + } |
|
| 399 | + |
|
| 400 | + return false; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
@@ -406,15 +406,15 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | public function isAccessTokenExpired() |
| 408 | 408 | { |
| 409 | - if (!$this->token || !isset($this->token['created'])) { |
|
| 410 | - return true; |
|
| 411 | - } |
|
| 409 | + if (!$this->token || !isset($this->token['created'])) { |
|
| 410 | + return true; |
|
| 411 | + } |
|
| 412 | 412 | |
| 413 | - // If the token is set to expire in the next 30 seconds. |
|
| 414 | - $expired = ($this->token['created'] |
|
| 415 | - + ($this->token['expires_in'] - 30)) < time(); |
|
| 413 | + // If the token is set to expire in the next 30 seconds. |
|
| 414 | + $expired = ($this->token['created'] |
|
| 415 | + + ($this->token['expires_in'] - 30)) < time(); |
|
| 416 | 416 | |
| 417 | - return $expired; |
|
| 417 | + return $expired; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | // Gets federated sign-on certificates to use for verifying identity tokens. |
@@ -422,9 +422,9 @@ discard block |
||
| 422 | 422 | // are PEM encoded certificates. |
| 423 | 423 | private function getFederatedSignOnCerts() |
| 424 | 424 | { |
| 425 | - return $this->retrieveCertsFromLocation( |
|
| 426 | - $this->client->getClassConfig($this, 'federated_signon_certs_url') |
|
| 427 | - ); |
|
| 425 | + return $this->retrieveCertsFromLocation( |
|
| 426 | + $this->client->getClassConfig($this, 'federated_signon_certs_url') |
|
| 427 | + ); |
|
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | /** |
@@ -436,36 +436,36 @@ discard block |
||
| 436 | 436 | */ |
| 437 | 437 | public function retrieveCertsFromLocation($url) |
| 438 | 438 | { |
| 439 | - // If we're retrieving a local file, just grab it. |
|
| 440 | - if ("http" != substr($url, 0, 4)) { |
|
| 441 | - $file = file_get_contents($url); |
|
| 442 | - if ($file) { |
|
| 443 | - return json_decode($file, true); |
|
| 444 | - } else { |
|
| 445 | - throw new Google_Auth_Exception( |
|
| 446 | - "Failed to retrieve verification certificates: '" . |
|
| 447 | - $url . "'." |
|
| 448 | - ); |
|
| 449 | - } |
|
| 450 | - } |
|
| 451 | - |
|
| 452 | - // This relies on makeRequest caching certificate responses. |
|
| 453 | - $request = $this->client->getIo()->makeRequest( |
|
| 454 | - new Google_Http_Request( |
|
| 455 | - $url |
|
| 456 | - ) |
|
| 457 | - ); |
|
| 458 | - if ($request->getResponseHttpCode() == 200) { |
|
| 459 | - $certs = json_decode($request->getResponseBody(), true); |
|
| 460 | - if ($certs) { |
|
| 461 | - return $certs; |
|
| 462 | - } |
|
| 463 | - } |
|
| 464 | - throw new Google_Auth_Exception( |
|
| 465 | - "Failed to retrieve verification certificates: '" . |
|
| 466 | - $request->getResponseBody() . "'.", |
|
| 467 | - $request->getResponseHttpCode() |
|
| 468 | - ); |
|
| 439 | + // If we're retrieving a local file, just grab it. |
|
| 440 | + if ("http" != substr($url, 0, 4)) { |
|
| 441 | + $file = file_get_contents($url); |
|
| 442 | + if ($file) { |
|
| 443 | + return json_decode($file, true); |
|
| 444 | + } else { |
|
| 445 | + throw new Google_Auth_Exception( |
|
| 446 | + "Failed to retrieve verification certificates: '" . |
|
| 447 | + $url . "'." |
|
| 448 | + ); |
|
| 449 | + } |
|
| 450 | + } |
|
| 451 | + |
|
| 452 | + // This relies on makeRequest caching certificate responses. |
|
| 453 | + $request = $this->client->getIo()->makeRequest( |
|
| 454 | + new Google_Http_Request( |
|
| 455 | + $url |
|
| 456 | + ) |
|
| 457 | + ); |
|
| 458 | + if ($request->getResponseHttpCode() == 200) { |
|
| 459 | + $certs = json_decode($request->getResponseBody(), true); |
|
| 460 | + if ($certs) { |
|
| 461 | + return $certs; |
|
| 462 | + } |
|
| 463 | + } |
|
| 464 | + throw new Google_Auth_Exception( |
|
| 465 | + "Failed to retrieve verification certificates: '" . |
|
| 466 | + $request->getResponseBody() . "'.", |
|
| 467 | + $request->getResponseHttpCode() |
|
| 468 | + ); |
|
| 469 | 469 | } |
| 470 | 470 | |
| 471 | 471 | /** |
@@ -480,15 +480,15 @@ discard block |
||
| 480 | 480 | */ |
| 481 | 481 | public function verifyIdToken($id_token = null, $audience = null) |
| 482 | 482 | { |
| 483 | - if (!$id_token) { |
|
| 484 | - $id_token = $this->token['id_token']; |
|
| 485 | - } |
|
| 486 | - $certs = $this->getFederatedSignonCerts(); |
|
| 487 | - if (!$audience) { |
|
| 488 | - $audience = $this->client->getClassConfig($this, 'client_id'); |
|
| 489 | - } |
|
| 490 | - |
|
| 491 | - return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER); |
|
| 483 | + if (!$id_token) { |
|
| 484 | + $id_token = $this->token['id_token']; |
|
| 485 | + } |
|
| 486 | + $certs = $this->getFederatedSignonCerts(); |
|
| 487 | + if (!$audience) { |
|
| 488 | + $audience = $this->client->getClassConfig($this, 'client_id'); |
|
| 489 | + } |
|
| 490 | + |
|
| 491 | + return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER); |
|
| 492 | 492 | } |
| 493 | 493 | |
| 494 | 494 | /** |
@@ -503,125 +503,125 @@ discard block |
||
| 503 | 503 | * @return mixed token information if valid, false if not |
| 504 | 504 | */ |
| 505 | 505 | public function verifySignedJwtWithCerts( |
| 506 | - $jwt, |
|
| 507 | - $certs, |
|
| 508 | - $required_audience, |
|
| 509 | - $issuer = null, |
|
| 510 | - $max_expiry = null |
|
| 506 | + $jwt, |
|
| 507 | + $certs, |
|
| 508 | + $required_audience, |
|
| 509 | + $issuer = null, |
|
| 510 | + $max_expiry = null |
|
| 511 | 511 | ) { |
| 512 | - if (!$max_expiry) { |
|
| 513 | - // Set the maximum time we will accept a token for. |
|
| 514 | - $max_expiry = self::MAX_TOKEN_LIFETIME_SECS; |
|
| 515 | - } |
|
| 516 | - |
|
| 517 | - $segments = explode(".", $jwt); |
|
| 518 | - if (count($segments) != 3) { |
|
| 519 | - throw new Google_Auth_Exception("Wrong number of segments in token: $jwt"); |
|
| 520 | - } |
|
| 521 | - $signed = $segments[0] . "." . $segments[1]; |
|
| 522 | - $signature = Google_Utils::urlSafeB64Decode($segments[2]); |
|
| 523 | - |
|
| 524 | - // Parse envelope. |
|
| 525 | - $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true); |
|
| 526 | - if (!$envelope) { |
|
| 527 | - throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]); |
|
| 528 | - } |
|
| 529 | - |
|
| 530 | - // Parse token |
|
| 531 | - $json_body = Google_Utils::urlSafeB64Decode($segments[1]); |
|
| 532 | - $payload = json_decode($json_body, true); |
|
| 533 | - if (!$payload) { |
|
| 534 | - throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]); |
|
| 535 | - } |
|
| 536 | - |
|
| 537 | - // Check signature |
|
| 538 | - $verified = false; |
|
| 539 | - foreach ($certs as $keyName => $pem) { |
|
| 540 | - $public_key = new Google_Verifier_Pem($pem); |
|
| 541 | - if ($public_key->verify($signed, $signature)) { |
|
| 542 | - $verified = true; |
|
| 543 | - break; |
|
| 544 | - } |
|
| 545 | - } |
|
| 546 | - |
|
| 547 | - if (!$verified) { |
|
| 548 | - throw new Google_Auth_Exception("Invalid token signature: $jwt"); |
|
| 549 | - } |
|
| 550 | - |
|
| 551 | - // Check issued-at timestamp |
|
| 552 | - $iat = 0; |
|
| 553 | - if (array_key_exists("iat", $payload)) { |
|
| 554 | - $iat = $payload["iat"]; |
|
| 555 | - } |
|
| 556 | - if (!$iat) { |
|
| 557 | - throw new Google_Auth_Exception("No issue time in token: $json_body"); |
|
| 558 | - } |
|
| 559 | - $earliest = $iat - self::CLOCK_SKEW_SECS; |
|
| 560 | - |
|
| 561 | - // Check expiration timestamp |
|
| 562 | - $now = time(); |
|
| 563 | - $exp = 0; |
|
| 564 | - if (array_key_exists("exp", $payload)) { |
|
| 565 | - $exp = $payload["exp"]; |
|
| 566 | - } |
|
| 567 | - if (!$exp) { |
|
| 568 | - throw new Google_Auth_Exception("No expiration time in token: $json_body"); |
|
| 569 | - } |
|
| 570 | - if ($exp >= $now + $max_expiry) { |
|
| 571 | - throw new Google_Auth_Exception( |
|
| 572 | - sprintf("Expiration time too far in future: %s", $json_body) |
|
| 573 | - ); |
|
| 574 | - } |
|
| 575 | - |
|
| 576 | - $latest = $exp + self::CLOCK_SKEW_SECS; |
|
| 577 | - if ($now < $earliest) { |
|
| 578 | - throw new Google_Auth_Exception( |
|
| 579 | - sprintf( |
|
| 580 | - "Token used too early, %s < %s: %s", |
|
| 581 | - $now, |
|
| 582 | - $earliest, |
|
| 583 | - $json_body |
|
| 584 | - ) |
|
| 585 | - ); |
|
| 586 | - } |
|
| 587 | - if ($now > $latest) { |
|
| 588 | - throw new Google_Auth_Exception( |
|
| 589 | - sprintf( |
|
| 590 | - "Token used too late, %s > %s: %s", |
|
| 591 | - $now, |
|
| 592 | - $latest, |
|
| 593 | - $json_body |
|
| 594 | - ) |
|
| 595 | - ); |
|
| 596 | - } |
|
| 597 | - |
|
| 598 | - $iss = $payload['iss']; |
|
| 599 | - if ($issuer && $iss != $issuer) { |
|
| 600 | - throw new Google_Auth_Exception( |
|
| 601 | - sprintf( |
|
| 602 | - "Invalid issuer, %s != %s: %s", |
|
| 603 | - $iss, |
|
| 604 | - $issuer, |
|
| 605 | - $json_body |
|
| 606 | - ) |
|
| 607 | - ); |
|
| 608 | - } |
|
| 609 | - |
|
| 610 | - // Check audience |
|
| 611 | - $aud = $payload["aud"]; |
|
| 612 | - if ($aud != $required_audience) { |
|
| 613 | - throw new Google_Auth_Exception( |
|
| 614 | - sprintf( |
|
| 615 | - "Wrong recipient, %s != %s:", |
|
| 616 | - $aud, |
|
| 617 | - $required_audience, |
|
| 618 | - $json_body |
|
| 619 | - ) |
|
| 620 | - ); |
|
| 621 | - } |
|
| 622 | - |
|
| 623 | - // All good. |
|
| 624 | - return new Google_Auth_LoginTicket($envelope, $payload); |
|
| 512 | + if (!$max_expiry) { |
|
| 513 | + // Set the maximum time we will accept a token for. |
|
| 514 | + $max_expiry = self::MAX_TOKEN_LIFETIME_SECS; |
|
| 515 | + } |
|
| 516 | + |
|
| 517 | + $segments = explode(".", $jwt); |
|
| 518 | + if (count($segments) != 3) { |
|
| 519 | + throw new Google_Auth_Exception("Wrong number of segments in token: $jwt"); |
|
| 520 | + } |
|
| 521 | + $signed = $segments[0] . "." . $segments[1]; |
|
| 522 | + $signature = Google_Utils::urlSafeB64Decode($segments[2]); |
|
| 523 | + |
|
| 524 | + // Parse envelope. |
|
| 525 | + $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true); |
|
| 526 | + if (!$envelope) { |
|
| 527 | + throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]); |
|
| 528 | + } |
|
| 529 | + |
|
| 530 | + // Parse token |
|
| 531 | + $json_body = Google_Utils::urlSafeB64Decode($segments[1]); |
|
| 532 | + $payload = json_decode($json_body, true); |
|
| 533 | + if (!$payload) { |
|
| 534 | + throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]); |
|
| 535 | + } |
|
| 536 | + |
|
| 537 | + // Check signature |
|
| 538 | + $verified = false; |
|
| 539 | + foreach ($certs as $keyName => $pem) { |
|
| 540 | + $public_key = new Google_Verifier_Pem($pem); |
|
| 541 | + if ($public_key->verify($signed, $signature)) { |
|
| 542 | + $verified = true; |
|
| 543 | + break; |
|
| 544 | + } |
|
| 545 | + } |
|
| 546 | + |
|
| 547 | + if (!$verified) { |
|
| 548 | + throw new Google_Auth_Exception("Invalid token signature: $jwt"); |
|
| 549 | + } |
|
| 550 | + |
|
| 551 | + // Check issued-at timestamp |
|
| 552 | + $iat = 0; |
|
| 553 | + if (array_key_exists("iat", $payload)) { |
|
| 554 | + $iat = $payload["iat"]; |
|
| 555 | + } |
|
| 556 | + if (!$iat) { |
|
| 557 | + throw new Google_Auth_Exception("No issue time in token: $json_body"); |
|
| 558 | + } |
|
| 559 | + $earliest = $iat - self::CLOCK_SKEW_SECS; |
|
| 560 | + |
|
| 561 | + // Check expiration timestamp |
|
| 562 | + $now = time(); |
|
| 563 | + $exp = 0; |
|
| 564 | + if (array_key_exists("exp", $payload)) { |
|
| 565 | + $exp = $payload["exp"]; |
|
| 566 | + } |
|
| 567 | + if (!$exp) { |
|
| 568 | + throw new Google_Auth_Exception("No expiration time in token: $json_body"); |
|
| 569 | + } |
|
| 570 | + if ($exp >= $now + $max_expiry) { |
|
| 571 | + throw new Google_Auth_Exception( |
|
| 572 | + sprintf("Expiration time too far in future: %s", $json_body) |
|
| 573 | + ); |
|
| 574 | + } |
|
| 575 | + |
|
| 576 | + $latest = $exp + self::CLOCK_SKEW_SECS; |
|
| 577 | + if ($now < $earliest) { |
|
| 578 | + throw new Google_Auth_Exception( |
|
| 579 | + sprintf( |
|
| 580 | + "Token used too early, %s < %s: %s", |
|
| 581 | + $now, |
|
| 582 | + $earliest, |
|
| 583 | + $json_body |
|
| 584 | + ) |
|
| 585 | + ); |
|
| 586 | + } |
|
| 587 | + if ($now > $latest) { |
|
| 588 | + throw new Google_Auth_Exception( |
|
| 589 | + sprintf( |
|
| 590 | + "Token used too late, %s > %s: %s", |
|
| 591 | + $now, |
|
| 592 | + $latest, |
|
| 593 | + $json_body |
|
| 594 | + ) |
|
| 595 | + ); |
|
| 596 | + } |
|
| 597 | + |
|
| 598 | + $iss = $payload['iss']; |
|
| 599 | + if ($issuer && $iss != $issuer) { |
|
| 600 | + throw new Google_Auth_Exception( |
|
| 601 | + sprintf( |
|
| 602 | + "Invalid issuer, %s != %s: %s", |
|
| 603 | + $iss, |
|
| 604 | + $issuer, |
|
| 605 | + $json_body |
|
| 606 | + ) |
|
| 607 | + ); |
|
| 608 | + } |
|
| 609 | + |
|
| 610 | + // Check audience |
|
| 611 | + $aud = $payload["aud"]; |
|
| 612 | + if ($aud != $required_audience) { |
|
| 613 | + throw new Google_Auth_Exception( |
|
| 614 | + sprintf( |
|
| 615 | + "Wrong recipient, %s != %s:", |
|
| 616 | + $aud, |
|
| 617 | + $required_audience, |
|
| 618 | + $json_body |
|
| 619 | + ) |
|
| 620 | + ); |
|
| 621 | + } |
|
| 622 | + |
|
| 623 | + // All good. |
|
| 624 | + return new Google_Auth_LoginTicket($envelope, $payload); |
|
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | /** |
@@ -629,10 +629,10 @@ discard block |
||
| 629 | 629 | */ |
| 630 | 630 | private function maybeAddParam($params, $name) |
| 631 | 631 | { |
| 632 | - $param = $this->client->getClassConfig($this, $name); |
|
| 633 | - if ($param != '') { |
|
| 634 | - $params[$name] = $param; |
|
| 635 | - } |
|
| 636 | - return $params; |
|
| 632 | + $param = $this->client->getClassConfig($this, $name); |
|
| 633 | + if ($param != '') { |
|
| 634 | + $params[$name] = $param; |
|
| 635 | + } |
|
| 636 | + return $params; |
|
| 637 | 637 | } |
| 638 | 638 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | if ($decodedResponse != null && $decodedResponse['error']) { |
| 120 | 120 | $errorText = $decodedResponse['error']; |
| 121 | 121 | if (isset($decodedResponse['error_description'])) { |
| 122 | - $errorText .= ": " . $decodedResponse['error_description']; |
|
| 122 | + $errorText .= ": ".$decodedResponse['error_description']; |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | throw new Google_Auth_Exception( |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $params['state'] = $this->state; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&'); |
|
| 174 | + return self::OAUTH2_AUTH_URL."?".http_build_query($params, '', '&'); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if ($token == null) { |
| 185 | 185 | throw new Google_Auth_Exception('Could not json decode the token'); |
| 186 | 186 | } |
| 187 | - if (! isset($token['access_token'])) { |
|
| 187 | + if (!isset($token['access_token'])) { |
|
| 188 | 188 | throw new Google_Auth_Exception("Invalid token format"); |
| 189 | 189 | } |
| 190 | 190 | $this->token = $token; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $this->refreshTokenWithAssertion(); |
| 240 | 240 | } else { |
| 241 | 241 | $this->client->getLogger()->debug('OAuth2 access token expired'); |
| 242 | - if (! array_key_exists('refresh_token', $this->token)) { |
|
| 242 | + if (!array_key_exists('refresh_token', $this->token)) { |
|
| 243 | 243 | $error = "The OAuth 2.0 access token has expired," |
| 244 | 244 | ." and a refresh token is not available. Refresh tokens" |
| 245 | 245 | ." are not returned for responses that were auto-approved."; |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | // Add the OAuth2 header to the request |
| 257 | 257 | $request->setRequestHeaders( |
| 258 | - array('Authorization' => 'Bearer ' . $this->token['access_token']) |
|
| 258 | + array('Authorization' => 'Bearer '.$this->token['access_token']) |
|
| 259 | 259 | ); |
| 260 | 260 | |
| 261 | 261 | return $request; |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | throw new Google_Auth_Exception("Could not json decode the access token"); |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - if (! isset($token['access_token']) || ! isset($token['expires_in'])) { |
|
| 352 | + if (!isset($token['access_token']) || !isset($token['expires_in'])) { |
|
| 353 | 353 | throw new Google_Auth_Exception("Invalid token format"); |
| 354 | 354 | } |
| 355 | 355 | |
@@ -443,8 +443,8 @@ discard block |
||
| 443 | 443 | return json_decode($file, true); |
| 444 | 444 | } else { |
| 445 | 445 | throw new Google_Auth_Exception( |
| 446 | - "Failed to retrieve verification certificates: '" . |
|
| 447 | - $url . "'." |
|
| 446 | + "Failed to retrieve verification certificates: '". |
|
| 447 | + $url."'." |
|
| 448 | 448 | ); |
| 449 | 449 | } |
| 450 | 450 | } |
@@ -462,8 +462,8 @@ discard block |
||
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | throw new Google_Auth_Exception( |
| 465 | - "Failed to retrieve verification certificates: '" . |
|
| 466 | - $request->getResponseBody() . "'.", |
|
| 465 | + "Failed to retrieve verification certificates: '". |
|
| 466 | + $request->getResponseBody()."'.", |
|
| 467 | 467 | $request->getResponseHttpCode() |
| 468 | 468 | ); |
| 469 | 469 | } |
@@ -518,20 +518,20 @@ discard block |
||
| 518 | 518 | if (count($segments) != 3) { |
| 519 | 519 | throw new Google_Auth_Exception("Wrong number of segments in token: $jwt"); |
| 520 | 520 | } |
| 521 | - $signed = $segments[0] . "." . $segments[1]; |
|
| 521 | + $signed = $segments[0].".".$segments[1]; |
|
| 522 | 522 | $signature = Google_Utils::urlSafeB64Decode($segments[2]); |
| 523 | 523 | |
| 524 | 524 | // Parse envelope. |
| 525 | 525 | $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true); |
| 526 | 526 | if (!$envelope) { |
| 527 | - throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]); |
|
| 527 | + throw new Google_Auth_Exception("Can't parse token envelope: ".$segments[0]); |
|
| 528 | 528 | } |
| 529 | 529 | |
| 530 | 530 | // Parse token |
| 531 | 531 | $json_body = Google_Utils::urlSafeB64Decode($segments[1]); |
| 532 | 532 | $payload = json_decode($json_body, true); |
| 533 | 533 | if (!$payload) { |
| 534 | - throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]); |
|
| 534 | + throw new Google_Auth_Exception("Can't parse token payload: ".$segments[1]); |
|
| 535 | 535 | } |
| 536 | 536 | |
| 537 | 537 | // Check signature |
@@ -129,6 +129,9 @@ discard block |
||
| 129 | 129 | ); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | + /** |
|
| 133 | + * @param string $file |
|
| 134 | + */ |
|
| 132 | 135 | private function getWriteableCacheFile($file) |
| 133 | 136 | { |
| 134 | 137 | return $this->getCacheFile($file, true); |
@@ -139,6 +142,9 @@ discard block |
||
| 139 | 142 | return $this->getCacheDir($file, $forWrite) . '/' . md5($file); |
| 140 | 143 | } |
| 141 | 144 | |
| 145 | + /** |
|
| 146 | + * @param boolean $forWrite |
|
| 147 | + */ |
|
| 142 | 148 | private function getCacheDir($file, $forWrite) |
| 143 | 149 | { |
| 144 | 150 | // use the first 2 characters of the hash as a directory prefix |
@@ -157,11 +163,17 @@ discard block |
||
| 157 | 163 | return $storageDir; |
| 158 | 164 | } |
| 159 | 165 | |
| 166 | + /** |
|
| 167 | + * @param string $storageFile |
|
| 168 | + */ |
|
| 160 | 169 | private function acquireReadLock($storageFile) |
| 161 | 170 | { |
| 162 | 171 | return $this->acquireLock(LOCK_SH, $storageFile); |
| 163 | 172 | } |
| 164 | 173 | |
| 174 | + /** |
|
| 175 | + * @param string $storageFile |
|
| 176 | + */ |
|
| 165 | 177 | private function acquireWriteLock($storageFile) |
| 166 | 178 | { |
| 167 | 179 | $rc = $this->acquireLock(LOCK_EX, $storageFile); |
@@ -175,6 +187,9 @@ discard block |
||
| 175 | 187 | return $rc; |
| 176 | 188 | } |
| 177 | 189 | |
| 190 | + /** |
|
| 191 | + * @param integer $type |
|
| 192 | + */ |
|
| 178 | 193 | private function acquireLock($type, $storageFile) |
| 179 | 194 | { |
| 180 | 195 | $mode = $type == LOCK_EX ? "w" : "r"; |
@@ -197,6 +212,9 @@ discard block |
||
| 197 | 212 | return true; |
| 198 | 213 | } |
| 199 | 214 | |
| 215 | + /** |
|
| 216 | + * @param string $storageFile |
|
| 217 | + */ |
|
| 200 | 218 | public function unlock($storageFile) |
| 201 | 219 | { |
| 202 | 220 | if ($this->fh) { |
@@ -40,167 +40,167 @@ |
||
| 40 | 40 | |
| 41 | 41 | public function __construct(Google_Client $client) |
| 42 | 42 | { |
| 43 | - $this->client = $client; |
|
| 44 | - $this->path = $this->client->getClassConfig($this, 'directory'); |
|
| 43 | + $this->client = $client; |
|
| 44 | + $this->path = $this->client->getClassConfig($this, 'directory'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function get($key, $expiration = false) |
| 48 | 48 | { |
| 49 | - $storageFile = $this->getCacheFile($key); |
|
| 50 | - $data = false; |
|
| 51 | - |
|
| 52 | - if (!file_exists($storageFile)) { |
|
| 53 | - $this->client->getLogger()->debug( |
|
| 54 | - 'File cache miss', |
|
| 55 | - array('key' => $key, 'file' => $storageFile) |
|
| 56 | - ); |
|
| 57 | - return false; |
|
| 58 | - } |
|
| 59 | - |
|
| 60 | - if ($expiration) { |
|
| 61 | - $mtime = filemtime($storageFile); |
|
| 62 | - if ((time() - $mtime) >= $expiration) { |
|
| 63 | - $this->client->getLogger()->debug( |
|
| 64 | - 'File cache miss (expired)', |
|
| 65 | - array('key' => $key, 'file' => $storageFile) |
|
| 66 | - ); |
|
| 67 | - $this->delete($key); |
|
| 68 | - return false; |
|
| 69 | - } |
|
| 70 | - } |
|
| 71 | - |
|
| 72 | - if ($this->acquireReadLock($storageFile)) { |
|
| 73 | - if (filesize($storageFile) > 0) { |
|
| 74 | - $data = fread($this->fh, filesize($storageFile)); |
|
| 75 | - $data = unserialize($data); |
|
| 76 | - } else { |
|
| 77 | - $this->client->getLogger()->debug( |
|
| 78 | - 'Cache file was empty', |
|
| 79 | - array('file' => $storageFile) |
|
| 80 | - ); |
|
| 81 | - } |
|
| 82 | - $this->unlock($storageFile); |
|
| 83 | - } |
|
| 84 | - |
|
| 85 | - $this->client->getLogger()->debug( |
|
| 86 | - 'File cache hit', |
|
| 87 | - array('key' => $key, 'file' => $storageFile, 'var' => $data) |
|
| 88 | - ); |
|
| 89 | - |
|
| 90 | - return $data; |
|
| 49 | + $storageFile = $this->getCacheFile($key); |
|
| 50 | + $data = false; |
|
| 51 | + |
|
| 52 | + if (!file_exists($storageFile)) { |
|
| 53 | + $this->client->getLogger()->debug( |
|
| 54 | + 'File cache miss', |
|
| 55 | + array('key' => $key, 'file' => $storageFile) |
|
| 56 | + ); |
|
| 57 | + return false; |
|
| 58 | + } |
|
| 59 | + |
|
| 60 | + if ($expiration) { |
|
| 61 | + $mtime = filemtime($storageFile); |
|
| 62 | + if ((time() - $mtime) >= $expiration) { |
|
| 63 | + $this->client->getLogger()->debug( |
|
| 64 | + 'File cache miss (expired)', |
|
| 65 | + array('key' => $key, 'file' => $storageFile) |
|
| 66 | + ); |
|
| 67 | + $this->delete($key); |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 70 | + } |
|
| 71 | + |
|
| 72 | + if ($this->acquireReadLock($storageFile)) { |
|
| 73 | + if (filesize($storageFile) > 0) { |
|
| 74 | + $data = fread($this->fh, filesize($storageFile)); |
|
| 75 | + $data = unserialize($data); |
|
| 76 | + } else { |
|
| 77 | + $this->client->getLogger()->debug( |
|
| 78 | + 'Cache file was empty', |
|
| 79 | + array('file' => $storageFile) |
|
| 80 | + ); |
|
| 81 | + } |
|
| 82 | + $this->unlock($storageFile); |
|
| 83 | + } |
|
| 84 | + |
|
| 85 | + $this->client->getLogger()->debug( |
|
| 86 | + 'File cache hit', |
|
| 87 | + array('key' => $key, 'file' => $storageFile, 'var' => $data) |
|
| 88 | + ); |
|
| 89 | + |
|
| 90 | + return $data; |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | public function set($key, $value) |
| 94 | 94 | { |
| 95 | - $storageFile = $this->getWriteableCacheFile($key); |
|
| 96 | - if ($this->acquireWriteLock($storageFile)) { |
|
| 97 | - // We serialize the whole request object, since we don't only want the |
|
| 98 | - // responseContent but also the postBody used, headers, size, etc. |
|
| 99 | - $data = serialize($value); |
|
| 100 | - $result = fwrite($this->fh, $data); |
|
| 101 | - $this->unlock($storageFile); |
|
| 102 | - |
|
| 103 | - $this->client->getLogger()->debug( |
|
| 104 | - 'File cache set', |
|
| 105 | - array('key' => $key, 'file' => $storageFile, 'var' => $value) |
|
| 106 | - ); |
|
| 107 | - } else { |
|
| 108 | - $this->client->getLogger()->notice( |
|
| 109 | - 'File cache set failed', |
|
| 110 | - array('key' => $key, 'file' => $storageFile) |
|
| 111 | - ); |
|
| 112 | - } |
|
| 95 | + $storageFile = $this->getWriteableCacheFile($key); |
|
| 96 | + if ($this->acquireWriteLock($storageFile)) { |
|
| 97 | + // We serialize the whole request object, since we don't only want the |
|
| 98 | + // responseContent but also the postBody used, headers, size, etc. |
|
| 99 | + $data = serialize($value); |
|
| 100 | + $result = fwrite($this->fh, $data); |
|
| 101 | + $this->unlock($storageFile); |
|
| 102 | + |
|
| 103 | + $this->client->getLogger()->debug( |
|
| 104 | + 'File cache set', |
|
| 105 | + array('key' => $key, 'file' => $storageFile, 'var' => $value) |
|
| 106 | + ); |
|
| 107 | + } else { |
|
| 108 | + $this->client->getLogger()->notice( |
|
| 109 | + 'File cache set failed', |
|
| 110 | + array('key' => $key, 'file' => $storageFile) |
|
| 111 | + ); |
|
| 112 | + } |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | public function delete($key) |
| 116 | 116 | { |
| 117 | - $file = $this->getCacheFile($key); |
|
| 118 | - if (file_exists($file) && !unlink($file)) { |
|
| 119 | - $this->client->getLogger()->error( |
|
| 120 | - 'File cache delete failed', |
|
| 121 | - array('key' => $key, 'file' => $file) |
|
| 122 | - ); |
|
| 123 | - throw new Google_Cache_Exception("Cache file could not be deleted"); |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - $this->client->getLogger()->debug( |
|
| 127 | - 'File cache delete', |
|
| 128 | - array('key' => $key, 'file' => $file) |
|
| 129 | - ); |
|
| 117 | + $file = $this->getCacheFile($key); |
|
| 118 | + if (file_exists($file) && !unlink($file)) { |
|
| 119 | + $this->client->getLogger()->error( |
|
| 120 | + 'File cache delete failed', |
|
| 121 | + array('key' => $key, 'file' => $file) |
|
| 122 | + ); |
|
| 123 | + throw new Google_Cache_Exception("Cache file could not be deleted"); |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + $this->client->getLogger()->debug( |
|
| 127 | + 'File cache delete', |
|
| 128 | + array('key' => $key, 'file' => $file) |
|
| 129 | + ); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | private function getWriteableCacheFile($file) |
| 133 | 133 | { |
| 134 | - return $this->getCacheFile($file, true); |
|
| 134 | + return $this->getCacheFile($file, true); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | private function getCacheFile($file, $forWrite = false) |
| 138 | 138 | { |
| 139 | - return $this->getCacheDir($file, $forWrite) . '/' . md5($file); |
|
| 139 | + return $this->getCacheDir($file, $forWrite) . '/' . md5($file); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | private function getCacheDir($file, $forWrite) |
| 143 | 143 | { |
| 144 | - // use the first 2 characters of the hash as a directory prefix |
|
| 145 | - // this should prevent slowdowns due to huge directory listings |
|
| 146 | - // and thus give some basic amount of scalability |
|
| 147 | - $storageDir = $this->path . '/' . substr(md5($file), 0, 2); |
|
| 148 | - if ($forWrite && ! is_dir($storageDir)) { |
|
| 149 | - if (! mkdir($storageDir, 0755, true)) { |
|
| 150 | - $this->client->getLogger()->error( |
|
| 151 | - 'File cache creation failed', |
|
| 152 | - array('dir' => $storageDir) |
|
| 153 | - ); |
|
| 154 | - throw new Google_Cache_Exception("Could not create storage directory: $storageDir"); |
|
| 155 | - } |
|
| 156 | - } |
|
| 157 | - return $storageDir; |
|
| 144 | + // use the first 2 characters of the hash as a directory prefix |
|
| 145 | + // this should prevent slowdowns due to huge directory listings |
|
| 146 | + // and thus give some basic amount of scalability |
|
| 147 | + $storageDir = $this->path . '/' . substr(md5($file), 0, 2); |
|
| 148 | + if ($forWrite && ! is_dir($storageDir)) { |
|
| 149 | + if (! mkdir($storageDir, 0755, true)) { |
|
| 150 | + $this->client->getLogger()->error( |
|
| 151 | + 'File cache creation failed', |
|
| 152 | + array('dir' => $storageDir) |
|
| 153 | + ); |
|
| 154 | + throw new Google_Cache_Exception("Could not create storage directory: $storageDir"); |
|
| 155 | + } |
|
| 156 | + } |
|
| 157 | + return $storageDir; |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | private function acquireReadLock($storageFile) |
| 161 | 161 | { |
| 162 | - return $this->acquireLock(LOCK_SH, $storageFile); |
|
| 162 | + return $this->acquireLock(LOCK_SH, $storageFile); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | private function acquireWriteLock($storageFile) |
| 166 | 166 | { |
| 167 | - $rc = $this->acquireLock(LOCK_EX, $storageFile); |
|
| 168 | - if (!$rc) { |
|
| 169 | - $this->client->getLogger()->notice( |
|
| 170 | - 'File cache write lock failed', |
|
| 171 | - array('file' => $storageFile) |
|
| 172 | - ); |
|
| 173 | - $this->delete($storageFile); |
|
| 174 | - } |
|
| 175 | - return $rc; |
|
| 167 | + $rc = $this->acquireLock(LOCK_EX, $storageFile); |
|
| 168 | + if (!$rc) { |
|
| 169 | + $this->client->getLogger()->notice( |
|
| 170 | + 'File cache write lock failed', |
|
| 171 | + array('file' => $storageFile) |
|
| 172 | + ); |
|
| 173 | + $this->delete($storageFile); |
|
| 174 | + } |
|
| 175 | + return $rc; |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | private function acquireLock($type, $storageFile) |
| 179 | 179 | { |
| 180 | - $mode = $type == LOCK_EX ? "w" : "r"; |
|
| 181 | - $this->fh = fopen($storageFile, $mode); |
|
| 182 | - if (!$this->fh) { |
|
| 183 | - $this->client->getLogger()->error( |
|
| 184 | - 'Failed to open file during lock acquisition', |
|
| 185 | - array('file' => $storageFile) |
|
| 186 | - ); |
|
| 187 | - return false; |
|
| 188 | - } |
|
| 189 | - $count = 0; |
|
| 190 | - while (!flock($this->fh, $type | LOCK_NB)) { |
|
| 191 | - // Sleep for 10ms. |
|
| 192 | - usleep(10000); |
|
| 193 | - if (++$count < self::MAX_LOCK_RETRIES) { |
|
| 194 | - return false; |
|
| 195 | - } |
|
| 196 | - } |
|
| 197 | - return true; |
|
| 180 | + $mode = $type == LOCK_EX ? "w" : "r"; |
|
| 181 | + $this->fh = fopen($storageFile, $mode); |
|
| 182 | + if (!$this->fh) { |
|
| 183 | + $this->client->getLogger()->error( |
|
| 184 | + 'Failed to open file during lock acquisition', |
|
| 185 | + array('file' => $storageFile) |
|
| 186 | + ); |
|
| 187 | + return false; |
|
| 188 | + } |
|
| 189 | + $count = 0; |
|
| 190 | + while (!flock($this->fh, $type | LOCK_NB)) { |
|
| 191 | + // Sleep for 10ms. |
|
| 192 | + usleep(10000); |
|
| 193 | + if (++$count < self::MAX_LOCK_RETRIES) { |
|
| 194 | + return false; |
|
| 195 | + } |
|
| 196 | + } |
|
| 197 | + return true; |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | public function unlock($storageFile) |
| 201 | 201 | { |
| 202 | - if ($this->fh) { |
|
| 203 | - flock($this->fh, LOCK_UN); |
|
| 204 | - } |
|
| 202 | + if ($this->fh) { |
|
| 203 | + flock($this->fh, LOCK_UN); |
|
| 204 | + } |
|
| 205 | 205 | } |
| 206 | 206 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /* |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | if ($this->acquireReadLock($storageFile)) { |
| 73 | 73 | if (filesize($storageFile) > 0) { |
| 74 | 74 | $data = fread($this->fh, filesize($storageFile)); |
| 75 | - $data = unserialize($data); |
|
| 75 | + $data = unserialize($data); |
|
| 76 | 76 | } else { |
| 77 | 77 | $this->client->getLogger()->debug( |
| 78 | 78 | 'Cache file was empty', |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | private function getCacheFile($file, $forWrite = false) |
| 138 | 138 | { |
| 139 | - return $this->getCacheDir($file, $forWrite) . '/' . md5($file); |
|
| 139 | + return $this->getCacheDir($file, $forWrite).'/'.md5($file); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | private function getCacheDir($file, $forWrite) |
@@ -144,9 +144,9 @@ discard block |
||
| 144 | 144 | // use the first 2 characters of the hash as a directory prefix |
| 145 | 145 | // this should prevent slowdowns due to huge directory listings |
| 146 | 146 | // and thus give some basic amount of scalability |
| 147 | - $storageDir = $this->path . '/' . substr(md5($file), 0, 2); |
|
| 148 | - if ($forWrite && ! is_dir($storageDir)) { |
|
| 149 | - if (! mkdir($storageDir, 0755, true)) { |
|
| 147 | + $storageDir = $this->path.'/'.substr(md5($file), 0, 2); |
|
| 148 | + if ($forWrite && !is_dir($storageDir)) { |
|
| 149 | + if (!mkdir($storageDir, 0755, true)) { |
|
| 150 | 150 | $this->client->getLogger()->error( |
| 151 | 151 | 'File cache creation failed', |
| 152 | 152 | array('dir' => $storageDir) |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | /** |
| 193 | 193 | * @throws Google_Auth_Exception |
| 194 | - * @return array |
|
| 194 | + * @return string |
|
| 195 | 195 | * @visible For Testing |
| 196 | 196 | */ |
| 197 | 197 | public function prepareScopes() |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | * @param $audience string the expected consumer of the token |
| 491 | 491 | * @param $issuer string the expected issuer, defaults to Google |
| 492 | 492 | * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS |
| 493 | - * @return mixed token information if valid, false if not |
|
| 493 | + * @return Google_Auth_LoginTicket token information if valid, false if not |
|
| 494 | 494 | */ |
| 495 | 495 | public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null) |
| 496 | 496 | { |
@@ -512,6 +512,7 @@ discard block |
||
| 512 | 512 | * Will remove any previously configured scopes. |
| 513 | 513 | * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login', |
| 514 | 514 | * 'https://www.googleapis.com/auth/moderator') |
| 515 | + * @param string[] $scopes |
|
| 515 | 516 | */ |
| 516 | 517 | public function setScopes($scopes) |
| 517 | 518 | { |
@@ -74,32 +74,32 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | public function __construct($config = null) |
| 76 | 76 | { |
| 77 | - if (is_string($config) && strlen($config)) { |
|
| 78 | - $config = new Google_Config($config); |
|
| 79 | - } else if ( !($config instanceof Google_Config)) { |
|
| 80 | - $config = new Google_Config(); |
|
| 77 | + if (is_string($config) && strlen($config)) { |
|
| 78 | + $config = new Google_Config($config); |
|
| 79 | + } else if ( !($config instanceof Google_Config)) { |
|
| 80 | + $config = new Google_Config(); |
|
| 81 | 81 | |
| 82 | - if ($this->isAppEngine()) { |
|
| 83 | - // Automatically use Memcache if we're in AppEngine. |
|
| 84 | - $config->setCacheClass('Google_Cache_Memcache'); |
|
| 85 | - } |
|
| 82 | + if ($this->isAppEngine()) { |
|
| 83 | + // Automatically use Memcache if we're in AppEngine. |
|
| 84 | + $config->setCacheClass('Google_Cache_Memcache'); |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) { |
|
| 88 | - // Automatically disable compress.zlib, as currently unsupported. |
|
| 89 | - $config->setClassConfig('Google_Http_Request', 'disable_gzip', true); |
|
| 90 | - } |
|
| 91 | - } |
|
| 87 | + if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) { |
|
| 88 | + // Automatically disable compress.zlib, as currently unsupported. |
|
| 89 | + $config->setClassConfig('Google_Http_Request', 'disable_gzip', true); |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) { |
|
| 94 | - if (function_exists('curl_version') && function_exists('curl_exec') |
|
| 95 | - && !$this->isAppEngine()) { |
|
| 96 | - $config->setIoClass("Google_IO_Curl"); |
|
| 97 | - } else { |
|
| 98 | - $config->setIoClass("Google_IO_Stream"); |
|
| 99 | - } |
|
| 100 | - } |
|
| 93 | + if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) { |
|
| 94 | + if (function_exists('curl_version') && function_exists('curl_exec') |
|
| 95 | + && !$this->isAppEngine()) { |
|
| 96 | + $config->setIoClass("Google_IO_Curl"); |
|
| 97 | + } else { |
|
| 98 | + $config->setIoClass("Google_IO_Stream"); |
|
| 99 | + } |
|
| 100 | + } |
|
| 101 | 101 | |
| 102 | - $this->config = $config; |
|
| 102 | + $this->config = $config; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function getLibraryVersion() |
| 111 | 111 | { |
| 112 | - return self::LIBVER; |
|
| 112 | + return self::LIBVER; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public function authenticate($code, $crossClient = false) |
| 126 | 126 | { |
| 127 | - $this->authenticated = true; |
|
| 128 | - return $this->getAuth()->authenticate($code, $crossClient); |
|
| 127 | + $this->authenticated = true; |
|
| 128 | + return $this->getAuth()->authenticate($code, $crossClient); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -141,18 +141,18 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | public function loadServiceAccountJson($jsonLocation, $scopes) |
| 143 | 143 | { |
| 144 | - $data = json_decode(file_get_contents($jsonLocation)); |
|
| 145 | - if (isset($data->type) && $data->type == 'service_account') { |
|
| 146 | - // Service Account format. |
|
| 147 | - $cred = new Google_Auth_AssertionCredentials( |
|
| 148 | - $data->client_email, |
|
| 149 | - $scopes, |
|
| 150 | - $data->private_key |
|
| 151 | - ); |
|
| 152 | - return $cred; |
|
| 153 | - } else { |
|
| 154 | - throw new Google_Exception("Invalid service account JSON file."); |
|
| 155 | - } |
|
| 144 | + $data = json_decode(file_get_contents($jsonLocation)); |
|
| 145 | + if (isset($data->type) && $data->type == 'service_account') { |
|
| 146 | + // Service Account format. |
|
| 147 | + $cred = new Google_Auth_AssertionCredentials( |
|
| 148 | + $data->client_email, |
|
| 149 | + $scopes, |
|
| 150 | + $data->private_key |
|
| 151 | + ); |
|
| 152 | + return $cred; |
|
| 153 | + } else { |
|
| 154 | + throw new Google_Exception("Invalid service account JSON file."); |
|
| 155 | + } |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -165,16 +165,16 @@ discard block |
||
| 165 | 165 | */ |
| 166 | 166 | public function setAuthConfig($json) |
| 167 | 167 | { |
| 168 | - $data = json_decode($json); |
|
| 169 | - $key = isset($data->installed) ? 'installed' : 'web'; |
|
| 170 | - if (!isset($data->$key)) { |
|
| 171 | - throw new Google_Exception("Invalid client secret JSON file."); |
|
| 172 | - } |
|
| 173 | - $this->setClientId($data->$key->client_id); |
|
| 174 | - $this->setClientSecret($data->$key->client_secret); |
|
| 175 | - if (isset($data->$key->redirect_uris)) { |
|
| 176 | - $this->setRedirectUri($data->$key->redirect_uris[0]); |
|
| 177 | - } |
|
| 168 | + $data = json_decode($json); |
|
| 169 | + $key = isset($data->installed) ? 'installed' : 'web'; |
|
| 170 | + if (!isset($data->$key)) { |
|
| 171 | + throw new Google_Exception("Invalid client secret JSON file."); |
|
| 172 | + } |
|
| 173 | + $this->setClientId($data->$key->client_id); |
|
| 174 | + $this->setClientSecret($data->$key->client_secret); |
|
| 175 | + if (isset($data->$key->redirect_uris)) { |
|
| 176 | + $this->setRedirectUri($data->$key->redirect_uris[0]); |
|
| 177 | + } |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | /** |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | */ |
| 187 | 187 | public function setAuthConfigFile($file) |
| 188 | 188 | { |
| 189 | - $this->setAuthConfig(file_get_contents($file)); |
|
| 189 | + $this->setAuthConfig(file_get_contents($file)); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /** |
@@ -196,11 +196,11 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | public function prepareScopes() |
| 198 | 198 | { |
| 199 | - if (empty($this->requestedScopes)) { |
|
| 200 | - throw new Google_Auth_Exception("No scopes specified"); |
|
| 201 | - } |
|
| 202 | - $scopes = implode(' ', $this->requestedScopes); |
|
| 203 | - return $scopes; |
|
| 199 | + if (empty($this->requestedScopes)) { |
|
| 200 | + throw new Google_Auth_Exception("No scopes specified"); |
|
| 201 | + } |
|
| 202 | + $scopes = implode(' ', $this->requestedScopes); |
|
| 203 | + return $scopes; |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -212,10 +212,10 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function setAccessToken($accessToken) |
| 214 | 214 | { |
| 215 | - if ($accessToken == 'null') { |
|
| 216 | - $accessToken = null; |
|
| 217 | - } |
|
| 218 | - $this->getAuth()->setAccessToken($accessToken); |
|
| 215 | + if ($accessToken == 'null') { |
|
| 216 | + $accessToken = null; |
|
| 217 | + } |
|
| 218 | + $this->getAuth()->setAccessToken($accessToken); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | |
@@ -226,8 +226,8 @@ discard block |
||
| 226 | 226 | */ |
| 227 | 227 | public function setAuth(Google_Auth_Abstract $auth) |
| 228 | 228 | { |
| 229 | - $this->config->setAuthClass(get_class($auth)); |
|
| 230 | - $this->auth = $auth; |
|
| 229 | + $this->config->setAuthClass(get_class($auth)); |
|
| 230 | + $this->auth = $auth; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
@@ -236,8 +236,8 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | public function setIo(Google_IO_Abstract $io) |
| 238 | 238 | { |
| 239 | - $this->config->setIoClass(get_class($io)); |
|
| 240 | - $this->io = $io; |
|
| 239 | + $this->config->setIoClass(get_class($io)); |
|
| 240 | + $this->io = $io; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | */ |
| 247 | 247 | public function setCache(Google_Cache_Abstract $cache) |
| 248 | 248 | { |
| 249 | - $this->config->setCacheClass(get_class($cache)); |
|
| 250 | - $this->cache = $cache; |
|
| 249 | + $this->config->setCacheClass(get_class($cache)); |
|
| 250 | + $this->cache = $cache; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /** |
@@ -256,8 +256,8 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | public function setLogger(Google_Logger_Abstract $logger) |
| 258 | 258 | { |
| 259 | - $this->config->setLoggerClass(get_class($logger)); |
|
| 260 | - $this->logger = $logger; |
|
| 259 | + $this->config->setLoggerClass(get_class($logger)); |
|
| 260 | + $this->logger = $logger; |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /** |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | public function createAuthUrl() |
| 268 | 268 | { |
| 269 | - $scopes = $this->prepareScopes(); |
|
| 270 | - return $this->getAuth()->createAuthUrl($scopes); |
|
| 269 | + $scopes = $this->prepareScopes(); |
|
| 270 | + return $this->getAuth()->createAuthUrl($scopes); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | /** |
@@ -278,11 +278,11 @@ discard block |
||
| 278 | 278 | */ |
| 279 | 279 | public function getAccessToken() |
| 280 | 280 | { |
| 281 | - $token = $this->getAuth()->getAccessToken(); |
|
| 282 | - // The response is json encoded, so could be the string null. |
|
| 283 | - // It is arguable whether this check should be here or lower |
|
| 284 | - // in the library. |
|
| 285 | - return (null == $token || 'null' == $token || '[]' == $token) ? null : $token; |
|
| 281 | + $token = $this->getAuth()->getAccessToken(); |
|
| 282 | + // The response is json encoded, so could be the string null. |
|
| 283 | + // It is arguable whether this check should be here or lower |
|
| 284 | + // in the library. |
|
| 285 | + return (null == $token || 'null' == $token || '[]' == $token) ? null : $token; |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | /** |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | public function getRefreshToken() |
| 293 | 293 | { |
| 294 | - return $this->getAuth()->getRefreshToken(); |
|
| 294 | + return $this->getAuth()->getRefreshToken(); |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | /** |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | */ |
| 301 | 301 | public function isAccessTokenExpired() |
| 302 | 302 | { |
| 303 | - return $this->getAuth()->isAccessTokenExpired(); |
|
| 303 | + return $this->getAuth()->isAccessTokenExpired(); |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | /** |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | */ |
| 311 | 311 | public function setState($state) |
| 312 | 312 | { |
| 313 | - $this->getAuth()->setState($state); |
|
| 313 | + $this->getAuth()->setState($state); |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /** |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | */ |
| 321 | 321 | public function setAccessType($accessType) |
| 322 | 322 | { |
| 323 | - $this->config->setAccessType($accessType); |
|
| 323 | + $this->config->setAccessType($accessType); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | */ |
| 331 | 331 | public function setApprovalPrompt($approvalPrompt) |
| 332 | 332 | { |
| 333 | - $this->config->setApprovalPrompt($approvalPrompt); |
|
| 333 | + $this->config->setApprovalPrompt($approvalPrompt); |
|
| 334 | 334 | } |
| 335 | 335 | |
| 336 | 336 | /** |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | */ |
| 340 | 340 | public function setLoginHint($loginHint) |
| 341 | 341 | { |
| 342 | - $this->config->setLoginHint($loginHint); |
|
| 342 | + $this->config->setLoginHint($loginHint); |
|
| 343 | 343 | } |
| 344 | 344 | |
| 345 | 345 | /** |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | */ |
| 349 | 349 | public function setApplicationName($applicationName) |
| 350 | 350 | { |
| 351 | - $this->config->setApplicationName($applicationName); |
|
| 351 | + $this->config->setApplicationName($applicationName); |
|
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | /** |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | */ |
| 358 | 358 | public function setClientId($clientId) |
| 359 | 359 | { |
| 360 | - $this->config->setClientId($clientId); |
|
| 360 | + $this->config->setClientId($clientId); |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | */ |
| 367 | 367 | public function setClientSecret($clientSecret) |
| 368 | 368 | { |
| 369 | - $this->config->setClientSecret($clientSecret); |
|
| 369 | + $this->config->setClientSecret($clientSecret); |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | /** |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | public function setRedirectUri($redirectUri) |
| 377 | 377 | { |
| 378 | - $this->config->setRedirectUri($redirectUri); |
|
| 378 | + $this->config->setRedirectUri($redirectUri); |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | /** |
@@ -388,10 +388,10 @@ discard block |
||
| 388 | 388 | */ |
| 389 | 389 | public function setRequestVisibleActions($requestVisibleActions) |
| 390 | 390 | { |
| 391 | - if (is_array($requestVisibleActions)) { |
|
| 392 | - $requestVisibleActions = join(" ", $requestVisibleActions); |
|
| 393 | - } |
|
| 394 | - $this->config->setRequestVisibleActions($requestVisibleActions); |
|
| 391 | + if (is_array($requestVisibleActions)) { |
|
| 392 | + $requestVisibleActions = join(" ", $requestVisibleActions); |
|
| 393 | + } |
|
| 394 | + $this->config->setRequestVisibleActions($requestVisibleActions); |
|
| 395 | 395 | } |
| 396 | 396 | |
| 397 | 397 | /** |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | */ |
| 402 | 402 | public function setDeveloperKey($developerKey) |
| 403 | 403 | { |
| 404 | - $this->config->setDeveloperKey($developerKey); |
|
| 404 | + $this->config->setDeveloperKey($developerKey); |
|
| 405 | 405 | } |
| 406 | 406 | |
| 407 | 407 | /** |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | */ |
| 413 | 413 | public function setHostedDomain($hd) |
| 414 | 414 | { |
| 415 | - $this->config->setHostedDomain($hd); |
|
| 415 | + $this->config->setHostedDomain($hd); |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | /** |
@@ -423,7 +423,7 @@ discard block |
||
| 423 | 423 | */ |
| 424 | 424 | public function setPrompt($prompt) |
| 425 | 425 | { |
| 426 | - $this->config->setPrompt($prompt); |
|
| 426 | + $this->config->setPrompt($prompt); |
|
| 427 | 427 | } |
| 428 | 428 | |
| 429 | 429 | /** |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | */ |
| 435 | 435 | public function setOpenidRealm($realm) |
| 436 | 436 | { |
| 437 | - $this->config->setOpenidRealm($realm); |
|
| 437 | + $this->config->setOpenidRealm($realm); |
|
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | /** |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | */ |
| 446 | 446 | public function setIncludeGrantedScopes($include) |
| 447 | 447 | { |
| 448 | - $this->config->setIncludeGrantedScopes($include); |
|
| 448 | + $this->config->setIncludeGrantedScopes($include); |
|
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | /** |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | */ |
| 455 | 455 | public function refreshToken($refreshToken) |
| 456 | 456 | { |
| 457 | - $this->getAuth()->refreshToken($refreshToken); |
|
| 457 | + $this->getAuth()->refreshToken($refreshToken); |
|
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | */ |
| 467 | 467 | public function revokeToken($token = null) |
| 468 | 468 | { |
| 469 | - return $this->getAuth()->revokeToken($token); |
|
| 469 | + return $this->getAuth()->revokeToken($token); |
|
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | /** |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | */ |
| 480 | 480 | public function verifyIdToken($token = null) |
| 481 | 481 | { |
| 482 | - return $this->getAuth()->verifyIdToken($token); |
|
| 482 | + return $this->getAuth()->verifyIdToken($token); |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | /** |
@@ -494,9 +494,9 @@ discard block |
||
| 494 | 494 | */ |
| 495 | 495 | public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null) |
| 496 | 496 | { |
| 497 | - $auth = new Google_Auth_OAuth2($this); |
|
| 498 | - $certs = $auth->retrieveCertsFromLocation($cert_location); |
|
| 499 | - return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry); |
|
| 497 | + $auth = new Google_Auth_OAuth2($this); |
|
| 498 | + $certs = $auth->retrieveCertsFromLocation($cert_location); |
|
| 499 | + return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry); |
|
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | /** |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | */ |
| 505 | 505 | public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds) |
| 506 | 506 | { |
| 507 | - $this->getAuth()->setAssertionCredentials($creds); |
|
| 507 | + $this->getAuth()->setAssertionCredentials($creds); |
|
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | /** |
@@ -515,8 +515,8 @@ discard block |
||
| 515 | 515 | */ |
| 516 | 516 | public function setScopes($scopes) |
| 517 | 517 | { |
| 518 | - $this->requestedScopes = array(); |
|
| 519 | - $this->addScope($scopes); |
|
| 518 | + $this->requestedScopes = array(); |
|
| 519 | + $this->addScope($scopes); |
|
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | /** |
@@ -528,13 +528,13 @@ discard block |
||
| 528 | 528 | */ |
| 529 | 529 | public function addScope($scope_or_scopes) |
| 530 | 530 | { |
| 531 | - if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) { |
|
| 532 | - $this->requestedScopes[] = $scope_or_scopes; |
|
| 533 | - } else if (is_array($scope_or_scopes)) { |
|
| 534 | - foreach ($scope_or_scopes as $scope) { |
|
| 535 | - $this->addScope($scope); |
|
| 536 | - } |
|
| 537 | - } |
|
| 531 | + if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) { |
|
| 532 | + $this->requestedScopes[] = $scope_or_scopes; |
|
| 533 | + } else if (is_array($scope_or_scopes)) { |
|
| 534 | + foreach ($scope_or_scopes as $scope) { |
|
| 535 | + $this->addScope($scope); |
|
| 536 | + } |
|
| 537 | + } |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | 540 | /** |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | */ |
| 545 | 545 | public function getScopes() |
| 546 | 546 | { |
| 547 | - return $this->requestedScopes; |
|
| 547 | + return $this->requestedScopes; |
|
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | /** |
@@ -556,8 +556,8 @@ discard block |
||
| 556 | 556 | */ |
| 557 | 557 | public function setUseBatch($useBatch) |
| 558 | 558 | { |
| 559 | - // This is actually an alias for setDefer. |
|
| 560 | - $this->setDefer($useBatch); |
|
| 559 | + // This is actually an alias for setDefer. |
|
| 560 | + $this->setDefer($useBatch); |
|
| 561 | 561 | } |
| 562 | 562 | |
| 563 | 563 | /** |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | */ |
| 569 | 569 | public function setDefer($defer) |
| 570 | 570 | { |
| 571 | - $this->deferExecution = $defer; |
|
| 571 | + $this->deferExecution = $defer; |
|
| 572 | 572 | } |
| 573 | 573 | |
| 574 | 574 | /** |
@@ -580,22 +580,22 @@ discard block |
||
| 580 | 580 | */ |
| 581 | 581 | public function execute($request) |
| 582 | 582 | { |
| 583 | - if ($request instanceof Google_Http_Request) { |
|
| 584 | - $request->setUserAgent( |
|
| 585 | - $this->getApplicationName() |
|
| 586 | - . " " . self::USER_AGENT_SUFFIX |
|
| 587 | - . $this->getLibraryVersion() |
|
| 588 | - ); |
|
| 589 | - if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) { |
|
| 590 | - $request->enableGzip(); |
|
| 591 | - } |
|
| 592 | - $request->maybeMoveParametersToBody(); |
|
| 593 | - return Google_Http_REST::execute($this, $request); |
|
| 594 | - } else if ($request instanceof Google_Http_Batch) { |
|
| 595 | - return $request->execute(); |
|
| 596 | - } else { |
|
| 597 | - throw new Google_Exception("Do not know how to execute this type of object."); |
|
| 598 | - } |
|
| 583 | + if ($request instanceof Google_Http_Request) { |
|
| 584 | + $request->setUserAgent( |
|
| 585 | + $this->getApplicationName() |
|
| 586 | + . " " . self::USER_AGENT_SUFFIX |
|
| 587 | + . $this->getLibraryVersion() |
|
| 588 | + ); |
|
| 589 | + if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) { |
|
| 590 | + $request->enableGzip(); |
|
| 591 | + } |
|
| 592 | + $request->maybeMoveParametersToBody(); |
|
| 593 | + return Google_Http_REST::execute($this, $request); |
|
| 594 | + } else if ($request instanceof Google_Http_Batch) { |
|
| 595 | + return $request->execute(); |
|
| 596 | + } else { |
|
| 597 | + throw new Google_Exception("Do not know how to execute this type of object."); |
|
| 598 | + } |
|
| 599 | 599 | } |
| 600 | 600 | |
| 601 | 601 | /** |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | */ |
| 605 | 605 | public function shouldDefer() |
| 606 | 606 | { |
| 607 | - return $this->deferExecution; |
|
| 607 | + return $this->deferExecution; |
|
| 608 | 608 | } |
| 609 | 609 | |
| 610 | 610 | /** |
@@ -612,11 +612,11 @@ discard block |
||
| 612 | 612 | */ |
| 613 | 613 | public function getAuth() |
| 614 | 614 | { |
| 615 | - if (!isset($this->auth)) { |
|
| 616 | - $class = $this->config->getAuthClass(); |
|
| 617 | - $this->auth = new $class($this); |
|
| 618 | - } |
|
| 619 | - return $this->auth; |
|
| 615 | + if (!isset($this->auth)) { |
|
| 616 | + $class = $this->config->getAuthClass(); |
|
| 617 | + $this->auth = new $class($this); |
|
| 618 | + } |
|
| 619 | + return $this->auth; |
|
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | /** |
@@ -624,11 +624,11 @@ discard block |
||
| 624 | 624 | */ |
| 625 | 625 | public function getIo() |
| 626 | 626 | { |
| 627 | - if (!isset($this->io)) { |
|
| 628 | - $class = $this->config->getIoClass(); |
|
| 629 | - $this->io = new $class($this); |
|
| 630 | - } |
|
| 631 | - return $this->io; |
|
| 627 | + if (!isset($this->io)) { |
|
| 628 | + $class = $this->config->getIoClass(); |
|
| 629 | + $this->io = new $class($this); |
|
| 630 | + } |
|
| 631 | + return $this->io; |
|
| 632 | 632 | } |
| 633 | 633 | |
| 634 | 634 | /** |
@@ -636,11 +636,11 @@ discard block |
||
| 636 | 636 | */ |
| 637 | 637 | public function getCache() |
| 638 | 638 | { |
| 639 | - if (!isset($this->cache)) { |
|
| 640 | - $class = $this->config->getCacheClass(); |
|
| 641 | - $this->cache = new $class($this); |
|
| 642 | - } |
|
| 643 | - return $this->cache; |
|
| 639 | + if (!isset($this->cache)) { |
|
| 640 | + $class = $this->config->getCacheClass(); |
|
| 641 | + $this->cache = new $class($this); |
|
| 642 | + } |
|
| 643 | + return $this->cache; |
|
| 644 | 644 | } |
| 645 | 645 | |
| 646 | 646 | /** |
@@ -648,11 +648,11 @@ discard block |
||
| 648 | 648 | */ |
| 649 | 649 | public function getLogger() |
| 650 | 650 | { |
| 651 | - if (!isset($this->logger)) { |
|
| 652 | - $class = $this->config->getLoggerClass(); |
|
| 653 | - $this->logger = new $class($this); |
|
| 654 | - } |
|
| 655 | - return $this->logger; |
|
| 651 | + if (!isset($this->logger)) { |
|
| 652 | + $class = $this->config->getLoggerClass(); |
|
| 653 | + $this->logger = new $class($this); |
|
| 654 | + } |
|
| 655 | + return $this->logger; |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | /** |
@@ -663,10 +663,10 @@ discard block |
||
| 663 | 663 | */ |
| 664 | 664 | public function getClassConfig($class, $key = null) |
| 665 | 665 | { |
| 666 | - if (!is_string($class)) { |
|
| 667 | - $class = get_class($class); |
|
| 668 | - } |
|
| 669 | - return $this->config->getClassConfig($class, $key); |
|
| 666 | + if (!is_string($class)) { |
|
| 667 | + $class = get_class($class); |
|
| 668 | + } |
|
| 669 | + return $this->config->getClassConfig($class, $key); |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | /** |
@@ -680,10 +680,10 @@ discard block |
||
| 680 | 680 | */ |
| 681 | 681 | public function setClassConfig($class, $config, $value = null) |
| 682 | 682 | { |
| 683 | - if (!is_string($class)) { |
|
| 684 | - $class = get_class($class); |
|
| 685 | - } |
|
| 686 | - $this->config->setClassConfig($class, $config, $value); |
|
| 683 | + if (!is_string($class)) { |
|
| 684 | + $class = get_class($class); |
|
| 685 | + } |
|
| 686 | + $this->config->setClassConfig($class, $config, $value); |
|
| 687 | 687 | |
| 688 | 688 | } |
| 689 | 689 | |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | */ |
| 693 | 693 | public function getBasePath() |
| 694 | 694 | { |
| 695 | - return $this->config->getBasePath(); |
|
| 695 | + return $this->config->getBasePath(); |
|
| 696 | 696 | } |
| 697 | 697 | |
| 698 | 698 | /** |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | */ |
| 701 | 701 | public function getApplicationName() |
| 702 | 702 | { |
| 703 | - return $this->config->getApplicationName(); |
|
| 703 | + return $this->config->getApplicationName(); |
|
| 704 | 704 | } |
| 705 | 705 | |
| 706 | 706 | /** |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | */ |
| 710 | 710 | public function isAppEngine() |
| 711 | 711 | { |
| 712 | - return (isset($_SERVER['SERVER_SOFTWARE']) && |
|
| 713 | - strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false); |
|
| 712 | + return (isset($_SERVER['SERVER_SOFTWARE']) && |
|
| 713 | + strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false); |
|
| 714 | 714 | } |
| 715 | 715 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | { |
| 77 | 77 | if (is_string($config) && strlen($config)) { |
| 78 | 78 | $config = new Google_Config($config); |
| 79 | - } else if ( !($config instanceof Google_Config)) { |
|
| 79 | + } else if (!($config instanceof Google_Config)) { |
|
| 80 | 80 | $config = new Google_Config(); |
| 81 | 81 | |
| 82 | 82 | if ($this->isAppEngine()) { |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | if ($request instanceof Google_Http_Request) { |
| 584 | 584 | $request->setUserAgent( |
| 585 | 585 | $this->getApplicationName() |
| 586 | - . " " . self::USER_AGENT_SUFFIX |
|
| 586 | + . " ".self::USER_AGENT_SUFFIX |
|
| 587 | 587 | . $this->getLibraryVersion() |
| 588 | 588 | ); |
| 589 | 589 | if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) { |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | 81 | * Set the base URL that path and query parameters will be added to. |
| 82 | - * @param $baseComponent string |
|
| 82 | + * @param string $baseComponent string |
|
| 83 | 83 | */ |
| 84 | 84 | public function setBaseComponent($baseComponent) |
| 85 | 85 | { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | /** |
| 134 | 134 | * Set a new query parameter. |
| 135 | - * @param $key - string to set, does not need to be URL encoded |
|
| 135 | + * @param string $key - string to set, does not need to be URL encoded |
|
| 136 | 136 | * @param $value - string to set, does not need to be URL encoded |
| 137 | 137 | */ |
| 138 | 138 | public function setQueryParam($key, $value) |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
| 144 | - * @return string HTTP Response Code. |
|
| 144 | + * @return integer HTTP Response Code. |
|
| 145 | 145 | */ |
| 146 | 146 | public function getResponseHttpCode() |
| 147 | 147 | { |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | const GZIP_UA = " (gzip)"; |
| 33 | 33 | |
| 34 | 34 | private $batchHeaders = array( |
| 35 | - 'Content-Type' => 'application/http', |
|
| 36 | - 'Content-Transfer-Encoding' => 'binary', |
|
| 37 | - 'MIME-Version' => '1.0', |
|
| 35 | + 'Content-Type' => 'application/http', |
|
| 36 | + 'Content-Transfer-Encoding' => 'binary', |
|
| 37 | + 'MIME-Version' => '1.0', |
|
| 38 | 38 | ); |
| 39 | 39 | |
| 40 | 40 | protected $queryParams; |
@@ -56,15 +56,15 @@ discard block |
||
| 56 | 56 | public $accessKey; |
| 57 | 57 | |
| 58 | 58 | public function __construct( |
| 59 | - $url, |
|
| 60 | - $method = 'GET', |
|
| 61 | - $headers = array(), |
|
| 62 | - $postBody = null |
|
| 59 | + $url, |
|
| 60 | + $method = 'GET', |
|
| 61 | + $headers = array(), |
|
| 62 | + $postBody = null |
|
| 63 | 63 | ) { |
| 64 | - $this->setUrl($url); |
|
| 65 | - $this->setRequestMethod($method); |
|
| 66 | - $this->setRequestHeaders($headers); |
|
| 67 | - $this->setPostBody($postBody); |
|
| 64 | + $this->setUrl($url); |
|
| 65 | + $this->setRequestMethod($method); |
|
| 66 | + $this->setRequestHeaders($headers); |
|
| 67 | + $this->setPostBody($postBody); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | public function getBaseComponent() |
| 76 | 76 | { |
| 77 | - return $this->baseComponent; |
|
| 77 | + return $this->baseComponent; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function setBaseComponent($baseComponent) |
| 85 | 85 | { |
| 86 | - $this->baseComponent = rtrim($baseComponent, '/'); |
|
| 86 | + $this->baseComponent = rtrim($baseComponent, '/'); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | /** |
@@ -91,9 +91,9 @@ discard block |
||
| 91 | 91 | */ |
| 92 | 92 | public function enableGzip() |
| 93 | 93 | { |
| 94 | - $this->setRequestHeaders(array("Accept-Encoding" => "gzip")); |
|
| 95 | - $this->canGzip = true; |
|
| 96 | - $this->setUserAgent($this->userAgent); |
|
| 94 | + $this->setRequestHeaders(array("Accept-Encoding" => "gzip")); |
|
| 95 | + $this->canGzip = true; |
|
| 96 | + $this->setUserAgent($this->userAgent); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
@@ -101,14 +101,14 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | public function disableGzip() |
| 103 | 103 | { |
| 104 | - if ( |
|
| 105 | - isset($this->requestHeaders['accept-encoding']) && |
|
| 106 | - $this->requestHeaders['accept-encoding'] == "gzip" |
|
| 107 | - ) { |
|
| 108 | - unset($this->requestHeaders['accept-encoding']); |
|
| 109 | - } |
|
| 110 | - $this->canGzip = false; |
|
| 111 | - $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent); |
|
| 104 | + if ( |
|
| 105 | + isset($this->requestHeaders['accept-encoding']) && |
|
| 106 | + $this->requestHeaders['accept-encoding'] == "gzip" |
|
| 107 | + ) { |
|
| 108 | + unset($this->requestHeaders['accept-encoding']); |
|
| 109 | + } |
|
| 110 | + $this->canGzip = false; |
|
| 111 | + $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | public function canGzip() |
| 119 | 119 | { |
| 120 | - return $this->canGzip; |
|
| 120 | + return $this->canGzip; |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | public function getQueryParams() |
| 129 | 129 | { |
| 130 | - return $this->queryParams; |
|
| 130 | + return $this->queryParams; |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | */ |
| 138 | 138 | public function setQueryParam($key, $value) |
| 139 | 139 | { |
| 140 | - $this->queryParams[$key] = $value; |
|
| 140 | + $this->queryParams[$key] = $value; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public function getResponseHttpCode() |
| 147 | 147 | { |
| 148 | - return (int) $this->responseHttpCode; |
|
| 148 | + return (int) $this->responseHttpCode; |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public function setResponseHttpCode($responseHttpCode) |
| 155 | 155 | { |
| 156 | - $this->responseHttpCode = $responseHttpCode; |
|
| 156 | + $this->responseHttpCode = $responseHttpCode; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | */ |
| 162 | 162 | public function getResponseHeaders() |
| 163 | 163 | { |
| 164 | - return $this->responseHeaders; |
|
| 164 | + return $this->responseHeaders; |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | */ |
| 170 | 170 | public function getResponseBody() |
| 171 | 171 | { |
| 172 | - return $this->responseBody; |
|
| 172 | + return $this->responseBody; |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | */ |
| 180 | 180 | public function setExpectedClass($class) |
| 181 | 181 | { |
| 182 | - $this->expectedClass = $class; |
|
| 182 | + $this->expectedClass = $class; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | /** |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | */ |
| 189 | 189 | public function getExpectedClass() |
| 190 | 190 | { |
| 191 | - return $this->expectedClass; |
|
| 191 | + return $this->expectedClass; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | */ |
| 197 | 197 | public function enableExpectedRaw() |
| 198 | 198 | { |
| 199 | - $this->expectedRaw = true; |
|
| 199 | + $this->expectedRaw = true; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | */ |
| 205 | 205 | public function disableExpectedRaw() |
| 206 | 206 | { |
| 207 | - $this->expectedRaw = false; |
|
| 207 | + $this->expectedRaw = false; |
|
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | */ |
| 214 | 214 | public function getExpectedRaw() |
| 215 | 215 | { |
| 216 | - return $this->expectedRaw; |
|
| 216 | + return $this->expectedRaw; |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
@@ -222,12 +222,12 @@ discard block |
||
| 222 | 222 | */ |
| 223 | 223 | public function setResponseHeaders($headers) |
| 224 | 224 | { |
| 225 | - $headers = Google_Utils::normalize($headers); |
|
| 226 | - if ($this->responseHeaders) { |
|
| 227 | - $headers = array_merge($this->responseHeaders, $headers); |
|
| 228 | - } |
|
| 225 | + $headers = Google_Utils::normalize($headers); |
|
| 226 | + if ($this->responseHeaders) { |
|
| 227 | + $headers = array_merge($this->responseHeaders, $headers); |
|
| 228 | + } |
|
| 229 | 229 | |
| 230 | - $this->responseHeaders = $headers; |
|
| 230 | + $this->responseHeaders = $headers; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | /** |
@@ -237,9 +237,9 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | public function getResponseHeader($key) |
| 239 | 239 | { |
| 240 | - return isset($this->responseHeaders[$key]) |
|
| 241 | - ? $this->responseHeaders[$key] |
|
| 242 | - : false; |
|
| 240 | + return isset($this->responseHeaders[$key]) |
|
| 241 | + ? $this->responseHeaders[$key] |
|
| 242 | + : false; |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | /** |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | */ |
| 248 | 248 | public function setResponseBody($responseBody) |
| 249 | 249 | { |
| 250 | - $this->responseBody = $responseBody; |
|
| 250 | + $this->responseBody = $responseBody; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /** |
@@ -255,10 +255,10 @@ discard block |
||
| 255 | 255 | */ |
| 256 | 256 | public function getUrl() |
| 257 | 257 | { |
| 258 | - return $this->baseComponent . $this->path . |
|
| 259 | - (count($this->queryParams) ? |
|
| 260 | - "?" . $this->buildQuery($this->queryParams) : |
|
| 261 | - ''); |
|
| 258 | + return $this->baseComponent . $this->path . |
|
| 259 | + (count($this->queryParams) ? |
|
| 260 | + "?" . $this->buildQuery($this->queryParams) : |
|
| 261 | + ''); |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | /** |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | public function getRequestMethod() |
| 268 | 268 | { |
| 269 | - return $this->requestMethod; |
|
| 269 | + return $this->requestMethod; |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | /** |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | */ |
| 275 | 275 | public function getRequestHeaders() |
| 276 | 276 | { |
| 277 | - return $this->requestHeaders; |
|
| 277 | + return $this->requestHeaders; |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | /** |
@@ -284,9 +284,9 @@ discard block |
||
| 284 | 284 | */ |
| 285 | 285 | public function getRequestHeader($key) |
| 286 | 286 | { |
| 287 | - return isset($this->requestHeaders[$key]) |
|
| 288 | - ? $this->requestHeaders[$key] |
|
| 289 | - : false; |
|
| 287 | + return isset($this->requestHeaders[$key]) |
|
| 288 | + ? $this->requestHeaders[$key] |
|
| 289 | + : false; |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | /** |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | */ |
| 295 | 295 | public function getPostBody() |
| 296 | 296 | { |
| 297 | - return $this->postBody; |
|
| 297 | + return $this->postBody; |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | /** |
@@ -302,26 +302,26 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public function setUrl($url) |
| 304 | 304 | { |
| 305 | - if (substr($url, 0, 4) != 'http') { |
|
| 306 | - // Force the path become relative. |
|
| 307 | - if (substr($url, 0, 1) !== '/') { |
|
| 308 | - $url = '/' . $url; |
|
| 309 | - } |
|
| 310 | - } |
|
| 311 | - $parts = parse_url($url); |
|
| 312 | - if (isset($parts['host'])) { |
|
| 313 | - $this->baseComponent = sprintf( |
|
| 314 | - "%s%s%s", |
|
| 315 | - isset($parts['scheme']) ? $parts['scheme'] . "://" : '', |
|
| 316 | - isset($parts['host']) ? $parts['host'] : '', |
|
| 317 | - isset($parts['port']) ? ":" . $parts['port'] : '' |
|
| 318 | - ); |
|
| 319 | - } |
|
| 320 | - $this->path = isset($parts['path']) ? $parts['path'] : ''; |
|
| 321 | - $this->queryParams = array(); |
|
| 322 | - if (isset($parts['query'])) { |
|
| 323 | - $this->queryParams = $this->parseQuery($parts['query']); |
|
| 324 | - } |
|
| 305 | + if (substr($url, 0, 4) != 'http') { |
|
| 306 | + // Force the path become relative. |
|
| 307 | + if (substr($url, 0, 1) !== '/') { |
|
| 308 | + $url = '/' . $url; |
|
| 309 | + } |
|
| 310 | + } |
|
| 311 | + $parts = parse_url($url); |
|
| 312 | + if (isset($parts['host'])) { |
|
| 313 | + $this->baseComponent = sprintf( |
|
| 314 | + "%s%s%s", |
|
| 315 | + isset($parts['scheme']) ? $parts['scheme'] . "://" : '', |
|
| 316 | + isset($parts['host']) ? $parts['host'] : '', |
|
| 317 | + isset($parts['port']) ? ":" . $parts['port'] : '' |
|
| 318 | + ); |
|
| 319 | + } |
|
| 320 | + $this->path = isset($parts['path']) ? $parts['path'] : ''; |
|
| 321 | + $this->queryParams = array(); |
|
| 322 | + if (isset($parts['query'])) { |
|
| 323 | + $this->queryParams = $this->parseQuery($parts['query']); |
|
| 324 | + } |
|
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | /** |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | */ |
| 332 | 332 | public function setRequestMethod($method) |
| 333 | 333 | { |
| 334 | - $this->requestMethod = strtoupper($method); |
|
| 334 | + $this->requestMethod = strtoupper($method); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | /** |
@@ -340,11 +340,11 @@ discard block |
||
| 340 | 340 | */ |
| 341 | 341 | public function setRequestHeaders($headers) |
| 342 | 342 | { |
| 343 | - $headers = Google_Utils::normalize($headers); |
|
| 344 | - if ($this->requestHeaders) { |
|
| 345 | - $headers = array_merge($this->requestHeaders, $headers); |
|
| 346 | - } |
|
| 347 | - $this->requestHeaders = $headers; |
|
| 343 | + $headers = Google_Utils::normalize($headers); |
|
| 344 | + if ($this->requestHeaders) { |
|
| 345 | + $headers = array_merge($this->requestHeaders, $headers); |
|
| 346 | + } |
|
| 347 | + $this->requestHeaders = $headers; |
|
| 348 | 348 | } |
| 349 | 349 | |
| 350 | 350 | /** |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | */ |
| 353 | 353 | public function setPostBody($postBody) |
| 354 | 354 | { |
| 355 | - $this->postBody = $postBody; |
|
| 355 | + $this->postBody = $postBody; |
|
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | /** |
@@ -361,10 +361,10 @@ discard block |
||
| 361 | 361 | */ |
| 362 | 362 | public function setUserAgent($userAgent) |
| 363 | 363 | { |
| 364 | - $this->userAgent = $userAgent; |
|
| 365 | - if ($this->canGzip) { |
|
| 366 | - $this->userAgent = $userAgent . self::GZIP_UA; |
|
| 367 | - } |
|
| 364 | + $this->userAgent = $userAgent; |
|
| 365 | + if ($this->canGzip) { |
|
| 366 | + $this->userAgent = $userAgent . self::GZIP_UA; |
|
| 367 | + } |
|
| 368 | 368 | } |
| 369 | 369 | |
| 370 | 370 | /** |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | */ |
| 373 | 373 | public function getUserAgent() |
| 374 | 374 | { |
| 375 | - return $this->userAgent; |
|
| 375 | + return $this->userAgent; |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | /** |
@@ -383,29 +383,29 @@ discard block |
||
| 383 | 383 | */ |
| 384 | 384 | public function getCacheKey() |
| 385 | 385 | { |
| 386 | - $key = $this->getUrl(); |
|
| 386 | + $key = $this->getUrl(); |
|
| 387 | 387 | |
| 388 | - if (isset($this->accessKey)) { |
|
| 389 | - $key .= $this->accessKey; |
|
| 390 | - } |
|
| 388 | + if (isset($this->accessKey)) { |
|
| 389 | + $key .= $this->accessKey; |
|
| 390 | + } |
|
| 391 | 391 | |
| 392 | - if (isset($this->requestHeaders['authorization'])) { |
|
| 393 | - $key .= $this->requestHeaders['authorization']; |
|
| 394 | - } |
|
| 392 | + if (isset($this->requestHeaders['authorization'])) { |
|
| 393 | + $key .= $this->requestHeaders['authorization']; |
|
| 394 | + } |
|
| 395 | 395 | |
| 396 | - return md5($key); |
|
| 396 | + return md5($key); |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | 399 | public function getParsedCacheControl() |
| 400 | 400 | { |
| 401 | - $parsed = array(); |
|
| 402 | - $rawCacheControl = $this->getResponseHeader('cache-control'); |
|
| 403 | - if ($rawCacheControl) { |
|
| 404 | - $rawCacheControl = str_replace(', ', '&', $rawCacheControl); |
|
| 405 | - parse_str($rawCacheControl, $parsed); |
|
| 406 | - } |
|
| 401 | + $parsed = array(); |
|
| 402 | + $rawCacheControl = $this->getResponseHeader('cache-control'); |
|
| 403 | + if ($rawCacheControl) { |
|
| 404 | + $rawCacheControl = str_replace(', ', '&', $rawCacheControl); |
|
| 405 | + parse_str($rawCacheControl, $parsed); |
|
| 406 | + } |
|
| 407 | 407 | |
| 408 | - return $parsed; |
|
| 408 | + return $parsed; |
|
| 409 | 409 | } |
| 410 | 410 | |
| 411 | 411 | /** |
@@ -414,29 +414,29 @@ discard block |
||
| 414 | 414 | */ |
| 415 | 415 | public function toBatchString($id) |
| 416 | 416 | { |
| 417 | - $str = ''; |
|
| 418 | - $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" . |
|
| 419 | - http_build_query($this->queryParams); |
|
| 420 | - $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n"; |
|
| 417 | + $str = ''; |
|
| 418 | + $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" . |
|
| 419 | + http_build_query($this->queryParams); |
|
| 420 | + $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n"; |
|
| 421 | 421 | |
| 422 | - foreach ($this->getRequestHeaders() as $key => $val) { |
|
| 423 | - $str .= $key . ': ' . $val . "\n"; |
|
| 424 | - } |
|
| 422 | + foreach ($this->getRequestHeaders() as $key => $val) { |
|
| 423 | + $str .= $key . ': ' . $val . "\n"; |
|
| 424 | + } |
|
| 425 | 425 | |
| 426 | - if ($this->getPostBody()) { |
|
| 427 | - $str .= "\n"; |
|
| 428 | - $str .= $this->getPostBody(); |
|
| 429 | - } |
|
| 426 | + if ($this->getPostBody()) { |
|
| 427 | + $str .= "\n"; |
|
| 428 | + $str .= $this->getPostBody(); |
|
| 429 | + } |
|
| 430 | 430 | |
| 431 | - $headers = ''; |
|
| 432 | - foreach ($this->batchHeaders as $key => $val) { |
|
| 433 | - $headers .= $key . ': ' . $val . "\n"; |
|
| 434 | - } |
|
| 431 | + $headers = ''; |
|
| 432 | + foreach ($this->batchHeaders as $key => $val) { |
|
| 433 | + $headers .= $key . ': ' . $val . "\n"; |
|
| 434 | + } |
|
| 435 | 435 | |
| 436 | - $headers .= "Content-ID: $id\n"; |
|
| 437 | - $str = $headers . "\n" . $str; |
|
| 436 | + $headers .= "Content-ID: $id\n"; |
|
| 437 | + $str = $headers . "\n" . $str; |
|
| 438 | 438 | |
| 439 | - return $str; |
|
| 439 | + return $str; |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | /** |
@@ -446,21 +446,21 @@ discard block |
||
| 446 | 446 | */ |
| 447 | 447 | private function parseQuery($string) |
| 448 | 448 | { |
| 449 | - $return = array(); |
|
| 450 | - $parts = explode("&", $string); |
|
| 451 | - foreach ($parts as $part) { |
|
| 452 | - list($key, $value) = explode('=', $part, 2); |
|
| 453 | - $value = urldecode($value); |
|
| 454 | - if (isset($return[$key])) { |
|
| 455 | - if (!is_array($return[$key])) { |
|
| 456 | - $return[$key] = array($return[$key]); |
|
| 457 | - } |
|
| 458 | - $return[$key][] = $value; |
|
| 459 | - } else { |
|
| 460 | - $return[$key] = $value; |
|
| 461 | - } |
|
| 462 | - } |
|
| 463 | - return $return; |
|
| 449 | + $return = array(); |
|
| 450 | + $parts = explode("&", $string); |
|
| 451 | + foreach ($parts as $part) { |
|
| 452 | + list($key, $value) = explode('=', $part, 2); |
|
| 453 | + $value = urldecode($value); |
|
| 454 | + if (isset($return[$key])) { |
|
| 455 | + if (!is_array($return[$key])) { |
|
| 456 | + $return[$key] = array($return[$key]); |
|
| 457 | + } |
|
| 458 | + $return[$key][] = $value; |
|
| 459 | + } else { |
|
| 460 | + $return[$key] = $value; |
|
| 461 | + } |
|
| 462 | + } |
|
| 463 | + return $return; |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | /** |
@@ -470,17 +470,17 @@ discard block |
||
| 470 | 470 | */ |
| 471 | 471 | private function buildQuery($parts) |
| 472 | 472 | { |
| 473 | - $return = array(); |
|
| 474 | - foreach ($parts as $key => $value) { |
|
| 475 | - if (is_array($value)) { |
|
| 476 | - foreach ($value as $v) { |
|
| 477 | - $return[] = urlencode($key) . "=" . urlencode($v); |
|
| 478 | - } |
|
| 479 | - } else { |
|
| 480 | - $return[] = urlencode($key) . "=" . urlencode($value); |
|
| 481 | - } |
|
| 482 | - } |
|
| 483 | - return implode('&', $return); |
|
| 473 | + $return = array(); |
|
| 474 | + foreach ($parts as $key => $value) { |
|
| 475 | + if (is_array($value)) { |
|
| 476 | + foreach ($value as $v) { |
|
| 477 | + $return[] = urlencode($key) . "=" . urlencode($v); |
|
| 478 | + } |
|
| 479 | + } else { |
|
| 480 | + $return[] = urlencode($key) . "=" . urlencode($value); |
|
| 481 | + } |
|
| 482 | + } |
|
| 483 | + return implode('&', $return); |
|
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | /** |
@@ -490,15 +490,15 @@ discard block |
||
| 490 | 490 | */ |
| 491 | 491 | public function maybeMoveParametersToBody() |
| 492 | 492 | { |
| 493 | - if ($this->getRequestMethod() == "POST" && empty($this->postBody)) { |
|
| 494 | - $this->setRequestHeaders( |
|
| 495 | - array( |
|
| 496 | - "content-type" => |
|
| 497 | - "application/x-www-form-urlencoded; charset=UTF-8" |
|
| 498 | - ) |
|
| 499 | - ); |
|
| 500 | - $this->setPostBody($this->buildQuery($this->queryParams)); |
|
| 501 | - $this->queryParams = array(); |
|
| 502 | - } |
|
| 493 | + if ($this->getRequestMethod() == "POST" && empty($this->postBody)) { |
|
| 494 | + $this->setRequestHeaders( |
|
| 495 | + array( |
|
| 496 | + "content-type" => |
|
| 497 | + "application/x-www-form-urlencoded; charset=UTF-8" |
|
| 498 | + ) |
|
| 499 | + ); |
|
| 500 | + $this->setPostBody($this->buildQuery($this->queryParams)); |
|
| 501 | + $this->queryParams = array(); |
|
| 502 | + } |
|
| 503 | 503 | } |
| 504 | 504 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -255,10 +255,9 @@ discard block |
||
| 255 | 255 | */ |
| 256 | 256 | public function getUrl() |
| 257 | 257 | { |
| 258 | - return $this->baseComponent . $this->path . |
|
| 258 | + return $this->baseComponent.$this->path. |
|
| 259 | 259 | (count($this->queryParams) ? |
| 260 | - "?" . $this->buildQuery($this->queryParams) : |
|
| 261 | - ''); |
|
| 260 | + "?".$this->buildQuery($this->queryParams) : ''); |
|
| 262 | 261 | } |
| 263 | 262 | |
| 264 | 263 | /** |
@@ -305,16 +304,16 @@ discard block |
||
| 305 | 304 | if (substr($url, 0, 4) != 'http') { |
| 306 | 305 | // Force the path become relative. |
| 307 | 306 | if (substr($url, 0, 1) !== '/') { |
| 308 | - $url = '/' . $url; |
|
| 307 | + $url = '/'.$url; |
|
| 309 | 308 | } |
| 310 | 309 | } |
| 311 | 310 | $parts = parse_url($url); |
| 312 | 311 | if (isset($parts['host'])) { |
| 313 | 312 | $this->baseComponent = sprintf( |
| 314 | 313 | "%s%s%s", |
| 315 | - isset($parts['scheme']) ? $parts['scheme'] . "://" : '', |
|
| 314 | + isset($parts['scheme']) ? $parts['scheme']."://" : '', |
|
| 316 | 315 | isset($parts['host']) ? $parts['host'] : '', |
| 317 | - isset($parts['port']) ? ":" . $parts['port'] : '' |
|
| 316 | + isset($parts['port']) ? ":".$parts['port'] : '' |
|
| 318 | 317 | ); |
| 319 | 318 | } |
| 320 | 319 | $this->path = isset($parts['path']) ? $parts['path'] : ''; |
@@ -363,7 +362,7 @@ discard block |
||
| 363 | 362 | { |
| 364 | 363 | $this->userAgent = $userAgent; |
| 365 | 364 | if ($this->canGzip) { |
| 366 | - $this->userAgent = $userAgent . self::GZIP_UA; |
|
| 365 | + $this->userAgent = $userAgent.self::GZIP_UA; |
|
| 367 | 366 | } |
| 368 | 367 | } |
| 369 | 368 | |
@@ -415,12 +414,12 @@ discard block |
||
| 415 | 414 | public function toBatchString($id) |
| 416 | 415 | { |
| 417 | 416 | $str = ''; |
| 418 | - $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" . |
|
| 417 | + $path = parse_url($this->getUrl(), PHP_URL_PATH)."?". |
|
| 419 | 418 | http_build_query($this->queryParams); |
| 420 | - $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n"; |
|
| 419 | + $str .= $this->getRequestMethod().' '.$path." HTTP/1.1\n"; |
|
| 421 | 420 | |
| 422 | 421 | foreach ($this->getRequestHeaders() as $key => $val) { |
| 423 | - $str .= $key . ': ' . $val . "\n"; |
|
| 422 | + $str .= $key.': '.$val."\n"; |
|
| 424 | 423 | } |
| 425 | 424 | |
| 426 | 425 | if ($this->getPostBody()) { |
@@ -430,11 +429,11 @@ discard block |
||
| 430 | 429 | |
| 431 | 430 | $headers = ''; |
| 432 | 431 | foreach ($this->batchHeaders as $key => $val) { |
| 433 | - $headers .= $key . ': ' . $val . "\n"; |
|
| 432 | + $headers .= $key.': '.$val."\n"; |
|
| 434 | 433 | } |
| 435 | 434 | |
| 436 | 435 | $headers .= "Content-ID: $id\n"; |
| 437 | - $str = $headers . "\n" . $str; |
|
| 436 | + $str = $headers."\n".$str; |
|
| 438 | 437 | |
| 439 | 438 | return $str; |
| 440 | 439 | } |
@@ -474,10 +473,10 @@ discard block |
||
| 474 | 473 | foreach ($parts as $key => $value) { |
| 475 | 474 | if (is_array($value)) { |
| 476 | 475 | foreach ($value as $v) { |
| 477 | - $return[] = urlencode($key) . "=" . urlencode($v); |
|
| 476 | + $return[] = urlencode($key)."=".urlencode($v); |
|
| 478 | 477 | } |
| 479 | 478 | } else { |
| 480 | - $return[] = urlencode($key) . "=" . urlencode($value); |
|
| 479 | + $return[] = urlencode($key)."=".urlencode($value); |
|
| 481 | 480 | } |
| 482 | 481 | } |
| 483 | 482 | return implode('&', $return); |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | /** |
| 262 | 262 | * Logs with an arbitrary level. |
| 263 | 263 | * |
| 264 | - * @param mixed $level The log level |
|
| 264 | + * @param string $level The log level |
|
| 265 | 265 | * @param string $message The log message |
| 266 | 266 | * @param array $context The log context |
| 267 | 267 | */ |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | /** |
| 381 | 381 | * Converts a given log level to the integer form. |
| 382 | 382 | * |
| 383 | - * @param mixed $level The logging level |
|
| 383 | + * @param integer $level The logging level |
|
| 384 | 384 | * @return integer $level The normalized level |
| 385 | 385 | * @throws Google_Logger_Exception If $level is invalid |
| 386 | 386 | */ |
@@ -88,14 +88,14 @@ discard block |
||
| 88 | 88 | * @var array $levels Logging levels |
| 89 | 89 | */ |
| 90 | 90 | protected static $levels = array( |
| 91 | - self::EMERGENCY => 600, |
|
| 92 | - self::ALERT => 550, |
|
| 93 | - self::CRITICAL => 500, |
|
| 94 | - self::ERROR => 400, |
|
| 95 | - self::WARNING => 300, |
|
| 96 | - self::NOTICE => 250, |
|
| 97 | - self::INFO => 200, |
|
| 98 | - self::DEBUG => 100, |
|
| 91 | + self::EMERGENCY => 600, |
|
| 92 | + self::ALERT => 550, |
|
| 93 | + self::CRITICAL => 500, |
|
| 94 | + self::ERROR => 400, |
|
| 95 | + self::WARNING => 300, |
|
| 96 | + self::NOTICE => 250, |
|
| 97 | + self::INFO => 200, |
|
| 98 | + self::DEBUG => 100, |
|
| 99 | 99 | ); |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -122,20 +122,20 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function __construct(Google_Client $client) |
| 124 | 124 | { |
| 125 | - $this->setLevel( |
|
| 126 | - $client->getClassConfig('Google_Logger_Abstract', 'level') |
|
| 127 | - ); |
|
| 125 | + $this->setLevel( |
|
| 126 | + $client->getClassConfig('Google_Logger_Abstract', 'level') |
|
| 127 | + ); |
|
| 128 | 128 | |
| 129 | - $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format'); |
|
| 130 | - $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT; |
|
| 129 | + $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format'); |
|
| 130 | + $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT; |
|
| 131 | 131 | |
| 132 | - $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format'); |
|
| 133 | - $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT; |
|
| 132 | + $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format'); |
|
| 133 | + $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT; |
|
| 134 | 134 | |
| 135 | - $this->allowNewLines = (bool) $client->getClassConfig( |
|
| 136 | - 'Google_Logger_Abstract', |
|
| 137 | - 'allow_newlines' |
|
| 138 | - ); |
|
| 135 | + $this->allowNewLines = (bool) $client->getClassConfig( |
|
| 136 | + 'Google_Logger_Abstract', |
|
| 137 | + 'allow_newlines' |
|
| 138 | + ); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | */ |
| 146 | 146 | public function setLevel($level) |
| 147 | 147 | { |
| 148 | - $this->level = $this->normalizeLevel($level); |
|
| 148 | + $this->level = $this->normalizeLevel($level); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | /** |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public function shouldHandle($level) |
| 158 | 158 | { |
| 159 | - return $this->normalizeLevel($level) >= $this->level; |
|
| 159 | + return $this->normalizeLevel($level) >= $this->level; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | */ |
| 168 | 168 | public function emergency($message, array $context = array()) |
| 169 | 169 | { |
| 170 | - $this->log(self::EMERGENCY, $message, $context); |
|
| 170 | + $this->log(self::EMERGENCY, $message, $context); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | public function alert($message, array $context = array()) |
| 183 | 183 | { |
| 184 | - $this->log(self::ALERT, $message, $context); |
|
| 184 | + $this->log(self::ALERT, $message, $context); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | /** |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | */ |
| 195 | 195 | public function critical($message, array $context = array()) |
| 196 | 196 | { |
| 197 | - $this->log(self::CRITICAL, $message, $context); |
|
| 197 | + $this->log(self::CRITICAL, $message, $context); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | /** |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | public function error($message, array $context = array()) |
| 208 | 208 | { |
| 209 | - $this->log(self::ERROR, $message, $context); |
|
| 209 | + $this->log(self::ERROR, $message, $context); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | public function warning($message, array $context = array()) |
| 222 | 222 | { |
| 223 | - $this->log(self::WARNING, $message, $context); |
|
| 223 | + $this->log(self::WARNING, $message, $context); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /** |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | */ |
| 232 | 232 | public function notice($message, array $context = array()) |
| 233 | 233 | { |
| 234 | - $this->log(self::NOTICE, $message, $context); |
|
| 234 | + $this->log(self::NOTICE, $message, $context); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | /** |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | public function info($message, array $context = array()) |
| 246 | 246 | { |
| 247 | - $this->log(self::INFO, $message, $context); |
|
| 247 | + $this->log(self::INFO, $message, $context); |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | /** |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | */ |
| 256 | 256 | public function debug($message, array $context = array()) |
| 257 | 257 | { |
| 258 | - $this->log(self::DEBUG, $message, $context); |
|
| 258 | + $this->log(self::DEBUG, $message, $context); |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | /** |
@@ -267,21 +267,21 @@ discard block |
||
| 267 | 267 | */ |
| 268 | 268 | public function log($level, $message, array $context = array()) |
| 269 | 269 | { |
| 270 | - if (!$this->shouldHandle($level)) { |
|
| 271 | - return false; |
|
| 272 | - } |
|
| 273 | - |
|
| 274 | - $levelName = is_int($level) ? array_search($level, self::$levels) : $level; |
|
| 275 | - $message = $this->interpolate( |
|
| 276 | - array( |
|
| 277 | - 'message' => $message, |
|
| 278 | - 'context' => $context, |
|
| 279 | - 'level' => strtoupper($levelName), |
|
| 280 | - 'datetime' => new DateTime(), |
|
| 281 | - ) |
|
| 282 | - ); |
|
| 283 | - |
|
| 284 | - $this->write($message); |
|
| 270 | + if (!$this->shouldHandle($level)) { |
|
| 271 | + return false; |
|
| 272 | + } |
|
| 273 | + |
|
| 274 | + $levelName = is_int($level) ? array_search($level, self::$levels) : $level; |
|
| 275 | + $message = $this->interpolate( |
|
| 276 | + array( |
|
| 277 | + 'message' => $message, |
|
| 278 | + 'context' => $context, |
|
| 279 | + 'level' => strtoupper($levelName), |
|
| 280 | + 'datetime' => new DateTime(), |
|
| 281 | + ) |
|
| 282 | + ); |
|
| 283 | + |
|
| 284 | + $this->write($message); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -292,26 +292,26 @@ discard block |
||
| 292 | 292 | */ |
| 293 | 293 | protected function interpolate(array $variables = array()) |
| 294 | 294 | { |
| 295 | - $template = $this->logFormat; |
|
| 296 | - |
|
| 297 | - if (!$variables['context']) { |
|
| 298 | - $template = str_replace('%context%', '', $template); |
|
| 299 | - unset($variables['context']); |
|
| 300 | - } else { |
|
| 301 | - $this->reverseJsonInContext($variables['context']); |
|
| 302 | - } |
|
| 303 | - |
|
| 304 | - foreach ($variables as $key => $value) { |
|
| 305 | - if (strpos($template, '%'. $key .'%') !== false) { |
|
| 306 | - $template = str_replace( |
|
| 307 | - '%' . $key . '%', |
|
| 308 | - $this->export($value), |
|
| 309 | - $template |
|
| 310 | - ); |
|
| 311 | - } |
|
| 312 | - } |
|
| 313 | - |
|
| 314 | - return $template; |
|
| 295 | + $template = $this->logFormat; |
|
| 296 | + |
|
| 297 | + if (!$variables['context']) { |
|
| 298 | + $template = str_replace('%context%', '', $template); |
|
| 299 | + unset($variables['context']); |
|
| 300 | + } else { |
|
| 301 | + $this->reverseJsonInContext($variables['context']); |
|
| 302 | + } |
|
| 303 | + |
|
| 304 | + foreach ($variables as $key => $value) { |
|
| 305 | + if (strpos($template, '%'. $key .'%') !== false) { |
|
| 306 | + $template = str_replace( |
|
| 307 | + '%' . $key . '%', |
|
| 308 | + $this->export($value), |
|
| 309 | + $template |
|
| 310 | + ); |
|
| 311 | + } |
|
| 312 | + } |
|
| 313 | + |
|
| 314 | + return $template; |
|
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | /** |
@@ -321,20 +321,20 @@ discard block |
||
| 321 | 321 | */ |
| 322 | 322 | protected function reverseJsonInContext(array &$context) |
| 323 | 323 | { |
| 324 | - if (!$context) { |
|
| 325 | - return; |
|
| 326 | - } |
|
| 327 | - |
|
| 328 | - foreach ($context as $key => $val) { |
|
| 329 | - if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) { |
|
| 330 | - continue; |
|
| 331 | - } |
|
| 332 | - |
|
| 333 | - $json = @json_decode($val); |
|
| 334 | - if (is_object($json) || is_array($json)) { |
|
| 335 | - $context[$key] = $json; |
|
| 336 | - } |
|
| 337 | - } |
|
| 324 | + if (!$context) { |
|
| 325 | + return; |
|
| 326 | + } |
|
| 327 | + |
|
| 328 | + foreach ($context as $key => $val) { |
|
| 329 | + if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) { |
|
| 330 | + continue; |
|
| 331 | + } |
|
| 332 | + |
|
| 333 | + $json = @json_decode($val); |
|
| 334 | + if (is_object($json) || is_array($json)) { |
|
| 335 | + $context[$key] = $json; |
|
| 336 | + } |
|
| 337 | + } |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | /** |
@@ -344,37 +344,37 @@ discard block |
||
| 344 | 344 | */ |
| 345 | 345 | protected function export($value) |
| 346 | 346 | { |
| 347 | - if (is_string($value)) { |
|
| 348 | - if ($this->allowNewLines) { |
|
| 349 | - return $value; |
|
| 350 | - } |
|
| 347 | + if (is_string($value)) { |
|
| 348 | + if ($this->allowNewLines) { |
|
| 349 | + return $value; |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | - return preg_replace('/[\r\n]+/', ' ', $value); |
|
| 353 | - } |
|
| 352 | + return preg_replace('/[\r\n]+/', ' ', $value); |
|
| 353 | + } |
|
| 354 | 354 | |
| 355 | - if (is_resource($value)) { |
|
| 356 | - return sprintf( |
|
| 357 | - 'resource(%d) of type (%s)', |
|
| 358 | - $value, |
|
| 359 | - get_resource_type($value) |
|
| 360 | - ); |
|
| 361 | - } |
|
| 355 | + if (is_resource($value)) { |
|
| 356 | + return sprintf( |
|
| 357 | + 'resource(%d) of type (%s)', |
|
| 358 | + $value, |
|
| 359 | + get_resource_type($value) |
|
| 360 | + ); |
|
| 361 | + } |
|
| 362 | 362 | |
| 363 | - if ($value instanceof DateTime) { |
|
| 364 | - return $value->format($this->dateFormat); |
|
| 365 | - } |
|
| 363 | + if ($value instanceof DateTime) { |
|
| 364 | + return $value->format($this->dateFormat); |
|
| 365 | + } |
|
| 366 | 366 | |
| 367 | - if (version_compare(PHP_VERSION, '5.4.0', '>=')) { |
|
| 368 | - $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; |
|
| 367 | + if (version_compare(PHP_VERSION, '5.4.0', '>=')) { |
|
| 368 | + $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE; |
|
| 369 | 369 | |
| 370 | - if ($this->allowNewLines) { |
|
| 371 | - $options |= JSON_PRETTY_PRINT; |
|
| 372 | - } |
|
| 370 | + if ($this->allowNewLines) { |
|
| 371 | + $options |= JSON_PRETTY_PRINT; |
|
| 372 | + } |
|
| 373 | 373 | |
| 374 | - return @json_encode($value, $options); |
|
| 375 | - } |
|
| 374 | + return @json_encode($value, $options); |
|
| 375 | + } |
|
| 376 | 376 | |
| 377 | - return str_replace('\\/', '/', @json_encode($value)); |
|
| 377 | + return str_replace('\\/', '/', @json_encode($value)); |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | /** |
@@ -386,17 +386,17 @@ discard block |
||
| 386 | 386 | */ |
| 387 | 387 | protected function normalizeLevel($level) |
| 388 | 388 | { |
| 389 | - if (is_int($level) && array_search($level, self::$levels) !== false) { |
|
| 390 | - return $level; |
|
| 391 | - } |
|
| 389 | + if (is_int($level) && array_search($level, self::$levels) !== false) { |
|
| 390 | + return $level; |
|
| 391 | + } |
|
| 392 | 392 | |
| 393 | - if (is_string($level) && isset(self::$levels[$level])) { |
|
| 394 | - return self::$levels[$level]; |
|
| 395 | - } |
|
| 393 | + if (is_string($level) && isset(self::$levels[$level])) { |
|
| 394 | + return self::$levels[$level]; |
|
| 395 | + } |
|
| 396 | 396 | |
| 397 | - throw new Google_Logger_Exception( |
|
| 398 | - sprintf("Unknown LogLevel: '%s'", $level) |
|
| 399 | - ); |
|
| 397 | + throw new Google_Logger_Exception( |
|
| 398 | + sprintf("Unknown LogLevel: '%s'", $level) |
|
| 399 | + ); |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | /** |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | |
| 18 | 18 | if (!class_exists('Google_Client')) { |
| 19 | - require_once dirname(__FILE__) . '/../autoload.php'; |
|
| 19 | + require_once dirname(__FILE__).'/../autoload.php'; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -302,9 +302,9 @@ discard block |
||
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | foreach ($variables as $key => $value) { |
| 305 | - if (strpos($template, '%'. $key .'%') !== false) { |
|
| 305 | + if (strpos($template, '%'.$key.'%') !== false) { |
|
| 306 | 306 | $template = str_replace( |
| 307 | - '%' . $key . '%', |
|
| 307 | + '%'.$key.'%', |
|
| 308 | 308 | $this->export($value), |
| 309 | 309 | $template |
| 310 | 310 | ); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | /** |
| 222 | 222 | * Given a variable name, discover its type. |
| 223 | 223 | * |
| 224 | - * @param $name |
|
| 224 | + * @param string $name |
|
| 225 | 225 | * @param $item |
| 226 | 226 | * @return object The object from the item. |
| 227 | 227 | */ |
@@ -278,6 +278,9 @@ discard block |
||
| 278 | 278 | return $key . "Type"; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | + /** |
|
| 282 | + * @param string $key |
|
| 283 | + */ |
|
| 281 | 284 | protected function dataType($key) |
| 282 | 285 | { |
| 283 | 286 | return $key . "DataType"; |
@@ -38,12 +38,12 @@ discard block |
||
| 38 | 38 | */ |
| 39 | 39 | final public function __construct() |
| 40 | 40 | { |
| 41 | - if (func_num_args() == 1 && is_array(func_get_arg(0))) { |
|
| 42 | - // Initialize the model with the array's contents. |
|
| 43 | - $array = func_get_arg(0); |
|
| 44 | - $this->mapTypes($array); |
|
| 45 | - } |
|
| 46 | - $this->gapiInit(); |
|
| 41 | + if (func_num_args() == 1 && is_array(func_get_arg(0))) { |
|
| 42 | + // Initialize the model with the array's contents. |
|
| 43 | + $array = func_get_arg(0); |
|
| 44 | + $this->mapTypes($array); |
|
| 45 | + } |
|
| 46 | + $this->gapiInit(); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
@@ -53,39 +53,39 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function __get($key) |
| 55 | 55 | { |
| 56 | - $keyTypeName = $this->keyType($key); |
|
| 57 | - $keyDataType = $this->dataType($key); |
|
| 58 | - if (isset($this->$keyTypeName) && !isset($this->processed[$key])) { |
|
| 59 | - if (isset($this->modelData[$key])) { |
|
| 60 | - $val = $this->modelData[$key]; |
|
| 61 | - } else if (isset($this->$keyDataType) && |
|
| 62 | - ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) { |
|
| 63 | - $val = array(); |
|
| 64 | - } else { |
|
| 65 | - $val = null; |
|
| 66 | - } |
|
| 56 | + $keyTypeName = $this->keyType($key); |
|
| 57 | + $keyDataType = $this->dataType($key); |
|
| 58 | + if (isset($this->$keyTypeName) && !isset($this->processed[$key])) { |
|
| 59 | + if (isset($this->modelData[$key])) { |
|
| 60 | + $val = $this->modelData[$key]; |
|
| 61 | + } else if (isset($this->$keyDataType) && |
|
| 62 | + ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) { |
|
| 63 | + $val = array(); |
|
| 64 | + } else { |
|
| 65 | + $val = null; |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - if ($this->isAssociativeArray($val)) { |
|
| 69 | - if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) { |
|
| 70 | - foreach ($val as $arrayKey => $arrayItem) { |
|
| 71 | - $this->modelData[$key][$arrayKey] = |
|
| 72 | - $this->createObjectFromName($keyTypeName, $arrayItem); |
|
| 73 | - } |
|
| 74 | - } else { |
|
| 75 | - $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val); |
|
| 76 | - } |
|
| 77 | - } else if (is_array($val)) { |
|
| 78 | - $arrayObject = array(); |
|
| 79 | - foreach ($val as $arrayIndex => $arrayItem) { |
|
| 80 | - $arrayObject[$arrayIndex] = |
|
| 81 | - $this->createObjectFromName($keyTypeName, $arrayItem); |
|
| 82 | - } |
|
| 83 | - $this->modelData[$key] = $arrayObject; |
|
| 84 | - } |
|
| 85 | - $this->processed[$key] = true; |
|
| 86 | - } |
|
| 68 | + if ($this->isAssociativeArray($val)) { |
|
| 69 | + if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) { |
|
| 70 | + foreach ($val as $arrayKey => $arrayItem) { |
|
| 71 | + $this->modelData[$key][$arrayKey] = |
|
| 72 | + $this->createObjectFromName($keyTypeName, $arrayItem); |
|
| 73 | + } |
|
| 74 | + } else { |
|
| 75 | + $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val); |
|
| 76 | + } |
|
| 77 | + } else if (is_array($val)) { |
|
| 78 | + $arrayObject = array(); |
|
| 79 | + foreach ($val as $arrayIndex => $arrayItem) { |
|
| 80 | + $arrayObject[$arrayIndex] = |
|
| 81 | + $this->createObjectFromName($keyTypeName, $arrayItem); |
|
| 82 | + } |
|
| 83 | + $this->modelData[$key] = $arrayObject; |
|
| 84 | + } |
|
| 85 | + $this->processed[$key] = true; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - return isset($this->modelData[$key]) ? $this->modelData[$key] : null; |
|
| 88 | + return isset($this->modelData[$key]) ? $this->modelData[$key] : null; |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /** |
@@ -96,19 +96,19 @@ discard block |
||
| 96 | 96 | */ |
| 97 | 97 | protected function mapTypes($array) |
| 98 | 98 | { |
| 99 | - // Hard initialise simple types, lazy load more complex ones. |
|
| 100 | - foreach ($array as $key => $val) { |
|
| 101 | - if ( !property_exists($this, $this->keyType($key)) && |
|
| 102 | - property_exists($this, $key)) { |
|
| 103 | - $this->$key = $val; |
|
| 104 | - unset($array[$key]); |
|
| 105 | - } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) { |
|
| 106 | - // This checks if property exists as camelCase, leaving it in array as snake_case |
|
| 107 | - // in case of backwards compatibility issues. |
|
| 108 | - $this->$camelKey = $val; |
|
| 109 | - } |
|
| 110 | - } |
|
| 111 | - $this->modelData = $array; |
|
| 99 | + // Hard initialise simple types, lazy load more complex ones. |
|
| 100 | + foreach ($array as $key => $val) { |
|
| 101 | + if ( !property_exists($this, $this->keyType($key)) && |
|
| 102 | + property_exists($this, $key)) { |
|
| 103 | + $this->$key = $val; |
|
| 104 | + unset($array[$key]); |
|
| 105 | + } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) { |
|
| 106 | + // This checks if property exists as camelCase, leaving it in array as snake_case |
|
| 107 | + // in case of backwards compatibility issues. |
|
| 108 | + $this->$camelKey = $val; |
|
| 109 | + } |
|
| 110 | + } |
|
| 111 | + $this->modelData = $array; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | */ |
| 119 | 119 | protected function gapiInit() |
| 120 | 120 | { |
| 121 | - return; |
|
| 121 | + return; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
@@ -129,29 +129,29 @@ discard block |
||
| 129 | 129 | */ |
| 130 | 130 | public function toSimpleObject() |
| 131 | 131 | { |
| 132 | - $object = new stdClass(); |
|
| 132 | + $object = new stdClass(); |
|
| 133 | 133 | |
| 134 | - // Process all other data. |
|
| 135 | - foreach ($this->modelData as $key => $val) { |
|
| 136 | - $result = $this->getSimpleValue($val); |
|
| 137 | - if ($result !== null) { |
|
| 138 | - $object->$key = $this->nullPlaceholderCheck($result); |
|
| 139 | - } |
|
| 140 | - } |
|
| 134 | + // Process all other data. |
|
| 135 | + foreach ($this->modelData as $key => $val) { |
|
| 136 | + $result = $this->getSimpleValue($val); |
|
| 137 | + if ($result !== null) { |
|
| 138 | + $object->$key = $this->nullPlaceholderCheck($result); |
|
| 139 | + } |
|
| 140 | + } |
|
| 141 | 141 | |
| 142 | - // Process all public properties. |
|
| 143 | - $reflect = new ReflectionObject($this); |
|
| 144 | - $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC); |
|
| 145 | - foreach ($props as $member) { |
|
| 146 | - $name = $member->getName(); |
|
| 147 | - $result = $this->getSimpleValue($this->$name); |
|
| 148 | - if ($result !== null) { |
|
| 149 | - $name = $this->getMappedName($name); |
|
| 150 | - $object->$name = $this->nullPlaceholderCheck($result); |
|
| 151 | - } |
|
| 152 | - } |
|
| 142 | + // Process all public properties. |
|
| 143 | + $reflect = new ReflectionObject($this); |
|
| 144 | + $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC); |
|
| 145 | + foreach ($props as $member) { |
|
| 146 | + $name = $member->getName(); |
|
| 147 | + $result = $this->getSimpleValue($this->$name); |
|
| 148 | + if ($result !== null) { |
|
| 149 | + $name = $this->getMappedName($name); |
|
| 150 | + $object->$name = $this->nullPlaceholderCheck($result); |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | 153 | |
| 154 | - return $object; |
|
| 154 | + return $object; |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |
@@ -160,20 +160,20 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | private function getSimpleValue($value) |
| 162 | 162 | { |
| 163 | - if ($value instanceof Google_Model) { |
|
| 164 | - return $value->toSimpleObject(); |
|
| 165 | - } else if (is_array($value)) { |
|
| 166 | - $return = array(); |
|
| 167 | - foreach ($value as $key => $a_value) { |
|
| 168 | - $a_value = $this->getSimpleValue($a_value); |
|
| 169 | - if ($a_value !== null) { |
|
| 170 | - $key = $this->getMappedName($key); |
|
| 171 | - $return[$key] = $this->nullPlaceholderCheck($a_value); |
|
| 172 | - } |
|
| 173 | - } |
|
| 174 | - return $return; |
|
| 175 | - } |
|
| 176 | - return $value; |
|
| 163 | + if ($value instanceof Google_Model) { |
|
| 164 | + return $value->toSimpleObject(); |
|
| 165 | + } else if (is_array($value)) { |
|
| 166 | + $return = array(); |
|
| 167 | + foreach ($value as $key => $a_value) { |
|
| 168 | + $a_value = $this->getSimpleValue($a_value); |
|
| 169 | + if ($a_value !== null) { |
|
| 170 | + $key = $this->getMappedName($key); |
|
| 171 | + $return[$key] = $this->nullPlaceholderCheck($a_value); |
|
| 172 | + } |
|
| 173 | + } |
|
| 174 | + return $return; |
|
| 175 | + } |
|
| 176 | + return $value; |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
@@ -181,10 +181,10 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | private function nullPlaceholderCheck($value) |
| 183 | 183 | { |
| 184 | - if ($value === self::NULL_VALUE) { |
|
| 185 | - return null; |
|
| 186 | - } |
|
| 187 | - return $value; |
|
| 184 | + if ($value === self::NULL_VALUE) { |
|
| 185 | + return null; |
|
| 186 | + } |
|
| 187 | + return $value; |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** |
@@ -192,11 +192,11 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | private function getMappedName($key) |
| 194 | 194 | { |
| 195 | - if (isset($this->internal_gapi_mappings) && |
|
| 196 | - isset($this->internal_gapi_mappings[$key])) { |
|
| 197 | - $key = $this->internal_gapi_mappings[$key]; |
|
| 198 | - } |
|
| 199 | - return $key; |
|
| 195 | + if (isset($this->internal_gapi_mappings) && |
|
| 196 | + isset($this->internal_gapi_mappings[$key])) { |
|
| 197 | + $key = $this->internal_gapi_mappings[$key]; |
|
| 198 | + } |
|
| 199 | + return $key; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
@@ -206,16 +206,16 @@ discard block |
||
| 206 | 206 | */ |
| 207 | 207 | protected function isAssociativeArray($array) |
| 208 | 208 | { |
| 209 | - if (!is_array($array)) { |
|
| 210 | - return false; |
|
| 211 | - } |
|
| 212 | - $keys = array_keys($array); |
|
| 213 | - foreach ($keys as $key) { |
|
| 214 | - if (is_string($key)) { |
|
| 215 | - return true; |
|
| 216 | - } |
|
| 217 | - } |
|
| 218 | - return false; |
|
| 209 | + if (!is_array($array)) { |
|
| 210 | + return false; |
|
| 211 | + } |
|
| 212 | + $keys = array_keys($array); |
|
| 213 | + foreach ($keys as $key) { |
|
| 214 | + if (is_string($key)) { |
|
| 215 | + return true; |
|
| 216 | + } |
|
| 217 | + } |
|
| 218 | + return false; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /** |
@@ -227,8 +227,8 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | private function createObjectFromName($name, $item) |
| 229 | 229 | { |
| 230 | - $type = $this->$name; |
|
| 231 | - return new $type($item); |
|
| 230 | + $type = $this->$name; |
|
| 231 | + return new $type($item); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /** |
@@ -239,57 +239,57 @@ discard block |
||
| 239 | 239 | */ |
| 240 | 240 | public function assertIsArray($obj, $method) |
| 241 | 241 | { |
| 242 | - if ($obj && !is_array($obj)) { |
|
| 243 | - throw new Google_Exception( |
|
| 244 | - "Incorrect parameter type passed to $method(). Expected an array." |
|
| 245 | - ); |
|
| 246 | - } |
|
| 242 | + if ($obj && !is_array($obj)) { |
|
| 243 | + throw new Google_Exception( |
|
| 244 | + "Incorrect parameter type passed to $method(). Expected an array." |
|
| 245 | + ); |
|
| 246 | + } |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | public function offsetExists($offset) |
| 250 | 250 | { |
| 251 | - return isset($this->$offset) || isset($this->modelData[$offset]); |
|
| 251 | + return isset($this->$offset) || isset($this->modelData[$offset]); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | public function offsetGet($offset) |
| 255 | 255 | { |
| 256 | - return isset($this->$offset) ? |
|
| 257 | - $this->$offset : |
|
| 258 | - $this->__get($offset); |
|
| 256 | + return isset($this->$offset) ? |
|
| 257 | + $this->$offset : |
|
| 258 | + $this->__get($offset); |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | public function offsetSet($offset, $value) |
| 262 | 262 | { |
| 263 | - if (property_exists($this, $offset)) { |
|
| 264 | - $this->$offset = $value; |
|
| 265 | - } else { |
|
| 266 | - $this->modelData[$offset] = $value; |
|
| 267 | - $this->processed[$offset] = true; |
|
| 268 | - } |
|
| 263 | + if (property_exists($this, $offset)) { |
|
| 264 | + $this->$offset = $value; |
|
| 265 | + } else { |
|
| 266 | + $this->modelData[$offset] = $value; |
|
| 267 | + $this->processed[$offset] = true; |
|
| 268 | + } |
|
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | public function offsetUnset($offset) |
| 272 | 272 | { |
| 273 | - unset($this->modelData[$offset]); |
|
| 273 | + unset($this->modelData[$offset]); |
|
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | protected function keyType($key) |
| 277 | 277 | { |
| 278 | - return $key . "Type"; |
|
| 278 | + return $key . "Type"; |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | protected function dataType($key) |
| 282 | 282 | { |
| 283 | - return $key . "DataType"; |
|
| 283 | + return $key . "DataType"; |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | public function __isset($key) |
| 287 | 287 | { |
| 288 | - return isset($this->modelData[$key]); |
|
| 288 | + return isset($this->modelData[$key]); |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | public function __unset($key) |
| 292 | 292 | { |
| 293 | - unset($this->modelData[$key]); |
|
| 293 | + unset($this->modelData[$key]); |
|
| 294 | 294 | } |
| 295 | 295 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | // Hard initialise simple types, lazy load more complex ones. |
| 100 | 100 | foreach ($array as $key => $val) { |
| 101 | - if ( !property_exists($this, $this->keyType($key)) && |
|
| 101 | + if (!property_exists($this, $this->keyType($key)) && |
|
| 102 | 102 | property_exists($this, $key)) { |
| 103 | 103 | $this->$key = $val; |
| 104 | 104 | unset($array[$key]); |
@@ -254,8 +254,7 @@ discard block |
||
| 254 | 254 | public function offsetGet($offset) |
| 255 | 255 | { |
| 256 | 256 | return isset($this->$offset) ? |
| 257 | - $this->$offset : |
|
| 258 | - $this->__get($offset); |
|
| 257 | + $this->$offset : $this->__get($offset); |
|
| 259 | 258 | } |
| 260 | 259 | |
| 261 | 260 | public function offsetSet($offset, $value) |
@@ -275,12 +274,12 @@ discard block |
||
| 275 | 274 | |
| 276 | 275 | protected function keyType($key) |
| 277 | 276 | { |
| 278 | - return $key . "Type"; |
|
| 277 | + return $key."Type"; |
|
| 279 | 278 | } |
| 280 | 279 | |
| 281 | 280 | protected function dataType($key) |
| 282 | 281 | { |
| 283 | - return $key . "DataType"; |
|
| 282 | + return $key."DataType"; |
|
| 284 | 283 | } |
| 285 | 284 | |
| 286 | 285 | public function __isset($key) |
