GeoDirectory /
geodirectory
@@ -15,296 +15,296 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | function geodir_register_sidebar() |
| 17 | 17 | {
|
| 18 | - global $geodir_sidebars; |
|
| 19 | - |
|
| 20 | - if (function_exists('register_sidebar')) {
|
|
| 21 | - /*===========================*/ |
|
| 22 | - /* Home page sidebars start*/ |
|
| 23 | - /*===========================*/ |
|
| 24 | - |
|
| 25 | - /** |
|
| 26 | - * Filter the `$before_widget` widget opening HTML tag. |
|
| 27 | - * |
|
| 28 | - * @since 1.0.0 |
|
| 29 | - * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'. |
|
| 30 | - * @see 'geodir_after_widget' |
|
| 31 | - */ |
|
| 32 | - $before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');
|
|
| 33 | - /** |
|
| 34 | - * Filter the `$after_widget` widget closing HTML tag. |
|
| 35 | - * |
|
| 36 | - * @since 1.0.0 |
|
| 37 | - * @param string $var The HTML string to filter. Default = '</section>'. |
|
| 38 | - * @see 'geodir_before_widget' |
|
| 39 | - */ |
|
| 40 | - $after_widget = apply_filters('geodir_after_widget', '</section>');
|
|
| 41 | - /** |
|
| 42 | - * Filter the `$before_title` widget title opening HTML tag. |
|
| 43 | - * |
|
| 44 | - * @since 1.0.0 |
|
| 45 | - * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'. |
|
| 46 | - * @see 'geodir_after_title' |
|
| 47 | - */ |
|
| 48 | - $before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');
|
|
| 49 | - /** |
|
| 50 | - * Filter the `$after_title` widget title closing HTML tag. |
|
| 51 | - * |
|
| 52 | - * @since 1.0.0 |
|
| 53 | - * @param string $var The HTML string to filter. Default = '</h3>'. |
|
| 54 | - * @see 'geodir_before_title' |
|
| 55 | - */ |
|
| 56 | - $after_title = apply_filters('geodir_after_title', '</h3>');
|
|
| 57 | - |
|
| 58 | - if (get_option('geodir_show_home_top_section')) {
|
|
| 59 | - register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 60 | - |
|
| 61 | - $geodir_sidebars[] = 'geodir_home_top'; |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - if (get_option('geodir_show_home_contant_section')) {
|
|
| 65 | - register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 18 | + global $geodir_sidebars; |
|
| 66 | 19 | |
| 67 | - $geodir_sidebars[] = 'geodir_home_content'; |
|
| 68 | - } |
|
| 20 | + if (function_exists('register_sidebar')) {
|
|
| 21 | + /*===========================*/ |
|
| 22 | + /* Home page sidebars start*/ |
|
| 23 | + /*===========================*/ |
|
| 69 | 24 | |
| 70 | - if (get_option('geodir_show_home_right_section')) {
|
|
| 71 | - register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 25 | + /** |
|
| 26 | + * Filter the `$before_widget` widget opening HTML tag. |
|
| 27 | + * |
|
| 28 | + * @since 1.0.0 |
|
| 29 | + * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'. |
|
| 30 | + * @see 'geodir_after_widget' |
|
| 31 | + */ |
|
| 32 | + $before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');
|
|
| 33 | + /** |
|
| 34 | + * Filter the `$after_widget` widget closing HTML tag. |
|
| 35 | + * |
|
| 36 | + * @since 1.0.0 |
|
| 37 | + * @param string $var The HTML string to filter. Default = '</section>'. |
|
| 38 | + * @see 'geodir_before_widget' |
|
| 39 | + */ |
|
| 40 | + $after_widget = apply_filters('geodir_after_widget', '</section>');
|
|
| 41 | + /** |
|
| 42 | + * Filter the `$before_title` widget title opening HTML tag. |
|
| 43 | + * |
|
| 44 | + * @since 1.0.0 |
|
| 45 | + * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'. |
|
| 46 | + * @see 'geodir_after_title' |
|
| 47 | + */ |
|
| 48 | + $before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');
|
|
| 49 | + /** |
|
| 50 | + * Filter the `$after_title` widget title closing HTML tag. |
|
| 51 | + * |
|
| 52 | + * @since 1.0.0 |
|
| 53 | + * @param string $var The HTML string to filter. Default = '</h3>'. |
|
| 54 | + * @see 'geodir_before_title' |
|
| 55 | + */ |
|
| 56 | + $after_title = apply_filters('geodir_after_title', '</h3>');
|
|
| 57 | + |
|
| 58 | + if (get_option('geodir_show_home_top_section')) {
|
|
| 59 | + register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 72 | 60 | |
| 73 | - $geodir_sidebars[] = 'geodir_home_right'; |
|
| 74 | - } |
|
| 61 | + $geodir_sidebars[] = 'geodir_home_top'; |
|
| 62 | + } |
|
| 75 | 63 | |
| 76 | - if (get_option('geodir_show_home_left_section')) {
|
|
| 77 | - register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 64 | + if (get_option('geodir_show_home_contant_section')) {
|
|
| 65 | + register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 78 | 66 | |
| 79 | - $geodir_sidebars[] = 'geodir_home_left'; |
|
| 80 | - } |
|
| 67 | + $geodir_sidebars[] = 'geodir_home_content'; |
|
| 68 | + } |
|
| 81 | 69 | |
| 82 | - if (get_option('geodir_show_home_bottom_section')) {
|
|
| 83 | - register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 70 | + if (get_option('geodir_show_home_right_section')) {
|
|
| 71 | + register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 84 | 72 | |
| 85 | - $geodir_sidebars[] = 'geodir_home_bottom'; |
|
| 86 | - } |
|
| 73 | + $geodir_sidebars[] = 'geodir_home_right'; |
|
| 74 | + } |
|
| 87 | 75 | |
| 88 | - /*===========================*/ |
|
| 89 | - /* Home page sidebars end*/ |
|
| 90 | - /*===========================*/ |
|
| 76 | + if (get_option('geodir_show_home_left_section')) {
|
|
| 77 | + register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 91 | 78 | |
| 92 | - /*===========================*/ |
|
| 93 | - /* Listing page sidebars start*/ |
|
| 94 | - /*===========================*/ |
|
| 79 | + $geodir_sidebars[] = 'geodir_home_left'; |
|
| 80 | + } |
|
| 95 | 81 | |
| 96 | - if (get_option('geodir_show_listing_top_section')) {
|
|
| 97 | - register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 82 | + if (get_option('geodir_show_home_bottom_section')) {
|
|
| 83 | + register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 98 | 84 | |
| 99 | - $geodir_sidebars[] = 'geodir_listing_top'; |
|
| 100 | - } |
|
| 85 | + $geodir_sidebars[] = 'geodir_home_bottom'; |
|
| 86 | + } |
|
| 101 | 87 | |
| 102 | - if (get_option('geodir_show_listing_left_section')) {
|
|
| 103 | - register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 88 | + /*===========================*/ |
|
| 89 | + /* Home page sidebars end*/ |
|
| 90 | + /*===========================*/ |
|
| 104 | 91 | |
| 105 | - $geodir_sidebars[] = 'geodir_listing_left_sidebar'; |
|
| 106 | - } |
|
| 92 | + /*===========================*/ |
|
| 93 | + /* Listing page sidebars start*/ |
|
| 94 | + /*===========================*/ |
|
| 107 | 95 | |
| 108 | - if (get_option('geodir_show_listing_right_section')) {
|
|
| 109 | - register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 96 | + if (get_option('geodir_show_listing_top_section')) {
|
|
| 97 | + register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 110 | 98 | |
| 111 | - $geodir_sidebars[] = 'geodir_listing_right_sidebar'; |
|
| 112 | - } |
|
| 99 | + $geodir_sidebars[] = 'geodir_listing_top'; |
|
| 100 | + } |
|
| 113 | 101 | |
| 114 | - if (get_option('geodir_show_listing_bottom_section')) {
|
|
| 115 | - register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 102 | + if (get_option('geodir_show_listing_left_section')) {
|
|
| 103 | + register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 116 | 104 | |
| 117 | - $geodir_sidebars[] = 'geodir_listing_bottom'; |
|
| 118 | - } |
|
| 105 | + $geodir_sidebars[] = 'geodir_listing_left_sidebar'; |
|
| 106 | + } |
|
| 119 | 107 | |
| 120 | - /*===========================*/ |
|
| 121 | - /* Listing page sidebars start*/ |
|
| 122 | - /*===========================*/ |
|
| 108 | + if (get_option('geodir_show_listing_right_section')) {
|
|
| 109 | + register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 123 | 110 | |
| 124 | - /*===========================*/ |
|
| 125 | - /* Search page sidebars start*/ |
|
| 126 | - /*===========================*/ |
|
| 111 | + $geodir_sidebars[] = 'geodir_listing_right_sidebar'; |
|
| 112 | + } |
|
| 127 | 113 | |
| 128 | - if (get_option('geodir_show_search_top_section')) {
|
|
| 129 | - register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 114 | + if (get_option('geodir_show_listing_bottom_section')) {
|
|
| 115 | + register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 130 | 116 | |
| 131 | - $geodir_sidebars[] = 'geodir_search_top'; |
|
| 132 | - } |
|
| 117 | + $geodir_sidebars[] = 'geodir_listing_bottom'; |
|
| 118 | + } |
|
| 133 | 119 | |
| 134 | - if (get_option('geodir_show_search_left_section')) {
|
|
| 135 | - register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 120 | + /*===========================*/ |
|
| 121 | + /* Listing page sidebars start*/ |
|
| 122 | + /*===========================*/ |
|
| 136 | 123 | |
| 137 | - $geodir_sidebars[] = 'geodir_search_left_sidebar'; |
|
| 138 | - } |
|
| 124 | + /*===========================*/ |
|
| 125 | + /* Search page sidebars start*/ |
|
| 126 | + /*===========================*/ |
|
| 139 | 127 | |
| 140 | - if (get_option('geodir_show_search_right_section')) {
|
|
| 141 | - register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 128 | + if (get_option('geodir_show_search_top_section')) {
|
|
| 129 | + register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 142 | 130 | |
| 143 | - $geodir_sidebars[] = 'geodir_search_right_sidebar'; |
|
| 144 | - } |
|
| 131 | + $geodir_sidebars[] = 'geodir_search_top'; |
|
| 132 | + } |
|
| 145 | 133 | |
| 146 | - if (get_option('geodir_show_search_bottom_section')) {
|
|
| 147 | - register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 134 | + if (get_option('geodir_show_search_left_section')) {
|
|
| 135 | + register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 148 | 136 | |
| 149 | - $geodir_sidebars[] = 'geodir_search_bottom'; |
|
| 150 | - } |
|
| 137 | + $geodir_sidebars[] = 'geodir_search_left_sidebar'; |
|
| 138 | + } |
|
| 151 | 139 | |
| 152 | - /*===========================*/ |
|
| 153 | - /* Search page sidebars end*/ |
|
| 154 | - /*===========================*/ |
|
| 140 | + if (get_option('geodir_show_search_right_section')) {
|
|
| 141 | + register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 155 | 142 | |
| 156 | - /*==================================*/ |
|
| 157 | - /* Detail/Single page sidebars start*/ |
|
| 158 | - /*==================================*/ |
|
| 159 | - if (get_option('geodir_show_detail_top_section')) {
|
|
| 160 | - register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 143 | + $geodir_sidebars[] = 'geodir_search_right_sidebar'; |
|
| 144 | + } |
|
| 161 | 145 | |
| 162 | - $geodir_sidebars[] = 'geodir_detail_top'; |
|
| 163 | - } |
|
| 146 | + if (get_option('geodir_show_search_bottom_section')) {
|
|
| 147 | + register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 164 | 148 | |
| 165 | - register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 149 | + $geodir_sidebars[] = 'geodir_search_bottom'; |
|
| 150 | + } |
|
| 166 | 151 | |
| 167 | - $geodir_sidebars[] = 'geodir_detail_sidebar'; |
|
| 152 | + /*===========================*/ |
|
| 153 | + /* Search page sidebars end*/ |
|
| 154 | + /*===========================*/ |
|
| 168 | 155 | |
| 169 | - if (get_option('geodir_show_detail_bottom_section')) {
|
|
| 170 | - register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 156 | + /*==================================*/ |
|
| 157 | + /* Detail/Single page sidebars start*/ |
|
| 158 | + /*==================================*/ |
|
| 159 | + if (get_option('geodir_show_detail_top_section')) {
|
|
| 160 | + register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 171 | 161 | |
| 172 | - $geodir_sidebars[] = 'geodir_detail_bottom'; |
|
| 173 | - } |
|
| 162 | + $geodir_sidebars[] = 'geodir_detail_top'; |
|
| 163 | + } |
|
| 174 | 164 | |
| 175 | - /*==================================*/ |
|
| 176 | - /* Detail/Single page sidebars end*/ |
|
| 177 | - /*==================================*/ |
|
| 165 | + register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 178 | 166 | |
| 179 | - /*==================================*/ |
|
| 180 | - /* Author page sidebars start */ |
|
| 181 | - /*==================================*/ |
|
| 167 | + $geodir_sidebars[] = 'geodir_detail_sidebar'; |
|
| 182 | 168 | |
| 183 | - if (get_option('geodir_show_author_top_section')) {
|
|
| 184 | - register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 169 | + if (get_option('geodir_show_detail_bottom_section')) {
|
|
| 170 | + register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 185 | 171 | |
| 186 | - $geodir_sidebars[] = 'geodir_author_top'; |
|
| 187 | - } |
|
| 172 | + $geodir_sidebars[] = 'geodir_detail_bottom'; |
|
| 173 | + } |
|
| 188 | 174 | |
| 189 | - if (get_option('geodir_show_author_left_section')) {
|
|
| 190 | - register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 175 | + /*==================================*/ |
|
| 176 | + /* Detail/Single page sidebars end*/ |
|
| 177 | + /*==================================*/ |
|
| 191 | 178 | |
| 192 | - $geodir_sidebars[] = 'geodir_author_left_sidebar'; |
|
| 193 | - } |
|
| 179 | + /*==================================*/ |
|
| 180 | + /* Author page sidebars start */ |
|
| 181 | + /*==================================*/ |
|
| 194 | 182 | |
| 195 | - if (get_option('geodir_show_author_right_section')) {
|
|
| 196 | - register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 183 | + if (get_option('geodir_show_author_top_section')) {
|
|
| 184 | + register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 197 | 185 | |
| 198 | - $geodir_sidebars[] = 'geodir_author_right_sidebar'; |
|
| 199 | - } |
|
| 186 | + $geodir_sidebars[] = 'geodir_author_top'; |
|
| 187 | + } |
|
| 200 | 188 | |
| 201 | - if (get_option('geodir_show_author_bottom_section')) {
|
|
| 202 | - register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 189 | + if (get_option('geodir_show_author_left_section')) {
|
|
| 190 | + register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 203 | 191 | |
| 204 | - $geodir_sidebars[] = 'geodir_author_bottom'; |
|
| 205 | - } |
|
| 192 | + $geodir_sidebars[] = 'geodir_author_left_sidebar'; |
|
| 193 | + } |
|
| 206 | 194 | |
| 207 | - /*==================================*/ |
|
| 208 | - /* Author page sidebars end */ |
|
| 209 | - /*==================================*/ |
|
| 195 | + if (get_option('geodir_show_author_right_section')) {
|
|
| 196 | + register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 210 | 197 | |
| 211 | - /*==================================*/ |
|
| 212 | - /* Add listing page sidebars start */ |
|
| 213 | - /*==================================*/ |
|
| 198 | + $geodir_sidebars[] = 'geodir_author_right_sidebar'; |
|
| 199 | + } |
|
| 214 | 200 | |
| 215 | - register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 201 | + if (get_option('geodir_show_author_bottom_section')) {
|
|
| 202 | + register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 216 | 203 | |
| 217 | - $geodir_sidebars[] = 'geodir_add_listing_sidebar'; |
|
| 204 | + $geodir_sidebars[] = 'geodir_author_bottom'; |
|
| 205 | + } |
|
| 218 | 206 | |
| 219 | - /*==================================*/ |
|
| 220 | - /* Add listing page sidebars end */ |
|
| 221 | - /*==================================*/ |
|
| 207 | + /*==================================*/ |
|
| 208 | + /* Author page sidebars end */ |
|
| 209 | + /*==================================*/ |
|
| 222 | 210 | |
| 223 | - } |
|
| 211 | + /*==================================*/ |
|
| 212 | + /* Add listing page sidebars start */ |
|
| 213 | + /*==================================*/ |
|
| 214 | + |
|
| 215 | + register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
|
|
| 216 | + |
|
| 217 | + $geodir_sidebars[] = 'geodir_add_listing_sidebar'; |
|
| 218 | + |
|
| 219 | + /*==================================*/ |
|
| 220 | + /* Add listing page sidebars end */ |
|
| 221 | + /*==================================*/ |
|
| 222 | + |
|
| 223 | + } |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | |
| 227 | 227 | if (!function_exists('register_geodir_widgets')) {
|
| 228 | - /** |
|
| 229 | - * Registers all Widgets. |
|
| 230 | - * |
|
| 231 | - * @since 1.0.0 |
|
| 232 | - * @package GeoDirectory |
|
| 233 | - */ |
|
| 234 | - function register_geodir_widgets() |
|
| 235 | - {
|
|
| 236 | - /** |
|
| 237 | - * Login Widget. |
|
| 238 | - * |
|
| 239 | - * @since 1.0.0 |
|
| 240 | - */ |
|
| 241 | - class geodir_loginwidget extends WP_Widget |
|
| 242 | - {
|
|
| 243 | - /** |
|
| 244 | - * Register the login widget with WordPress. |
|
| 245 | - * |
|
| 246 | - * @since 1.0.0 |
|
| 247 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 248 | - */ |
|
| 249 | - public function __construct() {
|
|
| 250 | - $widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));
|
|
| 251 | - parent::__construct( |
|
| 252 | - 'geodir_loginbox', // Base ID |
|
| 253 | - __('GD > Loginbox', 'geodirectory'), // Name
|
|
| 254 | - $widget_ops// Args |
|
| 255 | - ); |
|
| 256 | - } |
|
| 257 | - |
|
| 258 | - /** |
|
| 259 | - * Front-end display content for login widget. |
|
| 260 | - * |
|
| 261 | - * @since 1.0.0 |
|
| 262 | - * @since 1.5.1 Declare function public. |
|
| 263 | - * |
|
| 264 | - * @param array $args Widget arguments. |
|
| 265 | - * @param array $instance Saved values from database. |
|
| 266 | - */ |
|
| 267 | - public function widget($args, $instance) |
|
| 268 | - {
|
|
| 269 | - geodir_loginwidget_output($args, $instance); |
|
| 270 | - } |
|
| 271 | - |
|
| 272 | - /** |
|
| 273 | - * Sanitize login widget form values as they are saved. |
|
| 274 | - * |
|
| 275 | - * @since 1.0.0 |
|
| 276 | - * @since 1.5.1 Declare function public. |
|
| 277 | - * |
|
| 278 | - * @param array $new_instance Values just sent to be saved. |
|
| 279 | - * @param array $old_instance Previously saved values from database. |
|
| 280 | - * |
|
| 281 | - * @return array Updated safe values to be saved. |
|
| 282 | - */ |
|
| 283 | - public function update($new_instance, $old_instance) |
|
| 284 | - {
|
|
| 285 | - //save the widget |
|
| 286 | - $instance = $old_instance; |
|
| 287 | - $instance['title'] = strip_tags($new_instance['title']); |
|
| 288 | - |
|
| 289 | - return $instance; |
|
| 290 | - } |
|
| 291 | - |
|
| 292 | - /** |
|
| 293 | - * Back-end login widget settings form. |
|
| 294 | - * |
|
| 295 | - * @since 1.0.0 |
|
| 296 | - * @since 1.5.1 Declare function public. |
|
| 297 | - * |
|
| 298 | - * @param array $instance Previously saved values from database. |
|
| 299 | - * @return string|void |
|
| 300 | - */ |
|
| 301 | - public function form($instance) |
|
| 302 | - {
|
|
| 303 | - //widgetform in backend |
|
| 304 | - $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 305 | - $title = strip_tags($instance['title']); |
|
| 306 | - |
|
| 307 | - ?> |
|
| 228 | + /** |
|
| 229 | + * Registers all Widgets. |
|
| 230 | + * |
|
| 231 | + * @since 1.0.0 |
|
| 232 | + * @package GeoDirectory |
|
| 233 | + */ |
|
| 234 | + function register_geodir_widgets() |
|
| 235 | + {
|
|
| 236 | + /** |
|
| 237 | + * Login Widget. |
|
| 238 | + * |
|
| 239 | + * @since 1.0.0 |
|
| 240 | + */ |
|
| 241 | + class geodir_loginwidget extends WP_Widget |
|
| 242 | + {
|
|
| 243 | + /** |
|
| 244 | + * Register the login widget with WordPress. |
|
| 245 | + * |
|
| 246 | + * @since 1.0.0 |
|
| 247 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 248 | + */ |
|
| 249 | + public function __construct() {
|
|
| 250 | + $widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));
|
|
| 251 | + parent::__construct( |
|
| 252 | + 'geodir_loginbox', // Base ID |
|
| 253 | + __('GD > Loginbox', 'geodirectory'), // Name
|
|
| 254 | + $widget_ops// Args |
|
| 255 | + ); |
|
| 256 | + } |
|
| 257 | + |
|
| 258 | + /** |
|
| 259 | + * Front-end display content for login widget. |
|
| 260 | + * |
|
| 261 | + * @since 1.0.0 |
|
| 262 | + * @since 1.5.1 Declare function public. |
|
| 263 | + * |
|
| 264 | + * @param array $args Widget arguments. |
|
| 265 | + * @param array $instance Saved values from database. |
|
| 266 | + */ |
|
| 267 | + public function widget($args, $instance) |
|
| 268 | + {
|
|
| 269 | + geodir_loginwidget_output($args, $instance); |
|
| 270 | + } |
|
| 271 | + |
|
| 272 | + /** |
|
| 273 | + * Sanitize login widget form values as they are saved. |
|
| 274 | + * |
|
| 275 | + * @since 1.0.0 |
|
| 276 | + * @since 1.5.1 Declare function public. |
|
| 277 | + * |
|
| 278 | + * @param array $new_instance Values just sent to be saved. |
|
| 279 | + * @param array $old_instance Previously saved values from database. |
|
| 280 | + * |
|
| 281 | + * @return array Updated safe values to be saved. |
|
| 282 | + */ |
|
| 283 | + public function update($new_instance, $old_instance) |
|
| 284 | + {
|
|
| 285 | + //save the widget |
|
| 286 | + $instance = $old_instance; |
|
| 287 | + $instance['title'] = strip_tags($new_instance['title']); |
|
| 288 | + |
|
| 289 | + return $instance; |
|
| 290 | + } |
|
| 291 | + |
|
| 292 | + /** |
|
| 293 | + * Back-end login widget settings form. |
|
| 294 | + * |
|
| 295 | + * @since 1.0.0 |
|
| 296 | + * @since 1.5.1 Declare function public. |
|
| 297 | + * |
|
| 298 | + * @param array $instance Previously saved values from database. |
|
| 299 | + * @return string|void |
|
| 300 | + */ |
|
| 301 | + public function form($instance) |
|
| 302 | + {
|
|
| 303 | + //widgetform in backend |
|
| 304 | + $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 305 | + $title = strip_tags($instance['title']); |
|
| 306 | + |
|
| 307 | + ?> |
|
| 308 | 308 | <p><label |
| 309 | 309 | for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Widget Title', 'geodirectory'); ?>
|
| 310 | 310 | : <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
|
@@ -313,64 +313,64 @@ discard block |
||
| 313 | 313 | |
| 314 | 314 | |
| 315 | 315 | <?php |
| 316 | - } |
|
| 317 | - } |
|
| 318 | - |
|
| 319 | - register_widget('geodir_loginwidget');
|
|
| 320 | - |
|
| 321 | - |
|
| 322 | - /** |
|
| 323 | - * GeoDirectory Social Like Widget. |
|
| 324 | - * |
|
| 325 | - * @since 1.0.0 |
|
| 326 | - */ |
|
| 327 | - class geodir_social_like_widget extends WP_Widget |
|
| 328 | - {
|
|
| 329 | - |
|
| 330 | - /** |
|
| 331 | - * Register the social like widget with WordPress. |
|
| 332 | - * |
|
| 333 | - * @since 1.0.0 |
|
| 334 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 335 | - */ |
|
| 336 | - public function __construct() {
|
|
| 337 | - $widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));
|
|
| 338 | - parent::__construct( |
|
| 339 | - 'social_like_widget', // Base ID |
|
| 340 | - __('GD > Social Like', 'geodirectory'), // Name
|
|
| 341 | - $widget_ops// Args |
|
| 342 | - ); |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - /** |
|
| 346 | - * Front-end display content for social like widget. |
|
| 347 | - * |
|
| 348 | - * @since 1.0.0 |
|
| 349 | - * @since 1.5.1 Declare function public. |
|
| 350 | - * |
|
| 351 | - * @param array $args Widget arguments. |
|
| 352 | - * @param array $instance Saved values from database. |
|
| 353 | - */ |
|
| 354 | - public function widget($args, $instance) |
|
| 355 | - {
|
|
| 356 | - // prints the widget |
|
| 357 | - extract($args, EXTR_SKIP); |
|
| 358 | - |
|
| 359 | - /** |
|
| 360 | - * Filter the widget title text. |
|
| 361 | - * |
|
| 362 | - * @since 1.0.0 |
|
| 363 | - * @global object $current_user Current user object. |
|
| 364 | - * @param string $title The widget title text. |
|
| 365 | - */ |
|
| 366 | - $title = empty($instance['title']) ? ' ' : apply_filters('widget_title', $instance['title']);
|
|
| 367 | - |
|
| 368 | - global $current_user, $post; |
|
| 369 | - echo $before_widget; |
|
| 370 | - ?> |
|
| 316 | + } |
|
| 317 | + } |
|
| 318 | + |
|
| 319 | + register_widget('geodir_loginwidget');
|
|
| 320 | + |
|
| 321 | + |
|
| 322 | + /** |
|
| 323 | + * GeoDirectory Social Like Widget. |
|
| 324 | + * |
|
| 325 | + * @since 1.0.0 |
|
| 326 | + */ |
|
| 327 | + class geodir_social_like_widget extends WP_Widget |
|
| 328 | + {
|
|
| 329 | + |
|
| 330 | + /** |
|
| 331 | + * Register the social like widget with WordPress. |
|
| 332 | + * |
|
| 333 | + * @since 1.0.0 |
|
| 334 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 335 | + */ |
|
| 336 | + public function __construct() {
|
|
| 337 | + $widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));
|
|
| 338 | + parent::__construct( |
|
| 339 | + 'social_like_widget', // Base ID |
|
| 340 | + __('GD > Social Like', 'geodirectory'), // Name
|
|
| 341 | + $widget_ops// Args |
|
| 342 | + ); |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + /** |
|
| 346 | + * Front-end display content for social like widget. |
|
| 347 | + * |
|
| 348 | + * @since 1.0.0 |
|
| 349 | + * @since 1.5.1 Declare function public. |
|
| 350 | + * |
|
| 351 | + * @param array $args Widget arguments. |
|
| 352 | + * @param array $instance Saved values from database. |
|
| 353 | + */ |
|
| 354 | + public function widget($args, $instance) |
|
| 355 | + {
|
|
| 356 | + // prints the widget |
|
| 357 | + extract($args, EXTR_SKIP); |
|
| 358 | + |
|
| 359 | + /** |
|
| 360 | + * Filter the widget title text. |
|
| 361 | + * |
|
| 362 | + * @since 1.0.0 |
|
| 363 | + * @global object $current_user Current user object. |
|
| 364 | + * @param string $title The widget title text. |
|
| 365 | + */ |
|
| 366 | + $title = empty($instance['title']) ? ' ' : apply_filters('widget_title', $instance['title']);
|
|
| 367 | + |
|
| 368 | + global $current_user, $post; |
|
| 369 | + echo $before_widget; |
|
| 370 | + ?> |
|
| 371 | 371 | |
| 372 | 372 | <?php //if ( get_option('gd_tweet_button') ) {
|
| 373 | - ?> |
|
| 373 | + ?> |
|
| 374 | 374 | |
| 375 | 375 | <a href="http://twitter.com/share" |
| 376 | 376 | class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>
|
@@ -378,23 +378,23 @@ discard block |
||
| 378 | 378 | <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script> |
| 379 | 379 | |
| 380 | 380 | <?php //} |
| 381 | - ?> |
|
| 381 | + ?> |
|
| 382 | 382 | |
| 383 | 383 | <?php // if ( get_option('gd_facebook_button') ) {
|
| 384 | - ?> |
|
| 384 | + ?> |
|
| 385 | 385 | |
| 386 | 386 | <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
|
| 387 | - echo 'allowtransparency="true"'; |
|
| 388 | - }?> class="facebook" |
|
| 387 | + echo 'allowtransparency="true"'; |
|
| 388 | + }?> class="facebook" |
|
| 389 | 389 | src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(geodir_curPageURL()); ?>&layout=button_count&show_faces=false&width=100&action=like&colorscheme=light" |
| 390 | 390 | style="border:none; overflow:hidden; width:100px; height:20px"></iframe> |
| 391 | 391 | |
| 392 | 392 | |
| 393 | 393 | <?php //} |
| 394 | - ?> |
|
| 394 | + ?> |
|
| 395 | 395 | |
| 396 | 396 | <?php //if ( get_option('gd_google_button') ) {
|
| 397 | - ?> |
|
| 397 | + ?> |
|
| 398 | 398 | <script> |
| 399 | 399 | window.___gcfg = {
|
| 400 | 400 | parsetags: 'explicit' |
@@ -408,118 +408,118 @@ discard block |
||
| 408 | 408 | "count": "true" |
| 409 | 409 | });</script> |
| 410 | 410 | <?php //} |
| 411 | - echo $after_widget; |
|
| 412 | - |
|
| 413 | - } |
|
| 414 | - |
|
| 415 | - /** |
|
| 416 | - * Sanitize social like widget form values as they are saved. |
|
| 417 | - * |
|
| 418 | - * @since 1.0.0 |
|
| 419 | - * @since 1.5.1 Declare function public. |
|
| 420 | - * |
|
| 421 | - * @param array $new_instance Values just sent to be saved. |
|
| 422 | - * @param array $old_instance Previously saved values from database. |
|
| 423 | - * |
|
| 424 | - * @return array Updated safe values to be saved. |
|
| 425 | - */ |
|
| 426 | - public function update($new_instance, $old_instance) |
|
| 427 | - {
|
|
| 428 | - //save the widget |
|
| 429 | - $instance = $old_instance; |
|
| 430 | - $instance['title'] = strip_tags($new_instance['title']); |
|
| 431 | - return $instance; |
|
| 432 | - } |
|
| 433 | - |
|
| 434 | - /** |
|
| 435 | - * Back-end social like widget settings form. |
|
| 436 | - * |
|
| 437 | - * @since 1.0.0 |
|
| 438 | - * @since 1.5.1 Declare function public. |
|
| 439 | - * |
|
| 440 | - * @param array $instance Previously saved values from database. |
|
| 441 | - * @return string|void |
|
| 442 | - */ |
|
| 443 | - public function form($instance) |
|
| 444 | - {
|
|
| 445 | - //widgetform in backend |
|
| 446 | - $instance = wp_parse_args((array)$instance, array('title' => ''));
|
|
| 447 | - $title = strip_tags($instance['title']); |
|
| 448 | - ?> |
|
| 411 | + echo $after_widget; |
|
| 412 | + |
|
| 413 | + } |
|
| 414 | + |
|
| 415 | + /** |
|
| 416 | + * Sanitize social like widget form values as they are saved. |
|
| 417 | + * |
|
| 418 | + * @since 1.0.0 |
|
| 419 | + * @since 1.5.1 Declare function public. |
|
| 420 | + * |
|
| 421 | + * @param array $new_instance Values just sent to be saved. |
|
| 422 | + * @param array $old_instance Previously saved values from database. |
|
| 423 | + * |
|
| 424 | + * @return array Updated safe values to be saved. |
|
| 425 | + */ |
|
| 426 | + public function update($new_instance, $old_instance) |
|
| 427 | + {
|
|
| 428 | + //save the widget |
|
| 429 | + $instance = $old_instance; |
|
| 430 | + $instance['title'] = strip_tags($new_instance['title']); |
|
| 431 | + return $instance; |
|
| 432 | + } |
|
| 433 | + |
|
| 434 | + /** |
|
| 435 | + * Back-end social like widget settings form. |
|
| 436 | + * |
|
| 437 | + * @since 1.0.0 |
|
| 438 | + * @since 1.5.1 Declare function public. |
|
| 439 | + * |
|
| 440 | + * @param array $instance Previously saved values from database. |
|
| 441 | + * @return string|void |
|
| 442 | + */ |
|
| 443 | + public function form($instance) |
|
| 444 | + {
|
|
| 445 | + //widgetform in backend |
|
| 446 | + $instance = wp_parse_args((array)$instance, array('title' => ''));
|
|
| 447 | + $title = strip_tags($instance['title']); |
|
| 448 | + ?> |
|
| 449 | 449 | <p>No settings for this widget</p> |
| 450 | 450 | |
| 451 | 451 | |
| 452 | 452 | <?php |
| 453 | - } |
|
| 454 | - } |
|
| 455 | - |
|
| 456 | - register_widget('geodir_social_like_widget');
|
|
| 457 | - |
|
| 458 | - |
|
| 459 | - /** |
|
| 460 | - * GeoDirectory Feedburner Subscribe widget. |
|
| 461 | - * |
|
| 462 | - * @since 1.0.0 |
|
| 463 | - */ |
|
| 464 | - class geodirsubscribeWidget extends WP_Widget |
|
| 465 | - {
|
|
| 466 | - |
|
| 467 | - /** |
|
| 468 | - * Register the feedburner subscribe widget with WordPress. |
|
| 469 | - * |
|
| 470 | - * @since 1.0.0 |
|
| 471 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 472 | - */ |
|
| 473 | - public function __construct() {
|
|
| 474 | - $widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));
|
|
| 475 | - parent::__construct( |
|
| 476 | - 'widget_subscribeWidget', // Base ID |
|
| 477 | - __('GD > Subscribe', 'geodirectory'), // Name
|
|
| 478 | - $widget_ops// Args |
|
| 479 | - ); |
|
| 480 | - } |
|
| 481 | - |
|
| 482 | - /** |
|
| 483 | - * Front-end display content for feedburner subscribe widget. |
|
| 484 | - * |
|
| 485 | - * @since 1.0.0 |
|
| 486 | - * @since 1.5.1 Declare function public. |
|
| 487 | - * |
|
| 488 | - * @param array $args Widget arguments. |
|
| 489 | - * @param array $instance Saved values from database. |
|
| 490 | - */ |
|
| 491 | - public function widget($args, $instance) |
|
| 492 | - {
|
|
| 493 | - // prints the widget |
|
| 494 | - extract($args, EXTR_SKIP); |
|
| 495 | - |
|
| 496 | - /** |
|
| 497 | - * Filter the widget instance id. |
|
| 498 | - * |
|
| 499 | - * @since 1.0.0 |
|
| 500 | - * @param string $id The widget instance id. |
|
| 501 | - */ |
|
| 502 | - $id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);
|
|
| 503 | - |
|
| 504 | - /** This filter is documented in geodirectory_widgets.php */ |
|
| 505 | - $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 506 | - |
|
| 507 | - /** |
|
| 508 | - * Filter the widget text. |
|
| 509 | - * |
|
| 510 | - * @since 1.0.0 |
|
| 511 | - * @param string $text The widget text. |
|
| 512 | - */ |
|
| 513 | - $text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);
|
|
| 514 | - |
|
| 515 | - echo $before_widget; |
|
| 516 | - ?> |
|
| 453 | + } |
|
| 454 | + } |
|
| 455 | + |
|
| 456 | + register_widget('geodir_social_like_widget');
|
|
| 457 | + |
|
| 458 | + |
|
| 459 | + /** |
|
| 460 | + * GeoDirectory Feedburner Subscribe widget. |
|
| 461 | + * |
|
| 462 | + * @since 1.0.0 |
|
| 463 | + */ |
|
| 464 | + class geodirsubscribeWidget extends WP_Widget |
|
| 465 | + {
|
|
| 466 | + |
|
| 467 | + /** |
|
| 468 | + * Register the feedburner subscribe widget with WordPress. |
|
| 469 | + * |
|
| 470 | + * @since 1.0.0 |
|
| 471 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 472 | + */ |
|
| 473 | + public function __construct() {
|
|
| 474 | + $widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));
|
|
| 475 | + parent::__construct( |
|
| 476 | + 'widget_subscribeWidget', // Base ID |
|
| 477 | + __('GD > Subscribe', 'geodirectory'), // Name
|
|
| 478 | + $widget_ops// Args |
|
| 479 | + ); |
|
| 480 | + } |
|
| 481 | + |
|
| 482 | + /** |
|
| 483 | + * Front-end display content for feedburner subscribe widget. |
|
| 484 | + * |
|
| 485 | + * @since 1.0.0 |
|
| 486 | + * @since 1.5.1 Declare function public. |
|
| 487 | + * |
|
| 488 | + * @param array $args Widget arguments. |
|
| 489 | + * @param array $instance Saved values from database. |
|
| 490 | + */ |
|
| 491 | + public function widget($args, $instance) |
|
| 492 | + {
|
|
| 493 | + // prints the widget |
|
| 494 | + extract($args, EXTR_SKIP); |
|
| 495 | + |
|
| 496 | + /** |
|
| 497 | + * Filter the widget instance id. |
|
| 498 | + * |
|
| 499 | + * @since 1.0.0 |
|
| 500 | + * @param string $id The widget instance id. |
|
| 501 | + */ |
|
| 502 | + $id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);
|
|
| 503 | + |
|
| 504 | + /** This filter is documented in geodirectory_widgets.php */ |
|
| 505 | + $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 506 | + |
|
| 507 | + /** |
|
| 508 | + * Filter the widget text. |
|
| 509 | + * |
|
| 510 | + * @since 1.0.0 |
|
| 511 | + * @param string $text The widget text. |
|
| 512 | + */ |
|
| 513 | + $text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);
|
|
| 514 | + |
|
| 515 | + echo $before_widget; |
|
| 516 | + ?> |
|
| 517 | 517 | |
| 518 | 518 | <?php echo $before_title . $title; ?> <a href="<?php if ($id) {
|
| 519 | - echo 'http://feeds2.feedburner.com/' . $id; |
|
| 520 | - } else {
|
|
| 521 | - bloginfo('rss_url');
|
|
| 522 | - } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?> |
|
| 519 | + echo 'http://feeds2.feedburner.com/' . $id; |
|
| 520 | + } else {
|
|
| 521 | + bloginfo('rss_url');
|
|
| 522 | + } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?> |
|
| 523 | 523 | |
| 524 | 524 | <?php if ($text <> "") { ?>
|
| 525 | 525 | |
@@ -544,57 +544,57 @@ discard block |
||
| 544 | 544 | </form> |
| 545 | 545 | |
| 546 | 546 | <?php |
| 547 | - echo $after_widget; |
|
| 547 | + echo $after_widget; |
|
| 548 | 548 | |
| 549 | - } |
|
| 549 | + } |
|
| 550 | 550 | |
| 551 | - /** |
|
| 552 | - * Sanitize feedburner subscribe widget form values as they are saved. |
|
| 553 | - * |
|
| 554 | - * @since 1.0.0 |
|
| 555 | - * @since 1.5.1 Declare function public. |
|
| 556 | - * |
|
| 557 | - * @param array $new_instance Values just sent to be saved. |
|
| 558 | - * @param array $old_instance Previously saved values from database. |
|
| 559 | - * |
|
| 560 | - * @return array Updated safe values to be saved. |
|
| 561 | - */ |
|
| 562 | - public function update($new_instance, $old_instance) |
|
| 563 | - {
|
|
| 551 | + /** |
|
| 552 | + * Sanitize feedburner subscribe widget form values as they are saved. |
|
| 553 | + * |
|
| 554 | + * @since 1.0.0 |
|
| 555 | + * @since 1.5.1 Declare function public. |
|
| 556 | + * |
|
| 557 | + * @param array $new_instance Values just sent to be saved. |
|
| 558 | + * @param array $old_instance Previously saved values from database. |
|
| 559 | + * |
|
| 560 | + * @return array Updated safe values to be saved. |
|
| 561 | + */ |
|
| 562 | + public function update($new_instance, $old_instance) |
|
| 563 | + {
|
|
| 564 | 564 | |
| 565 | - //save the widget |
|
| 566 | - $instance = $old_instance; |
|
| 567 | - $instance['id'] = strip_tags($new_instance['id']); |
|
| 568 | - $instance['title'] = ($new_instance['title']); |
|
| 569 | - $instance['text'] = ($new_instance['text']); |
|
| 565 | + //save the widget |
|
| 566 | + $instance = $old_instance; |
|
| 567 | + $instance['id'] = strip_tags($new_instance['id']); |
|
| 568 | + $instance['title'] = ($new_instance['title']); |
|
| 569 | + $instance['text'] = ($new_instance['text']); |
|
| 570 | 570 | |
| 571 | 571 | |
| 572 | - return $instance; |
|
| 573 | - } |
|
| 572 | + return $instance; |
|
| 573 | + } |
|
| 574 | 574 | |
| 575 | - /** |
|
| 576 | - * Back-end feedburner subscribe widget settings form. |
|
| 577 | - * |
|
| 578 | - * @since 1.0.0 |
|
| 579 | - * @since 1.5.1 Declare function public. |
|
| 580 | - * |
|
| 581 | - * @param array $instance Previously saved values from database. |
|
| 582 | - * @return string|void |
|
| 583 | - */ |
|
| 584 | - public function form($instance) |
|
| 585 | - {
|
|
| 586 | - //widgetform in backend |
|
| 587 | - $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
|
|
| 575 | + /** |
|
| 576 | + * Back-end feedburner subscribe widget settings form. |
|
| 577 | + * |
|
| 578 | + * @since 1.0.0 |
|
| 579 | + * @since 1.5.1 Declare function public. |
|
| 580 | + * |
|
| 581 | + * @param array $instance Previously saved values from database. |
|
| 582 | + * @return string|void |
|
| 583 | + */ |
|
| 584 | + public function form($instance) |
|
| 585 | + {
|
|
| 586 | + //widgetform in backend |
|
| 587 | + $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
|
|
| 588 | 588 | |
| 589 | - $id = strip_tags($instance['id']); |
|
| 589 | + $id = strip_tags($instance['id']); |
|
| 590 | 590 | |
| 591 | - $title = strip_tags($instance['title']); |
|
| 591 | + $title = strip_tags($instance['title']); |
|
| 592 | 592 | |
| 593 | - $text = strip_tags($instance['text']); |
|
| 593 | + $text = strip_tags($instance['text']); |
|
| 594 | 594 | |
| 595 | 595 | |
| 596 | 596 | |
| 597 | - ?> |
|
| 597 | + ?> |
|
| 598 | 598 | <p><label |
| 599 | 599 | for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:
|
| 600 | 600 | <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
|
@@ -613,101 +613,101 @@ discard block |
||
| 613 | 613 | name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>
|
| 614 | 614 | </p> |
| 615 | 615 | <?php |
| 616 | - } |
|
| 617 | - } |
|
| 618 | - |
|
| 619 | - register_widget('geodirsubscribeWidget');
|
|
| 620 | - |
|
| 621 | - /** |
|
| 622 | - * GeoDirectory advertise widget. |
|
| 623 | - * |
|
| 624 | - * @since 1.0.0 |
|
| 625 | - */ |
|
| 626 | - class geodiradvtwidget extends WP_Widget |
|
| 627 | - {
|
|
| 628 | - |
|
| 629 | - /** |
|
| 630 | - * Register the advertise widget with WordPress. |
|
| 631 | - * |
|
| 632 | - * @since 1.0.0 |
|
| 633 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 634 | - */ |
|
| 635 | - public function __construct() {
|
|
| 636 | - $widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));
|
|
| 637 | - parent::__construct( |
|
| 638 | - 'advtwidget', // Base ID |
|
| 639 | - __('GD > Advertise', 'geodirectory'), // Name
|
|
| 640 | - $widget_ops// Args |
|
| 641 | - ); |
|
| 642 | - } |
|
| 643 | - |
|
| 644 | - |
|
| 645 | - /** |
|
| 646 | - * Front-end display content for advertise widget. |
|
| 647 | - * |
|
| 648 | - * @since 1.0.0 |
|
| 649 | - * @since 1.5.1 Declare function public. |
|
| 650 | - * |
|
| 651 | - * @param array $args Widget arguments. |
|
| 652 | - * @param array $instance Saved values from database. |
|
| 653 | - */ |
|
| 654 | - public function widget($args, $instance) |
|
| 655 | - {
|
|
| 656 | - |
|
| 657 | - // prints the widget |
|
| 658 | - |
|
| 659 | - extract($args, EXTR_SKIP); |
|
| 660 | - |
|
| 661 | - /** |
|
| 662 | - * Filter the description text. |
|
| 663 | - * |
|
| 664 | - * @since 1.0.0 |
|
| 665 | - * @param string $desc1 The widget description text. |
|
| 666 | - */ |
|
| 667 | - $desc1 = empty($instance['desc1']) ? ' ' : apply_filters('widget_desc1', $instance['desc1']);
|
|
| 668 | - echo $before_widget; |
|
| 669 | - ?> |
|
| 616 | + } |
|
| 617 | + } |
|
| 618 | + |
|
| 619 | + register_widget('geodirsubscribeWidget');
|
|
| 620 | + |
|
| 621 | + /** |
|
| 622 | + * GeoDirectory advertise widget. |
|
| 623 | + * |
|
| 624 | + * @since 1.0.0 |
|
| 625 | + */ |
|
| 626 | + class geodiradvtwidget extends WP_Widget |
|
| 627 | + {
|
|
| 628 | + |
|
| 629 | + /** |
|
| 630 | + * Register the advertise widget with WordPress. |
|
| 631 | + * |
|
| 632 | + * @since 1.0.0 |
|
| 633 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 634 | + */ |
|
| 635 | + public function __construct() {
|
|
| 636 | + $widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));
|
|
| 637 | + parent::__construct( |
|
| 638 | + 'advtwidget', // Base ID |
|
| 639 | + __('GD > Advertise', 'geodirectory'), // Name
|
|
| 640 | + $widget_ops// Args |
|
| 641 | + ); |
|
| 642 | + } |
|
| 643 | + |
|
| 644 | + |
|
| 645 | + /** |
|
| 646 | + * Front-end display content for advertise widget. |
|
| 647 | + * |
|
| 648 | + * @since 1.0.0 |
|
| 649 | + * @since 1.5.1 Declare function public. |
|
| 650 | + * |
|
| 651 | + * @param array $args Widget arguments. |
|
| 652 | + * @param array $instance Saved values from database. |
|
| 653 | + */ |
|
| 654 | + public function widget($args, $instance) |
|
| 655 | + {
|
|
| 656 | + |
|
| 657 | + // prints the widget |
|
| 658 | + |
|
| 659 | + extract($args, EXTR_SKIP); |
|
| 660 | + |
|
| 661 | + /** |
|
| 662 | + * Filter the description text. |
|
| 663 | + * |
|
| 664 | + * @since 1.0.0 |
|
| 665 | + * @param string $desc1 The widget description text. |
|
| 666 | + */ |
|
| 667 | + $desc1 = empty($instance['desc1']) ? ' ' : apply_filters('widget_desc1', $instance['desc1']);
|
|
| 668 | + echo $before_widget; |
|
| 669 | + ?> |
|
| 670 | 670 | <?php if ($desc1 <> "") { ?>
|
| 671 | 671 | <?php echo $desc1; ?> |
| 672 | 672 | <?php } |
| 673 | - echo $after_widget; |
|
| 674 | - } |
|
| 675 | - |
|
| 676 | - /** |
|
| 677 | - * Sanitize advertise widget form values as they are saved. |
|
| 678 | - * |
|
| 679 | - * @since 1.0.0 |
|
| 680 | - * @since 1.5.1 Declare function public. |
|
| 681 | - * |
|
| 682 | - * @param array $new_instance Values just sent to be saved. |
|
| 683 | - * @param array $old_instance Previously saved values from database. |
|
| 684 | - * |
|
| 685 | - * @return array Updated safe values to be saved. |
|
| 686 | - */ |
|
| 687 | - public function update($new_instance, $old_instance) |
|
| 688 | - {
|
|
| 689 | - //save the widget |
|
| 690 | - $instance = $old_instance; |
|
| 691 | - $instance['desc1'] = ($new_instance['desc1']); |
|
| 692 | - return $instance; |
|
| 693 | - } |
|
| 694 | - |
|
| 695 | - /** |
|
| 696 | - * Back-end advertise widget settings form. |
|
| 697 | - * |
|
| 698 | - * @since 1.0.0 |
|
| 699 | - * @since 1.5.1 Declare function public. |
|
| 700 | - * |
|
| 701 | - * @param array $instance Previously saved values from database. |
|
| 702 | - * @return string|void |
|
| 703 | - */ |
|
| 704 | - public function form($instance) |
|
| 705 | - {
|
|
| 706 | - //widgetform in backend |
|
| 707 | - $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 708 | - |
|
| 709 | - $desc1 = ($instance['desc1']); |
|
| 710 | - ?> |
|
| 673 | + echo $after_widget; |
|
| 674 | + } |
|
| 675 | + |
|
| 676 | + /** |
|
| 677 | + * Sanitize advertise widget form values as they are saved. |
|
| 678 | + * |
|
| 679 | + * @since 1.0.0 |
|
| 680 | + * @since 1.5.1 Declare function public. |
|
| 681 | + * |
|
| 682 | + * @param array $new_instance Values just sent to be saved. |
|
| 683 | + * @param array $old_instance Previously saved values from database. |
|
| 684 | + * |
|
| 685 | + * @return array Updated safe values to be saved. |
|
| 686 | + */ |
|
| 687 | + public function update($new_instance, $old_instance) |
|
| 688 | + {
|
|
| 689 | + //save the widget |
|
| 690 | + $instance = $old_instance; |
|
| 691 | + $instance['desc1'] = ($new_instance['desc1']); |
|
| 692 | + return $instance; |
|
| 693 | + } |
|
| 694 | + |
|
| 695 | + /** |
|
| 696 | + * Back-end advertise widget settings form. |
|
| 697 | + * |
|
| 698 | + * @since 1.0.0 |
|
| 699 | + * @since 1.5.1 Declare function public. |
|
| 700 | + * |
|
| 701 | + * @param array $instance Previously saved values from database. |
|
| 702 | + * @return string|void |
|
| 703 | + */ |
|
| 704 | + public function form($instance) |
|
| 705 | + {
|
|
| 706 | + //widgetform in backend |
|
| 707 | + $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 708 | + |
|
| 709 | + $desc1 = ($instance['desc1']); |
|
| 710 | + ?> |
|
| 711 | 711 | <p><label |
| 712 | 712 | for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>
|
| 713 | 713 | <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"
|
@@ -715,65 +715,65 @@ discard block |
||
| 715 | 715 | </p> |
| 716 | 716 | |
| 717 | 717 | <?php |
| 718 | - } |
|
| 719 | - } |
|
| 720 | - |
|
| 721 | - register_widget('geodiradvtwidget');
|
|
| 722 | - |
|
| 723 | - /** |
|
| 724 | - * GeoDirectory Flickr widget. |
|
| 725 | - * |
|
| 726 | - * @since 1.0.0 |
|
| 727 | - */ |
|
| 728 | - class GeodirFlickrWidget extends WP_Widget |
|
| 729 | - {
|
|
| 730 | - |
|
| 731 | - /** |
|
| 732 | - * Register the flickr widget with WordPress. |
|
| 733 | - * |
|
| 734 | - * @since 1.0.0 |
|
| 735 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 736 | - */ |
|
| 737 | - public function __construct() {
|
|
| 738 | - $widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));
|
|
| 739 | - parent::__construct( |
|
| 740 | - 'widget_flickrwidget', // Base ID |
|
| 741 | - __('GD > Flickr Photos', 'geodirectory'), // Name
|
|
| 742 | - $widget_ops// Args |
|
| 743 | - ); |
|
| 744 | - } |
|
| 745 | - |
|
| 746 | - /** |
|
| 747 | - * Front-end display content for flickr widget. |
|
| 748 | - * |
|
| 749 | - * @since 1.0.0 |
|
| 750 | - * @since 1.5.1 Declare function public. |
|
| 751 | - * |
|
| 752 | - * @param array $args Widget arguments. |
|
| 753 | - * @param array $instance Saved values from database. |
|
| 754 | - */ |
|
| 755 | - public function widget($args, $instance) |
|
| 756 | - {
|
|
| 757 | - |
|
| 758 | - // prints the widget |
|
| 759 | - extract($args, EXTR_SKIP); |
|
| 760 | - |
|
| 761 | - echo $before_widget; |
|
| 762 | - |
|
| 763 | - /** This filter is documented in geodirectory_widgets.php */ |
|
| 764 | - $id = empty($instance['id']) ? ' ' : apply_filters('widget_id', $instance['id']);
|
|
| 765 | - |
|
| 766 | - /** |
|
| 767 | - * Filter the widget number. |
|
| 768 | - * |
|
| 769 | - * This is used in the flicker widget to show how many images to show. |
|
| 770 | - * |
|
| 771 | - * @since 1.0.0 |
|
| 772 | - * @param string $number The image count. |
|
| 773 | - */ |
|
| 774 | - $number = empty($instance['number']) ? ' ' : apply_filters('widget_number', $instance['number']);
|
|
| 775 | - echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;
|
|
| 776 | - ?> |
|
| 718 | + } |
|
| 719 | + } |
|
| 720 | + |
|
| 721 | + register_widget('geodiradvtwidget');
|
|
| 722 | + |
|
| 723 | + /** |
|
| 724 | + * GeoDirectory Flickr widget. |
|
| 725 | + * |
|
| 726 | + * @since 1.0.0 |
|
| 727 | + */ |
|
| 728 | + class GeodirFlickrWidget extends WP_Widget |
|
| 729 | + {
|
|
| 730 | + |
|
| 731 | + /** |
|
| 732 | + * Register the flickr widget with WordPress. |
|
| 733 | + * |
|
| 734 | + * @since 1.0.0 |
|
| 735 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 736 | + */ |
|
| 737 | + public function __construct() {
|
|
| 738 | + $widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));
|
|
| 739 | + parent::__construct( |
|
| 740 | + 'widget_flickrwidget', // Base ID |
|
| 741 | + __('GD > Flickr Photos', 'geodirectory'), // Name
|
|
| 742 | + $widget_ops// Args |
|
| 743 | + ); |
|
| 744 | + } |
|
| 745 | + |
|
| 746 | + /** |
|
| 747 | + * Front-end display content for flickr widget. |
|
| 748 | + * |
|
| 749 | + * @since 1.0.0 |
|
| 750 | + * @since 1.5.1 Declare function public. |
|
| 751 | + * |
|
| 752 | + * @param array $args Widget arguments. |
|
| 753 | + * @param array $instance Saved values from database. |
|
| 754 | + */ |
|
| 755 | + public function widget($args, $instance) |
|
| 756 | + {
|
|
| 757 | + |
|
| 758 | + // prints the widget |
|
| 759 | + extract($args, EXTR_SKIP); |
|
| 760 | + |
|
| 761 | + echo $before_widget; |
|
| 762 | + |
|
| 763 | + /** This filter is documented in geodirectory_widgets.php */ |
|
| 764 | + $id = empty($instance['id']) ? ' ' : apply_filters('widget_id', $instance['id']);
|
|
| 765 | + |
|
| 766 | + /** |
|
| 767 | + * Filter the widget number. |
|
| 768 | + * |
|
| 769 | + * This is used in the flicker widget to show how many images to show. |
|
| 770 | + * |
|
| 771 | + * @since 1.0.0 |
|
| 772 | + * @param string $number The image count. |
|
| 773 | + */ |
|
| 774 | + $number = empty($instance['number']) ? ' ' : apply_filters('widget_number', $instance['number']);
|
|
| 775 | + echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;
|
|
| 776 | + ?> |
|
| 777 | 777 | |
| 778 | 778 | <div class="geodir-flickr clearfix"> |
| 779 | 779 | |
@@ -784,45 +784,45 @@ discard block |
||
| 784 | 784 | |
| 785 | 785 | |
| 786 | 786 | <?php echo $after_widget; |
| 787 | - } |
|
| 788 | - |
|
| 789 | - /** |
|
| 790 | - * Sanitize flickr widget form values as they are saved. |
|
| 791 | - * |
|
| 792 | - * @since 1.0.0 |
|
| 793 | - * @since 1.5.1 Declare function public. |
|
| 794 | - * |
|
| 795 | - * @param array $new_instance Values just sent to be saved. |
|
| 796 | - * @param array $old_instance Previously saved values from database. |
|
| 797 | - * |
|
| 798 | - * @return array Updated safe values to be saved. |
|
| 799 | - */ |
|
| 800 | - public function update($new_instance, $old_instance) |
|
| 801 | - {
|
|
| 802 | - //save the widget |
|
| 803 | - $instance = $old_instance; |
|
| 804 | - $instance['id'] = strip_tags($new_instance['id']); |
|
| 805 | - $instance['number'] = strip_tags($new_instance['number']); |
|
| 806 | - return $instance; |
|
| 807 | - } |
|
| 808 | - |
|
| 809 | - /** |
|
| 810 | - * Back-end flickr widget settings form. |
|
| 811 | - * |
|
| 812 | - * @since 1.0.0 |
|
| 813 | - * @since 1.5.1 Declare function public. |
|
| 814 | - * |
|
| 815 | - * @param array $instance Previously saved values from database. |
|
| 816 | - * @return string|void |
|
| 817 | - */ |
|
| 818 | - public function form($instance) |
|
| 819 | - {
|
|
| 820 | - |
|
| 821 | - //widgetform in backend |
|
| 822 | - $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));
|
|
| 823 | - $id = strip_tags($instance['id']); |
|
| 824 | - $number = strip_tags($instance['number']); |
|
| 825 | - ?> |
|
| 787 | + } |
|
| 788 | + |
|
| 789 | + /** |
|
| 790 | + * Sanitize flickr widget form values as they are saved. |
|
| 791 | + * |
|
| 792 | + * @since 1.0.0 |
|
| 793 | + * @since 1.5.1 Declare function public. |
|
| 794 | + * |
|
| 795 | + * @param array $new_instance Values just sent to be saved. |
|
| 796 | + * @param array $old_instance Previously saved values from database. |
|
| 797 | + * |
|
| 798 | + * @return array Updated safe values to be saved. |
|
| 799 | + */ |
|
| 800 | + public function update($new_instance, $old_instance) |
|
| 801 | + {
|
|
| 802 | + //save the widget |
|
| 803 | + $instance = $old_instance; |
|
| 804 | + $instance['id'] = strip_tags($new_instance['id']); |
|
| 805 | + $instance['number'] = strip_tags($new_instance['number']); |
|
| 806 | + return $instance; |
|
| 807 | + } |
|
| 808 | + |
|
| 809 | + /** |
|
| 810 | + * Back-end flickr widget settings form. |
|
| 811 | + * |
|
| 812 | + * @since 1.0.0 |
|
| 813 | + * @since 1.5.1 Declare function public. |
|
| 814 | + * |
|
| 815 | + * @param array $instance Previously saved values from database. |
|
| 816 | + * @return string|void |
|
| 817 | + */ |
|
| 818 | + public function form($instance) |
|
| 819 | + {
|
|
| 820 | + |
|
| 821 | + //widgetform in backend |
|
| 822 | + $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));
|
|
| 823 | + $id = strip_tags($instance['id']); |
|
| 824 | + $number = strip_tags($instance['number']); |
|
| 825 | + ?> |
|
| 826 | 826 | |
| 827 | 827 | <p> |
| 828 | 828 | <label |
@@ -843,99 +843,99 @@ discard block |
||
| 843 | 843 | </label> |
| 844 | 844 | </p> |
| 845 | 845 | <?php |
| 846 | - } |
|
| 847 | - } |
|
| 848 | - |
|
| 849 | - register_widget('GeodirFlickrWidget');
|
|
| 850 | - |
|
| 851 | - /** |
|
| 852 | - * GeoDirectory Twitter widget. |
|
| 853 | - * |
|
| 854 | - * @since 1.0.0 |
|
| 855 | - */ |
|
| 856 | - class geodir_twitter extends WP_Widget |
|
| 857 | - {
|
|
| 858 | - /** |
|
| 859 | - * Register the Twitter widget with WordPress. |
|
| 860 | - * |
|
| 861 | - * @since 1.0.0 |
|
| 862 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 863 | - */ |
|
| 864 | - public function __construct() {
|
|
| 865 | - $widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));
|
|
| 866 | - parent::__construct( |
|
| 867 | - 'widget_Twidget', // Base ID |
|
| 868 | - __('GD > Twitter', 'geodirectory'), // Name
|
|
| 869 | - $widget_ops// Args |
|
| 870 | - ); |
|
| 871 | - } |
|
| 872 | - |
|
| 873 | - |
|
| 874 | - /** |
|
| 875 | - * Front-end display content for Twitter widget. |
|
| 876 | - * |
|
| 877 | - * @since 1.0.0 |
|
| 878 | - * @since 1.5.1 Declare function public. |
|
| 879 | - * |
|
| 880 | - * @param array $args Widget arguments. |
|
| 881 | - * @param array $instance Saved values from database. |
|
| 882 | - */ |
|
| 883 | - public function widget($args, $instance) |
|
| 884 | - {
|
|
| 885 | - |
|
| 886 | - // prints the widget |
|
| 887 | - |
|
| 888 | - extract($args, EXTR_SKIP); |
|
| 889 | - |
|
| 890 | - /** |
|
| 891 | - * Filter the twitter widget description text. |
|
| 892 | - * |
|
| 893 | - * @since 1.0.0 |
|
| 894 | - * @param string $desc1 The widget description text. |
|
| 895 | - */ |
|
| 896 | - $desc1 = empty($instance['gd_tw_desc1']) ? ' ' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);
|
|
| 897 | - echo $before_widget; |
|
| 898 | - if ($desc1 <> "") {
|
|
| 899 | - echo $desc1; |
|
| 900 | - } |
|
| 901 | - echo $after_widget; |
|
| 902 | - } |
|
| 903 | - |
|
| 904 | - /** |
|
| 905 | - * Sanitize twitter widget form values as they are saved. |
|
| 906 | - * |
|
| 907 | - * @since 1.0.0 |
|
| 908 | - * @since 1.5.1 Declare function public. |
|
| 909 | - * |
|
| 910 | - * @param array $new_instance Values just sent to be saved. |
|
| 911 | - * @param array $old_instance Previously saved values from database. |
|
| 912 | - * |
|
| 913 | - * @return array Updated safe values to be saved. |
|
| 914 | - */ |
|
| 915 | - public function update($new_instance, $old_instance) |
|
| 916 | - {
|
|
| 917 | - //save the widget |
|
| 918 | - $instance = $old_instance; |
|
| 919 | - $instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']); |
|
| 920 | - return $instance; |
|
| 921 | - } |
|
| 922 | - |
|
| 923 | - /** |
|
| 924 | - * Back-end twitter widget settings form. |
|
| 925 | - * |
|
| 926 | - * @since 1.0.0 |
|
| 927 | - * @since 1.5.1 Declare function public. |
|
| 928 | - * |
|
| 929 | - * @param array $instance Previously saved values from database. |
|
| 930 | - * @return string|void |
|
| 931 | - */ |
|
| 932 | - public function form($instance) |
|
| 933 | - {
|
|
| 934 | - //widgetform in backend |
|
| 935 | - $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
|
|
| 936 | - |
|
| 937 | - $desc1 = ($instance['gd_tw_desc1']); |
|
| 938 | - ?> |
|
| 846 | + } |
|
| 847 | + } |
|
| 848 | + |
|
| 849 | + register_widget('GeodirFlickrWidget');
|
|
| 850 | + |
|
| 851 | + /** |
|
| 852 | + * GeoDirectory Twitter widget. |
|
| 853 | + * |
|
| 854 | + * @since 1.0.0 |
|
| 855 | + */ |
|
| 856 | + class geodir_twitter extends WP_Widget |
|
| 857 | + {
|
|
| 858 | + /** |
|
| 859 | + * Register the Twitter widget with WordPress. |
|
| 860 | + * |
|
| 861 | + * @since 1.0.0 |
|
| 862 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 863 | + */ |
|
| 864 | + public function __construct() {
|
|
| 865 | + $widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));
|
|
| 866 | + parent::__construct( |
|
| 867 | + 'widget_Twidget', // Base ID |
|
| 868 | + __('GD > Twitter', 'geodirectory'), // Name
|
|
| 869 | + $widget_ops// Args |
|
| 870 | + ); |
|
| 871 | + } |
|
| 872 | + |
|
| 873 | + |
|
| 874 | + /** |
|
| 875 | + * Front-end display content for Twitter widget. |
|
| 876 | + * |
|
| 877 | + * @since 1.0.0 |
|
| 878 | + * @since 1.5.1 Declare function public. |
|
| 879 | + * |
|
| 880 | + * @param array $args Widget arguments. |
|
| 881 | + * @param array $instance Saved values from database. |
|
| 882 | + */ |
|
| 883 | + public function widget($args, $instance) |
|
| 884 | + {
|
|
| 885 | + |
|
| 886 | + // prints the widget |
|
| 887 | + |
|
| 888 | + extract($args, EXTR_SKIP); |
|
| 889 | + |
|
| 890 | + /** |
|
| 891 | + * Filter the twitter widget description text. |
|
| 892 | + * |
|
| 893 | + * @since 1.0.0 |
|
| 894 | + * @param string $desc1 The widget description text. |
|
| 895 | + */ |
|
| 896 | + $desc1 = empty($instance['gd_tw_desc1']) ? ' ' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);
|
|
| 897 | + echo $before_widget; |
|
| 898 | + if ($desc1 <> "") {
|
|
| 899 | + echo $desc1; |
|
| 900 | + } |
|
| 901 | + echo $after_widget; |
|
| 902 | + } |
|
| 903 | + |
|
| 904 | + /** |
|
| 905 | + * Sanitize twitter widget form values as they are saved. |
|
| 906 | + * |
|
| 907 | + * @since 1.0.0 |
|
| 908 | + * @since 1.5.1 Declare function public. |
|
| 909 | + * |
|
| 910 | + * @param array $new_instance Values just sent to be saved. |
|
| 911 | + * @param array $old_instance Previously saved values from database. |
|
| 912 | + * |
|
| 913 | + * @return array Updated safe values to be saved. |
|
| 914 | + */ |
|
| 915 | + public function update($new_instance, $old_instance) |
|
| 916 | + {
|
|
| 917 | + //save the widget |
|
| 918 | + $instance = $old_instance; |
|
| 919 | + $instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']); |
|
| 920 | + return $instance; |
|
| 921 | + } |
|
| 922 | + |
|
| 923 | + /** |
|
| 924 | + * Back-end twitter widget settings form. |
|
| 925 | + * |
|
| 926 | + * @since 1.0.0 |
|
| 927 | + * @since 1.5.1 Declare function public. |
|
| 928 | + * |
|
| 929 | + * @param array $instance Previously saved values from database. |
|
| 930 | + * @return string|void |
|
| 931 | + */ |
|
| 932 | + public function form($instance) |
|
| 933 | + {
|
|
| 934 | + //widgetform in backend |
|
| 935 | + $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
|
|
| 936 | + |
|
| 937 | + $desc1 = ($instance['gd_tw_desc1']); |
|
| 938 | + ?> |
|
| 939 | 939 | <p><label |
| 940 | 940 | for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>
|
| 941 | 941 | <textarea class="widefat" rows="6" cols="20" |
@@ -944,179 +944,179 @@ discard block |
||
| 944 | 944 | </p> |
| 945 | 945 | |
| 946 | 946 | <?php |
| 947 | - } |
|
| 948 | - } |
|
| 949 | - |
|
| 950 | - register_widget('geodir_twitter');
|
|
| 951 | - |
|
| 952 | - /** |
|
| 953 | - * GeoDirectory Advanced Search widget. |
|
| 954 | - * |
|
| 955 | - * @since 1.0.0 |
|
| 956 | - */ |
|
| 957 | - class geodir_advance_search_widget extends WP_Widget |
|
| 958 | - {
|
|
| 959 | - /** |
|
| 960 | - * Register the advanced search widget with WordPress. |
|
| 961 | - * |
|
| 962 | - * @since 1.0.0 |
|
| 963 | - * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 964 | - */ |
|
| 965 | - public function __construct() {
|
|
| 966 | - $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');
|
|
| 967 | - parent::__construct( |
|
| 968 | - 'geodir_advance_search', // Base ID |
|
| 969 | - __('GD > Search', 'geodirectory'), // Name
|
|
| 970 | - $widget_ops// Args |
|
| 971 | - ); |
|
| 972 | - } |
|
| 973 | - |
|
| 974 | - |
|
| 975 | - /** |
|
| 976 | - * Front-end display content for advanced search widget. |
|
| 977 | - * |
|
| 978 | - * @since 1.0.0 |
|
| 979 | - * @since 1.5.1 Declare function public. |
|
| 980 | - * |
|
| 981 | - * @param array $args Widget arguments. |
|
| 982 | - * @param array $instance Saved values from database. |
|
| 983 | - */ |
|
| 984 | - public function widget($args, $instance) |
|
| 985 | - {
|
|
| 986 | - /** |
|
| 987 | - * Filter the search widget arguments. |
|
| 988 | - * |
|
| 989 | - * @since 1.5.7 |
|
| 990 | - * @param array $args The widget arguments. |
|
| 991 | - * @param array $instance The widget instance. |
|
| 992 | - */ |
|
| 993 | - $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);
|
|
| 994 | - |
|
| 995 | - // prints the widget |
|
| 996 | - extract($args, EXTR_SKIP); |
|
| 997 | - |
|
| 998 | - if(isset($post_type) && $post_type){
|
|
| 999 | - geodir_get_search_post_type($post_type);// set the post type |
|
| 1000 | - }else{
|
|
| 1001 | - geodir_get_search_post_type();// set the post type |
|
| 1002 | - } |
|
| 1003 | - |
|
| 1004 | - echo $before_widget; |
|
| 1005 | - |
|
| 1006 | - /** This filter is documented in geodirectory_widgets.php */ |
|
| 1007 | - $title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 1008 | - |
|
| 1009 | - geodir_get_template_part('listing', 'filter-form');
|
|
| 1010 | - |
|
| 1011 | - echo $after_widget; |
|
| 1012 | - |
|
| 1013 | - // after outputing the search reset the CPT |
|
| 1014 | - global $geodir_search_post_type; |
|
| 1015 | - $geodir_search_post_type = ''; |
|
| 1016 | - } |
|
| 1017 | - |
|
| 1018 | - /** |
|
| 1019 | - * Sanitize advanced search widget form values as they are saved. |
|
| 1020 | - * |
|
| 1021 | - * @since 1.0.0 |
|
| 1022 | - * @since 1.5.1 Declare function public. |
|
| 1023 | - * |
|
| 1024 | - * @param array $new_instance Values just sent to be saved. |
|
| 1025 | - * @param array $old_instance Previously saved values from database. |
|
| 1026 | - * |
|
| 1027 | - * @return array Updated safe values to be saved. |
|
| 1028 | - */ |
|
| 1029 | - public function update($new_instance, $old_instance) |
|
| 1030 | - {
|
|
| 1031 | - //save the widget |
|
| 1032 | - //Nothing to save |
|
| 1033 | - return isset($instance) ? $instance : array(); |
|
| 1034 | - } |
|
| 1035 | - |
|
| 1036 | - /** |
|
| 1037 | - * Back-end advanced search widget settings form. |
|
| 1038 | - * |
|
| 1039 | - * @since 1.0.0 |
|
| 1040 | - * @since 1.5.1 Declare function public. |
|
| 1041 | - * |
|
| 1042 | - * @param array $instance Previously saved values from database. |
|
| 1043 | - * @return string|void |
|
| 1044 | - */ |
|
| 1045 | - public function form($instance) |
|
| 1046 | - {
|
|
| 1047 | - //widgetform in backend |
|
| 1048 | - echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');
|
|
| 1049 | - } |
|
| 1050 | - } |
|
| 1051 | - |
|
| 1052 | - register_widget('geodir_advance_search_widget');
|
|
| 1053 | - |
|
| 1054 | - |
|
| 1055 | - /** |
|
| 1056 | - * Contains all functions for popular widget. |
|
| 1057 | - * |
|
| 1058 | - * @since 1.0.0 |
|
| 1059 | - * @package GeoDirectory |
|
| 1060 | - */ |
|
| 1061 | - include_once('geodirectory-widgets/geodirectory_popular_widget.php');
|
|
| 1062 | - /** |
|
| 1063 | - * Contains all functions for listing slider widget. |
|
| 1064 | - * |
|
| 1065 | - * @since 1.0.0 |
|
| 1066 | - * @package GeoDirectory |
|
| 1067 | - */ |
|
| 1068 | - include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');
|
|
| 1069 | - /** |
|
| 1070 | - * Contains all functions for home map widget. |
|
| 1071 | - * |
|
| 1072 | - * @since 1.0.0 |
|
| 1073 | - * @package GeoDirectory |
|
| 1074 | - */ |
|
| 1075 | - include_once('geodirectory-widgets/home_map_widget.php');
|
|
| 1076 | - /** |
|
| 1077 | - * Contains all functions for listing map widget. |
|
| 1078 | - * |
|
| 1079 | - * @since 1.0.0 |
|
| 1080 | - * @package GeoDirectory |
|
| 1081 | - */ |
|
| 1082 | - include_once('geodirectory-widgets/listing_map_widget.php');
|
|
| 1083 | - /** |
|
| 1084 | - * Contains all functions for reviews widget. |
|
| 1085 | - * |
|
| 1086 | - * @since 1.0.0 |
|
| 1087 | - * @package GeoDirectory |
|
| 1088 | - */ |
|
| 1089 | - include_once('geodirectory-widgets/geodirectory_reviews_widget.php');
|
|
| 1090 | - /** |
|
| 1091 | - * Contains all functions for related listing widget. |
|
| 1092 | - * |
|
| 1093 | - * @since 1.0.0 |
|
| 1094 | - * @package GeoDirectory |
|
| 1095 | - */ |
|
| 1096 | - include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');
|
|
| 1097 | - /** |
|
| 1098 | - * Contains all functions for bestof widget. |
|
| 1099 | - * |
|
| 1100 | - * @since 1.0.0 |
|
| 1101 | - * @package GeoDirectory |
|
| 1102 | - */ |
|
| 1103 | - include_once('geodirectory-widgets/geodirectory_bestof_widget.php');
|
|
| 947 | + } |
|
| 948 | + } |
|
| 949 | + |
|
| 950 | + register_widget('geodir_twitter');
|
|
| 951 | + |
|
| 952 | + /** |
|
| 953 | + * GeoDirectory Advanced Search widget. |
|
| 954 | + * |
|
| 955 | + * @since 1.0.0 |
|
| 956 | + */ |
|
| 957 | + class geodir_advance_search_widget extends WP_Widget |
|
| 958 | + {
|
|
| 959 | + /** |
|
| 960 | + * Register the advanced search widget with WordPress. |
|
| 961 | + * |
|
| 962 | + * @since 1.0.0 |
|
| 963 | + * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
|
| 964 | + */ |
|
| 965 | + public function __construct() {
|
|
| 966 | + $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');
|
|
| 967 | + parent::__construct( |
|
| 968 | + 'geodir_advance_search', // Base ID |
|
| 969 | + __('GD > Search', 'geodirectory'), // Name
|
|
| 970 | + $widget_ops// Args |
|
| 971 | + ); |
|
| 972 | + } |
|
| 973 | + |
|
| 974 | + |
|
| 975 | + /** |
|
| 976 | + * Front-end display content for advanced search widget. |
|
| 977 | + * |
|
| 978 | + * @since 1.0.0 |
|
| 979 | + * @since 1.5.1 Declare function public. |
|
| 980 | + * |
|
| 981 | + * @param array $args Widget arguments. |
|
| 982 | + * @param array $instance Saved values from database. |
|
| 983 | + */ |
|
| 984 | + public function widget($args, $instance) |
|
| 985 | + {
|
|
| 986 | + /** |
|
| 987 | + * Filter the search widget arguments. |
|
| 988 | + * |
|
| 989 | + * @since 1.5.7 |
|
| 990 | + * @param array $args The widget arguments. |
|
| 991 | + * @param array $instance The widget instance. |
|
| 992 | + */ |
|
| 993 | + $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);
|
|
| 994 | + |
|
| 995 | + // prints the widget |
|
| 996 | + extract($args, EXTR_SKIP); |
|
| 997 | + |
|
| 998 | + if(isset($post_type) && $post_type){
|
|
| 999 | + geodir_get_search_post_type($post_type);// set the post type |
|
| 1000 | + }else{
|
|
| 1001 | + geodir_get_search_post_type();// set the post type |
|
| 1002 | + } |
|
| 1003 | + |
|
| 1004 | + echo $before_widget; |
|
| 1005 | + |
|
| 1006 | + /** This filter is documented in geodirectory_widgets.php */ |
|
| 1007 | + $title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
|
|
| 1008 | + |
|
| 1009 | + geodir_get_template_part('listing', 'filter-form');
|
|
| 1010 | + |
|
| 1011 | + echo $after_widget; |
|
| 1012 | + |
|
| 1013 | + // after outputing the search reset the CPT |
|
| 1014 | + global $geodir_search_post_type; |
|
| 1015 | + $geodir_search_post_type = ''; |
|
| 1016 | + } |
|
| 1017 | + |
|
| 1018 | + /** |
|
| 1019 | + * Sanitize advanced search widget form values as they are saved. |
|
| 1020 | + * |
|
| 1021 | + * @since 1.0.0 |
|
| 1022 | + * @since 1.5.1 Declare function public. |
|
| 1023 | + * |
|
| 1024 | + * @param array $new_instance Values just sent to be saved. |
|
| 1025 | + * @param array $old_instance Previously saved values from database. |
|
| 1026 | + * |
|
| 1027 | + * @return array Updated safe values to be saved. |
|
| 1028 | + */ |
|
| 1029 | + public function update($new_instance, $old_instance) |
|
| 1030 | + {
|
|
| 1031 | + //save the widget |
|
| 1032 | + //Nothing to save |
|
| 1033 | + return isset($instance) ? $instance : array(); |
|
| 1034 | + } |
|
| 1035 | + |
|
| 1036 | + /** |
|
| 1037 | + * Back-end advanced search widget settings form. |
|
| 1038 | + * |
|
| 1039 | + * @since 1.0.0 |
|
| 1040 | + * @since 1.5.1 Declare function public. |
|
| 1041 | + * |
|
| 1042 | + * @param array $instance Previously saved values from database. |
|
| 1043 | + * @return string|void |
|
| 1044 | + */ |
|
| 1045 | + public function form($instance) |
|
| 1046 | + {
|
|
| 1047 | + //widgetform in backend |
|
| 1048 | + echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');
|
|
| 1049 | + } |
|
| 1050 | + } |
|
| 1051 | + |
|
| 1052 | + register_widget('geodir_advance_search_widget');
|
|
| 1053 | + |
|
| 1054 | + |
|
| 1055 | + /** |
|
| 1056 | + * Contains all functions for popular widget. |
|
| 1057 | + * |
|
| 1058 | + * @since 1.0.0 |
|
| 1059 | + * @package GeoDirectory |
|
| 1060 | + */ |
|
| 1061 | + include_once('geodirectory-widgets/geodirectory_popular_widget.php');
|
|
| 1062 | + /** |
|
| 1063 | + * Contains all functions for listing slider widget. |
|
| 1064 | + * |
|
| 1065 | + * @since 1.0.0 |
|
| 1066 | + * @package GeoDirectory |
|
| 1067 | + */ |
|
| 1068 | + include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');
|
|
| 1069 | + /** |
|
| 1070 | + * Contains all functions for home map widget. |
|
| 1071 | + * |
|
| 1072 | + * @since 1.0.0 |
|
| 1073 | + * @package GeoDirectory |
|
| 1074 | + */ |
|
| 1075 | + include_once('geodirectory-widgets/home_map_widget.php');
|
|
| 1076 | + /** |
|
| 1077 | + * Contains all functions for listing map widget. |
|
| 1078 | + * |
|
| 1079 | + * @since 1.0.0 |
|
| 1080 | + * @package GeoDirectory |
|
| 1081 | + */ |
|
| 1082 | + include_once('geodirectory-widgets/listing_map_widget.php');
|
|
| 1083 | + /** |
|
| 1084 | + * Contains all functions for reviews widget. |
|
| 1085 | + * |
|
| 1086 | + * @since 1.0.0 |
|
| 1087 | + * @package GeoDirectory |
|
| 1088 | + */ |
|
| 1089 | + include_once('geodirectory-widgets/geodirectory_reviews_widget.php');
|
|
| 1090 | + /** |
|
| 1091 | + * Contains all functions for related listing widget. |
|
| 1092 | + * |
|
| 1093 | + * @since 1.0.0 |
|
| 1094 | + * @package GeoDirectory |
|
| 1095 | + */ |
|
| 1096 | + include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');
|
|
| 1097 | + /** |
|
| 1098 | + * Contains all functions for bestof widget. |
|
| 1099 | + * |
|
| 1100 | + * @since 1.0.0 |
|
| 1101 | + * @package GeoDirectory |
|
| 1102 | + */ |
|
| 1103 | + include_once('geodirectory-widgets/geodirectory_bestof_widget.php');
|
|
| 1104 | + /** |
|
| 1105 | + * Contains all functions for cpt categories widget. |
|
| 1106 | + * |
|
| 1107 | + * @since 1.5.4 |
|
| 1108 | + * @package GeoDirectory |
|
| 1109 | + */ |
|
| 1110 | + include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');
|
|
| 1104 | 1111 | /** |
| 1105 | - * Contains all functions for cpt categories widget. |
|
| 1106 | - * |
|
| 1107 | - * @since 1.5.4 |
|
| 1108 | - * @package GeoDirectory |
|
| 1109 | - */ |
|
| 1110 | - include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');
|
|
| 1111 | - /** |
|
| 1112 | - * Contains all functions for features widget. |
|
| 1113 | - * |
|
| 1114 | - * @since 1.5.6 |
|
| 1115 | - * @package GeoDirectory |
|
| 1116 | - * @todo make the image field recurring |
|
| 1117 | - */ |
|
| 1118 | - include_once('geodirectory-widgets/geodirectory_features_widget.php');
|
|
| 1119 | - } |
|
| 1112 | + * Contains all functions for features widget. |
|
| 1113 | + * |
|
| 1114 | + * @since 1.5.6 |
|
| 1115 | + * @package GeoDirectory |
|
| 1116 | + * @todo make the image field recurring |
|
| 1117 | + */ |
|
| 1118 | + include_once('geodirectory-widgets/geodirectory_features_widget.php');
|
|
| 1119 | + } |
|
| 1120 | 1120 | |
| 1121 | 1121 | } |
| 1122 | 1122 | |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | public function form($instance) |
| 302 | 302 | {
|
| 303 | 303 | //widgetform in backend |
| 304 | - $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 304 | + $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 305 | 305 | $title = strip_tags($instance['title']); |
| 306 | 306 | |
| 307 | 307 | ?> |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | ?> |
| 374 | 374 | |
| 375 | 375 | <a href="http://twitter.com/share" |
| 376 | - class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>
|
|
| 376 | + class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>
|
|
| 377 | 377 | |
| 378 | 378 | <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script> |
| 379 | 379 | |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | public function form($instance) |
| 444 | 444 | {
|
| 445 | 445 | //widgetform in backend |
| 446 | - $instance = wp_parse_args((array)$instance, array('title' => ''));
|
|
| 446 | + $instance = wp_parse_args((array) $instance, array('title' => ''));
|
|
| 447 | 447 | $title = strip_tags($instance['title']); |
| 448 | 448 | ?> |
| 449 | 449 | <p>No settings for this widget</p> |
@@ -515,11 +515,11 @@ discard block |
||
| 515 | 515 | echo $before_widget; |
| 516 | 516 | ?> |
| 517 | 517 | |
| 518 | - <?php echo $before_title . $title; ?> <a href="<?php if ($id) {
|
|
| 519 | - echo 'http://feeds2.feedburner.com/' . $id; |
|
| 518 | + <?php echo $before_title.$title; ?> <a href="<?php if ($id) {
|
|
| 519 | + echo 'http://feeds2.feedburner.com/'.$id; |
|
| 520 | 520 | } else {
|
| 521 | 521 | bloginfo('rss_url');
|
| 522 | - } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?> |
|
| 522 | + } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title; ?> |
|
| 523 | 523 | |
| 524 | 524 | <?php if ($text <> "") { ?>
|
| 525 | 525 | |
@@ -584,7 +584,7 @@ discard block |
||
| 584 | 584 | public function form($instance) |
| 585 | 585 | {
|
| 586 | 586 | //widgetform in backend |
| 587 | - $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
|
|
| 587 | + $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
|
|
| 588 | 588 | |
| 589 | 589 | $id = strip_tags($instance['id']); |
| 590 | 590 | |
@@ -596,19 +596,19 @@ discard block |
||
| 596 | 596 | |
| 597 | 597 | ?> |
| 598 | 598 | <p><label |
| 599 | - for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:
|
|
| 599 | + for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory'); ?>:
|
|
| 600 | 600 | <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
|
| 601 | 601 | name="<?php echo $this->get_field_name('title'); ?>" type="text"
|
| 602 | 602 | value="<?php echo esc_attr($title); ?>"/></label></p> |
| 603 | 603 | |
| 604 | 604 | <p><label |
| 605 | - for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory');?>
|
|
| 605 | + for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory'); ?>
|
|
| 606 | 606 | : <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"
|
| 607 | 607 | name="<?php echo $this->get_field_name('id'); ?>" type="text"
|
| 608 | 608 | value="<?php echo esc_attr($id); ?>"/></label></p> |
| 609 | 609 | |
| 610 | 610 | <p><label |
| 611 | - for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory');?>
|
|
| 611 | + for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory'); ?>
|
|
| 612 | 612 | <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('text'); ?>"
|
| 613 | 613 | name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>
|
| 614 | 614 | </p> |
@@ -704,12 +704,12 @@ discard block |
||
| 704 | 704 | public function form($instance) |
| 705 | 705 | {
|
| 706 | 706 | //widgetform in backend |
| 707 | - $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 707 | + $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
|
|
| 708 | 708 | |
| 709 | 709 | $desc1 = ($instance['desc1']); |
| 710 | 710 | ?> |
| 711 | 711 | <p><label |
| 712 | - for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>
|
|
| 712 | + for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory'); ?>
|
|
| 713 | 713 | <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"
|
| 714 | 714 | name="<?php echo $this->get_field_name('desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>
|
| 715 | 715 | </p> |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | * @param string $number The image count. |
| 773 | 773 | */ |
| 774 | 774 | $number = empty($instance['number']) ? ' ' : apply_filters('widget_number', $instance['number']);
|
| 775 | - echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;
|
|
| 775 | + echo $before_title.__('Photo Gallery', 'geodirectory').$after_title;
|
|
| 776 | 776 | ?> |
| 777 | 777 | |
| 778 | 778 | <div class="geodir-flickr clearfix"> |
@@ -819,14 +819,14 @@ discard block |
||
| 819 | 819 | {
|
| 820 | 820 | |
| 821 | 821 | //widgetform in backend |
| 822 | - $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));
|
|
| 822 | + $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'number' => ''));
|
|
| 823 | 823 | $id = strip_tags($instance['id']); |
| 824 | 824 | $number = strip_tags($instance['number']); |
| 825 | 825 | ?> |
| 826 | 826 | |
| 827 | 827 | <p> |
| 828 | 828 | <label |
| 829 | - for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory');?>
|
|
| 829 | + for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory'); ?>
|
|
| 830 | 830 | (<a href="http://www.idgettr.com">idGettr</a>): |
| 831 | 831 | <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"
|
| 832 | 832 | name="<?php echo $this->get_field_name('id'); ?>" type="text"
|
@@ -836,7 +836,7 @@ discard block |
||
| 836 | 836 | |
| 837 | 837 | <p> |
| 838 | 838 | <label |
| 839 | - for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory');?>
|
|
| 839 | + for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory'); ?>
|
|
| 840 | 840 | <input class="widefat" id="<?php echo $this->get_field_id('number'); ?>"
|
| 841 | 841 | name="<?php echo $this->get_field_name('number'); ?>" type="text"
|
| 842 | 842 | value="<?php echo esc_attr($number); ?>"/> |
@@ -932,12 +932,12 @@ discard block |
||
| 932 | 932 | public function form($instance) |
| 933 | 933 | {
|
| 934 | 934 | //widgetform in backend |
| 935 | - $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
|
|
| 935 | + $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
|
|
| 936 | 936 | |
| 937 | 937 | $desc1 = ($instance['gd_tw_desc1']); |
| 938 | 938 | ?> |
| 939 | 939 | <p><label |
| 940 | - for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>
|
|
| 940 | + for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory'); ?>
|
|
| 941 | 941 | <textarea class="widefat" rows="6" cols="20" |
| 942 | 942 | id="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"
|
| 943 | 943 | name="<?php echo $this->get_field_name('gd_tw_desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>
|
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct. |
| 964 | 964 | */ |
| 965 | 965 | public function __construct() {
|
| 966 | - $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');
|
|
| 966 | + $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'), 'post_type'=>'');
|
|
| 967 | 967 | parent::__construct( |
| 968 | 968 | 'geodir_advance_search', // Base ID |
| 969 | 969 | __('GD > Search', 'geodirectory'), // Name
|
@@ -990,15 +990,15 @@ discard block |
||
| 990 | 990 | * @param array $args The widget arguments. |
| 991 | 991 | * @param array $instance The widget instance. |
| 992 | 992 | */ |
| 993 | - $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);
|
|
| 993 | + $args = apply_filters('widget_geodir_advance_search_args', $args, $instance);
|
|
| 994 | 994 | |
| 995 | 995 | // prints the widget |
| 996 | 996 | extract($args, EXTR_SKIP); |
| 997 | 997 | |
| 998 | - if(isset($post_type) && $post_type){
|
|
| 999 | - geodir_get_search_post_type($post_type);// set the post type |
|
| 1000 | - }else{
|
|
| 1001 | - geodir_get_search_post_type();// set the post type |
|
| 998 | + if (isset($post_type) && $post_type) {
|
|
| 999 | + geodir_get_search_post_type($post_type); // set the post type |
|
| 1000 | + } else {
|
|
| 1001 | + geodir_get_search_post_type(); // set the post type |
|
| 1002 | 1002 | } |
| 1003 | 1003 | |
| 1004 | 1004 | echo $before_widget; |
@@ -997,7 +997,7 @@ |
||
| 997 | 997 | |
| 998 | 998 | if(isset($post_type) && $post_type){
|
| 999 | 999 | geodir_get_search_post_type($post_type);// set the post type |
| 1000 | - }else{
|
|
| 1000 | + } else{
|
|
| 1001 | 1001 | geodir_get_search_post_type();// set the post type |
| 1002 | 1002 | } |
| 1003 | 1003 | |
@@ -17,26 +17,26 @@ discard block |
||
| 17 | 17 | function gd_compat_php_genesis() |
| 18 | 18 | { |
| 19 | 19 | // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS |
| 20 | - remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | - remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | - remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | - remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | - remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | - remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 20 | + remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20); |
|
| 21 | + remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20); |
|
| 22 | + remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20); |
|
| 23 | + remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20); |
|
| 24 | + remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20); |
|
| 25 | + remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20); |
|
| 26 | 26 | |
| 27 | 27 | |
| 28 | - // make top section wide |
|
| 29 | - remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | - remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | - remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | - remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | - remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | - remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 28 | + // make top section wide |
|
| 29 | + remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 30 | + remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10); |
|
| 31 | + remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10); |
|
| 32 | + remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10); |
|
| 33 | + remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10); |
|
| 34 | + remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10); |
|
| 35 | 35 | |
| 36 | - // REMOVE PAGE TITLES |
|
| 37 | - remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | - remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | - remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 36 | + // REMOVE PAGE TITLES |
|
| 37 | + remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10); |
|
| 38 | + remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10); |
|
| 39 | + remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10); |
|
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | } |
@@ -53,25 +53,25 @@ discard block |
||
| 53 | 53 | function gd_genesis_compat_left_sidebars() |
| 54 | 54 | { |
| 55 | 55 | |
| 56 | - if (is_page_geodir_home()) { |
|
| 57 | - remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | - } elseif (geodir_is_page('location')) { |
|
| 60 | - remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | - add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | - } elseif (geodir_is_page('listing')) { |
|
| 63 | - remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | - add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | - } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | - //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | - //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | - } elseif (geodir_is_page('search')) { |
|
| 69 | - remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | - add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | - } elseif (geodir_is_page('author')) { |
|
| 72 | - remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | - add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | - } |
|
| 56 | + if (is_page_geodir_home()) { |
|
| 57 | + remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 58 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 59 | + } elseif (geodir_is_page('location')) { |
|
| 60 | + remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10); |
|
| 61 | + add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11); |
|
| 62 | + } elseif (geodir_is_page('listing')) { |
|
| 63 | + remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10); |
|
| 64 | + add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11); |
|
| 65 | + } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) { |
|
| 66 | + //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 ); |
|
| 67 | + //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 ); |
|
| 68 | + } elseif (geodir_is_page('search')) { |
|
| 69 | + remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10); |
|
| 70 | + add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11); |
|
| 71 | + } elseif (geodir_is_page('author')) { |
|
| 72 | + remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10); |
|
| 73 | + add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11); |
|
| 74 | + } |
|
| 75 | 75 | |
| 76 | 76 | |
| 77 | 77 | } |
@@ -88,65 +88,65 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | function geodir_set_body_scs($classes) |
| 90 | 90 | { |
| 91 | - $remove_class = false; |
|
| 92 | - $new_class = ''; |
|
| 93 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 94 | - $remove_class = true; |
|
| 95 | - if (get_option('geodir_show_home_left_section')) { |
|
| 96 | - $new_class .= 'sidebar-'; |
|
| 97 | - } |
|
| 98 | - if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | - $new_class .= 'content'; |
|
| 100 | - } |
|
| 101 | - if (get_option('geodir_show_home_right_section')) { |
|
| 102 | - $new_class .= '-sidebar'; |
|
| 103 | - } |
|
| 104 | - } elseif (geodir_is_page('listing')) { |
|
| 105 | - $remove_class = true; |
|
| 106 | - if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | - $new_class .= 'sidebar-'; |
|
| 108 | - } |
|
| 109 | - $new_class .= 'content'; |
|
| 110 | - if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | - $new_class .= '-sidebar'; |
|
| 112 | - } |
|
| 113 | - } elseif (geodir_is_page('detail')) { |
|
| 114 | - $remove_class = true; |
|
| 115 | - if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | - $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | - } else { |
|
| 118 | - $new_class .= 'content-sidebar'; |
|
| 119 | - } |
|
| 120 | - } elseif (geodir_is_page('search')) { |
|
| 121 | - $remove_class = true; |
|
| 122 | - if (get_option('geodir_show_search_left_section')) { |
|
| 123 | - $new_class .= 'sidebar-'; |
|
| 124 | - } |
|
| 125 | - $new_class .= 'content'; |
|
| 126 | - if (get_option('geodir_show_search_right_section')) { |
|
| 127 | - $new_class .= '-sidebar'; |
|
| 128 | - } |
|
| 129 | - } elseif (geodir_is_page('author')) { |
|
| 130 | - $remove_class = true; |
|
| 131 | - if (get_option('geodir_show_author_left_section')) { |
|
| 132 | - $new_class .= 'sidebar-'; |
|
| 133 | - } |
|
| 134 | - $new_class .= 'content'; |
|
| 135 | - if (get_option('geodir_show_author_right_section')) { |
|
| 136 | - $new_class .= '-sidebar'; |
|
| 137 | - } |
|
| 138 | - } elseif (geodir_is_page('add-listing')) { |
|
| 139 | - $remove_class = true; |
|
| 140 | - $new_class .= 'content-sidebar'; |
|
| 141 | - } |
|
| 142 | - |
|
| 143 | - if ($remove_class) { |
|
| 144 | - $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | - //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes); |
|
| 146 | - $classes[] = $new_class; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - return $classes; |
|
| 91 | + $remove_class = false; |
|
| 92 | + $new_class = ''; |
|
| 93 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 94 | + $remove_class = true; |
|
| 95 | + if (get_option('geodir_show_home_left_section')) { |
|
| 96 | + $new_class .= 'sidebar-'; |
|
| 97 | + } |
|
| 98 | + if (get_option('geodir_show_home_contant_section')) { |
|
| 99 | + $new_class .= 'content'; |
|
| 100 | + } |
|
| 101 | + if (get_option('geodir_show_home_right_section')) { |
|
| 102 | + $new_class .= '-sidebar'; |
|
| 103 | + } |
|
| 104 | + } elseif (geodir_is_page('listing')) { |
|
| 105 | + $remove_class = true; |
|
| 106 | + if (get_option('geodir_show_listing_left_section')) { |
|
| 107 | + $new_class .= 'sidebar-'; |
|
| 108 | + } |
|
| 109 | + $new_class .= 'content'; |
|
| 110 | + if (get_option('geodir_show_listing_right_section')) { |
|
| 111 | + $new_class .= '-sidebar'; |
|
| 112 | + } |
|
| 113 | + } elseif (geodir_is_page('detail')) { |
|
| 114 | + $remove_class = true; |
|
| 115 | + if (get_option('geodir_detail_sidebar_left_section')) { |
|
| 116 | + $new_class .= 'sidebar-content gd-details-sidebar-left'; |
|
| 117 | + } else { |
|
| 118 | + $new_class .= 'content-sidebar'; |
|
| 119 | + } |
|
| 120 | + } elseif (geodir_is_page('search')) { |
|
| 121 | + $remove_class = true; |
|
| 122 | + if (get_option('geodir_show_search_left_section')) { |
|
| 123 | + $new_class .= 'sidebar-'; |
|
| 124 | + } |
|
| 125 | + $new_class .= 'content'; |
|
| 126 | + if (get_option('geodir_show_search_right_section')) { |
|
| 127 | + $new_class .= '-sidebar'; |
|
| 128 | + } |
|
| 129 | + } elseif (geodir_is_page('author')) { |
|
| 130 | + $remove_class = true; |
|
| 131 | + if (get_option('geodir_show_author_left_section')) { |
|
| 132 | + $new_class .= 'sidebar-'; |
|
| 133 | + } |
|
| 134 | + $new_class .= 'content'; |
|
| 135 | + if (get_option('geodir_show_author_right_section')) { |
|
| 136 | + $new_class .= '-sidebar'; |
|
| 137 | + } |
|
| 138 | + } elseif (geodir_is_page('add-listing')) { |
|
| 139 | + $remove_class = true; |
|
| 140 | + $new_class .= 'content-sidebar'; |
|
| 141 | + } |
|
| 142 | + |
|
| 143 | + if ($remove_class) { |
|
| 144 | + $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content')); |
|
| 145 | + //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes); |
|
| 146 | + $classes[] = $new_class; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + return $classes; |
|
| 150 | 150 | |
| 151 | 151 | } |
| 152 | 152 | |
@@ -160,17 +160,17 @@ discard block |
||
| 160 | 160 | function gd_genesis_compat_add_top_section_back() |
| 161 | 161 | { |
| 162 | 162 | |
| 163 | - if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 164 | - geodir_action_geodir_sidebar_home_top(); |
|
| 165 | - } elseif (geodir_is_page('listing')) { |
|
| 166 | - geodir_action_geodir_sidebar_listings_top(); |
|
| 167 | - } elseif (geodir_is_page('detail')) { |
|
| 168 | - geodir_action_geodir_sidebar_detail_top(); |
|
| 169 | - } elseif (geodir_is_page('search')) { |
|
| 170 | - geodir_action_geodir_sidebar_search_top(); |
|
| 171 | - } elseif (geodir_is_page('author')) { |
|
| 172 | - geodir_action_geodir_sidebar_author_top(); |
|
| 173 | - } |
|
| 163 | + if (is_page_geodir_home() || geodir_is_page('location')) { |
|
| 164 | + geodir_action_geodir_sidebar_home_top(); |
|
| 165 | + } elseif (geodir_is_page('listing')) { |
|
| 166 | + geodir_action_geodir_sidebar_listings_top(); |
|
| 167 | + } elseif (geodir_is_page('detail')) { |
|
| 168 | + geodir_action_geodir_sidebar_detail_top(); |
|
| 169 | + } elseif (geodir_is_page('search')) { |
|
| 170 | + geodir_action_geodir_sidebar_search_top(); |
|
| 171 | + } elseif (geodir_is_page('author')) { |
|
| 172 | + geodir_action_geodir_sidebar_author_top(); |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | } |
@@ -183,12 +183,12 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | function geodir_replace_breadcrumb() |
| 185 | 185 | { |
| 186 | - if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 187 | - } else { |
|
| 188 | - echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 189 | - geodir_breadcrumb(); |
|
| 190 | - echo '</div></div>'; |
|
| 191 | - } |
|
| 186 | + if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) { |
|
| 187 | + } else { |
|
| 188 | + echo '<div class="geodir-breadcrumb-bar"><div class="wrap">'; |
|
| 189 | + geodir_breadcrumb(); |
|
| 190 | + echo '</div></div>'; |
|
| 191 | + } |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | // Force Full Width on signup page |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | */ |
| 202 | 202 | function geodir_genesis_meta() |
| 203 | 203 | { |
| 204 | - if (geodir_is_page('login')) { |
|
| 205 | - add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 206 | - } |
|
| 204 | + if (geodir_is_page('login')) { |
|
| 205 | + add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content'); |
|
| 206 | + } |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | function geodir_add_listing_page_title_genesis_before() |
| 217 | 217 | { |
| 218 | 218 | |
| 219 | - echo "<div class='entry' >"; |
|
| 219 | + echo "<div class='entry' >"; |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | function geodir_add_listing_form_genesis_after() |
| 231 | 231 | { |
| 232 | 232 | |
| 233 | - echo "</div>"; |
|
| 233 | + echo "</div>"; |
|
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | |
@@ -249,38 +249,38 @@ discard block |
||
| 249 | 249 | { |
| 250 | 250 | |
| 251 | 251 | |
| 252 | - $title = ''; |
|
| 253 | - $subtitle = ''; |
|
| 254 | - |
|
| 255 | - if (geodir_is_page('listing')) { |
|
| 256 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 257 | - geodir_action_listings_title(); |
|
| 258 | - echo '</div>'; |
|
| 259 | - } |
|
| 260 | - |
|
| 261 | - if (geodir_is_page('add-listing')) { |
|
| 262 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 263 | - geodir_action_add_listing_page_title(); |
|
| 264 | - echo '</div>'; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - if (geodir_is_page('author')) { |
|
| 268 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 269 | - geodir_action_author_page_title(); |
|
| 270 | - echo '</div>'; |
|
| 271 | - } |
|
| 272 | - |
|
| 273 | - if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 274 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 275 | - echo get_the_title(); |
|
| 276 | - echo '</div>'; |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - if (geodir_is_page('search')) { |
|
| 280 | - echo '<div class="wrap gd-title-wrap">'; |
|
| 281 | - geodir_action_search_page_title(); |
|
| 282 | - echo '</div>'; |
|
| 283 | - } |
|
| 252 | + $title = ''; |
|
| 253 | + $subtitle = ''; |
|
| 254 | + |
|
| 255 | + if (geodir_is_page('listing')) { |
|
| 256 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 257 | + geodir_action_listings_title(); |
|
| 258 | + echo '</div>'; |
|
| 259 | + } |
|
| 260 | + |
|
| 261 | + if (geodir_is_page('add-listing')) { |
|
| 262 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 263 | + geodir_action_add_listing_page_title(); |
|
| 264 | + echo '</div>'; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + if (geodir_is_page('author')) { |
|
| 268 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 269 | + geodir_action_author_page_title(); |
|
| 270 | + echo '</div>'; |
|
| 271 | + } |
|
| 272 | + |
|
| 273 | + if (geodir_is_page('detail') || geodir_is_page('preview')) { |
|
| 274 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 275 | + echo get_the_title(); |
|
| 276 | + echo '</div>'; |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + if (geodir_is_page('search')) { |
|
| 280 | + echo '<div class="wrap gd-title-wrap">'; |
|
| 281 | + geodir_action_search_page_title(); |
|
| 282 | + echo '</div>'; |
|
| 283 | + } |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | */ |
| 294 | 294 | function gd_genesis_listing_page_title_bar() |
| 295 | 295 | { |
| 296 | - geodir_action_listings_title(); |
|
| 297 | - //geodir_action_listings_description(); |
|
| 296 | + geodir_action_listings_title(); |
|
| 297 | + //geodir_action_listings_description(); |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | |
@@ -307,19 +307,19 @@ discard block |
||
| 307 | 307 | */ |
| 308 | 308 | function gd_compat_php_genesis_geo_1280_fix() |
| 309 | 309 | { |
| 310 | - if (function_exists('geo1280_search_bar')) { |
|
| 311 | - remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 312 | - add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 310 | + if (function_exists('geo1280_search_bar')) { |
|
| 311 | + remove_action('genesis_after_header', 'geo1280_search_bar', 20); |
|
| 312 | + add_action('genesis_after_header', 'geo1280_search_bar_fix', 4); |
|
| 313 | 313 | |
| 314 | - // |
|
| 314 | + // |
|
| 315 | 315 | |
| 316 | - remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 317 | - remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 318 | - add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 316 | + remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20); |
|
| 317 | + remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20); |
|
| 318 | + add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105); |
|
| 319 | 319 | |
| 320 | - remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 321 | - add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 322 | - } |
|
| 320 | + remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10); |
|
| 321 | + add_action('geodir_wrapper_open', 'geo1280_page_title', 101); |
|
| 322 | + } |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | /** |
@@ -331,11 +331,11 @@ discard block |
||
| 331 | 331 | function geo1280_search_bar_fix() |
| 332 | 332 | { |
| 333 | 333 | |
| 334 | - echo '<div class="geo1280-placeholder"></div>'; |
|
| 335 | - if (is_active_sidebar('search-bar')) { |
|
| 336 | - genesis_widget_area('search-bar', array( |
|
| 337 | - 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 338 | - 'after' => '</div></div>', |
|
| 339 | - )); |
|
| 340 | - } |
|
| 334 | + echo '<div class="geo1280-placeholder"></div>'; |
|
| 335 | + if (is_active_sidebar('search-bar')) { |
|
| 336 | + genesis_widget_area('search-bar', array( |
|
| 337 | + 'before' => '<div class="search-bar widget-area"><div class="wrap">', |
|
| 338 | + 'after' => '</div></div>', |
|
| 339 | + )); |
|
| 340 | + } |
|
| 341 | 341 | } |
@@ -12,27 +12,27 @@ |
||
| 12 | 12 | <div class="clearfix"> |
| 13 | 13 | <div id="geodir_content"> |
| 14 | 14 | <?php |
| 15 | - /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 16 | - do_action('geodir_add_page_content', 'before', 'info-page'); |
|
| 17 | - global $information; |
|
| 18 | - echo '<h5 class="geodir_information">'; |
|
| 19 | - echo $information; |
|
| 20 | - echo '</h5>'; |
|
| 21 | - /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 22 | - do_action('geodir_add_page_content', 'after', 'info-page'); |
|
| 23 | - ?> |
|
| 15 | + /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 16 | + do_action('geodir_add_page_content', 'before', 'info-page'); |
|
| 17 | + global $information; |
|
| 18 | + echo '<h5 class="geodir_information">'; |
|
| 19 | + echo $information; |
|
| 20 | + echo '</h5>'; |
|
| 21 | + /** This action is documented in geodirectory-templates/geodir-home.php */ |
|
| 22 | + do_action('geodir_add_page_content', 'after', 'info-page'); |
|
| 23 | + ?> |
|
| 24 | 24 | </div> |
| 25 | 25 | <!-- geodir_content ends here--> |
| 26 | 26 | <div id="gd-sidebar-wrapper"> |
| 27 | 27 | <div class="geodir-sidebar-main"> |
| 28 | 28 | <div class="geodir-gd-sidebar"> |
| 29 | 29 | <?php |
| 30 | - /** |
|
| 31 | - * Calls the author sidebar. |
|
| 32 | - * |
|
| 33 | - * @since 1.6.11 |
|
| 34 | - */ |
|
| 35 | - dynamic_sidebar('geodir_author_right_sidebar'); ?> |
|
| 30 | + /** |
|
| 31 | + * Calls the author sidebar. |
|
| 32 | + * |
|
| 33 | + * @since 1.6.11 |
|
| 34 | + */ |
|
| 35 | + dynamic_sidebar('geodir_author_right_sidebar'); ?> |
|
| 36 | 36 | </div> |
| 37 | 37 | </div> |
| 38 | 38 | </div> |
@@ -223,6 +223,9 @@ |
||
| 223 | 223 | * @param filter - the property to filter on |
| 224 | 224 | * @param limit - the number of items to get |
| 225 | 225 | * @param realtime - if the realtime api should be used |
| 226 | + * @param string $metric |
|
| 227 | + * @param string $startDate |
|
| 228 | + * @param string $endDate |
|
| 226 | 229 | * @return the specific metrics in array form |
| 227 | 230 | **/ |
| 228 | 231 | function getMetrics($metric, $startDate, $endDate, $dimensions = false, $sort = false, $filter = false, $limit = false, $realtime = false) |
@@ -30,135 +30,135 @@ discard block |
||
| 30 | 30 | // Include the Google Service API |
| 31 | 31 | include_once('google-api-php-client/src/Google/autoload.php'); |
| 32 | 32 | |
| 33 | - $this->client = new Google_Client(); |
|
| 34 | - $this->client->setApprovalPrompt("force"); |
|
| 35 | - $this->client->setAccessType('offline'); |
|
| 36 | - $this->client->setClientId(GEODIR_GA_CLIENTID); |
|
| 37 | - $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET); |
|
| 38 | - $this->client->setRedirectUri(GEODIR_GA_REDIRECT); |
|
| 33 | + $this->client = new Google_Client(); |
|
| 34 | + $this->client->setApprovalPrompt("force"); |
|
| 35 | + $this->client->setAccessType('offline'); |
|
| 36 | + $this->client->setClientId(GEODIR_GA_CLIENTID); |
|
| 37 | + $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET); |
|
| 38 | + $this->client->setRedirectUri(GEODIR_GA_REDIRECT); |
|
| 39 | 39 | |
| 40 | - $this->client->setScopes(array("https://www.googleapis.com/auth/analytics")); |
|
| 41 | - |
|
| 42 | - try { |
|
| 43 | - $this->analytics = new Google_Service_Analytics($this->client); |
|
| 44 | - } |
|
| 45 | - catch (Google_ServiceException $e) |
|
| 46 | - { |
|
| 47 | - print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 40 | + $this->client->setScopes(array("https://www.googleapis.com/auth/analytics")); |
|
| 41 | + |
|
| 42 | + try { |
|
| 43 | + $this->analytics = new Google_Service_Analytics($this->client); |
|
| 44 | + } |
|
| 45 | + catch (Google_ServiceException $e) |
|
| 46 | + { |
|
| 47 | + print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 48 | 48 | return false; |
| 49 | - } |
|
| 49 | + } |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | function checkLogin() |
| 53 | 53 | { |
| 54 | - $ga_google_authtoken = get_option('geodir_ga_auth_token'); |
|
| 54 | + $ga_google_authtoken = get_option('geodir_ga_auth_token'); |
|
| 55 | 55 | |
| 56 | - if (!empty($ga_google_authtoken)) |
|
| 57 | - { |
|
| 56 | + if (!empty($ga_google_authtoken)) |
|
| 57 | + { |
|
| 58 | 58 | try |
| 59 | - { |
|
| 60 | - $this->client->setAccessToken($ga_google_authtoken); |
|
| 59 | + { |
|
| 60 | + $this->client->setAccessToken($ga_google_authtoken); |
|
| 61 | 61 | } |
| 62 | 62 | catch( Google_AuthException $e ) |
| 63 | - { |
|
| 64 | - print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 63 | + { |
|
| 64 | + print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 65 | 65 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 66 | 66 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 67 | 67 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 68 | 68 | <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
| 69 | 69 | |
| 70 | - return false; |
|
| 71 | - } |
|
| 72 | - } |
|
| 73 | - else |
|
| 74 | - { |
|
| 75 | - $authCode = get_option('geodir_ga_auth_code'); |
|
| 76 | - |
|
| 77 | - if (empty($authCode)) return false; |
|
| 78 | - |
|
| 79 | - try |
|
| 80 | - { |
|
| 81 | - $accessToken = $this->client->authenticate($authCode); |
|
| 82 | - } |
|
| 83 | - catch( Exception $e ) |
|
| 84 | - { |
|
| 85 | - print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 72 | + } |
|
| 73 | + else |
|
| 74 | + { |
|
| 75 | + $authCode = get_option('geodir_ga_auth_code'); |
|
| 76 | + |
|
| 77 | + if (empty($authCode)) return false; |
|
| 78 | + |
|
| 79 | + try |
|
| 80 | + { |
|
| 81 | + $accessToken = $this->client->authenticate($authCode); |
|
| 82 | + } |
|
| 83 | + catch( Exception $e ) |
|
| 84 | + { |
|
| 85 | + print '(cas:72) GeoDirectory was unable to authenticate you with |
|
| 86 | 86 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 87 | 87 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 88 | 88 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 89 | 89 | <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
| 90 | 90 | |
| 91 | - return false; |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - if($accessToken) |
|
| 95 | - { |
|
| 96 | - $this->client->setAccessToken($accessToken); |
|
| 97 | - update_option('geodir_ga_auth_token', $accessToken); |
|
| 98 | - } |
|
| 99 | - else |
|
| 100 | - { |
|
| 101 | - return false; |
|
| 102 | - } |
|
| 103 | - } |
|
| 104 | - |
|
| 105 | - $this->token = $this->client->getAccessToken(); |
|
| 106 | - return true; |
|
| 91 | + return false; |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + if($accessToken) |
|
| 95 | + { |
|
| 96 | + $this->client->setAccessToken($accessToken); |
|
| 97 | + update_option('geodir_ga_auth_token', $accessToken); |
|
| 98 | + } |
|
| 99 | + else |
|
| 100 | + { |
|
| 101 | + return false; |
|
| 102 | + } |
|
| 103 | + } |
|
| 104 | + |
|
| 105 | + $this->token = $this->client->getAccessToken(); |
|
| 106 | + return true; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | function deauthorize() |
| 110 | 110 | { |
| 111 | - update_option('geodir_ga_auth_code', ''); |
|
| 112 | - update_option('geodir_ga_auth_token', ''); |
|
| 111 | + update_option('geodir_ga_auth_code', ''); |
|
| 112 | + update_option('geodir_ga_auth_token', ''); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | function getSingleProfile() |
| 116 | 116 | { |
| 117 | - $webproperty_id = get_option('geodir_ga_account_id'); |
|
| 118 | - list($pre, $account_id, $post) = explode('-',$webproperty_id); |
|
| 119 | - |
|
| 120 | - if (empty($webproperty_id)) return false; |
|
| 121 | - |
|
| 122 | - try { |
|
| 123 | - $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id); |
|
| 124 | - } |
|
| 125 | - catch (Google_ServiceException $e) |
|
| 126 | - { |
|
| 127 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 128 | - return false; |
|
| 129 | - } |
|
| 130 | - |
|
| 131 | - $profile_id = $profiles->items[0]->id; |
|
| 132 | - if (empty($profile_id)) return false; |
|
| 133 | - |
|
| 134 | - $account_array = array(); |
|
| 135 | - array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id)); |
|
| 136 | - return $account_array; |
|
| 117 | + $webproperty_id = get_option('geodir_ga_account_id'); |
|
| 118 | + list($pre, $account_id, $post) = explode('-',$webproperty_id); |
|
| 119 | + |
|
| 120 | + if (empty($webproperty_id)) return false; |
|
| 121 | + |
|
| 122 | + try { |
|
| 123 | + $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id); |
|
| 124 | + } |
|
| 125 | + catch (Google_ServiceException $e) |
|
| 126 | + { |
|
| 127 | + print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 128 | + return false; |
|
| 129 | + } |
|
| 130 | + |
|
| 131 | + $profile_id = $profiles->items[0]->id; |
|
| 132 | + if (empty($profile_id)) return false; |
|
| 133 | + |
|
| 134 | + $account_array = array(); |
|
| 135 | + array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id)); |
|
| 136 | + return $account_array; |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - function getAllProfiles() |
|
| 140 | - { |
|
| 141 | - $profile_array = array(); |
|
| 139 | + function getAllProfiles() |
|
| 140 | + { |
|
| 141 | + $profile_array = array(); |
|
| 142 | 142 | |
| 143 | - try { |
|
| 144 | - $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all'); |
|
| 145 | - } |
|
| 146 | - catch (Google_ServiceException $e) |
|
| 147 | - { |
|
| 148 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 149 | - } |
|
| 150 | - |
|
| 151 | - |
|
| 152 | - if( !empty( $profiles->items ) ) |
|
| 153 | - { |
|
| 154 | - foreach( $profiles->items as $profile ) |
|
| 155 | - { |
|
| 156 | - $profile_array[ $profile->id ] = str_replace('http://','',$profile->name ); |
|
| 157 | - } |
|
| 158 | - } |
|
| 159 | - |
|
| 160 | - return $profile_array; |
|
| 161 | - } |
|
| 143 | + try { |
|
| 144 | + $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all'); |
|
| 145 | + } |
|
| 146 | + catch (Google_ServiceException $e) |
|
| 147 | + { |
|
| 148 | + print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + |
|
| 152 | + if( !empty( $profiles->items ) ) |
|
| 153 | + { |
|
| 154 | + foreach( $profiles->items as $profile ) |
|
| 155 | + { |
|
| 156 | + $profile_array[ $profile->id ] = str_replace('http://','',$profile->name ); |
|
| 157 | + } |
|
| 158 | + } |
|
| 159 | + |
|
| 160 | + return $profile_array; |
|
| 161 | + } |
|
| 162 | 162 | |
| 163 | 163 | function getAnalyticsAccounts() |
| 164 | 164 | { |
@@ -241,13 +241,13 @@ discard block |
||
| 241 | 241 | $params['max-results'] = $limit; |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | - // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking |
|
| 245 | - $filtered_id = str_replace( 'ga:', '', $this->accountId ); |
|
| 244 | + // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking |
|
| 245 | + $filtered_id = str_replace( 'ga:', '', $this->accountId ); |
|
| 246 | 246 | |
| 247 | - if(!$filtered_id){ |
|
| 248 | - echo 'Error - Account ID is blank'; |
|
| 249 | - return false; |
|
| 250 | - } |
|
| 247 | + if(!$filtered_id){ |
|
| 248 | + echo 'Error - Account ID is blank'; |
|
| 249 | + return false; |
|
| 250 | + } |
|
| 251 | 251 | |
| 252 | 252 | if($realtime){ |
| 253 | 253 | return $analytics->data_realtime->get( |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | catch (Google_ServiceException $e) |
| 46 | 46 | { |
| 47 | - print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 47 | + print '(cas:48) There was an Analytics API service error '.$e->getCode().':'.$e->getMessage(); |
|
| 48 | 48 | return false; |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -59,13 +59,13 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | $this->client->setAccessToken($ga_google_authtoken); |
| 61 | 61 | } |
| 62 | - catch( Google_AuthException $e ) |
|
| 62 | + catch (Google_AuthException $e) |
|
| 63 | 63 | { |
| 64 | 64 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 65 | 65 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 66 | 66 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 67 | 67 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 68 | - <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 68 | + <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage(); |
|
| 69 | 69 | |
| 70 | 70 | return false; |
| 71 | 71 | } |
@@ -80,18 +80,18 @@ discard block |
||
| 80 | 80 | { |
| 81 | 81 | $accessToken = $this->client->authenticate($authCode); |
| 82 | 82 | } |
| 83 | - catch( Exception $e ) |
|
| 83 | + catch (Exception $e) |
|
| 84 | 84 | { |
| 85 | 85 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 86 | 86 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
| 87 | 87 | This could mean either you pasted the token wrong, or the time/date on your server is wrong, |
| 88 | 88 | or an SSL issue preventing Google from Authenticating. <br><br> |
| 89 | - <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 89 | + <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage(); |
|
| 90 | 90 | |
| 91 | 91 | return false; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - if($accessToken) |
|
| 94 | + if ($accessToken) |
|
| 95 | 95 | { |
| 96 | 96 | $this->client->setAccessToken($accessToken); |
| 97 | 97 | update_option('geodir_ga_auth_token', $accessToken); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $this->token = $this->client->getAccessToken(); |
|
| 105 | + $this->token = $this->client->getAccessToken(); |
|
| 106 | 106 | return true; |
| 107 | 107 | } |
| 108 | 108 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | function getSingleProfile() |
| 116 | 116 | { |
| 117 | 117 | $webproperty_id = get_option('geodir_ga_account_id'); |
| 118 | - list($pre, $account_id, $post) = explode('-',$webproperty_id); |
|
| 118 | + list($pre, $account_id, $post) = explode('-', $webproperty_id); |
|
| 119 | 119 | |
| 120 | 120 | if (empty($webproperty_id)) return false; |
| 121 | 121 | |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | catch (Google_ServiceException $e) |
| 126 | 126 | { |
| 127 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 127 | + print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage(); |
|
| 128 | 128 | return false; |
| 129 | 129 | } |
| 130 | 130 | |
@@ -145,15 +145,15 @@ discard block |
||
| 145 | 145 | } |
| 146 | 146 | catch (Google_ServiceException $e) |
| 147 | 147 | { |
| 148 | - print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
|
| 148 | + print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage(); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | |
| 152 | - if( !empty( $profiles->items ) ) |
|
| 152 | + if (!empty($profiles->items)) |
|
| 153 | 153 | { |
| 154 | - foreach( $profiles->items as $profile ) |
|
| 154 | + foreach ($profiles->items as $profile) |
|
| 155 | 155 | { |
| 156 | - $profile_array[ $profile->id ] = str_replace('http://','',$profile->name ); |
|
| 156 | + $profile_array[$profile->id] = str_replace('http://', '', $profile->name); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
@@ -242,20 +242,20 @@ discard block |
||
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking |
| 245 | - $filtered_id = str_replace( 'ga:', '', $this->accountId ); |
|
| 245 | + $filtered_id = str_replace('ga:', '', $this->accountId); |
|
| 246 | 246 | |
| 247 | - if(!$filtered_id){ |
|
| 247 | + if (!$filtered_id) { |
|
| 248 | 248 | echo 'Error - Account ID is blank'; |
| 249 | 249 | return false; |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - if($realtime){ |
|
| 252 | + if ($realtime) { |
|
| 253 | 253 | return $analytics->data_realtime->get( |
| 254 | 254 | 'ga:'.$filtered_id, |
| 255 | 255 | $metric, |
| 256 | 256 | $params |
| 257 | 257 | ); |
| 258 | - }else{ |
|
| 258 | + } else { |
|
| 259 | 259 | return $analytics->data_ga->get( |
| 260 | 260 | 'ga:'.$filtered_id, |
| 261 | 261 | $startDate, |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | **/ |
| 280 | 280 | function verifyStartDate($date) |
| 281 | 281 | { |
| 282 | - if ( strtotime($date) > strtotime('2005-01-01') ) |
|
| 282 | + if (strtotime($date) > strtotime('2005-01-01')) |
|
| 283 | 283 | return $date; |
| 284 | 284 | else |
| 285 | 285 | return '2005-01-01'; |
@@ -41,8 +41,7 @@ discard block |
||
| 41 | 41 | |
| 42 | 42 | try { |
| 43 | 43 | $this->analytics = new Google_Service_Analytics($this->client); |
| 44 | - } |
|
| 45 | - catch (Google_ServiceException $e) |
|
| 44 | + } catch (Google_ServiceException $e) |
|
| 46 | 45 | { |
| 47 | 46 | print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage(); |
| 48 | 47 | return false; |
@@ -58,8 +57,7 @@ discard block |
||
| 58 | 57 | try |
| 59 | 58 | { |
| 60 | 59 | $this->client->setAccessToken($ga_google_authtoken); |
| 61 | - } |
|
| 62 | - catch( Google_AuthException $e ) |
|
| 60 | + } catch( Google_AuthException $e ) |
|
| 63 | 61 | { |
| 64 | 62 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 65 | 63 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
@@ -69,18 +67,18 @@ discard block |
||
| 69 | 67 | |
| 70 | 68 | return false; |
| 71 | 69 | } |
| 72 | - } |
|
| 73 | - else |
|
| 70 | + } else |
|
| 74 | 71 | { |
| 75 | 72 | $authCode = get_option('geodir_ga_auth_code'); |
| 76 | 73 | |
| 77 | - if (empty($authCode)) return false; |
|
| 74 | + if (empty($authCode)) { |
|
| 75 | + return false; |
|
| 76 | + } |
|
| 78 | 77 | |
| 79 | 78 | try |
| 80 | 79 | { |
| 81 | 80 | $accessToken = $this->client->authenticate($authCode); |
| 82 | - } |
|
| 83 | - catch( Exception $e ) |
|
| 81 | + } catch( Exception $e ) |
|
| 84 | 82 | { |
| 85 | 83 | print '(cas:72) GeoDirectory was unable to authenticate you with |
| 86 | 84 | Google using the Auth Token you pasted into the input box on the previous step. <br><br> |
@@ -95,8 +93,7 @@ discard block |
||
| 95 | 93 | { |
| 96 | 94 | $this->client->setAccessToken($accessToken); |
| 97 | 95 | update_option('geodir_ga_auth_token', $accessToken); |
| 98 | - } |
|
| 99 | - else |
|
| 96 | + } else |
|
| 100 | 97 | { |
| 101 | 98 | return false; |
| 102 | 99 | } |
@@ -117,19 +114,22 @@ discard block |
||
| 117 | 114 | $webproperty_id = get_option('geodir_ga_account_id'); |
| 118 | 115 | list($pre, $account_id, $post) = explode('-',$webproperty_id); |
| 119 | 116 | |
| 120 | - if (empty($webproperty_id)) return false; |
|
| 117 | + if (empty($webproperty_id)) { |
|
| 118 | + return false; |
|
| 119 | + } |
|
| 121 | 120 | |
| 122 | 121 | try { |
| 123 | 122 | $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id); |
| 124 | - } |
|
| 125 | - catch (Google_ServiceException $e) |
|
| 123 | + } catch (Google_ServiceException $e) |
|
| 126 | 124 | { |
| 127 | 125 | print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
| 128 | 126 | return false; |
| 129 | 127 | } |
| 130 | 128 | |
| 131 | 129 | $profile_id = $profiles->items[0]->id; |
| 132 | - if (empty($profile_id)) return false; |
|
| 130 | + if (empty($profile_id)) { |
|
| 131 | + return false; |
|
| 132 | + } |
|
| 133 | 133 | |
| 134 | 134 | $account_array = array(); |
| 135 | 135 | array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id)); |
@@ -142,8 +142,7 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | try { |
| 144 | 144 | $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all'); |
| 145 | - } |
|
| 146 | - catch (Google_ServiceException $e) |
|
| 145 | + } catch (Google_ServiceException $e) |
|
| 147 | 146 | { |
| 148 | 147 | print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage(); |
| 149 | 148 | } |
@@ -255,7 +254,7 @@ discard block |
||
| 255 | 254 | $metric, |
| 256 | 255 | $params |
| 257 | 256 | ); |
| 258 | - }else{ |
|
| 257 | + } else{ |
|
| 259 | 258 | return $analytics->data_ga->get( |
| 260 | 259 | 'ga:'.$filtered_id, |
| 261 | 260 | $startDate, |
@@ -279,10 +278,11 @@ discard block |
||
| 279 | 278 | **/ |
| 280 | 279 | function verifyStartDate($date) |
| 281 | 280 | { |
| 282 | - if ( strtotime($date) > strtotime('2005-01-01') ) |
|
| 283 | - return $date; |
|
| 284 | - else |
|
| 285 | - return '2005-01-01'; |
|
| 281 | + if ( strtotime($date) > strtotime('2005-01-01') ) { |
|
| 282 | + return $date; |
|
| 283 | + } else { |
|
| 284 | + return '2005-01-01'; |
|
| 285 | + } |
|
| 286 | 286 | } |
| 287 | 287 | |
| 288 | 288 | } // END class |
| 289 | 289 | \ No newline at end of file |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | * @param string $page Page url to use in analytics filters. |
| 56 | 56 | * @param bool $ga_start The start date of the data to include in YYYY-MM-DD format. |
| 57 | 57 | * @param bool $ga_end The end date of the data to include in YYYY-MM-DD format. |
| 58 | - * @return string Html text content. |
|
| 58 | + * @return false|null Html text content. |
|
| 59 | 59 | */ |
| 60 | 60 | function geodir_getGoogleAnalytics($page, $ga_start, $ga_end) |
| 61 | 61 | {
|
@@ -17,34 +17,34 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | function geodir_sec2hms($sec, $padHours = false) |
| 19 | 19 | {
|
| 20 | - // holds formatted string |
|
| 21 | - $hms = ""; |
|
| 22 | - // there are 3600 seconds in an hour, so if we |
|
| 23 | - // divide total seconds by 3600 and throw away |
|
| 24 | - // the remainder, we've got the number of hours |
|
| 25 | - $hours = intval(intval($sec) / 3600); |
|
| 26 | - |
|
| 27 | - // add to $hms, with a leading 0 if asked for |
|
| 28 | - $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':'; |
|
| 29 | - |
|
| 30 | - // dividing the total seconds by 60 will give us |
|
| 31 | - // the number of minutes, but we're interested in |
|
| 32 | - // minutes past the hour: to get that, we need to |
|
| 33 | - // divide by 60 again and keep the remainder |
|
| 34 | - $minutes = intval(($sec / 60) % 60); |
|
| 35 | - |
|
| 36 | - // then add to $hms (with a leading 0 if needed) |
|
| 37 | - $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':'; |
|
| 38 | - |
|
| 39 | - // seconds are simple - just divide the total |
|
| 40 | - // seconds by 60 and keep the remainder |
|
| 41 | - $seconds = intval($sec % 60); |
|
| 42 | - |
|
| 43 | - // add to $hms, again with a leading 0 if needed |
|
| 44 | - $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT); |
|
| 45 | - |
|
| 46 | - // done! |
|
| 47 | - return $hms; |
|
| 20 | + // holds formatted string |
|
| 21 | + $hms = ""; |
|
| 22 | + // there are 3600 seconds in an hour, so if we |
|
| 23 | + // divide total seconds by 3600 and throw away |
|
| 24 | + // the remainder, we've got the number of hours |
|
| 25 | + $hours = intval(intval($sec) / 3600); |
|
| 26 | + |
|
| 27 | + // add to $hms, with a leading 0 if asked for |
|
| 28 | + $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':'; |
|
| 29 | + |
|
| 30 | + // dividing the total seconds by 60 will give us |
|
| 31 | + // the number of minutes, but we're interested in |
|
| 32 | + // minutes past the hour: to get that, we need to |
|
| 33 | + // divide by 60 again and keep the remainder |
|
| 34 | + $minutes = intval(($sec / 60) % 60); |
|
| 35 | + |
|
| 36 | + // then add to $hms (with a leading 0 if needed) |
|
| 37 | + $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':'; |
|
| 38 | + |
|
| 39 | + // seconds are simple - just divide the total |
|
| 40 | + // seconds by 60 and keep the remainder |
|
| 41 | + $seconds = intval($sec % 60); |
|
| 42 | + |
|
| 43 | + // add to $hms, again with a leading 0 if needed |
|
| 44 | + $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT); |
|
| 45 | + |
|
| 46 | + // done! |
|
| 47 | + return $hms; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -60,122 +60,122 @@ discard block |
||
| 60 | 60 | function geodir_getGoogleAnalytics($page, $ga_start, $ga_end) |
| 61 | 61 | {
|
| 62 | 62 | |
| 63 | - // NEW ANALYTICS |
|
| 64 | - |
|
| 65 | - $start_date = ''; |
|
| 66 | - $end_date = ''; |
|
| 67 | - $dimensions = ''; |
|
| 68 | - $sort = ''; |
|
| 69 | - $filters = "ga:pagePath==".$page; |
|
| 70 | - $metrics = "ga:pageviews"; |
|
| 71 | - $realtime = false; |
|
| 72 | - $limit = false; |
|
| 73 | - if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
|
|
| 74 | - $start_date = date('Y-m-d', strtotime("-6 day"));
|
|
| 75 | - $end_date = date('Y-m-d');
|
|
| 76 | - $dimensions = "ga:date,ga:nthDay"; |
|
| 77 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 78 | - $start_date = date('Y-m-d', strtotime("-13 day"));
|
|
| 79 | - $end_date = date('Y-m-d', strtotime("-7 day"));
|
|
| 80 | - $dimensions = "ga:date,ga:nthDay"; |
|
| 81 | - } |
|
| 82 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 83 | - $start_date = date('Y')."-01-01";
|
|
| 84 | - $end_date = date('Y-m-d');
|
|
| 85 | - $dimensions = "ga:month,ga:nthMonth"; |
|
| 86 | - } |
|
| 87 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 88 | - $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
|
| 89 | - $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
|
| 90 | - $dimensions = "ga:month,ga:nthMonth"; |
|
| 91 | - } |
|
| 92 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 93 | - $start_date = "14daysAgo"; |
|
| 94 | - $end_date = "yesterday"; |
|
| 95 | - $dimensions = "ga:country"; |
|
| 96 | - $sort = "ga:pageviews"; |
|
| 97 | - $limit = 5; |
|
| 98 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 99 | - $metrics = "rt:activeUsers"; |
|
| 100 | - $realtime = true; |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - # Create a new Gdata call |
|
| 104 | - $gaApi = new GDGoogleAnalyticsStats(); |
|
| 105 | - |
|
| 106 | - # Check if Google sucessfully logged in |
|
| 107 | - if (!$gaApi->checkLogin()){
|
|
| 108 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 109 | - return false; |
|
| 110 | - } |
|
| 111 | - |
|
| 112 | - $account = $gaApi->getSingleProfile(); |
|
| 113 | - |
|
| 114 | - if(!isset($account[0]['id'])){
|
|
| 115 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 116 | - return false; |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - $account = $account[0]['id']; |
|
| 120 | - |
|
| 121 | - # Set the account to the one requested |
|
| 122 | - $gaApi->setAccount($account); |
|
| 123 | - |
|
| 124 | - |
|
| 125 | - |
|
| 126 | - # Get the metrics needed to build the visits graph; |
|
| 127 | - try {
|
|
| 128 | - $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
|
| 129 | - } |
|
| 130 | - catch (Exception $e) {
|
|
| 131 | - print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 132 | - } |
|
| 133 | - |
|
| 134 | - |
|
| 135 | - //print_r($stats); |
|
| 136 | - echo json_encode($stats); |
|
| 137 | - exit; |
|
| 63 | + // NEW ANALYTICS |
|
| 64 | + |
|
| 65 | + $start_date = ''; |
|
| 66 | + $end_date = ''; |
|
| 67 | + $dimensions = ''; |
|
| 68 | + $sort = ''; |
|
| 69 | + $filters = "ga:pagePath==".$page; |
|
| 70 | + $metrics = "ga:pageviews"; |
|
| 71 | + $realtime = false; |
|
| 72 | + $limit = false; |
|
| 73 | + if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
|
|
| 74 | + $start_date = date('Y-m-d', strtotime("-6 day"));
|
|
| 75 | + $end_date = date('Y-m-d');
|
|
| 76 | + $dimensions = "ga:date,ga:nthDay"; |
|
| 77 | + }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 78 | + $start_date = date('Y-m-d', strtotime("-13 day"));
|
|
| 79 | + $end_date = date('Y-m-d', strtotime("-7 day"));
|
|
| 80 | + $dimensions = "ga:date,ga:nthDay"; |
|
| 81 | + } |
|
| 82 | + elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 83 | + $start_date = date('Y')."-01-01";
|
|
| 84 | + $end_date = date('Y-m-d');
|
|
| 85 | + $dimensions = "ga:month,ga:nthMonth"; |
|
| 86 | + } |
|
| 87 | + elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 88 | + $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
|
| 89 | + $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
|
| 90 | + $dimensions = "ga:month,ga:nthMonth"; |
|
| 91 | + } |
|
| 92 | + elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 93 | + $start_date = "14daysAgo"; |
|
| 94 | + $end_date = "yesterday"; |
|
| 95 | + $dimensions = "ga:country"; |
|
| 96 | + $sort = "ga:pageviews"; |
|
| 97 | + $limit = 5; |
|
| 98 | + }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 99 | + $metrics = "rt:activeUsers"; |
|
| 100 | + $realtime = true; |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + # Create a new Gdata call |
|
| 104 | + $gaApi = new GDGoogleAnalyticsStats(); |
|
| 105 | + |
|
| 106 | + # Check if Google sucessfully logged in |
|
| 107 | + if (!$gaApi->checkLogin()){
|
|
| 108 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 109 | + return false; |
|
| 110 | + } |
|
| 111 | + |
|
| 112 | + $account = $gaApi->getSingleProfile(); |
|
| 113 | + |
|
| 114 | + if(!isset($account[0]['id'])){
|
|
| 115 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 116 | + return false; |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + $account = $account[0]['id']; |
|
| 120 | + |
|
| 121 | + # Set the account to the one requested |
|
| 122 | + $gaApi->setAccount($account); |
|
| 123 | + |
|
| 124 | + |
|
| 125 | + |
|
| 126 | + # Get the metrics needed to build the visits graph; |
|
| 127 | + try {
|
|
| 128 | + $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
|
| 129 | + } |
|
| 130 | + catch (Exception $e) {
|
|
| 131 | + print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 132 | + } |
|
| 133 | + |
|
| 134 | + |
|
| 135 | + //print_r($stats); |
|
| 136 | + echo json_encode($stats); |
|
| 137 | + exit; |
|
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | }// end GA function |
| 141 | 141 | |
| 142 | 142 | |
| 143 | 143 | function geodir_ga_get_token(){
|
| 144 | - $at = get_option('gd_ga_access_token');
|
|
| 145 | - $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at; |
|
| 146 | - $response = wp_remote_get($use_url,array('timeout' => 15));
|
|
| 144 | + $at = get_option('gd_ga_access_token');
|
|
| 145 | + $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at; |
|
| 146 | + $response = wp_remote_get($use_url,array('timeout' => 15));
|
|
| 147 | 147 | |
| 148 | - if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
|
| 148 | + if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
|
| 149 | 149 | |
| 150 | - return $at; |
|
| 151 | - }else{//else get new access token
|
|
| 150 | + return $at; |
|
| 151 | + }else{//else get new access token
|
|
| 152 | 152 | |
| 153 | - $refresh_at = get_option('gd_ga_refresh_token');
|
|
| 154 | - if(!$refresh_at){
|
|
| 155 | - echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
|
|
| 156 | - } |
|
| 153 | + $refresh_at = get_option('gd_ga_refresh_token');
|
|
| 154 | + if(!$refresh_at){
|
|
| 155 | + echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
|
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | - $rat_url = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 159 | - $client_id = "client_id=".get_option('geodir_ga_client_id');
|
|
| 160 | - $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 161 | - $refresh_token = "&refresh_token=".$refresh_at; |
|
| 162 | - $grant_type = "&grant_type=refresh_token"; |
|
| 158 | + $rat_url = "https://www.googleapis.com/oauth2/v3/token?"; |
|
| 159 | + $client_id = "client_id=".get_option('geodir_ga_client_id');
|
|
| 160 | + $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
|
|
| 161 | + $refresh_token = "&refresh_token=".$refresh_at; |
|
| 162 | + $grant_type = "&grant_type=refresh_token"; |
|
| 163 | 163 | |
| 164 | - $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type; |
|
| 164 | + $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type; |
|
| 165 | 165 | |
| 166 | - $rat_response = wp_remote_post($rat_url_use,array('timeout' => 15));
|
|
| 167 | - if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
|
|
| 168 | - $parts = json_decode($rat_response['body']); |
|
| 166 | + $rat_response = wp_remote_post($rat_url_use,array('timeout' => 15));
|
|
| 167 | + if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
|
|
| 168 | + $parts = json_decode($rat_response['body']); |
|
| 169 | 169 | |
| 170 | 170 | |
| 171 | - update_option('gd_ga_access_token', $parts->access_token);
|
|
| 172 | - return $parts->access_token; |
|
| 171 | + update_option('gd_ga_access_token', $parts->access_token);
|
|
| 172 | + return $parts->access_token; |
|
| 173 | 173 | |
| 174 | - }else{
|
|
| 175 | - echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
|
| 176 | - } |
|
| 174 | + }else{
|
|
| 175 | + echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
|
| 176 | + } |
|
| 177 | 177 | |
| 178 | 178 | |
| 179 | - } |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | 181 | } |
| 182 | 182 | \ No newline at end of file |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $hours = intval(intval($sec) / 3600); |
| 26 | 26 | |
| 27 | 27 | // add to $hms, with a leading 0 if asked for |
| 28 | - $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':'; |
|
| 28 | + $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT).':' : $hours.':'; |
|
| 29 | 29 | |
| 30 | 30 | // dividing the total seconds by 60 will give us |
| 31 | 31 | // the number of minutes, but we're interested in |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $minutes = intval(($sec / 60) % 60); |
| 35 | 35 | |
| 36 | 36 | // then add to $hms (with a leading 0 if needed) |
| 37 | - $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':'; |
|
| 37 | + $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT).':'; |
|
| 38 | 38 | |
| 39 | 39 | // seconds are simple - just divide the total |
| 40 | 40 | // seconds by 60 and keep the remainder |
@@ -70,32 +70,32 @@ discard block |
||
| 70 | 70 | $metrics = "ga:pageviews"; |
| 71 | 71 | $realtime = false; |
| 72 | 72 | $limit = false; |
| 73 | - if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
|
|
| 73 | + if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {
|
|
| 74 | 74 | $start_date = date('Y-m-d', strtotime("-6 day"));
|
| 75 | 75 | $end_date = date('Y-m-d');
|
| 76 | 76 | $dimensions = "ga:date,ga:nthDay"; |
| 77 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 77 | + }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {
|
|
| 78 | 78 | $start_date = date('Y-m-d', strtotime("-13 day"));
|
| 79 | 79 | $end_date = date('Y-m-d', strtotime("-7 day"));
|
| 80 | 80 | $dimensions = "ga:date,ga:nthDay"; |
| 81 | 81 | } |
| 82 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 82 | + elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {
|
|
| 83 | 83 | $start_date = date('Y')."-01-01";
|
| 84 | 84 | $end_date = date('Y-m-d');
|
| 85 | 85 | $dimensions = "ga:month,ga:nthMonth"; |
| 86 | 86 | } |
| 87 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 87 | + elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {
|
|
| 88 | 88 | $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
| 89 | 89 | $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
| 90 | 90 | $dimensions = "ga:month,ga:nthMonth"; |
| 91 | 91 | } |
| 92 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 92 | + elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {
|
|
| 93 | 93 | $start_date = "14daysAgo"; |
| 94 | 94 | $end_date = "yesterday"; |
| 95 | 95 | $dimensions = "ga:country"; |
| 96 | 96 | $sort = "ga:pageviews"; |
| 97 | - $limit = 5; |
|
| 98 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 97 | + $limit = 5; |
|
| 98 | + }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {
|
|
| 99 | 99 | $metrics = "rt:activeUsers"; |
| 100 | 100 | $realtime = true; |
| 101 | 101 | } |
@@ -104,15 +104,15 @@ discard block |
||
| 104 | 104 | $gaApi = new GDGoogleAnalyticsStats(); |
| 105 | 105 | |
| 106 | 106 | # Check if Google sucessfully logged in |
| 107 | - if (!$gaApi->checkLogin()){
|
|
| 108 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 107 | + if (!$gaApi->checkLogin()) {
|
|
| 108 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
|
|
| 109 | 109 | return false; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | $account = $gaApi->getSingleProfile(); |
| 113 | 113 | |
| 114 | - if(!isset($account[0]['id'])){
|
|
| 115 | - echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
|
|
| 114 | + if (!isset($account[0]['id'])) {
|
|
| 115 | + echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
|
|
| 116 | 116 | return false; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -125,10 +125,10 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | # Get the metrics needed to build the visits graph; |
| 127 | 127 | try {
|
| 128 | - $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
|
| 128 | + $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit, $realtime); |
|
| 129 | 129 | } |
| 130 | 130 | catch (Exception $e) {
|
| 131 | - print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
|
| 131 | + print 'GA Summary Widget - there was a service error '.$e->getCode().':'.$e->getMessage(); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | |
@@ -140,19 +140,19 @@ discard block |
||
| 140 | 140 | }// end GA function |
| 141 | 141 | |
| 142 | 142 | |
| 143 | -function geodir_ga_get_token(){
|
|
| 143 | +function geodir_ga_get_token() {
|
|
| 144 | 144 | $at = get_option('gd_ga_access_token');
|
| 145 | 145 | $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at; |
| 146 | - $response = wp_remote_get($use_url,array('timeout' => 15));
|
|
| 146 | + $response = wp_remote_get($use_url, array('timeout' => 15));
|
|
| 147 | 147 | |
| 148 | - if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
|
| 148 | + if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid
|
|
| 149 | 149 | |
| 150 | 150 | return $at; |
| 151 | - }else{//else get new access token
|
|
| 151 | + } else {//else get new access token
|
|
| 152 | 152 | |
| 153 | 153 | $refresh_at = get_option('gd_ga_refresh_token');
|
| 154 | - if(!$refresh_at){
|
|
| 155 | - echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
|
|
| 154 | + if (!$refresh_at) {
|
|
| 155 | + echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;
|
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | $rat_url = "https://www.googleapis.com/oauth2/v3/token?"; |
@@ -163,16 +163,16 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type; |
| 165 | 165 | |
| 166 | - $rat_response = wp_remote_post($rat_url_use,array('timeout' => 15));
|
|
| 167 | - if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
|
|
| 166 | + $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));
|
|
| 167 | + if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {
|
|
| 168 | 168 | $parts = json_decode($rat_response['body']); |
| 169 | 169 | |
| 170 | 170 | |
| 171 | 171 | update_option('gd_ga_access_token', $parts->access_token);
|
| 172 | 172 | return $parts->access_token; |
| 173 | 173 | |
| 174 | - }else{
|
|
| 175 | - echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
|
| 174 | + } else {
|
|
| 175 | + echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;
|
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | |
@@ -74,28 +74,25 @@ discard block |
||
| 74 | 74 | $start_date = date('Y-m-d', strtotime("-6 day"));
|
| 75 | 75 | $end_date = date('Y-m-d');
|
| 76 | 76 | $dimensions = "ga:date,ga:nthDay"; |
| 77 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 77 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
|
|
| 78 | 78 | $start_date = date('Y-m-d', strtotime("-13 day"));
|
| 79 | 79 | $end_date = date('Y-m-d', strtotime("-7 day"));
|
| 80 | 80 | $dimensions = "ga:date,ga:nthDay"; |
| 81 | - } |
|
| 82 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 81 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
|
|
| 83 | 82 | $start_date = date('Y')."-01-01";
|
| 84 | 83 | $end_date = date('Y-m-d');
|
| 85 | 84 | $dimensions = "ga:month,ga:nthMonth"; |
| 86 | - } |
|
| 87 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 85 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
|
|
| 88 | 86 | $start_date = date('Y', strtotime("-1 year"))."-01-01";
|
| 89 | 87 | $end_date = date('Y', strtotime("-1 year"))."-12-31";
|
| 90 | 88 | $dimensions = "ga:month,ga:nthMonth"; |
| 91 | - } |
|
| 92 | - elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 89 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
|
|
| 93 | 90 | $start_date = "14daysAgo"; |
| 94 | 91 | $end_date = "yesterday"; |
| 95 | 92 | $dimensions = "ga:country"; |
| 96 | 93 | $sort = "ga:pageviews"; |
| 97 | 94 | $limit = 5; |
| 98 | - }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 95 | + } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
|
|
| 99 | 96 | $metrics = "rt:activeUsers"; |
| 100 | 97 | $realtime = true; |
| 101 | 98 | } |
@@ -126,8 +123,7 @@ discard block |
||
| 126 | 123 | # Get the metrics needed to build the visits graph; |
| 127 | 124 | try {
|
| 128 | 125 | $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime); |
| 129 | - } |
|
| 130 | - catch (Exception $e) {
|
|
| 126 | + } catch (Exception $e) {
|
|
| 131 | 127 | print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage(); |
| 132 | 128 | } |
| 133 | 129 | |
@@ -148,7 +144,7 @@ discard block |
||
| 148 | 144 | if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
|
| 149 | 145 | |
| 150 | 146 | return $at; |
| 151 | - }else{//else get new access token
|
|
| 147 | + } else{//else get new access token
|
|
| 152 | 148 | |
| 153 | 149 | $refresh_at = get_option('gd_ga_refresh_token');
|
| 154 | 150 | if(!$refresh_at){
|
@@ -171,7 +167,7 @@ discard block |
||
| 171 | 167 | update_option('gd_ga_access_token', $parts->access_token);
|
| 172 | 168 | return $parts->access_token; |
| 173 | 169 | |
| 174 | - }else{
|
|
| 170 | + } else{
|
|
| 175 | 171 | echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
|
| 176 | 172 | } |
| 177 | 173 | |
@@ -79,43 +79,71 @@ |
||
| 79 | 79 | /** |
| 80 | 80 | * Do not store any revisions (except the one autosave per post). |
| 81 | 81 | */ |
| 82 | -if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);
|
|
| 82 | +if (!defined('WP_POST_REVISIONS')) { |
|
| 83 | + define('WP_POST_REVISIONS', 0); |
|
| 84 | +} |
|
| 83 | 85 | |
| 84 | 86 | /** |
| 85 | 87 | * Define constants |
| 86 | 88 | */ |
| 87 | -if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
|
|
| 89 | +if(!defined('GEODIRECTORY_PLUGIN_DIR')) { |
|
| 90 | + define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ )); |
|
| 91 | +} |
|
| 88 | 92 | |
| 89 | 93 | /* |
| 90 | 94 | * Declare database table names. All since version 1.0.0 |
| 91 | 95 | */ |
| 92 | 96 | |
| 93 | 97 | /** Define the database name for the countries table. */ |
| 94 | -if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
|
|
| 98 | +if (!defined('GEODIR_COUNTRIES_TABLE')) { |
|
| 99 | + define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries'); |
|
| 100 | +} |
|
| 95 | 101 | /** Define the database name for the custom fields table. */ |
| 96 | -if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
|
|
| 102 | +if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) { |
|
| 103 | + define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields'); |
|
| 104 | +} |
|
| 97 | 105 | /** Define the database name for the icons table. */ |
| 98 | -if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
|
|
| 106 | +if (!defined('GEODIR_ICON_TABLE')) { |
|
| 107 | + define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon'); |
|
| 108 | +} |
|
| 99 | 109 | /** Define the database name for the attachments table. */ |
| 100 | -if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
|
|
| 110 | +if (!defined('GEODIR_ATTACHMENT_TABLE')) { |
|
| 111 | + define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments'); |
|
| 112 | +} |
|
| 101 | 113 | /** Define the database name for the review table. */ |
| 102 | -if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
|
|
| 114 | +if (!defined('GEODIR_REVIEW_TABLE')) { |
|
| 115 | + define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review'); |
|
| 116 | +} |
|
| 103 | 117 | /** Define the database name for the custom sort fields table. */ |
| 104 | -if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
|
|
| 118 | +if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) { |
|
| 119 | + define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields'); |
|
| 120 | +} |
|
| 105 | 121 | |
| 106 | 122 | /* |
| 107 | 123 | * Define our Google Analytic app settings |
| 108 | 124 | */ |
| 109 | -if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
|
|
| 110 | -if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case
|
|
| 111 | -if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
|
|
| 112 | -if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly
|
|
| 125 | +if (!defined('GEODIR_GA_CLIENTID')) { |
|
| 126 | + define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com'); |
|
| 127 | +} |
|
| 128 | +if (!defined('GEODIR_GA_CLIENTSECRET')) { |
|
| 129 | + define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); |
|
| 130 | +} |
|
| 131 | +//don't worry - this don't need to be secret in our case |
|
| 132 | +if (!defined('GEODIR_GA_REDIRECT')) { |
|
| 133 | + define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob'); |
|
| 134 | +} |
|
| 135 | +if (!defined('GEODIR_GA_SCOPE')) { |
|
| 136 | + define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); |
|
| 137 | +} |
|
| 138 | +//.readonly |
|
| 113 | 139 | |
| 114 | 140 | |
| 115 | 141 | /* |
| 116 | 142 | * Localisation items. |
| 117 | 143 | */ |
| 118 | -if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
|
|
| 144 | +if (!defined('GEODIRECTORY_TEXTDOMAIN')) { |
|
| 145 | + define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory'); |
|
| 146 | +} |
|
| 119 | 147 | |
| 120 | 148 | // Load geodirectory plugin textdomain. |
| 121 | 149 | add_action( 'init', 'geodir_load_textdomain' ); |
@@ -31,30 +31,30 @@ discard block |
||
| 31 | 31 | * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE |
| 32 | 32 | */ |
| 33 | 33 | if (is_admin()) {
|
| 34 | - /** |
|
| 35 | - * Include WordPress core file so we can use core functions to check for active plugins. |
|
| 36 | - */ |
|
| 37 | - include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 34 | + /** |
|
| 35 | + * Include WordPress core file so we can use core functions to check for active plugins. |
|
| 36 | + */ |
|
| 37 | + include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 38 | 38 | |
| 39 | - if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
|
| 40 | - deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
|
| 41 | - } |
|
| 39 | + if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
|
| 40 | + deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {
|
|
| 44 | - deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');
|
|
| 45 | - } |
|
| 43 | + if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {
|
|
| 44 | + deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');
|
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {
|
|
| 48 | - deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');
|
|
| 49 | - } |
|
| 47 | + if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {
|
|
| 48 | + deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');
|
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {
|
|
| 52 | - deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');
|
|
| 53 | - } |
|
| 51 | + if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {
|
|
| 52 | + deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');
|
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {
|
|
| 56 | - deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');
|
|
| 57 | - } |
|
| 55 | + if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {
|
|
| 56 | + deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');
|
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | 59 | } |
| 60 | 60 | |
@@ -130,19 +130,19 @@ discard block |
||
| 130 | 130 | * @package GeoDirectory |
| 131 | 131 | */ |
| 132 | 132 | function geodir_error_log($log){
|
| 133 | - /* |
|
| 133 | + /* |
|
| 134 | 134 | * A filter to override the WP_DEBUG setting for function geodir_error_log(). |
| 135 | 135 | * |
| 136 | 136 | * @since 1.5.7 |
| 137 | 137 | */ |
| 138 | - $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 139 | - if ( true === $should_log ) {
|
|
| 140 | - if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 141 | - error_log( print_r( $log, true ) ); |
|
| 142 | - } else {
|
|
| 143 | - error_log( $log ); |
|
| 144 | - } |
|
| 145 | - } |
|
| 138 | + $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 139 | + if ( true === $should_log ) {
|
|
| 140 | + if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 141 | + error_log( print_r( $log, true ) ); |
|
| 142 | + } else {
|
|
| 143 | + error_log( $log ); |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | 146 | } |
| 147 | 147 | /** |
| 148 | 148 | * Include all plugin functions. |
@@ -181,72 +181,72 @@ discard block |
||
| 181 | 181 | */ |
| 182 | 182 | if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {
|
| 183 | 183 | |
| 184 | - /** |
|
| 185 | - * Include functions used in admin area only. |
|
| 186 | - * |
|
| 187 | - * @since 1.0.0 |
|
| 188 | - */ |
|
| 189 | - require_once('geodirectory-admin/admin_functions.php');
|
|
| 190 | - /** |
|
| 191 | - * Most actions/hooks used in admin area only are called from here. |
|
| 192 | - * |
|
| 193 | - * @since 1.6.11 |
|
| 194 | - */ |
|
| 195 | - require_once('geodirectory-admin/admin_dummy_data_functions.php');
|
|
| 196 | - /** |
|
| 197 | - * Most actions/hooks used in admin area only are called from here. |
|
| 198 | - * |
|
| 199 | - * @since 1.0.0 |
|
| 200 | - */ |
|
| 201 | - require_once('geodirectory-admin/admin_hooks_actions.php');
|
|
| 202 | - /** |
|
| 203 | - * Most admin JS and CSS is called from here. |
|
| 204 | - * |
|
| 205 | - * @since 1.0.0 |
|
| 206 | - */ |
|
| 207 | - require_once('geodirectory-admin/admin_template_tags.php');
|
|
| 208 | - /** |
|
| 209 | - * Include Google Analytics Class. |
|
| 210 | - * |
|
| 211 | - * @since 1.6.11 |
|
| 212 | - */ |
|
| 213 | - require_once('geodirectory-admin/class.analytics.stats.php');
|
|
| 214 | - /** |
|
| 215 | - * Include any functions needed for upgrades. |
|
| 216 | - * |
|
| 217 | - * @since 1.0.0 |
|
| 218 | - */ |
|
| 219 | - require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 220 | - if (get_option('geodir_installed') != 1) {
|
|
| 221 | - /** |
|
| 222 | - * Define language constants, here as they are not loaded yet. |
|
| 223 | - * |
|
| 224 | - * @since 1.0.0 |
|
| 225 | - */ |
|
| 226 | - require_once(geodir_plugin_path() . '/language.php'); |
|
| 227 | - /** |
|
| 228 | - * Include the plugin install file that sets up the databases and any options on first run. |
|
| 229 | - * |
|
| 230 | - * @since 1.0.0 |
|
| 231 | - */ |
|
| 232 | - require_once('geodirectory-admin/admin_install.php');
|
|
| 233 | - register_activation_hook(__FILE__, 'geodir_activation'); |
|
| 234 | - } |
|
| 235 | - register_deactivation_hook(__FILE__, 'geodir_deactivation'); |
|
| 236 | - |
|
| 237 | - /* |
|
| 184 | + /** |
|
| 185 | + * Include functions used in admin area only. |
|
| 186 | + * |
|
| 187 | + * @since 1.0.0 |
|
| 188 | + */ |
|
| 189 | + require_once('geodirectory-admin/admin_functions.php');
|
|
| 190 | + /** |
|
| 191 | + * Most actions/hooks used in admin area only are called from here. |
|
| 192 | + * |
|
| 193 | + * @since 1.6.11 |
|
| 194 | + */ |
|
| 195 | + require_once('geodirectory-admin/admin_dummy_data_functions.php');
|
|
| 196 | + /** |
|
| 197 | + * Most actions/hooks used in admin area only are called from here. |
|
| 198 | + * |
|
| 199 | + * @since 1.0.0 |
|
| 200 | + */ |
|
| 201 | + require_once('geodirectory-admin/admin_hooks_actions.php');
|
|
| 202 | + /** |
|
| 203 | + * Most admin JS and CSS is called from here. |
|
| 204 | + * |
|
| 205 | + * @since 1.0.0 |
|
| 206 | + */ |
|
| 207 | + require_once('geodirectory-admin/admin_template_tags.php');
|
|
| 208 | + /** |
|
| 209 | + * Include Google Analytics Class. |
|
| 210 | + * |
|
| 211 | + * @since 1.6.11 |
|
| 212 | + */ |
|
| 213 | + require_once('geodirectory-admin/class.analytics.stats.php');
|
|
| 214 | + /** |
|
| 215 | + * Include any functions needed for upgrades. |
|
| 216 | + * |
|
| 217 | + * @since 1.0.0 |
|
| 218 | + */ |
|
| 219 | + require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 220 | + if (get_option('geodir_installed') != 1) {
|
|
| 221 | + /** |
|
| 222 | + * Define language constants, here as they are not loaded yet. |
|
| 223 | + * |
|
| 224 | + * @since 1.0.0 |
|
| 225 | + */ |
|
| 226 | + require_once(geodir_plugin_path() . '/language.php'); |
|
| 227 | + /** |
|
| 228 | + * Include the plugin install file that sets up the databases and any options on first run. |
|
| 229 | + * |
|
| 230 | + * @since 1.0.0 |
|
| 231 | + */ |
|
| 232 | + require_once('geodirectory-admin/admin_install.php');
|
|
| 233 | + register_activation_hook(__FILE__, 'geodir_activation'); |
|
| 234 | + } |
|
| 235 | + register_deactivation_hook(__FILE__, 'geodir_deactivation'); |
|
| 236 | + |
|
| 237 | + /* |
|
| 238 | 238 | * Show a upgrade warning message if applicable. |
| 239 | 239 | * |
| 240 | 240 | * @since 1.5.6 |
| 241 | 241 | */ |
| 242 | - global $pagenow; |
|
| 243 | - if ( 'plugins.php' === $pagenow ) |
|
| 244 | - {
|
|
| 245 | - // Better update message |
|
| 246 | - $file = basename( __FILE__ ); |
|
| 247 | - $folder = basename( dirname( __FILE__ ) ); |
|
| 248 | - $hook = "in_plugin_update_message-{$folder}/{$file}";
|
|
| 249 | - add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 250 | - } |
|
| 242 | + global $pagenow; |
|
| 243 | + if ( 'plugins.php' === $pagenow ) |
|
| 244 | + {
|
|
| 245 | + // Better update message |
|
| 246 | + $file = basename( __FILE__ ); |
|
| 247 | + $folder = basename( dirname( __FILE__ ) ); |
|
| 248 | + $hook = "in_plugin_update_message-{$folder}/{$file}";
|
|
| 249 | + add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 250 | + } |
|
| 251 | 251 | |
| 252 | 252 | } |
| 253 | 253 | \ No newline at end of file |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | /** |
| 35 | 35 | * Include WordPress core file so we can use core functions to check for active plugins. |
| 36 | 36 | */ |
| 37 | - include_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
| 37 | + include_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
| 38 | 38 | |
| 39 | 39 | if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {
|
| 40 | 40 | deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');
|
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @global string $plugin_file_name Base file name. 'geodirectory/geodirectory.php'. |
| 69 | 69 | */ |
| 70 | 70 | global $wpdb, $plugin_prefix, $geodir_addon_list, $plugin_file_name; |
| 71 | -$plugin_prefix = $wpdb->prefix . 'geodir_'; |
|
| 72 | -$plugin_file_name = basename(plugin_dir_path(__FILE__)) . '/' . basename(__FILE__); |
|
| 71 | +$plugin_prefix = $wpdb->prefix.'geodir_'; |
|
| 72 | +$plugin_file_name = basename(plugin_dir_path(__FILE__)).'/'.basename(__FILE__); |
|
| 73 | 73 | |
| 74 | 74 | /* |
| 75 | 75 | * This will store the cached post custom fields per package for each page load so not to run for each listing. |
@@ -84,24 +84,24 @@ discard block |
||
| 84 | 84 | /** |
| 85 | 85 | * Define constants |
| 86 | 86 | */ |
| 87 | -if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
|
|
| 87 | +if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));
|
|
| 88 | 88 | |
| 89 | 89 | /* |
| 90 | 90 | * Declare database table names. All since version 1.0.0 |
| 91 | 91 | */ |
| 92 | 92 | |
| 93 | 93 | /** Define the database name for the countries table. */ |
| 94 | -if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
|
|
| 94 | +if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix.'countries');
|
|
| 95 | 95 | /** Define the database name for the custom fields table. */ |
| 96 | -if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
|
|
| 96 | +if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix.'custom_fields');
|
|
| 97 | 97 | /** Define the database name for the icons table. */ |
| 98 | -if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
|
|
| 98 | +if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix.'post_icon');
|
|
| 99 | 99 | /** Define the database name for the attachments table. */ |
| 100 | -if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
|
|
| 100 | +if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix.'attachments');
|
|
| 101 | 101 | /** Define the database name for the review table. */ |
| 102 | -if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
|
|
| 102 | +if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix.'post_review');
|
|
| 103 | 103 | /** Define the database name for the custom sort fields table. */ |
| 104 | -if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
|
|
| 104 | +if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix.'custom_sort_fields');
|
|
| 105 | 105 | |
| 106 | 106 | /* |
| 107 | 107 | * Define our Google Analytic app settings |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if (!defined('GEODIR_GA_CLIENTID')) define('GEODIR_GA_CLIENTID', '687912069872-sdpsjssrdt7t3ao1dnv1ib71hkckbt5s.apps.googleusercontent.com');
|
| 110 | 110 | if (!defined('GEODIR_GA_CLIENTSECRET')) define('GEODIR_GA_CLIENTSECRET', 'yBVkDpqJ1B9nAETHy738Zn8C'); //don't worry - this don't need to be secret in our case
|
| 111 | 111 | if (!defined('GEODIR_GA_REDIRECT')) define('GEODIR_GA_REDIRECT', 'urn:ietf:wg:oauth:2.0:oob');
|
| 112 | -if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics');//.readonly
|
|
| 112 | +if (!defined('GEODIR_GA_SCOPE')) define('GEODIR_GA_SCOPE', 'https://www.googleapis.com/auth/analytics'); //.readonly
|
|
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 | /* |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
|
| 119 | 119 | |
| 120 | 120 | // Load geodirectory plugin textdomain. |
| 121 | -add_action( 'init', 'geodir_load_textdomain' ); |
|
| 121 | +add_action('init', 'geodir_load_textdomain');
|
|
| 122 | 122 | |
| 123 | 123 | /* |
| 124 | 124 | * A function to log GD errors no matter the type given. |
@@ -129,18 +129,18 @@ discard block |
||
| 129 | 129 | * @param mixed $log The thing that should be logged. |
| 130 | 130 | * @package GeoDirectory |
| 131 | 131 | */ |
| 132 | -function geodir_error_log($log){
|
|
| 132 | +function geodir_error_log($log) {
|
|
| 133 | 133 | /* |
| 134 | 134 | * A filter to override the WP_DEBUG setting for function geodir_error_log(). |
| 135 | 135 | * |
| 136 | 136 | * @since 1.5.7 |
| 137 | 137 | */ |
| 138 | - $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG); |
|
| 139 | - if ( true === $should_log ) {
|
|
| 140 | - if ( is_array( $log ) || is_object( $log ) ) {
|
|
| 141 | - error_log( print_r( $log, true ) ); |
|
| 138 | + $should_log = apply_filters('geodir_log_errors', WP_DEBUG);
|
|
| 139 | + if (true === $should_log) {
|
|
| 140 | + if (is_array($log) || is_object($log)) {
|
|
| 141 | + error_log(print_r($log, true)); |
|
| 142 | 142 | } else {
|
| 143 | - error_log( $log ); |
|
| 143 | + error_log($log); |
|
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | /* |
| 180 | 180 | * Admin init + activation hooks |
| 181 | 181 | */ |
| 182 | -if (is_admin() || defined( 'GD_TESTING_MODE' ) || ( defined( 'WP_CLI' ) && WP_CLI )) {
|
|
| 182 | +if (is_admin() || defined('GD_TESTING_MODE') || (defined('WP_CLI') && WP_CLI)) {
|
|
| 183 | 183 | |
| 184 | 184 | /** |
| 185 | 185 | * Include functions used in admin area only. |
@@ -216,14 +216,14 @@ discard block |
||
| 216 | 216 | * |
| 217 | 217 | * @since 1.0.0 |
| 218 | 218 | */ |
| 219 | - require_once(geodir_plugin_path() . '/upgrade.php'); |
|
| 219 | + require_once(geodir_plugin_path().'/upgrade.php'); |
|
| 220 | 220 | if (get_option('geodir_installed') != 1) {
|
| 221 | 221 | /** |
| 222 | 222 | * Define language constants, here as they are not loaded yet. |
| 223 | 223 | * |
| 224 | 224 | * @since 1.0.0 |
| 225 | 225 | */ |
| 226 | - require_once(geodir_plugin_path() . '/language.php'); |
|
| 226 | + require_once(geodir_plugin_path().'/language.php'); |
|
| 227 | 227 | /** |
| 228 | 228 | * Include the plugin install file that sets up the databases and any options on first run. |
| 229 | 229 | * |
@@ -240,13 +240,13 @@ discard block |
||
| 240 | 240 | * @since 1.5.6 |
| 241 | 241 | */ |
| 242 | 242 | global $pagenow; |
| 243 | - if ( 'plugins.php' === $pagenow ) |
|
| 243 | + if ('plugins.php' === $pagenow)
|
|
| 244 | 244 | {
|
| 245 | 245 | // Better update message |
| 246 | - $file = basename( __FILE__ ); |
|
| 247 | - $folder = basename( dirname( __FILE__ ) ); |
|
| 246 | + $file = basename(__FILE__); |
|
| 247 | + $folder = basename(dirname(__FILE__)); |
|
| 248 | 248 | $hook = "in_plugin_update_message-{$folder}/{$file}";
|
| 249 | - add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 ); |
|
| 249 | + add_action($hook, 'geodire_admin_upgrade_notice', 20, 2); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | } |
| 253 | 253 | \ No newline at end of file |
@@ -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 |
@@ -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 |
