Changeset 2209033

Timestamp:

12/10/2019 06:55:14 AM (6 years ago)

Author:

hitcode

Message:

3.6.9

Location:

locatoraid/trunk

Files:

• config/_common.php (modified) (1 diff)
• happ2/lib-wp/hcWpBase6.php (modified) (1 diff)
• happ2/modules/http/uri.php (modified) (3 diffs)
• happ2/modules/session/lib.php (modified) (1 diff)
• locatoraid.php (modified) (2 diffs)
• modules/front/assets/js/front.js (modified) (2 diffs)
• modules/front/view_form.php (modified) (2 diffs)
• modules/search/radius_controller.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

locatoraid/trunk/config/_common.php

@@ -1 +1 @@
 <?php if (! defined('ABSPATH')) exit; // Exit if accessed directly
-$config['app_version'] = '3.6.8';
+$config['app_version'] = '3.6.9';
 // $config['dbprefix_version'] = 'v1';
 

locatoraid/trunk/happ2/lib-wp/hcWpBase6.php

@@ -203 +203 @@
 
 //      session_name( $session_name );
-//      @session_start();
+        @session_start();
+        // session_start();
         // ob_start();
     }

locatoraid/trunk/happ2/modules/http/uri.php

@@ -4 +4 @@
     protected $hca = 'hca';
     protected $hcs = 'hcs';
+
+    // protected $joinArray = '|';
+    protected $joinArray = '_';
 
     protected $mode_urls = array();
@@ -107 +110 @@
                 $return['raw_params'] = $params;
                 $return['params'] = hc2_parse_args($params);
+
+                foreach( array_keys($return['params']) as $k ){
+                    $v = $return['params'][$k];
+                    if( is_array($v) ){
+                        continue;
+                    }
+
+                    $pos = strpos( $v, $this->joinArray );
+
+                    if( FALSE === $pos ){
+                        continue;
+                    }
+                    if( 0 === $pos ){
+                        continue;
+                    }
+
+                    $v = explode( $this->joinArray, $v );
+                    $return['params'][$k] = $v;
+                }
             }
 
@@ -265 +287 @@
                     foreach( $p as $p2 ){
                         if( is_array($p2) ){
-                            $p2 = join('|', $p2);
+                            $p2 = join($this->joinArray, $p2);
                         }
                         $p2 = urlencode( $p2 ); 
                         $final_p[] = $p2;
                     }
-                    $p = join('|', $final_p);
+                    $p = join($this->joinArray, $final_p);
                 }
                 else {

locatoraid/trunk/happ2/modules/session/lib.php

@@ -82 +82 @@
         $this->my_prefix = $app_short_name . '_' . $this->my_prefix;
 // echo "INIT SESSION FOR '$app_short_name'<br>";
+// echo 'SESSION ID = ' . session_id() . '<br>';
 
         if( session_id() == '' ){

locatoraid/trunk/locatoraid.php

@@ -4 +4 @@
 Plugin URI: https://www.locatoraid.com/
 Description: Store locator plugin
-Version: 3.6.8
+Version: 3.6.9
 Author: hitcode.com
 Author URI: https://www.locatoraid.com/
@@ -12 +12 @@
 
 if( ! defined('LC3_VERSION') ){
-    define( 'LC3_VERSION', 368 );
+    define( 'LC3_VERSION', 369 );
 }
 

locatoraid/trunk/modules/front/assets/js/front.js

@@ -97 +97 @@
             var replace_to = search[k];
             if( Array.isArray(replace_to) ){
-                replace_to = replace_to.join('|');
+                replace_to = replace_to.join('_');
             }
             search_url = search_url.replace( to_replace, replace_to );
@@ -195 +195 @@
             var replace_to = search[k];
             if( Array.isArray(replace_to) ){
-                replace_to = replace_to.join('|');
+                replace_to = replace_to.join('_');
             }
             search_url = search_url.replace( to_replace, replace_to );

locatoraid/trunk/modules/front/view_form.php

@@ -10 +10 @@
 
         if( isset($params['where-product']) && $params['where-product'] ){
-            if( FALSE !== strpos($params['where-product'], '|') ){
+            if( FALSE !== strpos($params['where-product'], '_') ){
                 // if( isset($form_inputs['product']) && method_exists($form_inputs['product'], 'options') ){
                 if( isset($form_inputs['product']) ){
@@ -22 +22 @@
                     $options = $input->options();
 
-                    $filteredProducts = explode( '|', $params['where-product'] );
+                    $filteredProducts = explode( '_', $params['where-product'] );
                     $filteredProducts = array_map( function($e){ return trim($e); }, $filteredProducts );
                     $filteredProducts = array_combine( $filteredProducts, $filteredProducts );

locatoraid/trunk/modules/search/radius_controller.php

@@ -73 +73 @@
             if( is_array($v) ){
                 $command_args[] = array($tk, 'IN', $v);
-                $link_params[$tk] = array('IN', $v);
+                // $link_params[$tk] = array('IN', $v);
+                $link_params[$tk] = $v;
             }
             else {
@@ -121 +122 @@
         $command_args[] = 'count';
         $radiuses = $uri->param('radius');
+
         if( ! $radiuses ){
             $radiuses = array( 10, 20, 50, 100, 200, 500 );
@@ -177 +179 @@
             }
 
+// _print_r( $link_params );
+
             $link = $this->app->make('/http/uri')
                 ->url('/search', $this_link_params)

locatoraid/trunk/readme.txt

@@ -85 +85 @@
 == Changelog ==
 
+= 3.6.9 =
+* BUG: multiple products checkbox in the search form may have worked incorrectly. 
+
 = 3.6.8 =
 * BUG: the "limit" shortcode parameter may have worked incorrectly.