Changeset 733104
- Timestamp:
- 06/27/2013 09:24:33 PM (13 years ago)
- Location:
- ultralink/trunk
- Files:
-
- 6 edited
-
headers/adminheader.php (modified) (5 diffs)
-
headers/globals.php (modified) (1 diff)
-
panes/settings.php (modified) (4 diffs)
-
readme.txt (modified) (1 diff)
-
ultralink-manager.php (modified) (1 diff)
-
ultralink.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ultralink/trunk/headers/adminheader.php
r733091 r733104 15 15 else 16 16 { 17 $networkAdmin = 'false'; 18 17 19 $wpdb->query( "SHOW tables LIKE '" . $wpdb->prefix . "ultralink_config'" ); 18 20 … … 81 83 } 82 84 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");84 85 $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"); 85 86 if( is_null($options) ) … … 88 89 { 89 90 $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");91 91 $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"); 92 92 } … … 122 122 $amazonAffiliateTag = $options->amazonAffiliateTag; 123 123 $linkshareID = $options->linkshareID; 124 // $ebayPublisherID = $options->ebayPublisherID;125 124 $ebayCampaign = $options->ebayCampaign; 126 125 … … 144 143 var amazonAffiliateTag = '<?php echo $amazonAffiliateTag; ?>'; 145 144 var linkshareID = '<?php echo $linkshareID; ?>'; 146 // var ebayPublisherID = '<?php echo $ebayPublisherID; ?>';147 145 var ebayCampaign = '<?php echo $ebayCampaign; ?>'; 148 146 -
ultralink/trunk/headers/globals.php
r733091 r733104 9 9 10 10 $ultralink_version = "33"; 11 $ultralink_version_string = "0.9.3. 1";11 $ultralink_version_string = "0.9.3.2"; 12 12 13 13 ?> -
ultralink/trunk/panes/settings.php
r723202 r733104 28 28 var oldAmazonTag = amazonAffiliateTag; 29 29 var oldLinkshareID = linkshareID; 30 // var oldEbayPublisherID = ebayPublisherID;31 30 var oldEbayCampaign = ebayCampaign; 32 31 … … 36 35 amazonAffiliateTag = document.getElementById('ultralink_amazonAffiliateTag').value; 37 36 linkshareID = document.getElementById('ultralink_linkshareID').value; 38 // ebayPublisherID = document.getElementById('ultralink_ebayPublisherID').value;39 37 ebayCampaign = document.getElementById('ultralink_ebayCampaign').value; 40 38 … … 64 62 settingsString += "&ultralink_amazonAffiliateTag=" + encodeURIComponent(amazonAffiliateTag); 65 63 settingsString += "&ultralink_linkshareID=" + encodeURIComponent(linkshareID); 66 // settingsString += "&ultralink_ebayPublisherID=" + encodeURIComponent(ebayPublisherID);67 64 settingsString += "&ultralink_ebayCampaign=" + encodeURIComponent(ebayCampaign); 68 65 settingsString += "&ultralink_mergeUltralinkMeLinks=" + document.getElementById('ultralink_mergeUltralinkMeLinks').checked; … … 75 72 { 76 73 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 // }93 74 } 94 75 else -
ultralink/trunk/readme.txt
r733091 r733104 5 5 Requires at least: 3.0 6 6 Tested up to: 3.5.1 7 Stable tag: 0.9.3. 17 Stable tag: 0.9.3.2 8 8 License: Ultralink License 9 9 License URI: https://ultralink.me/w/license.txt -
ultralink/trunk/ultralink-manager.php
r723202 r733104 45 45 jQuery("ul.tabs").tabs("div.panes > div"); 46 46 47 // var pane = '<?php echo $_GET['pane'];?>';47 // var pane = '<?php /*echo $_GET['pane'];*/ ?>'; 48 48 49 49 // if( pane ) -
ultralink/trunk/ultralink.php
r733091 r733104 4 4 Plugin URI: https://ultralink.me 5 5 Description: 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. 16 Version: 0.9.3.2 7 7 Author: Ultralink Inc. 8 8 Author URI: http://ultralink.me … … 133 133 else if( $options->defaultSearch == 'bing' ){ $searchURL = "http://www.bing.com/search?q="; } 134 134 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 } 140 140 } 141 141 … … 551 551 $amazonAffiliateTag = $wpdb->escape($_POST['ultralink_amazonAffiliateTag']); 552 552 $linkshareID = $wpdb->escape($_POST['ultralink_linkshareID']); 553 // $ebayPublisherID = $wpdb->escape($_POST['ultralink_ebayPublisherID']);554 553 $ebayCampaign = $wpdb->escape($_POST['ultralink_ebayCampaign']); 555 554
Note: See TracChangeset
for help on using the changeset viewer.