WordPress.org
Get WordPress

Plugin Directory

Changeset 2583880


Ignore:
Timestamp:
08/17/2021 03:44:28 AM (5 years ago)
Author:
diversesolutions
Message:

Updating to version $dsphpversion

Location:
dsidxpress/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • dsidxpress/trunk/api-multirequest.php

    r2415988 r2583880  
    3030                    "url"       => "http://api-idx.diversesolutions.com/api/".$actionsArray[$i],
    3131                    "headers"   => array('Accept-Encoding' => 'identity'),
    32                     "data"      => json_decode($parameters),
     32                    "data"      => json_decode($parameters, true),
    3333                    "type"      => Requests::POST
    3434                );
    … …  
    4747                            $body= dsSearchAgent_ApiRequest::ProcessResponseBody($responses[$i]->body,$criteria);
    4848                        } else if (!empty($responses[$i]->status_code) && $responses[$i]->status_code === 403) {
    49                             $body= '<p class="dsidx-error">'.DSIDXPRESS_INACTIVE_ACCOUNT_MESSAGE.'</p>';
     49                            $body= "<p class='dsidx-error'>".DSIDXPRESS_INACTIVE_ACCOUNT_MESSAGE."</p>";
    5050                        }   else if (!empty($responses[$i]->status_code) && $responses[$i]->status_code === 404) {
    5151                            $responseContent= $responses[$i]->body;
    … …  
    5757                                        $responseContent= 'Not found';                 
    5858                            }                           
    59                             $body= '<p class="dsidx-error">'.$responseContent.'</p>';                   
     59                            $body= "<p class='dsidx-error'>".$responseContent."</p>";                   
    6060                        }   else {
    61                             $body=  '<p class="dsidx-error">'.DSIDXPRESS_IDX_ERROR_MESSAGE.'</p>';
     61                            $body=  "<p class='dsidx-error'>".DSIDXPRESS_IDX_ERROR_MESSAGE."</p>";                         
    6262                        }
    6363                        $buffer = str_replace($criteria,$body,$buffer);
    … …  
    6565            }   
    6666            $buffer = dsSearchAgent_ApiRequest::FilterData($buffer);
    67             $apiHttpResponse = dsSearchAgent_ApiRequest::FetchData("EnqueueGlobalAssets", array(), false, 3600);
    68             $pos = strpos($buffer,"</head>");       
    69             $ajaxHandler = "<script type='text/javascript'>var dsidxAjaxHandler = {'ajaxurl':'" . admin_url( 'admin-ajax.php' ) . "'};</script>";
    70             $final  = $apiHttpResponse["body"].$ajaxHandler;
    71             $buffer= substr_replace( $buffer, $final, $pos, 0 );
     67           
     68            $pos = strpos($buffer,"</head>");
     69            if(isset($pos) && !empty($pos)) {
     70                $apiHttpResponse = dsSearchAgent_ApiRequest::FetchData("EnqueueGlobalAssets", array(), false, 3600);
     71                $ajaxHandler = "<script type='text/javascript'>var dsidxAjaxHandler = {'ajaxurl':'" . admin_url( 'admin-ajax.php' ) . "'};</script>";
     72                $final  = $apiHttpResponse["body"].$ajaxHandler;
     73                $buffer= substr_replace( $buffer, $final, $pos, 0 );
     74            }
    7275        }       
    7376        return $buffer;

  • dsidxpress/trunk/dsidxpress.php

    r2549383 r2583880  
    77Author: Diverse Solutions
    88Author URI: http://www.diversesolutions.com/
    9 Version: 3.14.1
     9Version: 3.14.2
    1010*/
    1111

  • dsidxpress/trunk/dsidxwidgets/widget-service-mapsearch.php

    r2497486 r2583880  
    2626  }
    2727    function widget($args, $instance) {
     28        if(!isset($instance) || empty($instance)) {
     29            return;
     30        }
     31
    2832        if (!$this->instance) {
    2933            $this->instance = true;

  • dsidxpress/trunk/dsidxwidgets/widget-service-quicksearch.php

    r2415988 r2583880  
    1313    }
    1414    function widget($args, $instance) {
     15        if(!isset($instance) || empty($instance)) {
     16            return;
     17        }
     18
    1519        extract($args);
    1620        extract($instance);

  • dsidxpress/trunk/dsidxwidgets/widget-service-recentstatus.php

    r2415988 r2583880  
    1212    }
    1313    function widget($args, $instance) {
     14        if(!isset($instance) || empty($instance)) {
     15            return;
     16        }
     17
    1418        extract($args);
    1519        extract($instance);

  • dsidxpress/trunk/dsidxwidgets/widget-service-slideshow.php

    r2415988 r2583880  
    44
    55    public function __construct() {
     6        global $pagenow;
     7
    68        parent::__construct("dsidx-slideshow", "Property Slideshow", array(
    79            "classname" => "dsidx-widget-slideshow",
    … …  
    911            ));
    1012
     13        if ($pagenow == 'widgets.php')
     14            wp_enqueue_script('dsidxwidgets_widget_service_admin', DSIDXWIDGETS_PLUGIN_URL . 'js/widget-service-admin.js', array('jquery'), false, true);
     15
    1116        $this->widgetsCdn = dsWidgets_Service_Base::$widgets_cdn;
    1217    }
    1318    function widget($args, $instance) {
     19        if(!isset($instance) || empty($instance)) {
     20            return;
     21        }
     22
    1423        extract($args);
    1524        extract($instance);
    … …  
    120129        $new_instance["slideshowOptions"]["zip"] = sanitize_text_field($new_instance["zip"]);
    121130
    122         if(isset($new_instance["modernView"]) && sanitize_text_field($new_instance["modernView"]) == "on") $new_instance["slideshowOptions"]["modernView"] = "yes";
     131        if(isset($new_instance["modernView"]) && (sanitize_text_field($new_instance["modernView"]) == "on" || sanitize_text_field($new_instance["modernView"]) == "yes")) $new_instance["slideshowOptions"]["modernView"] = "yes";
    123132        else $new_instance["slideshowOptions"]["modernView"] = "no";
    124133
    … …  
    128137    }
    129138    function form($instance) {
    130         wp_enqueue_script('dsidxwidgets_widget_service_admin', DSIDXWIDGETS_PLUGIN_URL . 'js/widget-service-admin.js', array('jquery'), false, true);
    131139        $personal_info = stripslashes_deep(get_option('personal_info'));
    132140        $city = empty($personal_info['city']) ? 'Irvine' : $personal_info['city'];

  • dsidxpress/trunk/js/widget-list-areas.js

    r1419101 r2583880  
    1212       
    1313        jQuery('#'+list_id).val(original + "\r\n" + new_pair);
     14        jQuery('#'+list_id).change();
    1415        jQuery('#'+title_id).val('');
    1516        jQuery('#'+lookup_id).val('');

  • dsidxpress/trunk/js/widget-search.js

    r579854 r2583880  
    2424    }
    2525}
     26
     27jQuery(function($) {
     28    $(document).on('widget-added', function(event, widget) {
     29        if(widget.find('.search-widget-searchOptions').length > 0) {
     30            dsWidgetSearch.InitFields();
     31        }
     32    } );
     33} );

  • dsidxpress/trunk/readme.txt

    r2549383 r2583880  
    33Tags: IDX, MLS, real estate, realtor, housing, listings, SEO, CRM, lead capture, mobile friendly, customizable, diverse solutions, market leader, ds, marketleader, rets, idxpress, dsidxpress
    44Requires at least: 4.5.0
    5 Tested up to: 5.7
    6 Stable tag: 3.14.1
     5Tested up to: 5.8
     6Stable tag: 3.14.2
    77Requires PHP: 5.4.0
    88
    … …  
    120120
    121121== Changelog ==
     122
     123= 3.14.2 =
     124* WordPress v5.8 compatibility fixes
    122125
    123126= 3.14.1 =

  • dsidxpress/trunk/widget-idx-guided-search.php

    r2415988 r2583880  
    44class dsSearchAgent_IdxGuidedSearchWidget extends WP_Widget {
    55    public function __construct() {
     6        global $pagenow;
     7
    68        parent::__construct("dsidx-search", "IDX Guided Search", array(
    79            "classname" => "dsidx-widget-guided-search",
    810            "description" => "Allow users to search from a curated list of cities, communites, tracts and/or zip codes."
    911        ));
     12
     13        if ($pagenow == 'widgets.php')
     14            wp_enqueue_script('dsidxpress_widget_search', DSIDXPRESS_PLUGIN_URL . 'js/widget-search.js', array('jquery'), DSIDXPRESS_PLUGIN_VERSION, true);
    1015    }
    1116    public static function LoadScripts(){
    … …  
    1318    }
    1419    function widget($args, $instance) {
     20        if(!isset($instance) || empty($instance)) {
     21            return;
     22        }
     23               
    1524        extract($args);
    1625        extract($instance);
    … …  
    293302    function update($new_instance, $old_instance) {
    294303        $new_instance["title"] = sanitize_text_field($new_instance["title"]);
    295         $new_instance["searchOptions"]["cities"] = sanitize_textarea_field($new_instance["searchOptions"]["cities"]);
    296         $new_instance["searchOptions"]["zips"] = sanitize_textarea_field($new_instance["searchOptions"]["zips"]);
    297         $new_instance["searchOptions"]["tracts"] = sanitize_textarea_field($new_instance["searchOptions"]["tracts"]);
    298         $new_instance["searchOptions"]["communities"] = sanitize_textarea_field($new_instance["searchOptions"]["communities"]);
     304
     305        if (is_string($new_instance["searchOptions"]["cities"])) {
     306            $new_instance["searchOptions"]["cities"] = sanitize_textarea_field($new_instance["searchOptions"]["cities"]);
     307            $new_instance["searchOptions"]["cities"] = explode("\n", $new_instance["searchOptions"]["cities"]);
     308        }
     309
     310        if (is_string($new_instance["searchOptions"]["zips"])) {
     311            $new_instance["searchOptions"]["zips"] = sanitize_textarea_field($new_instance["searchOptions"]["zips"]);
     312            $new_instance["searchOptions"]["zips"] = explode("\n", $new_instance["searchOptions"]["zips"]);
     313        }
     314       
     315        if (is_string($new_instance["searchOptions"]["tracts"])) {
     316            $new_instance["searchOptions"]["tracts"] = sanitize_textarea_field($new_instance["searchOptions"]["tracts"]);
     317            $new_instance["searchOptions"]["tracts"] = explode("\n", $new_instance["searchOptions"]["tracts"]);
     318        }
     319       
     320        if (is_string($new_instance["searchOptions"]["communities"])) {
     321            $new_instance["searchOptions"]["communities"] = sanitize_textarea_field($new_instance["searchOptions"]["communities"]);
     322            $new_instance["searchOptions"]["communities"] = explode("\n", $new_instance["searchOptions"]["communities"]);
     323        }
    299324
    300325        if (isset($new_instance["searchOptions"]["sortCities"]))
    … …  
    327352        if (isset($new_instance["searchOptions"]["show_advanced"]))
    328353            $new_instance["searchOptions"]["show_advanced"] = sanitize_text_field($new_instance["searchOptions"]["show_advanced"]);
    329 
    330 
    331         $new_instance["searchOptions"]["cities"] = explode("\n", $new_instance["searchOptions"]["cities"]);
    332         $new_instance["searchOptions"]["zips"] = explode("\n", $new_instance["searchOptions"]["zips"]);
    333         $new_instance["searchOptions"]["tracts"] = explode("\n", $new_instance["searchOptions"]["tracts"]);
    334         $new_instance["searchOptions"]["communities"] = explode("\n", $new_instance["searchOptions"]["communities"]);
    335354
    336355        if (isset($new_instance["searchOptions"]["sortZips"]) && $new_instance["searchOptions"]["sortZips"])
    … …  
    363382        /* we're doing this conversion from on/null to yes/no so that we can detect if the show_cities has never been
    364383         * set, because if it's never been set we want it to show */
    365         if(isset($new_instance["searchOptions"]["show_cities"]) && $new_instance["searchOptions"]["show_cities"] == "on") $new_instance["searchOptions"]["show_cities"] = "yes";
     384
     385        if(isset($new_instance["searchOptions"]["show_cities"]) && ($new_instance["searchOptions"]["show_cities"] == "on" || $new_instance["searchOptions"]["show_cities"] == "yes")) $new_instance["searchOptions"]["show_cities"] = "yes";
    366386        else $new_instance["searchOptions"]["show_cities"] = "no";
    367387
    368         if(isset($new_instance["searchOptions"]["show_communities"]) && $new_instance["searchOptions"]["show_communities"] == "on") $new_instance["searchOptions"]["show_communities"] = "yes";
     388        if(isset($new_instance["searchOptions"]["show_communities"]) && ($new_instance["searchOptions"]["show_communities"] == "on" || $new_instance["searchOptions"]["show_communities"] == "yes")) $new_instance["searchOptions"]["show_communities"] = "yes";
    369389        else $new_instance["searchOptions"]["show_communities"] = "no";
    370390
    371         if(isset($new_instance["searchOptions"]["show_tracts"]) && $new_instance["searchOptions"]["show_tracts"] == "on") $new_instance["searchOptions"]["show_tracts"] = "yes";
     391        if(isset($new_instance["searchOptions"]["show_tracts"]) && ($new_instance["searchOptions"]["show_tracts"] == "on" || $new_instance["searchOptions"]["show_tracts"] == "yes")) $new_instance["searchOptions"]["show_tracts"] = "yes";
    372392        else $new_instance["searchOptions"]["show_tracts"] = "no";
    373393
    374         if(isset($new_instance["searchOptions"]["show_zips"]) && $new_instance["searchOptions"]["show_zips"] == "on") $new_instance["searchOptions"]["show_zips"] = "yes";
     394        if(isset($new_instance["searchOptions"]["show_zips"]) && ($new_instance["searchOptions"]["show_zips"] == "on" || $new_instance["searchOptions"]["show_zips"] == "yes")) $new_instance["searchOptions"]["show_zips"] = "yes";
    375395        else $new_instance["searchOptions"]["show_zips"] = "no";
    376396
    377         if(isset($new_instance["searchOptions"]["show_mlsnumber"]) && $new_instance["searchOptions"]["show_mlsnumber"] == "on") $new_instance["searchOptions"]["show_mlsnumber"] = "yes";
     397        if(isset($new_instance["searchOptions"]["show_mlsnumber"]) && ($new_instance["searchOptions"]["show_mlsnumber"] == "on" || $new_instance["searchOptions"]["show_mlsnumber"] == "yes")) $new_instance["searchOptions"]["show_mlsnumber"] = "yes";
    378398        else $new_instance["searchOptions"]["show_mlsnumber"] = "no";
    379399
    380         if(isset($new_instance["searchOptions"]["show_advanced"]) && $new_instance["searchOptions"]["show_advanced"] == "on") $new_instance["searchOptions"]["show_advanced"] = "yes";
     400        if(isset($new_instance["searchOptions"]["show_advanced"]) && ($new_instance["searchOptions"]["show_advanced"] == "on" || $new_instance["searchOptions"]["show_advanced"] == "yes")) $new_instance["searchOptions"]["show_advanced"] = "yes";
    381401        else $new_instance["searchOptions"]["show_advanced"] = "no";
    382402
    … …  
    384404    }
    385405    function form($instance) {
    386         wp_enqueue_script('dsidxpress_widget_search', DSIDXPRESS_PLUGIN_URL . 'js/widget-search.js', array('jquery'), DSIDXPRESS_PLUGIN_VERSION, true);
    387        
    388406        $pluginUrl = DSIDXPRESS_PLUGIN_URL;
    389407        $ajaxUrl = admin_url( 'admin-ajax.php' );

  • dsidxpress/trunk/widget-idx-quick-search.php

    r2498271 r2583880  
    2727
    2828    public static function renderWidget($args, $instance){
     29        if(!isset($instance) || empty($instance)) {
     30            return;
     31        }
     32
    2933        extract($args);
    3034        extract($instance);

  • dsidxpress/trunk/widget-list-areas.php

    r2415988 r2583880  
    22class dsSearchAgent_ListAreasWidget extends WP_Widget {
    33    public function __construct() {
     4        global $pagenow;
     5
    46        parent::__construct("dsidx-list-areas", "IDX Areas", array(
    57            "classname" => "dsidx-widget-list-areas",
    68            "description" => "Lists of links for showing real estate"
    79        ));
    8            
     10
     11        if ($pagenow == 'widgets.php')
     12            wp_enqueue_script('dsidxpress_widget_list_areas', DSIDXPRESS_PLUGIN_URL . 'js/widget-list-areas.js', array('jquery'), DSIDXPRESS_PLUGIN_VERSION, true);
     13
    914    }
    1015    function widget($args, $instance) {
     16        if(!isset($instance) || empty($instance)) {
     17            return;
     18        }
     19
    1120        extract($args);
    1221        extract($instance);
    … …  
    6170    function update($new_instance, $old_instance) {
    6271        $new_instance["title"] = sanitize_text_field($new_instance["title"]);
    63         $new_instance["areaOptions"]["areas"] = sanitize_textarea_field($new_instance["areaOptions"]["areas"]);
     72
     73        if (is_string($new_instance["areaOptions"]["areas"])) {
     74            $new_instance["areaOptions"]["areas"] = sanitize_textarea_field($new_instance["areaOptions"]["areas"]);
     75            $new_instance["areaOptions"]["areas"] = explode("\n", $new_instance["areaOptions"]["areas"]);
     76        }
    6477
    6578        if (isset($new_instance["areaOptions"]["sortAreas"]))
    6679            $new_instance["areaOptions"]["sortAreas"] = sanitize_text_field($new_instance["areaOptions"]["sortAreas"]);
    67 
    68         $new_instance["areaOptions"]["areas"] = explode("\n", $new_instance["areaOptions"]["areas"]);
    6980
    7081        if (isset($new_instance["areaOptions"]["sortAreas"]) && $new_instance["areaOptions"]["sortAreas"])
    … …  
    8091    }
    8192    function form($instance) {
    82         wp_enqueue_script('dsidxpress_widget_list_areas', DSIDXPRESS_PLUGIN_URL . 'js/widget-list-areas.js', array('jquery'), DSIDXPRESS_PLUGIN_VERSION, true);
    8393        $instance = wp_parse_args($instance, array(
    8494            "title" => "Our Coverage Areas",

  • dsidxpress/trunk/widget-listings.php

    r2415988 r2583880  
    99    }
    1010    function widget($args, $instance) {
     11        if(!isset($instance) || empty($instance)) {
     12            return;
     13        }
     14
    1115        extract($args);
    1216        extract($instance);
    … …  
    8892    function update($new_instance, $old_instance) {
    8993        // we need to do this first-line awkwardness so that the title comes through in the sidebar display thing
    90         $new_instance["listingsOptions"]["title"] = sanitize_text_field($new_instance["title"]);
    91 
    92         if (isset($new_instance["listingsOptions"]['areaSourceConfig']['name']))
    93             $new_instance["listingsOptions"]['areaSourceConfig']['name'] = sanitize_text_field($new_instance["listingsOptions"]['areaSourceConfig']['name']);
    94 
    95         $new_instance = $new_instance["listingsOptions"];
    96         return $new_instance;
     94        $new_instance["title"] = sanitize_text_field($new_instance["title"]);
     95        $new_instance["listingsToShow"] = sanitize_text_field($new_instance["listingsToShow"]);
     96        $new_instance["sort"] = sanitize_text_field($new_instance["sort"]);
     97        $new_instance["defaultDisplay"] = sanitize_text_field($new_instance["defaultDisplay"]);
     98        $new_instance["querySource"] = sanitize_text_field($new_instance["querySource"]);           
     99
     100        if (isset($new_instance['areaSourceConfig']['type']))
     101            $new_instance['areaSourceConfig']['type'] = sanitize_text_field($new_instance['areaSourceConfig']['type']);
     102
     103        if (isset($new_instance['areaSourceConfig']['name']))
     104            $new_instance['areaSourceConfig']['name'] = sanitize_text_field($new_instance['areaSourceConfig']['name']);
     105       
     106        if (isset($new_instance['areaSourceConfig']['title']))
     107            $new_instance['areaSourceConfig']['title'] = sanitize_text_field($new_instance['areaSourceConfig']['title']);
     108
     109        if (isset($new_instance['linkSourceConfig']['linkId']))
     110            $new_instance['linkSourceConfig']['linkId'] = sanitize_text_field($new_instance['linkSourceConfig']['linkId']);
     111
     112        return  $new_instance;
    97113    }
    98114    function form($instance) {
    … …  
    115131        $titleFieldId = $this->get_field_id("title");
    116132        $titleFieldName = $this->get_field_name("title");
    117         $baseFieldId = $this->get_field_id("listingsOptions");
    118         $baseFieldName = $this->get_field_name("listingsOptions");
     133
     134        $listingsToShowFieldId = $this->get_field_id("listingsToShow");
     135        $listingsToShowFieldName = $this->get_field_name("listingsToShow");
     136       
     137        $sortFieldId = $this->get_field_id("sort");
     138        $sortFieldName = $this->get_field_name("sort");
     139
     140        $defaultDisplayFieldId = $this->get_field_id("defaultDisplay");
     141        $defaultDisplayFieldName = $this->get_field_name("defaultDisplay");
     142
     143        $querySourceFieldId = $this->get_field_id("querySource");
     144        $querySourceFieldName = $this->get_field_name("querySource");
     145
     146        $areaSourceConfigFieldId = $this->get_field_id("areaSourceConfig");
     147        $areaSourceConfigFieldName = $this->get_field_name("areaSourceConfig");
     148
     149        $linkSourceConfigFieldId = $this->get_field_id("linkSourceConfig");
     150        $linkSourceConfigFieldName = $this->get_field_name("linkSourceConfig");
    119151
    120152        $checkedDefaultDisplay = array(
    … …  
    178210            </p>
    179211            <p>
    180                 <label for="{$baseFieldId}[listingsToShow]"># of listings to show (max 50)</label>
    181                 <input id="{$baseFieldId}[listingsToShow]" name="{$baseFieldName}[listingsToShow]" value="{$listingsToShow}" class="widefat" type="text" />
     212                <label for="{$listingsToShowFieldId}"># of listings to show (max 50)</label>
     213                <input id="{$listingsToShowFieldId}" name="{$listingsToShowFieldName}" value="{$listingsToShow}" class="widefat" type="text" />
    182214            </p>
    183215            <p>
    184                 <label for="{$baseFieldId}[sort]">Sort order</label>
    185                 <select id="{$baseFieldId}[sort]" name="{$baseFieldName}[sort]" class="widefat">
     216                <label for="{$sortFieldId}">Sort order</label>
     217                <select id="{$sortFieldId}" name="{$sortFieldName}" class="widefat">
    186218                    <option value="DateAdded|DESC" {$selectedSortOrder['DateAddedDESC']}>Time on market, newest first</option>
    187219                    <option value="Price|DESC" {$selectedSortOrder['PriceDESC']}>Price, highest first</option>
    … …  
    193225            </p>
    194226            <p>
    195                 <input type="radio" name="{$baseFieldName}[defaultDisplay]" id="{$baseFieldId}[defaultDisplay-listed]" value="listed" {$checkedDefaultDisplay['listed']}/>
    196                 <label for="{$baseFieldId}[defaultDisplay-listed]">Show in list by default</label>
     227                <input type="radio" name="{$defaultDisplayFieldName}" id="{$defaultDisplayFieldId}[listed]" value="listed" {$checkedDefaultDisplay['listed']}/>
     228                <label for="{$defaultDisplayFieldId}[listed]">Show in list by default</label>
    197229                <br />
    198                 <input type="radio" name="{$baseFieldName}[defaultDisplay]" id="{$baseFieldId}[defaultDisplay-slideshow]" value="slideshow" {$checkedDefaultDisplay['slideshow']}/>
    199                 <label for="{$baseFieldId}[defaultDisplay-slideshow]">Show slideshow details by default</label>
     230                <input type="radio" name="{$defaultDisplayFieldName}" id="{$defaultDisplayFieldId}[slideshow]" value="slideshow" {$checkedDefaultDisplay['slideshow']}/>
     231                <label for="{$defaultDisplayFieldId}[slideshow]">Show slideshow details by default</label>
    200232                <br />
    201                 <input type="radio" name="{$baseFieldName}[defaultDisplay]" id="{$baseFieldId}[defaultDisplay-expanded]" value="expanded" onclick="document.getElementById('{$baseFieldId}[listingsToShow]').value = 4;" {$checkedDefaultDisplay['expanded']}/>
    202                 <label for="{$baseFieldId}[defaultDisplay-expanded]">Show expanded details by default</label>
     233                <input type="radio" name="{$defaultDisplayFieldName}" id="{$defaultDisplayFieldId}[expanded]" value="expanded" onclick="document.getElementById('{$listingsToShowFieldId}').value = 4;" {$checkedDefaultDisplay['expanded']}/>
     234                <label for="{$defaultDisplayFieldId}[expanded]">Show expanded details by default</label>
    203235                <br />
    204                 <input type="radio" name="{$baseFieldName}[defaultDisplay]" id="{$baseFieldId}[defaultDisplay-map]" value="map" {$checkedDefaultDisplay['map']}/>
    205                 <label for="{$baseFieldId}[defaultDisplay-map]">Show on map by default</label>
     236                <input type="radio" name="{$defaultDisplayFieldName}" id="{$defaultDisplayFieldId}[map]" value="map" {$checkedDefaultDisplay['map']}/>
     237                <label for="{$defaultDisplayFieldId}[map]">Show on map by default</label>
    206238            </p>
    207239
    … …  
    210242            <table>
    211243                <tr>
    212                     <td style="width: 20px;"><p><input type="radio" name="{$baseFieldName}[querySource]" id="{$baseFieldId}[querySource-area]" value="area" {$checkedQuerySource['area']}/></p></td>
    213                     <td><p><label for="{$baseFieldId}[querySource-area]">Pick an area</label></p></td>
     244                    <td style="width: 20px;"><p><input type="radio" name="{$querySourceFieldName}" id="{$querySourceFieldId}[area]" value="area" {$checkedQuerySource['area']}/></p></td>
     245                    <td><p><label for="{$querySourceFieldId}[area]">Pick an area</label></p></td>
    214246                </tr>
    215247                <tr>
    … …  
    217249                    <td>
    218250                        <p>
    219                             <label for="{$baseFieldId}[areaSourceConfig][type]">Area type</label>
    220                             <select id="{$baseFieldId}_areaSourceConfig_type" name="{$baseFieldName}[areaSourceConfig][type]" class="widefat" onchange="dsWidgetListings.SwitchType(this, '{$baseFieldId}_areaSourceConfig_title')">
     251                            <label for="{$areaSourceConfigFieldId}_type">Area type</label>
     252                            <select id="{$areaSourceConfigFieldId}_type" name="{$areaSourceConfigFieldName}[type]" class="widefat" onchange="dsWidgetListings.SwitchType(this, '{$areaSourceConfigFieldId}_title')">
    221253                                <option value="city" {$selectedAreaType['city']}>City</option>
    222254                                <option value="community" {$selectedAreaType['community']}>Community</option>
    … …  
    227259
    228260                        <p>
    229                             <label for="{$baseFieldId}[areaSourceConfig][name]">Area name</label>
    230                             <input id="{$baseFieldId}[areaSourceConfig][name]" name="{$baseFieldName}[areaSourceConfig][name]" class="widefat" type="text" value="{$areaSourceConfigName}" />
     261                            <label for="{$areaSourceConfigFieldId}[name]">Area name</label>
     262                            <input id="{$areaSourceConfigFieldId}[name]" name="{$areaSourceConfigFieldName}[name]" class="widefat" type="text" value="{$areaSourceConfigName}" />
    231263                        </p>
    232264
    233265                        <p>
    234                             <span class="description">See all <span id="{$baseFieldId}_areaSourceConfig_title">{$selectedAreaTypeNormalized}</span> Names <a href="javascript:void(0);" onclick="dsWidgetListings.LaunchLookupList('{$ajaxLocationsUrl}', '{$baseFieldId}_areaSourceConfig_type')">here</a></span>
     266                            <span class="description">See all <span id="{$areaSourceConfigFieldId}_title">{$selectedAreaTypeNormalized}</span> Names <a href="javascript:void(0);" onclick="dsWidgetListings.LaunchLookupList('{$ajaxLocationsUrl}', '{$areaSourceConfigFieldId}_type')">here</a></span>
    235267                        </p>
    236268                    </td>
    … …  
    240272                </tr>
    241273                <tr>
    242                     <td valign="top"><p><input type="radio" name="{$baseFieldName}[querySource]" id="{$baseFieldId}[querySource-agentlistings]" value="agentlistings" {$checkedQuerySource['agentlistings']}/></p></td>
     274                    <td valign="top"><p><input type="radio" name="{$querySourceFieldName}" id="{$querySourceFieldId}[agentlistings]" value="agentlistings" {$checkedQuerySource['agentlistings']}/></p></td>
    243275                    <td>
    244                         <p><label for="{$baseFieldId}[querySource-agentlistings]">My own listings (via agent ID, newest listings first)</label></p>
     276                        <p><label for="{$querySourceFieldId}[agentlistings]">My own listings (via agent ID, newest listings first)</label></p>
    245277                        <p><i>{$agentListingsNote}</i></p>
    246278                    </td>
    … …  
    250282                </tr>
    251283                <tr>
    252                     <td valign="top"><p><input type="radio" name="{$baseFieldName}[querySource]" id="{$baseFieldId}[querySource-officelistings]" value="officelistings" {$checkedQuerySource['officelistings']}/></p></td>
     284                    <td valign="top"><p><input type="radio" name="{$querySourceFieldName}" id="{$querySourceFieldId}[officelistings]" value="officelistings" {$checkedQuerySource['officelistings']}/></p></td>
    253285                    <td>
    254                         <p><label for="{$baseFieldId}[querySource-officelistings]">My office's listings (via office ID, newest listings first)</label></p>
     286                        <p><label for="{$querySourceFieldId}[officelistings]">My office's listings (via office ID, newest listings first)</label></p>
    255287                        <p><i>{$officeListingsNote}</i></p>
    256288                    </td>
    … …  
    264296                </tr>
    265297                <tr>
    266                     <td><p><input type="radio" name="{$baseFieldName}[querySource]" id="{$baseFieldId}[querySource-link]" value="link" {$checkedQuerySource['link']}/></p></td>
    267                     <td><p><label for="{$baseFieldId}[querySource-link]">Use a link you created in your website control panel</label></p></td>
     298                    <td><p><input type="radio" name="{$querySourceFieldName}" id="{$querySourceFieldId}[link]" value="link" {$checkedQuerySource['link']}/></p></td>
     299                    <td><p><label for="{$querySourceFieldId}[link]">Use a link you created in your website control panel</label></p></td>
    268300                </tr>
    269301                <tr>
    … …  
    271303                    <td>
    272304                        <p>
    273                             <select name="{$baseFieldName}[linkSourceConfig][linkId]" class="widefat">
     305                            <select name="{$linkSourceConfigFieldName}[linkId]" class="widefat">
    274306HTML;
    275307            foreach ($availableLinks as $link) {

  • dsidxpress/trunk/widget-search.php

    r2415988 r2583880  
    88    }
    99    function widget($args, $instance) {
     10        if(!isset($instance) || empty($instance)) {
     11            return;
     12        }
     13
    1014        extract($args);
    1115        extract($instance);

  • dsidxpress/trunk/widget-single-listing.php

    r2403293 r2583880  
    99   
    1010    public function widget($args, $instance) {
     11        if(!isset($instance) || empty($instance)) {
     12            return;
     13        }
     14
    1115        extract($args, EXTR_SKIP);
    1216       
Note: See TracChangeset for help on using the changeset viewer.