Changeset 3337228
- Timestamp:
- 07/31/2025 11:28:38 AM (8 months ago)
- Location:
- travelmanager-buchungssoftware/trunk
- Files:
-
- 1 added
- 7 edited
-
ajax/target.php (modified) (1 diff)
-
buchung.component.php (modified) (1 diff)
-
index.php (modified) (9 diffs)
-
js/buchung.js (modified) (5 diffs)
-
js/fahrtfinderv2.js (modified) (1 diff)
-
js/functions-tm.js (modified) (1 diff)
-
libs/functions.php (modified) (3 diffs)
-
libs/metatitle_desc.php (added)
Legend:
- Unmodified
- Added
- Removed
-
travelmanager-buchungssoftware/trunk/ajax/target.php
r3328231 r3337228 161 161 $url.="&do=getRelations"; 162 162 163 $result = travelmanager_request_content($url, $_POST["signets"]==""?1:15 );163 $result = travelmanager_request_content($url, $_POST["signets"]==""?1:15,$_POST["lang"]); 164 164 165 165 $json = json_decode($result["msg"],true); -
travelmanager-buchungssoftware/trunk/buchung.component.php
r3255799 r3337228 10 10 elseif(isset($_SESSION['vermittler_id']) AND !empty($_SESSION['vermittler_id'])){ 11 11 $ref=$_SESSION['vermittler_id']; 12 } 13 14 //Meta Title und Description im Cache speichern 15 if(!empty($json["description"]) AND !empty($json["title"]) AND function_exists("tm_set_meta_data") AND function_exists("tm_save_meta_cache_url")){ 16 tm_set_meta_data($json["title"], $json["description"]); 17 tm_save_meta_cache_url($json["title"], $json["description"]); 12 18 } 13 19 -
travelmanager-buchungssoftware/trunk/index.php
r3328231 r3337228 4 4 Plugin URI: https://travelmanager.de/funktionen/wordpress-plugin/ 5 5 Description: Inhalte aus der Travelmanager, Tickyt Buchungssoftware und Gastrozack Gastrokasse direkt in WordPress einbinden 6 Version: 22. 096 Version: 22.10 7 7 Author: Philipp Stäbler 8 8 Text Domain: travelmanager … … 14 14 include( plugin_dir_path( __FILE__ ) . 'ajax/target.php'); 15 15 require_once plugin_dir_path( __FILE__ ) . 'libs/functions.php'; 16 require_once plugin_dir_path( __FILE__ ) . 'libs/metatitle_desc.php'; 16 17 17 18 if( !function_exists('get_plugin_data') ){ … … 36 37 { 37 38 global $dialog, $locale; 38 $regional = "en";39 if ($locale == 'de_DE' || $locale == 'de' || $locale == 'de_AT') {40 $regional = "de";41 setlocale(LC_TIME, "de_DE.UTF-8", "de_DE", "deu_deu", "de", "german");42 } elseif ($locale == 'pl_PL' || $locale == 'pl') {43 $regional = "pl";44 setlocale(LC_TIME, "pl_PL.UTF-8", "pl_PL", "pol_pol", "pl", "polish");45 } else {46 setlocale(LC_TIME, "en_US.UTF-8", "en_US", "english");47 }48 39 49 40 $plugin_data = get_plugin_data( __FILE__ ); … … 81 72 'current_date' => '', 82 73 'ressource_id' => '', 74 'cache' => '', 83 75 'call' => '' 84 76 ), $atts ); 77 78 //Spracheinstellung 79 $useLang = ""; 80 if(isset($a["lang"]) && !empty($a["lang"])){ 81 $useLang = $a["lang"]; 82 } 83 84 if ($useLang == "de" OR ($locale == 'de_DE' || $locale == 'de' || $locale == 'de_AT')) { 85 $regional = "de"; 86 setlocale(LC_TIME, "de_DE.UTF-8", "de_DE", "deu_deu", "de", "german"); 87 } elseif ($useLang == "pl" OR ($locale == 'pl_PL' || $locale == 'pl')) { 88 $regional = "pl"; 89 setlocale(LC_TIME, "pl_PL.UTF-8", "pl_PL", "pol_pol", "pl", "polish"); 90 } else { 91 $regional = "en"; 92 setlocale(LC_TIME, "en_US.UTF-8", "en_US", "english"); 93 } 85 94 86 95 //Sanitize … … 334 343 //Wenn es eine URL Gibt - Daten holen 335 344 if(!empty($url)){ 345 346 //Cache verwenden 347 $useCache= true; 348 if(isset($a["cache"]) && $a["cache"]==="false"){ 349 $useCache = false; 350 } 351 336 352 $url.="&from=wordpress"; 337 353 $url.="&version=".$plugin_version; … … 340 356 //URL speichern 341 357 $keyHash = travelmanager_save_hash($url); 342 $result = travelmanager_request_content($url,$cacheMinutes );358 $result = travelmanager_request_content($url,$cacheMinutes,$regional, $useCache); 343 359 344 360 if(array_key_exists("fehler",$result) && $result["fehler"]==true){ … … 696 712 } 697 713 elseif($a["call"]=="eventinfo"){ 714 // Eventinfo-Komponente einbinden 698 715 include("buchung.component.php"); 699 716 } … … 979 996 $Ausgabe.="<input type='hidden' id='tm_dialoge' value='".rawurlencode( json_encode( $dialog))."'/>"; 980 997 981 return "<div class='tm_plugin' lang='$ locale'>".$Ausgabe."</div>";998 return "<div class='tm_plugin' lang='$regional'>".$Ausgabe."</div>"; 982 999 } 983 1000 … … 1008 1025 add_action('wp_head', 'travelmanager_plugin_calendar_locale'); 1009 1026 add_action('wp_head', 'travelmanager_plugin_ajaxurl'); 1010 1011 1027 add_shortcode( 'travelmanager', 'travelmanager' ); 1012 1028 add_shortcode( 'tickyt', 'travelmanager' ); -
travelmanager-buchungssoftware/trunk/js/buchung.js
r3313142 r3337228 71 71 data['station_stop_id'] = station_stop_id; 72 72 data['linie_id'] = linie_id; 73 data['lang'] = $("div.tm_plugin").first().attr("lang"); 73 74 data['hash']=$(vObjj).attr("keyhash"); 74 75 … … 107 108 } 108 109 109 url+="&lang="+ getLanguageCode();110 url+="&lang="+$("div.tm_plugin").first().attr("lang"); 110 111 111 112 $(container).removeClass("hide"); … … 192 193 data['action'] = 'travelmanager_eventinfo_rueckfahrt'; 193 194 data['ankunft'] = ankunft; 195 data['lang'] = $("div.tm_plugin").first().attr("lang"); 194 196 data['hinfahrt_linie_id'] = linie_id; 195 197 data['station_start_id'] = $(vObjj).attr("location_start_id"); … … 232 234 } 233 235 234 url+="&lang="+ getLanguageCode();236 url+="&lang="+$("div.tm_plugin").first().attr("lang"); 235 237 236 238 $(container).removeClass("hide"); … … 267 269 url+="&vermittler_id="+vermittler_id; 268 270 } 269 url+="&lang="+ getLanguageCode();271 url+="&lang="+$("div.tm_plugin").first().attr("lang"); 270 272 var button = $("<input type='button' class='button' value='"+dialoge["einfache_fahrt"]+"'/>"); 271 273 $(button).on("click",function(){ -
travelmanager-buchungssoftware/trunk/js/fahrtfinderv2.js
r3222178 r3337228 73 73 data['max'] = $(container).attr("max"); 74 74 data['vermittler_id'] = $(container).attr("ref"); 75 data['lang'] = $("div.tm_plugin").first().attr("lang"); 75 76 data['datum'] = $(container).find("[name='datum_abfahrt']").val(); 76 77 data['rand'] = Math.random(); -
travelmanager-buchungssoftware/trunk/js/functions-tm.js
r3313142 r3337228 292 292 293 293 } 294 295 function getLanguageCode() {296 var lang = document.documentElement.lang || 'en';297 return lang.split('-')[0]; // Return the first part of the language code (e.g., 'en' from 'en-US')298 } -
travelmanager-buchungssoftware/trunk/libs/functions.php
r3315469 r3337228 63 63 } 64 64 65 function travelmanager_request_content($url,$cacheMinutes ){65 function travelmanager_request_content($url,$cacheMinutes,$lang='',$useCache=true){ 66 66 67 67 $return = array(); 68 68 $url.="&tsnow=".date('Y-m-d'); //Den Timestamp des Tages anhängenxs 69 $url.= tm_get_local_url( ); //Sprache hinzufügen69 $url.= tm_get_local_url($lang); //Sprache hinzufügen 70 70 71 71 $key = md5($url); … … 81 81 82 82 //Prüfung ob Daten neu geholt werden 83 if ($json_data===false OR empty($json_data) OR $cacheMinutes < 0 ) {83 if ($json_data===false OR empty($json_data) OR $cacheMinutes < 0 OR !$useCache) { 84 84 $args = array( 85 85 'timeout' => 15, 86 86 'sslverify' => false 87 87 ); 88 88 89 //Daten neu holen 89 90 $response = wp_remote_get( $url,$args); … … 289 290 } 290 291 291 function tm_get_local_url() { 292 292 function tm_get_local_url($lang) { 293 293 $url = ""; 294 295 if (get_locale() == 'de_DE') { 294 if(isset($lang) && !empty($lang)){ 295 $url.="&lang=".$lang; 296 } 297 elseif (get_locale() == 'de_DE') { 296 298 $url.="&lang=de"; 297 299 }
Note: See TracChangeset
for help on using the changeset viewer.