Plugin Directory

Changeset 733104


Ignore:
Timestamp:
06/27/2013 09:24:33 PM (13 years ago)
Author:
snielsen
Message:

Fixed some more outstanding bugs.

Location:
ultralink/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • ultralink/trunk/headers/adminheader.php

    r733091 r733104  
    1515    else
    1616    {
     17        $networkAdmin = 'false';
     18   
    1719        $wpdb->query( "SHOW tables LIKE '" . $wpdb->prefix . "ultralink_config'" );
    1820
     
    8183    }
    8284   
    83 //    $options = $wpdb->get_row("SELECT ultralinkEnabled, alwaysSearch, defaultSearch, useMultisiteDatabase, amazonAffiliateTag, linkshareID, ebayPublisherID, ultralinkEnabled, ultralinkMeEmail, ultralinkMeAPIKey, ultralinkMeWebsiteVerifier, UNIX_TIMESTAMP(ultralinkMeLastSync) AS ultralinkMeLastSync, mergeUltralinkMeLinks, ultralinkMeAnalytics, latestAvailableVersion, latestAvailableVersionString FROM " . $dbPrefix . "ultralink_config");
    8485    $options = $wpdb->get_row("SELECT ultralinkEnabled, alwaysSearch, combineSimilarButtons, multipleSearchOptions, linksMakeNewWindows, mouseProximityFade, hasHoverTime, hasPopupRecoveryTime, hoverTime, popupRecoveryTime, defaultSearch, useMultisiteDatabase, amazonAffiliateTag, linkshareID, ebayCampaign, ultralinkEnabled, ultralinkMeEmail, ultralinkMeAPIKey, ultralinkMeWebsiteVerifier, UNIX_TIMESTAMP(ultralinkMeLastSync) AS ultralinkMeLastSync, mergeUltralinkMeLinks, ultralinkMeAnalytics, latestAvailableVersion, latestAvailableVersionString, sourceType, source FROM " . $dbPrefix . "ultralink_config");
    8586    if( is_null($options) )
     
    8889        {
    8990            $wpdb->query("INSERT INTO " . $dbPrefix . "ultralink_config (defaultSearch) VALUES('google')");
    90     //        $options = $wpdb->get_row("SELECT ultralinkEnabled, alwaysSearch, defaultSearch, useMultisiteDatabase, amazonAffiliateTag, linkshareID, ebayPublisherID, ultralinkEnabled, ultralinkMeEmail, ultralinkMeAPIKey, ultralinkMeWebsiteVerifier, UNIX_TIMESTAMP(ultralinkMeLastSync) AS ultralinkMeLastSync, mergeUltralinkMeLinks, ultralinkMeAnalytics, latestAvailableVersion, latestAvailableVersionString FROM " . $dbPrefix . "ultralink_config");
    9191            $options = $wpdb->get_row("SELECT ultralinkEnabled, alwaysSearch, combineSimilarButtons, multipleSearchOptions, linksMakeNewWindows, mouseProximityFade, hasHoverTime, hasPopupRecoveryTime, hoverTime, popupRecoveryTime, defaultSearch, useMultisiteDatabase, amazonAffiliateTag, linkshareID, ebayCampaign, ultralinkEnabled, ultralinkMeEmail, ultralinkMeAPIKey, ultralinkMeWebsiteVerifier, UNIX_TIMESTAMP(ultralinkMeLastSync) AS ultralinkMeLastSync, mergeUltralinkMeLinks, ultralinkMeAnalytics, latestAvailableVersion, latestAvailableVersionString, sourceType, source FROM " . $dbPrefix . "ultralink_config");
    9292        }
     
    122122    $amazonAffiliateTag = $options->amazonAffiliateTag;
    123123    $linkshareID        = $options->linkshareID;
    124 //    $ebayPublisherID    = $options->ebayPublisherID;
    125124    $ebayCampaign       = $options->ebayCampaign;
    126125   
     
    144143    var amazonAffiliateTag = '<?php echo $amazonAffiliateTag; ?>';
    145144    var linkshareID = '<?php echo $linkshareID; ?>';
    146 //    var ebayPublisherID = '<?php echo $ebayPublisherID; ?>';
    147145    var ebayCampaign = '<?php echo $ebayCampaign; ?>';
    148146   
  • ultralink/trunk/headers/globals.php

    r733091 r733104  
    99       
    1010    $ultralink_version = "33";
    11     $ultralink_version_string = "0.9.3.1";
     11    $ultralink_version_string = "0.9.3.2";
    1212   
    1313?>
  • ultralink/trunk/panes/settings.php

    r723202 r733104  
    2828        var oldAmazonTag = amazonAffiliateTag;
    2929        var oldLinkshareID = linkshareID;
    30 //            var oldEbayPublisherID = ebayPublisherID;
    3130        var oldEbayCampaign = ebayCampaign;
    3231   
     
    3635        amazonAffiliateTag = document.getElementById('ultralink_amazonAffiliateTag').value;
    3736        linkshareID = document.getElementById('ultralink_linkshareID').value;
    38 //            ebayPublisherID = document.getElementById('ultralink_ebayPublisherID').value;
    3937        ebayCampaign = document.getElementById('ultralink_ebayCampaign').value;
    4038       
     
    6462        settingsString += "&ultralink_amazonAffiliateTag=" + encodeURIComponent(amazonAffiliateTag);
    6563        settingsString += "&ultralink_linkshareID=" + encodeURIComponent(linkshareID);
    66 //            settingsString += "&ultralink_ebayPublisherID=" + encodeURIComponent(ebayPublisherID);
    6764        settingsString += "&ultralink_ebayCampaign=" + encodeURIComponent(ebayCampaign);
    6865        settingsString += "&ultralink_mergeUltralinkMeLinks=" + document.getElementById('ultralink_mergeUltralinkMeLinks').checked;
     
    7572            {
    7673                console.log(xhrCall.responseText);
    77                
    78 //                if( oldAmazonTag != amazonAffiliateTag ) //*
    79 //                {
    80 //                    APICall( localAPI + "rebuildAffiliateLinks.php", "&ultralink_link_type=" + "buyamazon" + "&ultralink_old_info=" + oldAmazonTag, function( xhrCall ){ console.log(xhrCall.responseText); } );
    81 //                }
    82 //               
    83 //                if( oldLinkshareID != linkshareID )
    84 //                {
    85 //                    APICall( localAPI + "rebuildAffiliateLinks.php", "&ultralink_link_type=" + "buylinkshareapple" + "&ultralink_old_info=" + oldLinkshareID, function( xhrCall ){ console.log(xhrCall.responseText); } );
    86 //                }
    87 //
    88 ////                        if( oldEbayPublisherID != ebayPublisherID )
    89 //                if( oldEbayCampaign != ebayCampaign )
    90 //                {
    91 //                    APICall( localAPI + "rebuildAffiliateLinks.php", "&ultralink_link_type=" + "buyebay" + "&ultralink_old_info=" + oldEbayCampaign, function( xhrCall ){ console.log(xhrCall.responseText); } );
    92 //                }
    9374            }
    9475            else
  • ultralink/trunk/readme.txt

    r733091 r733104  
    55Requires at least: 3.0
    66Tested up to: 3.5.1
    7 Stable tag: 0.9.3.1
     7Stable tag: 0.9.3.2
    88License: Ultralink License
    99License URI: https://ultralink.me/w/license.txt
  • ultralink/trunk/ultralink-manager.php

    r723202 r733104  
    4545        jQuery("ul.tabs").tabs("div.panes > div");
    4646       
    47 //        var pane = '<?php echo $_GET['pane']; ?>';
     47//        var pane = '<?php /*echo $_GET['pane'];*/ ?>';
    4848       
    4949//        if( pane )
  • ultralink/trunk/ultralink.php

    r733091 r733104  
    44Plugin URI: https://ultralink.me
    55Description: The Hyperlink, 2.0. Add rich context to your writing, create a better experience for your readers and make more revenue doing it.
    6 Version: 0.9.3.1
     6Version: 0.9.3.2
    77Author: Ultralink Inc.
    88Author URI: http://ultralink.me
     
    133133            else if( $options->defaultSearch ==   'bing' ){ $searchURL = "http://www.bing.com/search?q=";   }
    134134                                                      else{ $searchURL = "http://www.google.com/search?q="; }
    135         }
    136        
    137         $imagesURL = plugin_dir_url( __FILE__ ) . "ultralinkImages/";
    138        
    139         echo "<script type='text/javascript'>Ultralink.startUltralink( { $databaseOption 'environment':'wordpress', 'scanFirst':'$scanFirst', 'sectionSelector':'div.entry-content', 'associatedWebsite':'" . site_url() .  "', 'combineLikeButtons':'$combineSimilarButtons', 'seperateSearch':'$multipleSearchOptions', 'newWindows':'$linksMakeNewWindows', 'proximityFade':'$mouseProximityFade', 'hoverTime':'$hoverTime', 'hoverRecoverTime':'$popupRecoveryTime', 'addSearch':'$addSearch', 'searchURL':'$searchURL', 'imagesURL':'$imagesURL', 'inlinePopups':'true', 'UMAnalytics':'$UMAnalytics'$adminOptions, 'iconSide' : 'right', 'buyamazon_affiliateInfo' : '$amazonAffiliateTag', 'buylinkshareapple_affiliateInfo' : '$linkshareID', 'buyebay_affiliateInfo' : '$ebayCampaign'  } );</script>";
     135
     136            $imagesURL = plugin_dir_url( __FILE__ ) . "ultralinkImages/";
     137           
     138            echo "<script type='text/javascript'>Ultralink.startUltralink( { $databaseOption 'environment':'wordpress', 'scanFirst':'$scanFirst', 'sectionSelector':'div.entry-content', 'associatedWebsite':'" . site_url() .  "', 'combineLikeButtons':'$combineSimilarButtons', 'seperateSearch':'$multipleSearchOptions', 'newWindows':'$linksMakeNewWindows', 'proximityFade':'$mouseProximityFade', 'hoverTime':'$hoverTime', 'hoverRecoverTime':'$popupRecoveryTime', 'addSearch':'$addSearch', 'searchURL':'$searchURL', 'imagesURL':'$imagesURL', 'inlinePopups':'true', 'UMAnalytics':'$UMAnalytics'$adminOptions, 'iconSide' : 'right', 'buyamazon_affiliateInfo' : '$amazonAffiliateTag', 'buylinkshareapple_affiliateInfo' : '$linkshareID', 'buyebay_affiliateInfo' : '$ebayCampaign'  } );</script>";
     139        }       
    140140    }
    141141
     
    551551    $amazonAffiliateTag = $wpdb->escape($_POST['ultralink_amazonAffiliateTag']);
    552552    $linkshareID = $wpdb->escape($_POST['ultralink_linkshareID']);
    553 //        $ebayPublisherID = $wpdb->escape($_POST['ultralink_ebayPublisherID']);
    554553    $ebayCampaign = $wpdb->escape($_POST['ultralink_ebayCampaign']);
    555554
Note: See TracChangeset for help on using the changeset viewer.