Changeset 2408971
- Timestamp:
- 10/29/2020 10:53:23 AM (5 years ago)
- Location:
- xamoom
- Files:
-
- 8 edited
- 1 copied
-
tags/3.6 (copied) (copied from xamoom/trunk)
-
tags/3.6/includes/class-xamoom.php (modified) (1 diff)
-
tags/3.6/public/class-xamoom-public.php (modified) (5 diffs)
-
tags/3.6/readme.txt (modified) (2 diffs)
-
tags/3.6/xamoom.php (modified) (1 diff)
-
trunk/includes/class-xamoom.php (modified) (1 diff)
-
trunk/public/class-xamoom-public.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/xamoom.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
xamoom/tags/3.6/includes/class-xamoom.php
r2362768 r2408971 69 69 70 70 $this->plugin_name = 'xamoom'; 71 $this->version = '3. 5.0';71 $this->version = '3.6.0'; 72 72 $this->api_endpoint = 'https://api.xamoom.net/consumer/'; 73 73 // $this->api_endpoint = 'https://xamoom-dev.appspot.com/consumer/'; // DEV -
xamoom/tags/3.6/public/class-xamoom-public.php
r2362768 r2408971 183 183 $html = "<style type='text/css'>" . get_option('xamoom_custom_css') . "</style>"; 184 184 185 186 185 //render block HTML for each content block 187 186 for($i = 0; $i < count($content_blocks); $i++){ 188 187 $block = $content_blocks[$i]['attributes']; 189 188 $block_type = $block['block-type']; //get block type 190 191 $html .= "<div class='xamoom_block'>"; //initializes content block div container 192 189 $is_public = $block['is-public']; 190 191 if (!$is_public && !wp_is_mobile()) { 192 continue; 193 } 194 195 //initializes content block div container 196 $html .= "<div class='xamoom_block'>"; 193 197 194 198 $html = $this->generate_blocks_html($block, $block_type, $html, $lang, $id, $custom_map_marker); … … 477 481 $icon = "fa-google-plus"; 478 482 break; 479 483 case "11": //TEL 480 484 $icon = "fa-phone"; 481 485 break; 482 486 case "12": //EMAIL 483 487 $icon = "fa-envelope-o"; 484 488 break; 485 489 case "13": //SPOTIFY 486 490 $icon = "fa-spotify"; 487 491 break; 488 492 case "14": //GOOGLE_MAPS 489 493 $icon = "fa-location-arrow"; 494 break; 495 case "15": //APP STORE 496 $icon = "fa fa-apple"; 497 break; 498 case "16": //GOOGLE PLAY 499 $icon = "fab fa-google-play"; 500 break; 501 case "17": //WINDOWS STORE 502 $icon = "fa fa-windows"; 503 break; 504 case "18": //INSTAGRAM 505 $icon = "fa fa-instagram"; 506 break; 507 case "19": //SMS 508 $icon = "fas fa-sms"; 509 break; 510 case "20": //WHATSAPP 511 $icon = "fab fa-whatsapp"; 490 512 break; 491 513 } … … 714 736 $html .= "var img = new Image(); 715 737 img.onload = async function() { 716 constmapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n738 var mapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n 717 739 map" . ($id . 'tour') . "_" . $map_id . " = mapBounds.map;\n 718 740 new tourMap('$id', '$map_id', '" . $file_url . "', ". $block['scale-x'] .", map" . ($id . 'tour') . "_" . $map_id . ",'" . $lang ."', mapBounds.bounds ); … … 721 743 "; 722 744 } else { //render without custom marker 723 $html .= " constmapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n745 $html .= "var mapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n 724 746 map" . ($id . 'tour') . "_" . $map_id . " = mapBounds.map;\n"; 725 747 $html .= "new tourMap('$id', '$map_id','" . $file_url . "', ". $block['scale-x'] .", map" . ($id . 'tour') . "_" . $map_id . ",'" . $lang ."', mapBounds.bounds )"; … … 955 977 */ 956 978 public function call_api($url){ 957 $header = array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 2, 'user-agent' => 'xamoom wordpress plugin' ));958 $result = wp_remote_get( $url , array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 2, 'user-agent' => 'xamoom wordpress plugin' ) ));979 $header = array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 0, 'user-agent' => 'xamoom wordpress plugin' )); 980 $result = wp_remote_get( $url , array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 0, 'user-agent' => 'xamoom wordpress plugin' ) )); 959 981 return wp_remote_retrieve_body($result); 960 982 } -
xamoom/tags/3.6/readme.txt
r2362777 r2408971 3 3 Tags: CMS, Location Based Service, Mobile Marketing, NFC, QR, iBeacon 4 4 Requires at least: 4.5 5 Tested up to: 5.5 5 Tested up to: 5.5.1 6 6 Requires PHP: 5.2.4 7 Stable tag: 3. 5.07 Stable tag: 3.6.0 8 8 9 9 The connection between the xamoom CMS and WordPress. Use your great mobile content also on the desktop. … … 43 43 44 44 == Changelog == 45 = 3.6 = 46 * Added new link blocks WhatsApp and SMS. 47 45 48 = 3.5 = 46 49 * Added new content block tour. -
xamoom/tags/3.6/xamoom.php
r2362768 r2408971 37 37 * Plugin URI: http://xamoom.com 38 38 * Description: This plugin allows you to sync xamoom pages to Wordpress 39 * Version: 3. 5.039 * Version: 3.6.0 40 40 * Author: xamoom GmbH 41 41 * Author URI: http://xamoom.com/ -
xamoom/trunk/includes/class-xamoom.php
r2362768 r2408971 69 69 70 70 $this->plugin_name = 'xamoom'; 71 $this->version = '3. 5.0';71 $this->version = '3.6.0'; 72 72 $this->api_endpoint = 'https://api.xamoom.net/consumer/'; 73 73 // $this->api_endpoint = 'https://xamoom-dev.appspot.com/consumer/'; // DEV -
xamoom/trunk/public/class-xamoom-public.php
r2362768 r2408971 183 183 $html = "<style type='text/css'>" . get_option('xamoom_custom_css') . "</style>"; 184 184 185 186 185 //render block HTML for each content block 187 186 for($i = 0; $i < count($content_blocks); $i++){ 188 187 $block = $content_blocks[$i]['attributes']; 189 188 $block_type = $block['block-type']; //get block type 190 191 $html .= "<div class='xamoom_block'>"; //initializes content block div container 192 189 $is_public = $block['is-public']; 190 191 if (!$is_public && !wp_is_mobile()) { 192 continue; 193 } 194 195 //initializes content block div container 196 $html .= "<div class='xamoom_block'>"; 193 197 194 198 $html = $this->generate_blocks_html($block, $block_type, $html, $lang, $id, $custom_map_marker); … … 477 481 $icon = "fa-google-plus"; 478 482 break; 479 483 case "11": //TEL 480 484 $icon = "fa-phone"; 481 485 break; 482 486 case "12": //EMAIL 483 487 $icon = "fa-envelope-o"; 484 488 break; 485 489 case "13": //SPOTIFY 486 490 $icon = "fa-spotify"; 487 491 break; 488 492 case "14": //GOOGLE_MAPS 489 493 $icon = "fa-location-arrow"; 494 break; 495 case "15": //APP STORE 496 $icon = "fa fa-apple"; 497 break; 498 case "16": //GOOGLE PLAY 499 $icon = "fab fa-google-play"; 500 break; 501 case "17": //WINDOWS STORE 502 $icon = "fa fa-windows"; 503 break; 504 case "18": //INSTAGRAM 505 $icon = "fa fa-instagram"; 506 break; 507 case "19": //SMS 508 $icon = "fas fa-sms"; 509 break; 510 case "20": //WHATSAPP 511 $icon = "fab fa-whatsapp"; 490 512 break; 491 513 } … … 714 736 $html .= "var img = new Image(); 715 737 img.onload = async function() { 716 constmapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n738 var mapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n 717 739 map" . ($id . 'tour') . "_" . $map_id . " = mapBounds.map;\n 718 740 new tourMap('$id', '$map_id', '" . $file_url . "', ". $block['scale-x'] .", map" . ($id . 'tour') . "_" . $map_id . ",'" . $lang ."', mapBounds.bounds ); … … 721 743 "; 722 744 } else { //render without custom marker 723 $html .= " constmapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n745 $html .= "var mapBounds = renderMap_" . ($id . 'tour') . "_" . $map_id . "(this.width,this.height);\n 724 746 map" . ($id . 'tour') . "_" . $map_id . " = mapBounds.map;\n"; 725 747 $html .= "new tourMap('$id', '$map_id','" . $file_url . "', ". $block['scale-x'] .", map" . ($id . 'tour') . "_" . $map_id . ",'" . $lang ."', mapBounds.bounds )"; … … 955 977 */ 956 978 public function call_api($url){ 957 $header = array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 2, 'user-agent' => 'xamoom wordpress plugin' ));958 $result = wp_remote_get( $url , array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 2, 'user-agent' => 'xamoom wordpress plugin' ) ));979 $header = array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 0, 'user-agent' => 'xamoom wordpress plugin' )); 980 $result = wp_remote_get( $url , array('headers' => array( 'ApiKey' => get_option('xamoom_api_key'), 'X-Reason' => 0, 'user-agent' => 'xamoom wordpress plugin' ) )); 959 981 return wp_remote_retrieve_body($result); 960 982 } -
xamoom/trunk/readme.txt
r2362777 r2408971 3 3 Tags: CMS, Location Based Service, Mobile Marketing, NFC, QR, iBeacon 4 4 Requires at least: 4.5 5 Tested up to: 5.5 5 Tested up to: 5.5.1 6 6 Requires PHP: 5.2.4 7 Stable tag: 3. 5.07 Stable tag: 3.6.0 8 8 9 9 The connection between the xamoom CMS and WordPress. Use your great mobile content also on the desktop. … … 43 43 44 44 == Changelog == 45 = 3.6 = 46 * Added new link blocks WhatsApp and SMS. 47 45 48 = 3.5 = 46 49 * Added new content block tour. -
xamoom/trunk/xamoom.php
r2362768 r2408971 37 37 * Plugin URI: http://xamoom.com 38 38 * Description: This plugin allows you to sync xamoom pages to Wordpress 39 * Version: 3. 5.039 * Version: 3.6.0 40 40 * Author: xamoom GmbH 41 41 * Author URI: http://xamoom.com/
Note: See TracChangeset
for help on using the changeset viewer.