Changeset 2888254
- Timestamp:
- 03/28/2023 10:20:04 AM (3 years ago)
- Location:
- apm-child/trunk
- Files:
-
- 6 edited
-
admin/apm-subscription-settings.php (modified) (3 diffs)
-
admin/classes/ESP.Class.php (modified) (2 diffs)
-
admin/list-aweber.php (modified) (3 diffs)
-
functions/session.php (modified) (2 diffs)
-
mc-main.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
apm-child/trunk/admin/apm-subscription-settings.php
r2745280 r2888254 44 44 $recordCrediantial = $wpdb->get_row($egSqlCrediantial, ARRAY_A); 45 45 46 $apm_first_name = $recordCrediantial['first_name'] ? $recordCrediantial['first_name'] : ''; 47 $apm_last_name = $recordCrediantial['last_name'] ? $recordCrediantial['last_name'] : ''; 48 $apm_email = $recordCrediantial['email'] ? $recordCrediantial['email'] : ''; 49 $apm_jv_zoo_id = $recordCrediantial['jv_zoo_id'] ? $recordCrediantial['jv_zoo_id'] : ''; 50 $apm_clickbank_affiliate_nickname = $recordCrediantial['clickbank_affiliate_nickname'] ? $recordCrediantial['clickbank_affiliate_nickname'] : ''; 51 $apm_warriorplus_aff_id = $recordCrediantial['warriorplus_aff_id'] ? $recordCrediantial['warriorplus_aff_id'] : ''; 52 $apm_thrivecart_affiliate_username = $recordCrediantial['thrivecart_affiliate_username'] ? $recordCrediantial['thrivecart_affiliate_username'] : ''; 53 $apm_email_service_provider = $recordCrediantial['email_service_provider'] ? $recordCrediantial['email_service_provider'] : ''; 54 46 55 ?> 47 56 … … 58 67 59 68 <label for="first_name">First Name</label> 60 <input class="txt-apmbox" name="first_name" type="text" id="first_name" value="<?php echo esc_html($ recordCrediantial['first_name']);?>" size="50" />69 <input class="txt-apmbox" name="first_name" type="text" id="first_name" value="<?php echo esc_html($apm_first_name);?>" size="50" /> 61 70 62 71 <label for="last_name">Last Name</label> 63 <input class="txt-apmbox" name="last_name" type="text" id="last_name" value="<?php echo esc_html($ recordCrediantial['last_name']);?>" size="50" />72 <input class="txt-apmbox" name="last_name" type="text" id="last_name" value="<?php echo esc_html($apm_last_name);?>" size="50" /> 64 73 65 74 <label for="email">Email</label> 66 <input class="txt-apmbox" name="email" type="email" id="email" value="<?php echo esc_html($ recordCrediantial['email']);?>" size="50" />75 <input class="txt-apmbox" name="email" type="email" id="email" value="<?php echo esc_html($apm_email);?>" size="50" /> 67 76 68 77 <label for="jv_zoo_id">JV Zoo ID</label> 69 <input class="txt-apmbox" name="jv_zoo_id" type="text" id="jv_zoo_id" value="<?php echo esc_html($ recordCrediantial['jv_zoo_id']);?>" size="50" />78 <input class="txt-apmbox" name="jv_zoo_id" type="text" id="jv_zoo_id" value="<?php echo esc_html($apm_jv_zoo_id);?>" size="50" /> 70 79 71 80 <label for="clickbank_affiliate_nickname">ClickBank Affiliate Username</label> 72 <input class="txt-apmbox" name="clickbank_affiliate_nickname" type="text" id="clickbank_affiliate_nickname" value="<?php echo esc_html($ recordCrediantial['clickbank_affiliate_nickname']);?>" size="50" />81 <input class="txt-apmbox" name="clickbank_affiliate_nickname" type="text" id="clickbank_affiliate_nickname" value="<?php echo esc_html($apm_clickbank_affiliate_nickname);?>" size="50" /> 73 82 74 83 75 84 <label for="warriorplus_affiliate_id">WarriorPlus Affiliate ID</label> 76 <input class="txt-apmbox" name="warriorplus_affiliate_id" type="text" id="warriorplus_affiliate_id" value="<?php echo esc_html($ recordCrediantial['warriorplus_aff_id']);?>" size="50" />85 <input class="txt-apmbox" name="warriorplus_affiliate_id" type="text" id="warriorplus_affiliate_id" value="<?php echo esc_html($apm_warriorplus_aff_id);?>" size="50" /> 77 86 78 87 79 88 <label for="thrivecart_affiliate_username">ThriveCart Affiliate Username</label> 80 <input class="txt-apmbox" name="thrivecart_affiliate_username" type="text" id="thrivecart_affiliate_username" value="<?php echo esc_html($ recordCrediantial['thrivecart_affiliate_username']);?>" size="50" />89 <input class="txt-apmbox" name="thrivecart_affiliate_username" type="text" id="thrivecart_affiliate_username" value="<?php echo esc_html($apm_thrivecart_affiliate_username);?>" size="50" /> 81 90 82 91 … … 84 93 <select name="email_service_provider" id="email_service_provider"> 85 94 <option value="">_____</option> 86 <option value="Aweber" <?php if($ recordCrediantial['email_service_provider']== "Aweber"){?> selected="selected" <?php } ?>>Aweber</option>87 <option value="Sendeagle" <?php if($ recordCrediantial['email_service_provider']== "Sendeagle"){?> selected="selected" <?php } ?>>Send Eagle</option>88 <option value="Infusionsoft" <?php if($ recordCrediantial['email_service_provider']== "Infusionsoft"){?> selected="selected" <?php } ?>>Infusionsoft/Keap</option>89 <option value="GetResponse" <?php if($ recordCrediantial['email_service_provider']== "GetResponse"){?> selected="selected" <?php } ?>>GetResponse</option>95 <option value="Aweber" <?php if($apm_email_service_provider == "Aweber"){?> selected="selected" <?php } ?>>Aweber</option> 96 <option value="Sendeagle" <?php if($apm_email_service_provider == "Sendeagle"){?> selected="selected" <?php } ?>>Send Eagle</option> 97 <option value="Infusionsoft" <?php if($apm_email_service_provider == "Infusionsoft"){?> selected="selected" <?php } ?>>Infusionsoft/Keap</option> 98 <option value="GetResponse" <?php if($apm_email_service_provider == "GetResponse"){?> selected="selected" <?php } ?>>GetResponse</option> 90 99 </select> 91 100 -
apm-child/trunk/admin/classes/ESP.Class.php
r2745280 r2888254 33 33 "INSERT INTO `".APM_OPTIONS_TABLE."` 34 34 (`first_name`,`last_name`, `email`, `jv_zoo_id`, `email_service_provider`, `clickbank_affiliate_nickname`, `thrivecart_affiliate_username`, `warriorplus_aff_id`, `last_updated_date`) 35 VALUES(%s, %s, %s, %s, %s, %s, %s, %s )",35 VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s)", 36 36 array($first_name, $last_name, $email, $jv_zoo_id, $email_service_provider, $clickbank_affiliate_nickname, $thrivecart_affiliate_username, $warriorplus_aff_id, $current_date)); 37 37 … … 126 126 if($recordCrediantial['email_service_provider'] == "Sendeagle") 127 127 { 128 $company_unique_id = $sendeagle_company_name = ''; 129 128 130 if ($sendeagle_api_key == '') 129 131 { -
apm-child/trunk/admin/list-aweber.php
r2745280 r2888254 280 280 <?php 281 281 282 if(count($resultFunnelList) > 0 && $show_aweber_list == true) 283 { 284 ?> 285 <div style="width:100%; display:inline-block; margin-top:20px; margin-bottom:10px; max-width:785px"> 286 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">Funnel Name</label></div> 287 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">AWeber List</label></div> 288 </div> 282 if( is_array($resultFunnelList )) 283 { 284 if(count($resultFunnelList) > 0 && $show_aweber_list == true) 285 { 286 ?> 287 <div style="width:100%; display:inline-block; margin-top:20px; margin-bottom:10px; max-width:785px"> 288 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">Funnel Name</label></div> 289 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">AWeber List</label></div> 290 </div> 289 291 <?php 292 } 290 293 } 291 294 292 295 293 296 $resultFunnelList = json_decode($resultFunnelList); 294 295 if(count($resultFunnelList) > 0 && $show_aweber_list == true) 296 { 297 foreach($resultFunnelList as $funnelList) 298 { 297 298 if( is_array($resultFunnelList )) 299 { 300 if(count($resultFunnelList) > 0 && $show_aweber_list == true) 301 { 302 foreach($resultFunnelList as $funnelList) 303 { 299 304 ?> 300 <div style="width:100%; margin:0; padding:0; clear:both"></div>301 <div style="width:100%; display:inline-block; max-width:785px; margin-bottom:5px;">302 <div style="width:49%; display:inline-block">303 <span><input type="hidden" name="funnel_id[]" value="<?php echo $funnelList->ID;?>" /> <?php echo $funnelList->funnel_name;?></span>304 </div>305 <div style="width:49%; display:inline-block">306 <?php 307 if($show_aweber_list == true)308 {305 <div style="width:100%; margin:0; padding:0; clear:both"></div> 306 <div style="width:100%; display:inline-block; max-width:785px; margin-bottom:5px;"> 307 <div style="width:49%; display:inline-block"> 308 <span><input type="hidden" name="funnel_id[]" value="<?php echo $funnelList->ID;?>" /> <?php echo $funnelList->funnel_name;?></span> 309 </div> 310 <div style="width:49%; display:inline-block"> 311 <?php 312 if($show_aweber_list == true) 313 { 309 314 ?> 310 311 <select name="esp_list_id[]">312 <option value="">_____________</option>313 <?php314 foreach ($account->lists as $list)315 {316 ?>317 <option value="<?php echo $list->id?>" <?php if(count($MappingFunnelIndexArr) > 0){ if(@$MappingFunnelIndexArr[$funnelList->ID] == $list->id){?> selected="selected" <?php } }?>><?php echo esc_html($list->name)?></option>318 <?php319 }320 ?>321 315 322 </select> 323 <?php 324 } 316 <select name="esp_list_id[]"> 317 <option value="">_____________</option> 318 <?php 319 foreach ($account->lists as $list) 320 { 321 ?> 322 <option value="<?php echo $list->id?>" <?php if(count($MappingFunnelIndexArr) > 0){ if(@$MappingFunnelIndexArr[$funnelList->ID] == $list->id){?> selected="selected" <?php } }?>><?php echo esc_html($list->name)?></option> 323 <?php 324 } 325 ?> 326 327 </select> 328 <?php 329 } 325 330 ?> 326 331 </div> 327 332 </div> 328 333 <?php 329 } 334 } 335 } 330 336 } 331 337 } … … 340 346 <?php 341 347 342 if(count($resultFunnelList) > 0 && count($sendeagle_lists) > 0) 343 { 344 ?> 345 <div style="width:100%; display:inline-block; margin-top:20px; margin-bottom:10px; max-width:785px"> 346 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">Funnel Name</label></div> 347 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">SendEagle List</label></div> 348 </div> 348 if( is_array( $resultFunnelList ) && is_array( $sendeagle_lists ) ) 349 { 350 if(count($resultFunnelList) > 0 && count($sendeagle_lists) > 0) 351 { 352 ?> 353 <div style="width:100%; display:inline-block; margin-top:20px; margin-bottom:10px; max-width:785px"> 354 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">Funnel Name</label></div> 355 <div style="width:49%; display:inline-block;"><label style="font-weight:700; font-size:15px;">SendEagle List</label></div> 356 </div> 349 357 <?php 358 } 350 359 } 351 360 … … 353 362 $resultFunnelList = json_decode($resultFunnelList); 354 363 355 if(count($resultFunnelList) > 0 && count($sendeagle_lists) > 0) 356 { 357 foreach($resultFunnelList as $funnelList) 358 { 364 if( is_array( $resultFunnelList ) && is_array( $sendeagle_lists ) ) 365 { 366 if(count($resultFunnelList) > 0 && count($sendeagle_lists) > 0) 367 { 368 foreach($resultFunnelList as $funnelList) 369 { 359 370 ?> 360 <div style="width:100%; margin:0; padding:0; clear:both"></div>361 <div style="width:100%; display:inline-block; max-width:785px; margin-bottom:5px;">362 <div style="width:49%; display:inline-block">363 <span><input type="hidden" name="funnel_id[]" value="<?php echo $funnelList->ID;?>" /> <?php echo $funnelList->funnel_name;?></span>364 </div>365 <div style="width:49%; display:inline-block">366 <?php 367 if(count($sendeagle_lists) > 0)368 {371 <div style="width:100%; margin:0; padding:0; clear:both"></div> 372 <div style="width:100%; display:inline-block; max-width:785px; margin-bottom:5px;"> 373 <div style="width:49%; display:inline-block"> 374 <span><input type="hidden" name="funnel_id[]" value="<?php echo $funnelList->ID;?>" /> <?php echo $funnelList->funnel_name;?></span> 375 </div> 376 <div style="width:49%; display:inline-block"> 377 <?php 378 if(count($sendeagle_lists) > 0) 379 { 369 380 ?> 370 <select name="esp_list_id[]">371 <option value="">_____________</option>372 <?php 373 foreach($sendeagle_lists as $sendeagle_list)374 {375 ?> 376 <option value="<?php echo $sendeagle_list['list_unique_id']?>" <?php if(@$MappingFunnelIndexArr[$funnelList->ID] == $sendeagle_list['list_unique_id']){?> selected="selected" <?php }?>><?php echo esc_html($sendeagle_list['list_name'])?></option>377 <?php 378 }379 ?> 380 </select>381 <?php 382 }383 ?> 384 </div>385 </div>381 <select name="esp_list_id[]"> 382 <option value="">_____________</option> 383 <?php 384 foreach($sendeagle_lists as $sendeagle_list) 385 { 386 ?> 387 <option value="<?php echo $sendeagle_list['list_unique_id']?>" <?php if(@$MappingFunnelIndexArr[$funnelList->ID] == $sendeagle_list['list_unique_id']){?> selected="selected" <?php }?>><?php echo esc_html($sendeagle_list['list_name'])?></option> 388 <?php 389 } 390 ?> 391 </select> 392 <?php 393 } 394 ?> 395 </div> 396 </div> 386 397 <?php 387 } 398 } 399 } 388 400 } 389 401 } -
apm-child/trunk/functions/session.php
r2138159 r2888254 58 58 $siteURLParent = str_replace("https://","", $siteURLParent); 59 59 60 if( count($recordCrediantial) > 0 && strtolower($siteURLParent) == $siteURL)60 if(is_array( $recordCrediantial )) 61 61 { 62 $egSql = $wpdb->prepare("UPDATE `".APM_OPTIONS_TABLE."` SET `user_email_id` = %s WHERE ID = %d LIMIT 1", array(apm_get_session_value('apm_ses_user_login'), $recordCrediantial['ID'])); 63 $wpdb->query($egSql); 62 if(count($recordCrediantial) > 0 && strtolower($siteURLParent) == $siteURL) 63 { 64 $egSql = $wpdb->prepare("UPDATE `".APM_OPTIONS_TABLE."` SET `user_email_id` = %s WHERE ID = %d LIMIT 1", array(apm_get_session_value('apm_ses_user_login'), $recordCrediantial['ID'])); 65 $wpdb->query($egSql); 66 } 64 67 } 65 68 } … … 84 87 } 85 88 } 89 86 90 function apm_logout() 87 91 { 92 @setcookie( $_COOKIE['apm_logged_in'], '', time() - ( 15 * 60 ) ); 93 @setcookie( $_COOKIE['apm_ses_user_login'], '', time() - ( 15 * 60 ) ); 88 94 unset($_COOKIE['apm_logged_in']); 89 95 unset($_COOKIE['apm_ses_user_login']); 90 @setcookie( $_COOKIE['apm_logged_in'], '', time() - ( 15 * 60 ) );91 @setcookie( $_COOKIE['apm_ses_user_login'], '', time() - ( 15 * 60 ) );92 96 } 93 97 -
apm-child/trunk/mc-main.php
r2761202 r2888254 9 9 Author: Nick James 10 10 E-mail: admin@nickjamesadmin.com 11 Version: 3. 211 Version: 3.3 12 12 Author URI: http://www.pluginpixie.com 13 13 */ … … 15 15 //ini_set('display_errors',1); 16 16 global $APM_SUBSCRIPTION_VER; 17 $APM_SUBSCRIPTION_VER = "3. 2";17 $APM_SUBSCRIPTION_VER = "3.3"; 18 18 19 19 define('APM_SUBSCRIPTION_PATH', plugins_url().'/'. basename(dirname(__FILE__)).'/'); -
apm-child/trunk/readme.txt
r2761202 r2888254 5 5 Stable tag: 2.1.3 6 6 Requires PHP: 5.4 7 Tested up to: 6. 07 Tested up to: 6.1.1 8 8 License: GPLv2 9 9 License URI: https://www.gnu.org/licenses/gpl-2.0.html … … 207 207 *Version update 208 208 209 3. 1209 3.2 210 210 *Change optinMonster tag logic 211 211 *Version update 212 213 3.3 214 *Fixed Compatibility Issues 215 *Version update
Note: See TracChangeset
for help on using the changeset viewer.