Ticket #1418: Erweiterung für Datenschutz- & Widerruf-Checkbox im Checkout.patch

File Erweiterung für Datenschutz- & Widerruf-Checkbox im Checkout.patch, 71.7 KB (added by Torsten Riemer, 8 years ago)

  • _installer/includes/sql/modified.sql

     
    16301630INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_PRODUCTS_KEYWORDS_LENGTH', '255', 16, 2, NULL, NOW(), NULL, NULL);
    16311631INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_KEYWORDS_LENGTH', '180', 16, 2, NULL, NOW(), NULL, NULL);
    16321632INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_TITLE_LENGTH', '55', 16, 2, NULL, NOW(), NULL, NULL);
    1633 INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_STOP_WORDS', '#german:\r\nab,aber,abgerufen,abgerufene,abgerufener,abgerufenes,acht,alle,allein,allem,allen,aller,allerdings,allerlei,alles,allgemein,allmählich,allzu,als,alsbald,also,am,an,ander,andere,anderem,anderen,anderer,andererseits,anderes,anderm,andern,andernfalls,anders,anerkannt,anerkannte,anerkannter,anerkanntes,anfangen,anfing,angefangen,angesetze,angesetzt,angesetzten,angesetzter,ansetzen,anstatt,arbeiten,auch,auf,aufgehört,aufgrund,aufhören,aufhörte,aufzusuchen,aus,ausdrücken,ausdrückt,ausdrückte,ausgenommen,ausser,ausserdem,author,autor,außen,außer,außerdem,außerhalb,bald,bearbeite,bearbeiten,bearbeitete,bearbeiteten,bedarf,bedurfte,bedürfen,befragen,befragte,befragten,befragter,begann,beginnen,begonnen,behalten,behielt,bei,beide,beiden,beiderlei,beides,beim,beinahe,beitragen,beitrugen,bekannt,bekannte,bekannter,bekennen,benutzt,bereits,berichten,berichtet,berichtete,berichteten,besonders,besser,bestehen,besteht,beträchtlich,bevor,bezüglich,bietet,bin,bis,bisher,bislang,bist,bleiben,blieb,bloss,bloß,brachte,brachten,brauchen,braucht,bringen,bräuchte,bsp.,bzw,böden,ca.,da,dabei,dadurch,dafür,dagegen,daher,dahin,damals,damit,danach,daneben,dank,danke,danken,dann,dannen,daran,darauf,daraus,darf,darfst,darin,darum,darunter,darüber,darüberhinaus,das,dass,dasselbe,davon,davor,dazu,daß,dein,deine,deinem,deinen,deiner,deines,dem,demnach,demselben,den,denen,denn,dennoch,denselben,der,derart,derartig,derem,deren,derer,derjenige,derjenigen,derselbe,derselben,derzeit,des,deshalb,desselben,dessen,desto,deswegen,dich,die,diejenige,dies,diese,dieselbe,dieselben,diesem,diesen,dieser,dieses,diesseits,dinge,dir,direkt,direkte,direkten,direkter,doch,doppelt,dort,dorther,dorthin,drauf,drei,dreißig,drin,dritte,drunter,drüber,du,dunklen,durch,durchaus,durfte,durften,dürfen,dürfte,eben,ebenfalls,ebenso,ehe,eher,eigenen,eigenes,eigentlich,ein,einbaün,eine,einem,einen,einer,einerseits,eines,einfach,einführen,einführte,einführten,eingesetzt,einig,einige,einigem,einigen,einiger,einigermaßen,einiges,einmal,eins,einseitig,einseitige,einseitigen,einseitiger,einst,einstmals,einzig,ende,entsprechend,entweder,er,ergänze,ergänzen,ergänzte,ergänzten,erhalten,erhielt,erhielten,erhält,erneut,erst,erste,ersten,erster,eröffne,eröffnen,eröffnet,eröffnete,eröffnetes,es,etc,etliche,etwa,etwas,euch,euer,eure,eurem,euren,eurer,eures,fall,falls,fand,fast,ferner,finden,findest,findet,folgende,folgenden,folgender,folgendes,folglich,fordern,fordert,forderte,forderten,fortsetzen,fortsetzt,fortsetzte,fortsetzten,fragte,frau,frei,freie,freier,freies,fuer,fünf,für,gab,ganz,ganze,ganzem,ganzen,ganzer,ganzes,gar,gbr,geb,geben,geblieben,gebracht,gedurft,geehrt,geehrte,geehrten,geehrter,gefallen,gefiel,gefälligst,gefällt,gegeben,gegen,gehabt,gehen,geht,gekommen,gekonnt,gemacht,gemocht,gemäss,genommen,genug,gern,gesagt,gesehen,gestern,gestrige,getan,geteilt,geteilte,getragen,gewesen,gewissermaßen,gewollt,geworden,ggf,gib,gibt,gleich,gleichwohl,gleichzeitig,glücklicherweise,gmbh,gratulieren,gratuliert,gratulierte,gute,guten,gängig,gängige,gängigen,gängiger,gängiges,gänzlich,hab,habe,haben,haette,halb,hallo,hast,hat,hatte,hatten,hattest,hattet,heraus,herein,heute,heutige,hier,hiermit,hiesige,hin,hinein,hinten,hinter,hinterher,hoch,hundert,hätt,hätte,hätten,höchstens,ich,igitt,ihm,ihn,ihnen,ihr,ihre,ihrem,ihren,ihrer,ihres,im,immer,immerhin,important,in,indem,indessen,info,infolge,innen,innerhalb,ins,insofern,inzwischen,irgend,irgendeine,irgendwas,irgendwen,irgendwer,irgendwie,irgendwo,ist,ja,je,jede,jedem,jeden,jedenfalls,jeder,jederlei,jedes,jedoch,jemand,jene,jenem,jenen,jener,jenes,jenseits,jetzt,jährig,jährige,jährigen,jähriges,kam,kann,kannst,kaum,kein,keine,keinem,keinen,keiner,keinerlei,keines,keineswegs,klar,klare,klaren,klares,klein,kleinen,kleiner,kleines,koennen,koennt,koennte,koennten,komme,kommen,kommt,konkret,konkrete,konkreten,konkreter,konkretes,konnte,konnten,könn,können,könnt,könnte,könnten,künftig,lag,lagen,langsam,lassen,laut,lediglich,leer,legen,legte,legten,leicht,leider,lesen,letze,letzten,letztendlich,letztens,letztes,letztlich,lichten,liegt,liest,links,längst,längstens,mache,machen,machst,macht,machte,machten,mag,magst,mal,man,manche,manchem,manchen,mancher,mancherorts,manches,manchmal,mann,margin,mehr,mehrere,mein,meine,meinem,meinen,meiner,meines,meist,meiste,meisten,meta,mich,mindestens,mir,mit,mithin,mochte,morgen,morgige,muessen,muesst,muesste,muss,musst,musste,mussten,muß,mußt,möchte,möchten,möchtest,mögen,möglich,mögliche,möglichen,möglicher,möglicherweise,müssen,müsste,müssten,müßt,müßte,nach,nachdem,nacher,nachhinein,nacht,nahm,natürlich,neben,nebenan,nehmen,nein,neu,neue,neuem,neuen,neuer,neues,neun,nicht,nichts,nie,niemals,niemand,nimm,nimmer,nimmt,nirgends,nirgendwo,noch,nun,nur,nutzen,nutzt,nutzung,nächste,nämlich,nötigenfalls,nützt,ob,oben,oberhalb,obgleich,obschon,obwohl,oder,oft,ohne,per,pfui,plötzlich,pro,reagiere,reagieren,reagiert,reagierte,rechts,regelmäßig,rief,rund,sage,sagen,sagt,sagte,sagten,sagtest,sang,sangen,schlechter,schließlich,schnell,schon,schreibe,schreiben,schreibens,schreiber,schwierig,schätzen,schätzt,schätzte,schätzten,sechs,sect,sehe,sehen,sehr,sehrwohl,seht,sei,seid,sein,seine,seinem,seinen,seiner,seines,seit,seitdem,seite,seiten,seither,selber,selbst,senke,senken,senkt,senkte,senkten,setzen,setzt,setzte,setzten,sich,sicher,sicherlich,sie,sieben,siebte,siehe,sieht,sind,singen,singt,so,sobald,sodaß,soeben,sofern,sofort,sog,sogar,solange,solch,solche,solchem,solchen,solcher,solches,soll,sollen,sollst,sollt,sollte,sollten,solltest,somit,sondern,sonst,sonstwo,sooft,soviel,soweit,sowie,sowohl,spielen,später,startet,startete,starteten,statt,stattdessen,steht,steige,steigen,steigt,stets,stieg,stiegen,such,suchen,sämtliche,tages,tat,tatsächlich,tatsächlichen,tatsächlicher,tatsächliches,tausend,teile,teilen,teilte,teilten,titel,total,trage,tragen,trotzdem,trug,trägt,tun,tust,tut,txt,tät,ueber,um,umso,unbedingt,und,ungefähr,unmöglich,unmögliche,unmöglichen,unmöglicher,unnötig,uns,unse,unsem,unsen,unser,unsere,unserem,unseren,unserer,unseres,unserm,unses,unten,unter,unterbrach,unterbrechen,unterhalb,unwichtig,usw,vergangen,vergangene,vergangener,vergangenes,vermag,vermutlich,vermögen,verrate,verraten,verriet,verrieten,version,versorge,versorgen,versorgt,versorgte,versorgten,versorgtes,veröffentlichen,veröffentlicher,veröffentlicht,veröffentlichte,veröffentlichten,veröffentlichtes,viel,viele,vielen,vieler,vieles,vielleicht,vielmals,vier,vollständig,vom,von,vor,voran,vorbei,vorgestern,vorher,vorne,vorüber,völlig,wachen,waere,wann,war,waren,warst,warum,was,weder,weg,wegen,weil,weiter,weitere,weiterem,weiteren,weiterer,weiteres,weiterhin,weiß,welche,welchem,welchen,welcher,welches,wem,wen,wenig,wenige,weniger,wenigstens,wenn,wenngleich,wer,werde,werden,werdet,weshalb,wessen,wichtig,wie,wieder,wieso,wieviel,wiewohl,will,willst,wir,wird,wirklich,wirst,wo,wodurch,wogegen,woher,wohin,wohingegen,wohl,wohlweislich,wolle,wollen,wollt,wollte,wollten,wolltest,wolltet,womit,woraufhin,woraus,worin,wurde,wurden,während,währenddessen,wär,wäre,wären,würde,würden,z.B.,zahlreich,zehn,zeitweise,ziehen,zieht,zog,zogen,zu,zudem,zuerst,zufolge,zugleich,zuletzt,zum,zumal,zur,zurück,zusammen,zuviel,zwanzig,zwar,zwei,zwischen,zwölf,ähnlich,übel,über,überall,überallhin,überdies,übermorgen,übrig,übrigens\r\n\r\n#english:\r\na\'s,able,about,above,abroad,according,accordingly,across,actually,adj,after,afterwards,again,against,ago,ahead,ain\'t,all,allow,allows,almost,alone,along,alongside,already,also,although,always,am,amid,amidst,among,amongst,an,and,another,any,anybody,anyhow,anyone,anything,anyway,anyways,anywhere,apart,appear,appreciate,appropriate,are,aren\'t,around,as,aside,ask,asking,associated,at,available,away,awfully,back,backward,backwards,be,became,because,become,becomes,becoming,been,before,beforehand,begin,behind,being,believe,below,beside,besides,best,better,between,beyond,both,brief,but,by,c\'mon,c\'s,came,can,can\'t,cannot,cant,caption,cause,causes,certain,certainly,changes,clearly,co,co.,com,come,comes,concerning,consequently,consider,considering,contain,containing,contains,corresponding,could,couldn\'t,course,currently,dare,daren\'t,definitely,described,despite,did,didn\'t,different,directly,do,does,doesn\'t,doing,don\'t,done,down,downwards,during,each,edu,eg,eight,eighty,either,else,elsewhere,end,ending,enough,entirely,especially,et,etc,even,ever,evermore,every,everybody,everyone,everything,everywhere,ex,exactly,example,except,fairly,far,farther,few,fewer,fifth,first,five,followed,following,follows,for,forever,former,formerly,forth,forward,found,four,from,further,furthermore,get,gets,getting,given,gives,go,goes,going,gone,got,gotten,greetings,had,hadn\'t,half,happens,hardly,has,hasn\'t,have,haven\'t,having,he,he\'d,he\'ll,he\'s,hello,help,hence,her,here,here\'s,hereafter,hereby,herein,hereupon,hers,herself,hi,him,himself,his,hither,hopefully,how,howbeit,however,hundred,i\'d,i\'ll,i\'m,i\'ve,ie,if,ignored,immediate,in,inasmuch,inc,inc.,indeed,indicate,indicated,indicates,inner,inside,insofar,instead,into,inward,is,isn\'t,it,it\'d,it\'ll,it\'s,its,itself,just,k,keep,keeps,kept,know,known,knows,last,lately,later,latter,latterly,least,less,lest,let,let\'s,like,liked,likely,likewise,little,look,looking,looks,low,lower,ltd,made,mainly,make,makes,many,may,maybe,mayn\'t,me,mean,meantime,meanwhile,merely,might,mightn\'t,mine,minus,miss,more,moreover,most,mostly,mr,mrs,much,must,mustn\'t,my,myself,name,namely,nd,near,nearly,necessary,need,needn\'t,needs,neither,never,neverf,neverless,nevertheless,new,next,nine,ninety,no,no-one,nobody,non,none,nonetheless,noone,nor,normally,not,nothing,notwithstanding,novel,now,nowhere,obviously,of,off,often,oh,ok,okay,old,on,once,one,one\'s,ones,only,onto,opposite,or,other,others,otherwise,ought,oughtn\'t,our,ours,ourselves,out,outside,over,overall,own,particular,particularly,past,per,perhaps,placed,please,plus,possible,presumably,probably,provided,provides,que,quite,qv,rather,rd,re,really,reasonably,recent,recently,regarding,regardless,regards,relatively,respectively,right,round,said,same,saw,say,saying,says,second,secondly,see,seeing,seem,seemed,seeming,seems,seen,self,selves,sensible,sent,serious,seriously,seven,several,shall,shan\'t,she,she\'d,she\'ll,she\'s,should,shouldn\'t,since,six,so,some,somebody,someday,somehow,someone,something,sometime,sometimes,somewhat,somewhere,soon,sorry,specified,specify,specifying,still,sub,such,sup,sure,t\'s,take,taken,taking,tell,tends,th,than,thank,thanks,thanx,that,that\'ll,that\'s,that\'ve,thats,the,their,theirs,them,themselves,then,thence,there,there\'d,there\'ll,there\'re,there\'s,there\'ve,thereafter,thereby,therefore,therein,theres,thereupon,these,they,they\'d,they\'ll,they\'re,they\'ve,thing,things,think,third,thirty,this,thorough,thoroughly,those,though,three,through,throughout,thru,thus,till,to,together,too,took,toward,towards,tried,tries,truly,try,trying,twice,two,un,under,underneath,undoing,unfortunately,unless,unlike,unlikely,until,unto,up,upon,upwards,us,use,used,useful,uses,using,usually,v,value,various,versus,very,via,viz,vs,want,wants,was,wasn\'t,way,we,we\'d,we\'ll,we\'re,we\'ve,welcome,well,went,were,weren\'t,what,what\'ll,what\'s,what\'ve,whatever,when,whence,whenever,where,where\'s,whereafter,whereas,whereby,wherein,whereupon,wherever,whether,which,whichever,while,whilst,whither,who,who\'d,who\'ll,who\'s,whoever,whole,whom,whomever,whose,why,will,willing,wish,with,within,without,won\'t,wonder,would,wouldn\'t,yes,yet,you,you\'d,you\'ll,you\'re,you\'ve,your,yours,yourself,yourselves,zero', 16, 16, NULL, NOW(), NULL, 'xtc_cfg_textarea(');
     1633INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_STOP_WORDS', '#german:\r\nab,aber,abgerufen,abgerufene,abgerufener,abgerufenes,acht,alle,allein,allem,allen,aller,allerdings,allerlei,alles,allgemein,allm?hlich,allzu,als,alsbald,also,am,an,ander,andere,anderem,anderen,anderer,andererseits,anderes,anderm,andern,andernfalls,anders,anerkannt,anerkannte,anerkannter,anerkanntes,anfangen,anfing,angefangen,angesetze,angesetzt,angesetzten,angesetzter,ansetzen,anstatt,arbeiten,auch,auf,aufgeh?rt,aufgrund,aufh?ren,aufh?rte,aufzusuchen,aus,ausdr?cken,ausdr?ckt,ausdr?ckte,ausgenommen,ausser,ausserdem,author,autor,au?en,au?er,au?erdem,au?erhalb,bald,bearbeite,bearbeiten,bearbeitete,bearbeiteten,bedarf,bedurfte,bed?rfen,befragen,befragte,befragten,befragter,begann,beginnen,begonnen,behalten,behielt,bei,beide,beiden,beiderlei,beides,beim,beinahe,beitragen,beitrugen,bekannt,bekannte,bekannter,bekennen,benutzt,bereits,berichten,berichtet,berichtete,berichteten,besonders,besser,bestehen,besteht,betr?chtlich,bevor,bez?glich,bietet,bin,bis,bisher,bislang,bist,bleiben,blieb,bloss,blo?,brachte,brachten,brauchen,braucht,bringen,br?uchte,bsp.,bzw,b?den,ca.,da,dabei,dadurch,daf?r,dagegen,daher,dahin,damals,damit,danach,daneben,dank,danke,danken,dann,dannen,daran,darauf,daraus,darf,darfst,darin,darum,darunter,dar?ber,dar?berhinaus,das,dass,dasselbe,davon,davor,dazu,da?,dein,deine,deinem,deinen,deiner,deines,dem,demnach,demselben,den,denen,denn,dennoch,denselben,der,derart,derartig,derem,deren,derer,derjenige,derjenigen,derselbe,derselben,derzeit,des,deshalb,desselben,dessen,desto,deswegen,dich,die,diejenige,dies,diese,dieselbe,dieselben,diesem,diesen,dieser,dieses,diesseits,dinge,dir,direkt,direkte,direkten,direkter,doch,doppelt,dort,dorther,dorthin,drauf,drei,drei?ig,drin,dritte,drunter,dr?ber,du,dunklen,durch,durchaus,durfte,durften,d?rfen,d?rfte,eben,ebenfalls,ebenso,ehe,eher,eigenen,eigenes,eigentlich,ein,einba?n,eine,einem,einen,einer,einerseits,eines,einfach,einf?hren,einf?hrte,einf?hrten,eingesetzt,einig,einige,einigem,einigen,einiger,einigerma?en,einiges,einmal,eins,einseitig,einseitige,einseitigen,einseitiger,einst,einstmals,einzig,ende,entsprechend,entweder,er,erg?nze,erg?nzen,erg?nzte,erg?nzten,erhalten,erhielt,erhielten,erh?lt,erneut,erst,erste,ersten,erster,er?ffne,er?ffnen,er?ffnet,er?ffnete,er?ffnetes,es,etc,etliche,etwa,etwas,euch,euer,eure,eurem,euren,eurer,eures,fall,falls,fand,fast,ferner,finden,findest,findet,folgende,folgenden,folgender,folgendes,folglich,fordern,fordert,forderte,forderten,fortsetzen,fortsetzt,fortsetzte,fortsetzten,fragte,frau,frei,freie,freier,freies,fuer,f?nf,f?r,gab,ganz,ganze,ganzem,ganzen,ganzer,ganzes,gar,gbr,geb,geben,geblieben,gebracht,gedurft,geehrt,geehrte,geehrten,geehrter,gefallen,gefiel,gef?lligst,gef?llt,gegeben,gegen,gehabt,gehen,geht,gekommen,gekonnt,gemacht,gemocht,gem?ss,genommen,genug,gern,gesagt,gesehen,gestern,gestrige,getan,geteilt,geteilte,getragen,gewesen,gewisserma?en,gewollt,geworden,ggf,gib,gibt,gleich,gleichwohl,gleichzeitig,gl?cklicherweise,gmbh,gratulieren,gratuliert,gratulierte,gute,guten,g?ngig,g?ngige,g?ngigen,g?ngiger,g?ngiges,g?nzlich,hab,habe,haben,haette,halb,hallo,hast,hat,hatte,hatten,hattest,hattet,heraus,herein,heute,heutige,hier,hiermit,hiesige,hin,hinein,hinten,hinter,hinterher,hoch,hundert,h?tt,h?tte,h?tten,h?chstens,ich,igitt,ihm,ihn,ihnen,ihr,ihre,ihrem,ihren,ihrer,ihres,im,immer,immerhin,important,in,indem,indessen,info,infolge,innen,innerhalb,ins,insofern,inzwischen,irgend,irgendeine,irgendwas,irgendwen,irgendwer,irgendwie,irgendwo,ist,ja,je,jede,jedem,jeden,jedenfalls,jeder,jederlei,jedes,jedoch,jemand,jene,jenem,jenen,jener,jenes,jenseits,jetzt,j?hrig,j?hrige,j?hrigen,j?hriges,kam,kann,kannst,kaum,kein,keine,keinem,keinen,keiner,keinerlei,keines,keineswegs,klar,klare,klaren,klares,klein,kleinen,kleiner,kleines,koennen,koennt,koennte,koennten,komme,kommen,kommt,konkret,konkrete,konkreten,konkreter,konkretes,konnte,ko,liegt,liest,links,l?ngst,l?ngstens,mache,machen,machst,macht,machte,machten,mag,magst,mal,man,manche,manchem,manchen,mancher,mancherorts,manches,manchmal,mann,margin,mehr,mehrere,mein,meine,meinem,meinen,meiner,meines,meist,meiste,meisten,meta,mich,mindestens,mir,mit,mithin,mochte,morgen,morgige,muessen,muesst,muesste,muss,musst,musste,mussten,mu?,mu?t,m?chte,m?chten,m?chtest,m?gen,m?glich,m?gliche,m?glichen,m?glicher,m?glicherweise,m?ssen,m?sste,m?ssten,m??t,m??te,nach,nachdem,nacher,nachhinein,nacht,nahm,nat?rlich,neben,nebenan,nehmen,nein,neu,neue,neuem,neuen,neuer,neues,neun,nicht,nichts,nie,niemals,niemand,nimm,nimmer,nimmt,nirgends,nirgendwo,noch,nun,nur,nutzen,nutzt,nutzung,n?chste,n?mlich,n?tigenfalls,n?tzt,ob,oben,oberhalb,obgleich,obschon,obwohl,oder,oft,ohne,per,pfui,pl?tzlich,pro,reagiere,reagieren,reagiert,reagierte,rechts,regelm??ig,rief,rund,sage,sagen,sagt,sagte,sagten,sagtest,sang,sangen,schlechter,schlie?lich,schnell,schon,schreibe,schreiben,schreibens,schreiber,schwierig,sch?tzen,sch?tzt,sch?tzte,sch?tzten,sechs,sect,sehe,sehen,sehr,sehrwohl,seht,sei,seid,sein,seine,seinem,seinen,seiner,seines,seit,seitdem,seite,seiten,seither,selber,selbst,senke,senken,senkt,senkte,senkten,setzen,setzt,setzte,setzten,sich,sicher,sicherlich,sie,sieben,siebte,siehe,sieht,sind,singen,singt,so,sobald,soda?,soeben,sofern,sofort,sog,sogar,solange,solch,solche,solchem,solchen,solcher,solches,soll,sollen,sollst,sollt,sollte,sollten,solltest,somit,sondern,sonst,sonstwo,sooft,soviel,soweit,sowie,sowohl,spielen,sp?ter,startet,startete,starteten,statt,stattdessen,steht,steige,steigen,steigt,stets,stieg,stiegen,such,suchen,s?mtliche,tages,tat,tats?chlich,tats?chlichen,tats?chlicher,tats?chliches,tausend,teile,teilen,teilte,teilten,titel,total,trage,tragen,trotzdem,trug,tr?gt,tun,tust,tut,txt,t?t,ueber,um,umso,unbedingt,und,ungef?hr,unm?glich,unm?gliche,unm?glichen,unm?glicher,unn?tig,uns,unse,unsem,unsen,unser,unsere,unserem,unseren,unserer,unseres,unserm,unses,unten,unter,unterbrach,unterbrechen,unterhalb,unwichtig,usw,vergangen,vergangene,vergangener,vergangenes,vermag,vermutlich,verm?gen,verrate,verraten,verriet,verrieten,version,versorge,versorgen,versorgt,versorgte,versorgten,versorgtes,ver?ffentlichen,ver?ffentlicher,ver?ffentlicht,ver?ffentlichte,ver?ffentlichten,ver?ffentlichtes,viel,viele,vielen,vieler,vieles,vielleicht,vielmals,vier,vollst?ndig,vom,von,vor,voran,vorbei,vorgestern,vorher,vorne,vor?ber,v?llig,wachen,waere,wann,war,waren,warst,warum,was,weder,weg,wegen,weil,weiter,weitere,weiterem,weiteren,weiterer,weiteres,weiterhin,wei?,welche,welchem,welchen,welcher,welches,wem,wen,wenig,wenige,weniger,wenigstens,wenn,wenngleich,wer,werde,werden,werdet,weshalb,wessen,wichtig,wie,wieder,wieso,wieviel,wiewohl,will,willst,wir,wird,wirklich,wirst,wo,wodurch,wogegen,woher,wohin,wohingegen,wohl,wohlweislich,wolle,wollen,wollt,wollte,wollten,wolltest,wolltet,womit,woraufhin,woraus,worin,wurde,wurden,w?hrend,w?hrenddessen,w?r,w?re,w?ren,w?rde,w?rden,z.B.,zahlreich,zehn,zeitweise,ziehen,zieht,zog,zogen,zu,zudem,zuerst,zufolge,zugleich,zuletzt,zum,zumal,zur,zur?ck,zusammen,zuviel,zwanzig,zwar,zwei,zwischen,zw?lf,?hnlich,?bel,?ber,?berall,?berallhin,?berdies,?bermorgen,?brig,?brigens\r\n\r\n#english:\r\na\'s,able,about,above,abroad,according,accordingly,across,actually,adj,after,afterwards,again,against,ago,ahead,ain\'t,all,allow,allows,almost,alone,along,alongside,already,also,although,always,am,amid,amidst,among,amongst,an,and,another,any,anybody,anyhow,anyone,anything,anyway,anyways,anywhere,apart,appear,appreciate,appropriate,are,aren\'t,around,as,aside,ask,asking,associated,at,available,away,awfully,back,backward,backwards,be,became,because,become,becomes,becoming,been,before,beforehand,begin,behind,being,believe,below,beside,besides,best,better,between,beyond,both,brief,but,by,c\'mon,c\'s,came,can,can\'t,cannot,cant,caption,cause,causes,certain,certainly,changes,clearly,co,co.,com,come,comes,concerning,consequently,consider,considering,contain,containing,contains,corresponding,could,couldn\'t,course,currently,dare,daren\'t,ds,doesn\'t,doing,don\'t,done,down,downwards,during,each,edu,eg,eight,eighty,either,else,elsewhere,end,ending,enough,entirely,especially,et,etc,even,ever,evermore,every,everybody,everyone,everything,everywhere,ex,exactly,example,except,fairly,far,farther,few,fewer,fifth,first,five,followed,following,follows,for,forever,former,formerly,forth,forward,found,four,from,further,furthermore,get,gets,getting,given,gives,go,goes,going,gone,got,gotten,greetings,had,hadn\'t,half,happens,hardly,has,hasn\'t,have,haven\'t,having,he,he\'d,he\'ll,he\'s,hello,help,hence,her,here,here\'s,hereafter,hereby,herein,hereupon,hers,herself,hi,him,himself,his,hither,hopefully,how,howbeit,however,hundred,i\'d,i\'ll,i\'m,i\'ve,ie,if,ignored,immediate,in,inasmuch,inc,inc.,indeed,indicate,indicated,indicates,inner,inside,insofar,instead,into,inward,is,isn\'t,it,it\'d,it\'ll,it\'s,its,itself,just,k,keep,keeps,kept,know,known,knows,last,lately,later,latter,latterly,least,less,lest,let,let\'s,like,liked,likely,likewise,little,look,looking,looks,low,lower,ltd,made,mainly,make,makes,many,may,maybe,mayn\'t,me,mean,meantime,meanwhile,merely,might,mightn\'t,mine,minus,miss,more,moreover,most,mostly,mr,mrs,much,must,mustn\'t,my,myself,name,namely,nd,near,nearly,necessary,need,needn\'t,needs,neither,never,neverf,neverless,nevertheless,new,next,nine,ninety,no,no-one,nobody,non,none,nonetheless,noone,nor,normally,not,nothing,notwithstanding,novel,now,nowhere,obviously,of,off,often,oh,ok,okay,old,on,once,one,one\'s,ones,only,onto,opposite,or,other,others,otherwise,ought,oughtn\'t,our,ours,ourselves,out,outside,over,overall,own,particular,particularly,past,per,perhaps,placed,please,plus,possible,presumably,probably,provided,provides,que,quite,qv,rather,rd,re,really,reasonably,recent,recently,regarding,regardless,regards,relatively,respectively,right,round,said,same,saw,say,saying,says,second,secondly,see,seeing,seem,seemed,seeming,seems,seen,self,selves,sensible,sent,serious,seriously,seven,several,shall,shan\'t,she,she\'d,she\'ll,she\'s,should,shouldn\'t,since,six,so,some,somebody,someday,somehow,someone,something,sometime,sometimes,somewhat,somewhere,soon,sorry,specified,specify,specifying,still,sub,such,sup,sure,t\'s,take,taken,taking,tell,tends,th,than,thank,thanks,thanx,that,that\'ll,that\'s,that\'ve,thats,the,their,theirs,them,themselves,then,thence,there,there\'d,there\'ll,there\'re,there\'s,there\'ve,thereafter,thereby,therefore,therein,theres,thereupon,these,they,they\'d,they\'ll,they\'re,they\'ve,thing,things,think,third,thirty,this,thorough,thoroughly,those,though,three,through,throughout,thru,thus,till,to,together,too,took,toward,towards,tried,tries,truly,try,trying,twice,two,un,under,underneath,undoing,unfortunately,unless,unlike,unlikely,until,unto,up,upon,upwards,us,use,used,useful,uses,using,usually,v,value,various,versus,very,via,viz,vs,want,wants,was,wasn\'t,way,we,we\'d,we\'ll,we\'re,we\'ve,welcome,well,went,were,weren\'t,what,what\'ll,what\'s,what\'ve,whatever,when,whence,whenever,where,where\'s,whereafter,whereas,whereby,wherein,whereupon,wherever,whether,which,whichever,while,whilst,whither,who,who\'d,who\'ll,who\'s,whoever,whole,whom,whomever,whose,why,will,willing,wish,with,within,without,won\'t,wonder,would,wouldn\'t,yes,yet,you,you\'d,you\'ll,you\'re,you\'ve,your,yours,yourself,yourselves,zero', 16, 16, NULL, NOW(), NULL, 'xtc_cfg_textarea(');
    16341634INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_GO_WORDS', '', 16, 17, NULL, NOW(), NULL, 'xtc_cfg_textarea(');
    16351635INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_CAT_SHOP_TITLE', 'false', 16, 18, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16361636INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'META_PROD_SHOP_TITLE', 'false', 16, 19, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    … …  
    16701670INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'MODULE_NEWSLETTER_STATUS', 'true', 17, 19, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16711671INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'MODULE_NEWSLETTER_VOUCHER_AMOUNT', '0', 17, 20, NULL, NOW(), NULL, NULL);
    16721672INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'MODULE_NEWSLETTER_DISCOUNT_COUPON', '', 17, 21, NULL, NOW(), NULL, NULL);
     1673INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'DISPLAY_PRIVACY_POLICY_ON_CHECKOUT', 'false', 17, 20, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    16731674
    16741675#configuration_group_id 18, VAT reg no
    16751676INSERT INTO configuration (configuration_id, configuration_key, configuration_value, configuration_group_id, sort_order, last_modified, date_added, use_function, set_function) VALUES (NULL, 'ACCOUNT_COMPANY_VAT_CHECK', 'true', 18, 4, NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'),');
    … …  
    22202221
    22212222# Germany
    22222223INSERT INTO zones VALUES (NULL,81,'NI','Niedersachsen');
    2223 INSERT INTO zones VALUES (NULL,81,'BW','Baden-Württemberg');
     2224INSERT INTO zones VALUES (NULL,81,'BW','Baden-W?rttemberg');
    22242225INSERT INTO zones VALUES (NULL,81,'BY','Bayern');
    22252226INSERT INTO zones VALUES (NULL,81,'BE','Berlin');
    22262227INSERT INTO zones VALUES (NULL,81,'BR','Brandenburg');
    … …  
    22342235INSERT INTO zones VALUES (NULL,81,'SN','Sachsen');
    22352236INSERT INTO zones VALUES (NULL,81,'ST','Sachsen-Anhalt');
    22362237INSERT INTO zones VALUES (NULL,81,'SH','Schleswig-Holstein');
    2237 INSERT INTO zones VALUES (NULL,81,'TH','Thüringen');
     2238INSERT INTO zones VALUES (NULL,81,'TH','Th?ringen');
    22382239
    22392240# Austria
    22402241INSERT INTO zones VALUES (NULL,14,'WI','Wien');
    2241 INSERT INTO zones VALUES (NULL,14,'NO','Niederösterreich');
    2242 INSERT INTO zones VALUES (NULL,14,'OO','Oberösterreich');
     2242INSERT INTO zones VALUES (NULL,14,'NO','Nieder?sterreich');
     2243INSERT INTO zones VALUES (NULL,14,'OO','Ober?sterreich');
    22432244INSERT INTO zones VALUES (NULL,14,'SB','Salzburg');
    2244 INSERT INTO zones VALUES (NULL,14,'KN','Kärnten');
     2245INSERT INTO zones VALUES (NULL,14,'KN','K?rnten');
    22452246INSERT INTO zones VALUES (NULL,14,'ST','Steiermark');
    22462247INSERT INTO zones VALUES (NULL,14,'TI','Tirol');
    22472248INSERT INTO zones VALUES (NULL,14,'BL','Burgenland');
    … …  
    22572258INSERT INTO zones VALUES (NULL,204,'FR','Freiburg');
    22582259INSERT INTO zones VALUES (NULL,204,'GE','Genf');
    22592260INSERT INTO zones VALUES (NULL,204,'GL','Glarus');
    2260 INSERT INTO zones VALUES (NULL,204,'GR','Graubünden');
     2261INSERT INTO zones VALUES (NULL,204,'GR','Graub?nden');
    22612262INSERT INTO zones VALUES (NULL,204,'JU','Jura');
    22622263INSERT INTO zones VALUES (NULL,204,'LU','Luzern');
    22632264INSERT INTO zones VALUES (NULL,204,'NE','Neuenburg');
    … …  
    22732274INSERT INTO zones VALUES (NULL,204,'VD','Waadt');
    22742275INSERT INTO zones VALUES (NULL,204,'VS','Wallis');
    22752276INSERT INTO zones VALUES (NULL,204,'ZG','Zug');
    2276 INSERT INTO zones VALUES (NULL,204,'ZH','Zürich');
     2277INSERT INTO zones VALUES (NULL,204,'ZH','Z?rich');
    22772278
    22782279# Spain
    2279 INSERT INTO zones VALUES (NULL,195,'ES-C','A Coruña');
    2280 INSERT INTO zones VALUES (NULL,195,'ES-VI','Álava');
     2280INSERT INTO zones VALUES (NULL,195,'ES-C','A Coru?a');
     2281INSERT INTO zones VALUES (NULL,195,'ES-VI','?lava');
    22812282INSERT INTO zones VALUES (NULL,195,'ES-AB','Albacete');
    22822283INSERT INTO zones VALUES (NULL,195,'ES-A','Alicante');
    2283 INSERT INTO zones VALUES (NULL,195,'ES-AL','Almería');
     2284INSERT INTO zones VALUES (NULL,195,'ES-AL','Almer?a');
    22842285INSERT INTO zones VALUES (NULL,195,'ES-O','Asturias');
    2285 INSERT INTO zones VALUES (NULL,195,'ES-AV','Ávila');
     2286INSERT INTO zones VALUES (NULL,195,'ES-AV','?vila');
    22862287INSERT INTO zones VALUES (NULL,195,'ES-BA','Badajoz');
    22872288INSERT INTO zones VALUES (NULL,195,'ES-PM','Balears');
    22882289INSERT INTO zones VALUES (NULL,195,'ES-B','Barcelona');
    22892290INSERT INTO zones VALUES (NULL,195,'ES-BU','Burgos');
    2290 INSERT INTO zones VALUES (NULL,195,'ES-CC','Cáceres');
    2291 INSERT INTO zones VALUES (NULL,195,'ES-CA','Cádiz');
     2291INSERT INTO zones VALUES (NULL,195,'ES-CC','C?ceres');
     2292INSERT INTO zones VALUES (NULL,195,'ES-CA','C?diz');
    22922293INSERT INTO zones VALUES (NULL,195,'ES-S','Cantabria');
    2293 INSERT INTO zones VALUES (NULL,195,'ES-CS','Castellón');
     2294INSERT INTO zones VALUES (NULL,195,'ES-CS','Castell?n');
    22942295INSERT INTO zones VALUES (NULL,195,'ES-CE','Ceuta');
    22952296INSERT INTO zones VALUES (NULL,195,'ES-CR','Ciudad Real');
    2296 INSERT INTO zones VALUES (NULL,195,'ES-CO','Córdoba');
     2297INSERT INTO zones VALUES (NULL,195,'ES-CO','C?rdoba');
    22972298INSERT INTO zones VALUES (NULL,195,'ES-CU','Cuenca');
    22982299INSERT INTO zones VALUES (NULL,195,'ES-GI','Girona');
    22992300INSERT INTO zones VALUES (NULL,195,'ES-GR','Granada');
    23002301INSERT INTO zones VALUES (NULL,195,'ES-GU','Guadalajara');
    2301 INSERT INTO zones VALUES (NULL,195,'ES-SS','Guipúzcoa');
     2302INSERT INTO zones VALUES (NULL,195,'ES-SS','Guip?zcoa');
    23022303INSERT INTO zones VALUES (NULL,195,'ES-H','Huelva');
    23032304INSERT INTO zones VALUES (NULL,195,'ES-HU','Huesca');
    2304 INSERT INTO zones VALUES (NULL,195,'ES-J','Jaén');
     2305INSERT INTO zones VALUES (NULL,195,'ES-J','Ja?n');
    23052306INSERT INTO zones VALUES (NULL,195,'ES-LO','La Rioja');
    23062307INSERT INTO zones VALUES (NULL,195,'ES-GC','Las Palmas');
    2307 INSERT INTO zones VALUES (NULL,195,'ES-LE','León');
     2308INSERT INTO zones VALUES (NULL,195,'ES-LE','Le?n');
    23082309INSERT INTO zones VALUES (NULL,195,'ES-L','Lleida');
    23092310INSERT INTO zones VALUES (NULL,195,'ES-LU','Lugo');
    23102311INSERT INTO zones VALUES (NULL,195,'ES-M','Madrid');
    … …  
    23582359INSERT INTO zones VALUES (NULL,153,'Marlborough','Marlborough');
    23592360
    23602361#Brazil
    2361 INSERT INTO zones VALUES (NULL,30,'SP','São Paulo');
     2362INSERT INTO zones VALUES (NULL,30,'SP','S?o Paulo');
    23622363INSERT INTO zones VALUES (NULL,30,'RJ','Rio de Janeiro');
    23632364INSERT INTO zones VALUES (NULL,30,'PE','Pernanbuco');
    23642365INSERT INTO zones VALUES (NULL,30,'BA','Bahia');
    … …  
    23662367INSERT INTO zones VALUES (NULL,30,'MG','Minas Gerais');
    23672368INSERT INTO zones VALUES (NULL,30,'ES','Espirito Santo');
    23682369INSERT INTO zones VALUES (NULL,30,'RS','Rio Grande do Sul');
    2369 INSERT INTO zones VALUES (NULL,30,'PR','Paraná');
     2370INSERT INTO zones VALUES (NULL,30,'PR','Paran?');
    23702371INSERT INTO zones VALUES (NULL,30,'SC','Santa Catarina');
    23712372INSERT INTO zones VALUES (NULL,30,'RG','Rio Grande do Norte');
    23722373INSERT INTO zones VALUES (NULL,30,'MS','Mato Grosso do Sul');
    … …  
    23792380INSERT INTO zones VALUES (NULL,30,'AP','Amapa');
    23802381INSERT INTO zones VALUES (NULL,30,'RR','Roraima');
    23812382INSERT INTO zones VALUES (NULL,30,'AL','Alagoas');
    2382 INSERT INTO zones VALUES (NULL,30,'CE','Ceará');
    2383 INSERT INTO zones VALUES (NULL,30,'MA','Maranhão');
    2384 INSERT INTO zones VALUES (NULL,30,'PA','Pará');
    2385 INSERT INTO zones VALUES (NULL,30,'PB','Paraíba');
    2386 INSERT INTO zones VALUES (NULL,30,'PI','Piauí');
     2383INSERT INTO zones VALUES (NULL,30,'CE','Cear?');
     2384INSERT INTO zones VALUES (NULL,30,'MA','Maranh?o');
     2385INSERT INTO zones VALUES (NULL,30,'PA','Par?');
     2386INSERT INTO zones VALUES (NULL,30,'PB','Para?ba');
     2387INSERT INTO zones VALUES (NULL,30,'PI','Piau?');
    23872388INSERT INTO zones VALUES (NULL,30,'SE','Sergipe');
    23882389
    23892390#Chile
    2390 INSERT INTO zones VALUES (NULL,43,'I','I Región de Tarapacá');
    2391 INSERT INTO zones VALUES (NULL,43,'II','II Región de Antofagasta');
    2392 INSERT INTO zones VALUES (NULL,43,'III','III Región de Atacama');
    2393 INSERT INTO zones VALUES (NULL,43,'IV','IV Región de Coquimbo');
    2394 INSERT INTO zones VALUES (NULL,43,'V','V Región de Valaparaíso');
    2395 INSERT INTO zones VALUES (NULL,43,'RM','Región Metropolitana');
    2396 INSERT INTO zones VALUES (NULL,43,'VI','VI Región de L. B. O´higgins');
    2397 INSERT INTO zones VALUES (NULL,43,'VII','VII Región del Maule');
    2398 INSERT INTO zones VALUES (NULL,43,'VIII','VIII Región del Bío Bío');
    2399 INSERT INTO zones VALUES (NULL,43,'IX','IX Región de la Araucanía');
    2400 INSERT INTO zones VALUES (NULL,43,'X','X Región de los Lagos');
    2401 INSERT INTO zones VALUES (NULL,43,'XI','XI Región de Aysén');
    2402 INSERT INTO zones VALUES (NULL,43,'XII','XII Región de Magallanes');
     2391INSERT INTO zones VALUES (NULL,43,'I','I Regi?n de Tarapac?');
     2392INSERT INTO zones VALUES (NULL,43,'II','II Regi?n de Antofagasta');
     2393INSERT INTO zones VALUES (NULL,43,'III','III Regi?n de Atacama');
     2394INSERT INTO zones VALUES (NULL,43,'IV','IV Regi?n de Coquimbo');
     2395INSERT INTO zones VALUES (NULL,43,'V','V Regi?n de Valapara?so');
     2396INSERT INTO zones VALUES (NULL,43,'RM','Regi?n Metropolitana');
     2397INSERT INTO zones VALUES (NULL,43,'VI','VI Regi?n de L. B. O?higgins');
     2398INSERT INTO zones VALUES (NULL,43,'VII','VII Regi?n del Maule');
     2399INSERT INTO zones VALUES (NULL,43,'VIII','VIII Regi?n del B?o B?o');
     2400INSERT INTO zones VALUES (NULL,43,'IX','IX Regi?n de la Araucan?a');
     2401INSERT INTO zones VALUES (NULL,43,'X','X Regi?n de los Lagos');
     2402INSERT INTO zones VALUES (NULL,43,'XI','XI Regi?n de Ays?n');
     2403INSERT INTO zones VALUES (NULL,43,'XII','XII Regi?n de Magallanes');
    24032404
    24042405#Columbia
    24052406INSERT INTO zones VALUES (NULL,47,'AMA','Amazonas');
    … …  
    24432444INSERT INTO zones VALUES (NULL,73,'04','Alpes de Haute Provence');
    24442445INSERT INTO zones VALUES (NULL,73,'05','Hautes-Alpes');
    24452446INSERT INTO zones VALUES (NULL,73,'06','Alpes Maritimes');
    2446 INSERT INTO zones VALUES (NULL,73,'07','Ardèche');
     2447INSERT INTO zones VALUES (NULL,73,'07','Ard?che');
    24472448INSERT INTO zones VALUES (NULL,73,'08','Ardennes');
    2448 INSERT INTO zones VALUES (NULL,73,'09','Ariège');
     2449INSERT INTO zones VALUES (NULL,73,'09','Ari?ge');
    24492450INSERT INTO zones VALUES (NULL,73,'10','Aube');
    24502451INSERT INTO zones VALUES (NULL,73,'11','Aude');
    24512452INSERT INTO zones VALUES (NULL,73,'12','Aveyron');
    2452 INSERT INTO zones VALUES (NULL,73,'13','Bouches-du-Rhône');
     2453INSERT INTO zones VALUES (NULL,73,'13','Bouches-du-Rh?ne');
    24532454INSERT INTO zones VALUES (NULL,73,'14','Calvados');
    24542455INSERT INTO zones VALUES (NULL,73,'15','Cantal');
    24552456INSERT INTO zones VALUES (NULL,73,'16','Charente');
    24562457INSERT INTO zones VALUES (NULL,73,'17','Charente Maritime');
    24572458INSERT INTO zones VALUES (NULL,73,'18','Cher');
    2458 INSERT INTO zones VALUES (NULL,73,'19','Corrèze');
     2459INSERT INTO zones VALUES (NULL,73,'19','Corr?ze');
    24592460INSERT INTO zones VALUES (NULL,73,'2A','Corse du Sud');
    24602461INSERT INTO zones VALUES (NULL,73,'2B','Haute Corse');
    2461 INSERT INTO zones VALUES (NULL,73,'21','Côte-d\'Or');
    2462 INSERT INTO zones VALUES (NULL,73,'22','Côtes-d\'Armor');
     2462INSERT INTO zones VALUES (NULL,73,'21','C?te-d\'Or');
     2463INSERT INTO zones VALUES (NULL,73,'22','C?tes-d\'Armor');
    24632464INSERT INTO zones VALUES (NULL,73,'23','Creuse');
    24642465INSERT INTO zones VALUES (NULL,73,'24','Dordogne');
    24652466INSERT INTO zones VALUES (NULL,73,'25','Doubs');
    2466 INSERT INTO zones VALUES (NULL,73,'26','Drôme');
     2467INSERT INTO zones VALUES (NULL,73,'26','Dr?me');
    24672468INSERT INTO zones VALUES (NULL,73,'27','Eure');
    24682469INSERT INTO zones VALUES (NULL,73,'28','Eure et Loir');
    2469 INSERT INTO zones VALUES (NULL,73,'29','Finistère');
     2470INSERT INTO zones VALUES (NULL,73,'29','Finist?re');
    24702471INSERT INTO zones VALUES (NULL,73,'30','Gard');
    24712472INSERT INTO zones VALUES (NULL,73,'31','Haute Garonne');
    24722473INSERT INTO zones VALUES (NULL,73,'32','Gers');
    24732474INSERT INTO zones VALUES (NULL,73,'33','Gironde');
    2474 INSERT INTO zones VALUES (NULL,73,'34','Hérault');
     2475INSERT INTO zones VALUES (NULL,73,'34','H?rault');
    24752476INSERT INTO zones VALUES (NULL,73,'35','Ille et Vilaine');
    24762477INSERT INTO zones VALUES (NULL,73,'36','Indre');
    24772478INSERT INTO zones VALUES (NULL,73,'37','Indre et Loire');
    2478 INSERT INTO zones VALUES (NULL,73,'38','Isère');
     2479INSERT INTO zones VALUES (NULL,73,'38','Is?re');
    24792480INSERT INTO zones VALUES (NULL,73,'39','Jura');
    24802481INSERT INTO zones VALUES (NULL,73,'40','Landes');
    24812482INSERT INTO zones VALUES (NULL,73,'41','Loir et Cher');
    … …  
    24852486INSERT INTO zones VALUES (NULL,73,'45','Loiret');
    24862487INSERT INTO zones VALUES (NULL,73,'46','Lot');
    24872488INSERT INTO zones VALUES (NULL,73,'47','Lot et Garonne');
    2488 INSERT INTO zones VALUES (NULL,73,'48','Lozère');
     2489INSERT INTO zones VALUES (NULL,73,'48','Loz?re');
    24892490INSERT INTO zones VALUES (NULL,73,'49','Maine et Loire');
    24902491INSERT INTO zones VALUES (NULL,73,'50','Manche');
    24912492INSERT INTO zones VALUES (NULL,73,'51','Marne');
    … …  
    24952496INSERT INTO zones VALUES (NULL,73,'55','Meuse');
    24962497INSERT INTO zones VALUES (NULL,73,'56','Morbihan');
    24972498INSERT INTO zones VALUES (NULL,73,'57','Moselle');
    2498 INSERT INTO zones VALUES (NULL,73,'58','Nièvre');
     2499INSERT INTO zones VALUES (NULL,73,'58','Ni?vre');
    24992500INSERT INTO zones VALUES (NULL,73,'59','Nord');
    25002501INSERT INTO zones VALUES (NULL,73,'60','Oise');
    25012502INSERT INTO zones VALUES (NULL,73,'61','Orne');
    25022503INSERT INTO zones VALUES (NULL,73,'62','Pas de Calais');
    2503 INSERT INTO zones VALUES (NULL,73,'63','Puy-de-Dôme');
    2504 INSERT INTO zones VALUES (NULL,73,'64','Pyrénées-Atlantiques');
    2505 INSERT INTO zones VALUES (NULL,73,'65','Hautes-Pyrénées');
    2506 INSERT INTO zones VALUES (NULL,73,'66','Pyrénées-Orientales');
     2504INSERT INTO zones VALUES (NULL,73,'63','Puy-de-D?me');
     2505INSERT INTO zones VALUES (NULL,73,'64','Pyr?n?es-Atlantiques');
     2506INSERT INTO zones VALUES (NULL,73,'65','Hautes-Pyr?n?es');
     2507INSERT INTO zones VALUES (NULL,73,'66','Pyr?n?es-Orientales');
    25072508INSERT INTO zones VALUES (NULL,73,'67','Bas Rhin');
    25082509INSERT INTO zones VALUES (NULL,73,'68','Haut Rhin');
    2509 INSERT INTO zones VALUES (NULL,73,'69','Rhône');
    2510 INSERT INTO zones VALUES (NULL,73,'70','Haute-Saône');
    2511 INSERT INTO zones VALUES (NULL,73,'71','Saône-et-Loire');
     2510INSERT INTO zones VALUES (NULL,73,'69','Rh?ne');
     2511INSERT INTO zones VALUES (NULL,73,'70','Haute-Sa?ne');
     2512INSERT INTO zones VALUES (NULL,73,'71','Sa?ne-et-Loire');
    25122513INSERT INTO zones VALUES (NULL,73,'72','Sarthe');
    25132514INSERT INTO zones VALUES (NULL,73,'73','Savoie');
    25142515INSERT INTO zones VALUES (NULL,73,'74','Haute Savoie');
    … …  
    25162517INSERT INTO zones VALUES (NULL,73,'76','Seine Maritime');
    25172518INSERT INTO zones VALUES (NULL,73,'77','Seine et Marne');
    25182519INSERT INTO zones VALUES (NULL,73,'78','Yvelines');
    2519 INSERT INTO zones VALUES (NULL,73,'79','Deux-Sèvres');
     2520INSERT INTO zones VALUES (NULL,73,'79','Deux-S?vres');
    25202521INSERT INTO zones VALUES (NULL,73,'80','Somme');
    25212522INSERT INTO zones VALUES (NULL,73,'81','Tarn');
    25222523INSERT INTO zones VALUES (NULL,73,'82','Tarn et Garonne');
    25232524INSERT INTO zones VALUES (NULL,73,'83','Var');
    25242525INSERT INTO zones VALUES (NULL,73,'84','Vaucluse');
    2525 INSERT INTO zones VALUES (NULL,73,'85','Vendée');
     2526INSERT INTO zones VALUES (NULL,73,'85','Vend?e');
    25262527INSERT INTO zones VALUES (NULL,73,'86','Vienne');
    25272528INSERT INTO zones VALUES (NULL,73,'87','Haute Vienne');
    25282529INSERT INTO zones VALUES (NULL,73,'88','Vosges');
    … …  
    25392540INSERT INTO zones VALUES (NULL,73,'974 (DOM)','Saint Denis');
    25402541INSERT INTO zones VALUES (NULL,73,'975 (DOM)','St-Pierre de Miquelon');
    25412542INSERT INTO zones VALUES (NULL,73,'976 (TOM)','Mayotte');
    2542 INSERT INTO zones VALUES (NULL,73,'984 (TOM)','Terres australes et Antartiques françaises');
    2543 INSERT INTO zones VALUES (NULL,73,'985 (TOM)','Nouvelle Calédonie');
     2543INSERT INTO zones VALUES (NULL,73,'984 (TOM)','Terres australes et Antartiques fran?aises');
     2544INSERT INTO zones VALUES (NULL,73,'985 (TOM)','Nouvelle Cal?donie');
    25442545INSERT INTO zones VALUES (NULL,73,'986 (TOM)','Wallis et Futuna');
    2545 INSERT INTO zones VALUES (NULL,73,'987 (TOM)','Polynésie française');
     2546INSERT INTO zones VALUES (NULL,73,'987 (TOM)','Polyn?sie fran?aise');
    25462547
    25472548#India
    25482549INSERT INTO zones VALUES (NULL,99,'DL','Delhi');
    … …  
    26182619INSERT INTO zones VALUES (NULL,105,'FE','Ferrara');
    26192620INSERT INTO zones VALUES (NULL,105,'FI','Firenze');
    26202621INSERT INTO zones VALUES (NULL,105,'FG','Foggia');
    2621 INSERT INTO zones VALUES (NULL,105,'FC','Forlì-Cesena');
     2622INSERT INTO zones VALUES (NULL,105,'FC','Forl?-Cesena');
    26222623INSERT INTO zones VALUES (NULL,105,'FR','Frosinone');
    26232624INSERT INTO zones VALUES (NULL,105,'GE','Genova');
    26242625INSERT INTO zones VALUES (NULL,105,'GO','Gorizia');
    … …  
    27862787INSERT INTO zones VALUES (NULL,160,'FIN','Finnmark');
    27872788INSERT INTO zones VALUES (NULL,160,'HED','Hedmark');
    27882789INSERT INTO zones VALUES (NULL,160,'HOR','Hordaland');
    2789 INSERT INTO zones VALUES (NULL,160,'MOR','Møre og Romsdal');
     2790INSERT INTO zones VALUES (NULL,160,'MOR','M?re og Romsdal');
    27902791INSERT INTO zones VALUES (NULL,160,'NOR','Nordland');
    2791 INSERT INTO zones VALUES (NULL,160,'NTR','Nord-Trøndelag');
     2792INSERT INTO zones VALUES (NULL,160,'NTR','Nord-Tr?ndelag');
    27922793INSERT INTO zones VALUES (NULL,160,'OPP','Oppland');
    27932794INSERT INTO zones VALUES (NULL,160,'ROG','Rogaland');
    27942795INSERT INTO zones VALUES (NULL,160,'SOF','Sogn og Fjordane');
    2795 INSERT INTO zones VALUES (NULL,160,'STR','Sør-Trøndelag');
     2796INSERT INTO zones VALUES (NULL,160,'STR','S?r-Tr?ndelag');
    27962797INSERT INTO zones VALUES (NULL,160,'TEL','Telemark');
    27972798INSERT INTO zones VALUES (NULL,160,'TRO','Troms');
    27982799INSERT INTO zones VALUES (NULL,160,'VEA','Vest-Agder');
    2799 INSERT INTO zones VALUES (NULL,160,'OST','Østfold');
     2800INSERT INTO zones VALUES (NULL,160,'OST','?stfold');
    28002801INSERT INTO zones VALUES (NULL,160,'SVA','Svalbard');
    28012802
    28022803#Pakistan
    … …  
    28692870INSERT INTO zones VALUES (NULL,203,'K','Blekinge');
    28702871INSERT INTO zones VALUES (NULL,203,'W','Dalarna');
    28712872INSERT INTO zones VALUES (NULL,203,'I','Gotland');
    2872 INSERT INTO zones VALUES (NULL,203,'X','Gävleborg');
     2873INSERT INTO zones VALUES (NULL,203,'X','G?vleborg');
    28732874INSERT INTO zones VALUES (NULL,203,'N','Halland');
    2874 INSERT INTO zones VALUES (NULL,203,'Z','Jämtland');
    2875 INSERT INTO zones VALUES (NULL,203,'F','Jönköping');
     2875INSERT INTO zones VALUES (NULL,203,'Z','J?mtland');
     2876INSERT INTO zones VALUES (NULL,203,'F','J?nk?ping');
    28762877INSERT INTO zones VALUES (NULL,203,'H','Kalmar');
    28772878INSERT INTO zones VALUES (NULL,203,'G','Kronoberg');
    28782879INSERT INTO zones VALUES (NULL,203,'BD','Norrbotten');
    2879 INSERT INTO zones VALUES (NULL,203,'T','Örebro');
    2880 INSERT INTO zones VALUES (NULL,203,'E','Östergötland');
    2881 INSERT INTO zones VALUES (NULL,203,'M','Skåne');
     2880INSERT INTO zones VALUES (NULL,203,'T','?rebro');
     2881INSERT INTO zones VALUES (NULL,203,'E','?sterg?tland');
     2882INSERT INTO zones VALUES (NULL,203,'M','Sk?ne');
    28822883INSERT INTO zones VALUES (NULL,203,'AB','Stockholm');
    2883 INSERT INTO zones VALUES (NULL,203,'D','Södermanland');
     2884INSERT INTO zones VALUES (NULL,203,'D','S?dermanland');
    28842885INSERT INTO zones VALUES (NULL,203,'C','Uppsala');
    2885 INSERT INTO zones VALUES (NULL,203,'S','Värmland');
    2886 INSERT INTO zones VALUES (NULL,203,'AC','Västerbotten');
    2887 INSERT INTO zones VALUES (NULL,203,'Y','Västernorrland');
    2888 INSERT INTO zones VALUES (NULL,203,'U','Västmanland');
    2889 INSERT INTO zones VALUES (NULL,203,'O','Västra Götaland');
     2886INSERT INTO zones VALUES (NULL,203,'S','V?rmland');
     2887INSERT INTO zones VALUES (NULL,203,'AC','V?sterbotten');
     2888INSERT INTO zones VALUES (NULL,203,'Y','V?sternorrland');
     2889INSERT INTO zones VALUES (NULL,203,'U','V?stmanland');
     2890INSERT INTO zones VALUES (NULL,203,'O','V?stra G?taland');
    28902891
    28912892#Turkey
    28922893INSERT INTO zones VALUES (NULL,215,'AA', 'Adana');
    … …  
    29052906INSERT INTO zones VALUES (NULL,215,'BM', 'Batman');
    29062907INSERT INTO zones VALUES (NULL,215,'BB', 'Bayburt');
    29072908INSERT INTO zones VALUES (NULL,215,'BC', 'Bilecik');
    2908 INSERT INTO zones VALUES (NULL,215,'BG', 'Bingöl');
     2909INSERT INTO zones VALUES (NULL,215,'BG', 'Bing?l');
    29092910INSERT INTO zones VALUES (NULL,215,'BT', 'Bitlis');
    29102911INSERT INTO zones VALUES (NULL,215,'BL', 'Bolu' );
    29112912INSERT INTO zones VALUES (NULL,215,'BD', 'Burdur');
    29122913INSERT INTO zones VALUES (NULL,215,'BU', 'Bursa');
    2913 INSERT INTO zones VALUES (NULL,215,'CK', 'Çanakkale');
    2914 INSERT INTO zones VALUES (NULL,215,'CI', 'Çankiri');
    2915 INSERT INTO zones VALUES (NULL,215,'CM', 'Çorum');
     2914INSERT INTO zones VALUES (NULL,215,'CK', '?anakkale');
     2915INSERT INTO zones VALUES (NULL,215,'CI', '?ankiri');
     2916INSERT INTO zones VALUES (NULL,215,'CM', '?orum');
    29162917INSERT INTO zones VALUES (NULL,215,'DN', 'Denizli');
    29172918INSERT INTO zones VALUES (NULL,215,'DY', 'Diyarbakir');
    2918 INSERT INTO zones VALUES (NULL,215,'DU', 'Düzce');
     2919INSERT INTO zones VALUES (NULL,215,'DU', 'D?zce');
    29192920INSERT INTO zones VALUES (NULL,215,'ED', 'Edirne');
    29202921INSERT INTO zones VALUES (NULL,215,'EG', 'Elazig');
    29212922INSERT INTO zones VALUES (NULL,215,'EN', 'Erzincan');
    … …  
    29232924INSERT INTO zones VALUES (NULL,215,'ES', 'Eskisehir');
    29242925INSERT INTO zones VALUES (NULL,215,'GA', 'Gaziantep');
    29252926INSERT INTO zones VALUES (NULL,215,'GI', 'Giresun');
    2926 INSERT INTO zones VALUES (NULL,215,'GU', 'Gümüshane');
     2927INSERT INTO zones VALUES (NULL,215,'GU', 'G?m?shane');
    29272928INSERT INTO zones VALUES (NULL,215,'HK', 'Hakkari');
    29282929INSERT INTO zones VALUES (NULL,215,'HT', 'Hatay');
    29292930INSERT INTO zones VALUES (NULL,215,'IG', 'Igdir');
    … …  
    29312932INSERT INTO zones VALUES (NULL,215,'IB', 'Istanbul');
    29322933INSERT INTO zones VALUES (NULL,215,'IZ', 'Izmir');
    29332934INSERT INTO zones VALUES (NULL,215,'KM', 'Kahramanmaras');
    2934 INSERT INTO zones VALUES (NULL,215,'KB', 'Karabük');
     2935INSERT INTO zones VALUES (NULL,215,'KB', 'Karab?k');
    29352936INSERT INTO zones VALUES (NULL,215,'KR', 'Karaman');
    29362937INSERT INTO zones VALUES (NULL,215,'KA', 'Kars');
    29372938INSERT INTO zones VALUES (NULL,215,'KS', 'Kastamonu');
    … …  
    29422943INSERT INTO zones VALUES (NULL,215,'KH', 'Kirsehir');
    29432944INSERT INTO zones VALUES (NULL,215,'KC', 'Kocaeli');
    29442945INSERT INTO zones VALUES (NULL,215,'KO', 'Konya');
    2945 INSERT INTO zones VALUES (NULL,215,'KU', 'Kütahya');
     2946INSERT INTO zones VALUES (NULL,215,'KU', 'K?tahya');
    29462947INSERT INTO zones VALUES (NULL,215,'ML', 'Malatya');
    29472948INSERT INTO zones VALUES (NULL,215,'MN', 'Manisa');
    29482949INSERT INTO zones VALUES (NULL,215,'MR', 'Mardin');
    … …  
    29732974
    29742975#Venezuela
    29752976INSERT INTO zones VALUES (NULL,229,'AM','Amazonas');
    2976 INSERT INTO zones VALUES (NULL,229,'AN','Anzoátegui');
     2977INSERT INTO zones VALUES (NULL,229,'AN','Anzo?tegui');
    29772978INSERT INTO zones VALUES (NULL,229,'AR','Aragua');
    29782979INSERT INTO zones VALUES (NULL,229,'AP','Apure');
    29792980INSERT INTO zones VALUES (NULL,229,'BA','Barinas');
    2980 INSERT INTO zones VALUES (NULL,229,'BO','Bolívar');
     2981INSERT INTO zones VALUES (NULL,229,'BO','Bol?var');
    29812982INSERT INTO zones VALUES (NULL,229,'CA','Carabobo');
    29822983INSERT INTO zones VALUES (NULL,229,'CO','Cojedes');
    29832984INSERT INTO zones VALUES (NULL,229,'DA','Delta Amacuro');
    29842985INSERT INTO zones VALUES (NULL,229,'DC','Distrito Capital');
    2985 INSERT INTO zones VALUES (NULL,229,'FA','Falcón');
    2986 INSERT INTO zones VALUES (NULL,229,'GA','Guárico');
     2986INSERT INTO zones VALUES (NULL,229,'FA','Falc?n');
     2987INSERT INTO zones VALUES (NULL,229,'GA','Gu?rico');
    29872988INSERT INTO zones VALUES (NULL,229,'GU','Guayana');
    29882989INSERT INTO zones VALUES (NULL,229,'LA','Lara');
    2989 INSERT INTO zones VALUES (NULL,229,'ME','Mérida');
     2990INSERT INTO zones VALUES (NULL,229,'ME','M?rida');
    29902991INSERT INTO zones VALUES (NULL,229,'MI','Miranda');
    29912992INSERT INTO zones VALUES (NULL,229,'MO','Monagas');
    29922993INSERT INTO zones VALUES (NULL,229,'NE','Nueva Esparta');
    29932994INSERT INTO zones VALUES (NULL,229,'PO','Portuguesa');
    29942995INSERT INTO zones VALUES (NULL,229,'SU','Sucre');
    2995 INSERT INTO zones VALUES (NULL,229,'TA','Táchira');
     2996INSERT INTO zones VALUES (NULL,229,'TA','T?chira');
    29962997INSERT INTO zones VALUES (NULL,229,'TU','Trujillo');
    29972998INSERT INTO zones VALUES (NULL,229,'VA','Vargas');
    29982999INSERT INTO zones VALUES (NULL,229,'YA','Yaracuy');
    … …  
    31243125INSERT INTO zones VALUES (NULL,10,'CT','Catamarca');
    31253126INSERT INTO zones VALUES (NULL,10,'CC','Chaco');
    31263127INSERT INTO zones VALUES (NULL,10,'CH','Chubut');
    3127 INSERT INTO zones VALUES (NULL,10,'CD','C—rdoba');
     3128INSERT INTO zones VALUES (NULL,10,'CD','C?rdoba');
    31283129INSERT INTO zones VALUES (NULL,10,'CR','Corrientes');
    3129 INSERT INTO zones VALUES (NULL,10,'ER','Entre R’os');
     3130INSERT INTO zones VALUES (NULL,10,'ER','Entre R?os');
    31303131INSERT INTO zones VALUES (NULL,10,'FO','Formosa');
    31313132INSERT INTO zones VALUES (NULL,10,'JY','Jujuy');
    31323133INSERT INTO zones VALUES (NULL,10,'LP','La Pampa');
    … …  
    31333134INSERT INTO zones VALUES (NULL,10,'LR','La Rioja');
    31343135INSERT INTO zones VALUES (NULL,10,'MZ','Mendoza');
    31353136INSERT INTO zones VALUES (NULL,10,'MN','Misiones');
    3136 INSERT INTO zones VALUES (NULL,10,'NQ','NeuquŽn');
    3137 INSERT INTO zones VALUES (NULL,10,'RN','R’o Negro');
     3137INSERT INTO zones VALUES (NULL,10,'NQ','Neuqu?n');
     3138INSERT INTO zones VALUES (NULL,10,'RN','R?o Negro');
    31383139INSERT INTO zones VALUES (NULL,10,'SA','Salta');
    31393140INSERT INTO zones VALUES (NULL,10,'SJ','San Juan');
    31403141INSERT INTO zones VALUES (NULL,10,'SL','San Luis');
    … …  
    31423143INSERT INTO zones VALUES (NULL,10,'SF','Santa Fe');
    31433144INSERT INTO zones VALUES (NULL,10,'SE','Santiago del Estero');
    31443145INSERT INTO zones VALUES (NULL,10,'TF','Tierra del Fuego');
    3145 INSERT INTO zones VALUES (NULL,10,'TM','Tucum‡n');
     3146INSERT INTO zones VALUES (NULL,10,'TM','Tucum?n');
    31463147
    31473148#ID
    31483149INSERT INTO zones VALUES (NULL,100,'AC','Aceh');

  • admin/includes/configuration_installer.php

     
    314314  $values[] = "(NULL, 'MODULE_NEWSLETTER_VOUCHER_AMOUNT', '0', '17', '20', NULL, NOW(), NULL, NULL);";
    315315  $values[] = "(NULL, 'MODULE_NEWSLETTER_DISCOUNT_COUPON', '', '17', '21', NULL, NOW(), NULL, NULL);";
    316316  $values[] = "(NULL, 'DISPLAY_HEADQUARTER_ON_CHECKOUT', 'true', '17', '8', NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'), ');";
     317  $values[] = "(NULL, 'DISPLAY_PRIVACY_POLICY_ON_CHECKOUT', 'false', '17', '20', NULL, NOW(), NULL, 'xtc_cfg_select_option(array(\'true\', \'false\'), ');";
    317318
    318319  $values_update[] = array (
    319320                           'values' => "set_function = 'xtc_cfg_select_content(\'REVOCATION_ID\','",

  • checkout_confirmation.php

     
    5757// if conditions are not accepted, redirect the customer to the payment method selection page
    5858if (DISPLAY_CONDITIONS_ON_CHECKOUT == 'true') {
    5959  if ((!isset($_POST['conditions']) || $_POST['conditions'] == false) && !isset($_GET['conditions'])) {
    60     $error = str_replace('\n', '<br />', ERROR_CONDITIONS_NOT_ACCEPTED);
    61     xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
     60    $error .= str_replace('\n', '<br />', ERROR_CONDITIONS_NOT_ACCEPTED);
     61    //xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
    6262  }
    6363}
    6464
    … …  
    6666if (DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT == 'true'
    6767    && ($_SESSION['cart']->content_type == 'virtual'
    6868        || $_SESSION['cart']->content_type == 'mixed')
    69     )
     69    || DISPLAY_REVOCATION_ON_CHECKOUT == 'true')
    7070{
    71   if ((!isset($_POST['revocation']) || $_POST['revocation'] == false) && !isset($_GET['conditions'])) {
    72     $error = str_replace('\n', '<br />', ERROR_REVOCATION_NOT_ACCEPTED);
    73     xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
     71  if (DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT == 'true'
     72      && ($_SESSION['cart']->content_type == 'virtual'
     73          || $_SESSION['cart']->content_type == 'mixed'))
     74  {
     75    $revocation_virtual == 'true';
    7476  }
     77  if ((!isset($_POST['revocation']) || $_POST['revocation'] == false) && !isset($_GET['revocation'])) {
     78    $error .= str_replace('\n', '<br />', $revocation_virtual == 'true' ? ERROR_REVOCATION_NOT_ACCEPTED : ERROR_REVOCATION_GENERAL_NOT_ACCEPTED);
     79    //xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
     80  }
    7581}
    7682
     83// if conditions are not accepted, redirect the customer to the payment method selection page
     84if (DISPLAY_PRIVACY_POLICY_ON_CHECKOUT == 'true') {
     85  if ((!isset($_POST['privacypolicy']) || $_POST['privacypolicy'] == false) && !isset($_GET['privacypolicy'])) {
     86    $error .= str_replace('\n', '<br />', ERROR_PRIVACY_POLICY_NOT_ACCEPTED);
     87    //xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
     88  }
     89}
     90
     91if (isset($error)) {
     92  xtc_redirect(xtc_href_link(FILENAME_CHECKOUT_PAYMENT, 'error_message=' . urlencode($error), 'SSL', true, false));
     93}
     94
    7795// load the selected payment module
    7896require_once (DIR_WS_CLASSES . 'payment.php');
    7997if (isset($_SESSION['credit_covers'])

  • checkout_payment.php

     
    259259  $smarty->assign('AGB_checkbox', '<input type="checkbox" value="conditions" name="conditions" id="conditions"'.(isset($_GET['step']) && $_GET['step'] == 'step2' ? ' checked="checked"' : '').' />');
    260260}
    261261
     262//check if display privacy policy on checkout page is true
     263if (DISPLAY_PRIVACY_POLICY_ON_CHECKOUT == 'true') {
     264  $shop_content_data = $main->getContentData(2);
     265  $smarty->assign('PRIVACY_DATA', '<div class="agbframe">' . $shop_content_data['content_text'] . '</div>');
     266  $smarty->assign('PRIVACY_DATA_LINK', $main->getContentLink(2, MORE_INFO,'SSL'));
     267  $smarty->assign('PRIVACY_DATA_checkbox', '<input type="checkbox" value="privacypolicy" name="privacypolicy" id="privacypolicy"'.(isset($_GET['step']) && $_GET['step'] == 'step2' ? ' checked="checked"' : '').' />');
     268}
     269
     270//check if display revocation on checkout page is true
    262271if (DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT == 'true'
    263272    && ($_SESSION['cart']->content_type == 'virtual'
    264273        || $_SESSION['cart']->content_type == 'mixed')
    265     )
     274    || DISPLAY_REVOCATION_ON_CHECKOUT == 'true')
    266275{
     276  if (DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT == 'true'
     277      && ($_SESSION['cart']->content_type == 'virtual'
     278          || $_SESSION['cart']->content_type == 'mixed'))
     279  {
     280    $smarty->assign('REVOCATION_VIRTUAL', 'true');
     281  }
    267282  $shop_content_data = $main->getContentData(REVOCATION_ID);
    268283  $smarty->assign('REVOCATION', '<div class="agbframe">' . $shop_content_data['content_text'] . '</div>');
    269284  $smarty->assign('REVOCATION_LINK', $main->getContentLink(REVOCATION_ID, MORE_INFO,'SSL'));

  • includes/classes/payment.php

     
    250250                 '  }' . "\n\n";
    251251        }
    252252
     253        if (DISPLAY_PRIVACY_POLICY_ON_CHECKOUT == 'true') {
     254          $js .= "\n" . '  if (!document.getElementById("checkout_payment").privacypolicy.checked) {' . "\n" .
     255                 '    error_message = error_message + unescape("' . xtc_js_lang(JS_ERROR_PRIVACY_POLICY_NOT_ACCEPTED) . '");' . "\n" .
     256                 '    error = 1;' . "\n" .
     257                 '  }' . "\n\n";
     258        }
     259
    253260        if (DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT == 'true'
    254261            && ($_SESSION['cart']->content_type == 'virtual'
    255262                || $_SESSION['cart']->content_type == 'mixed')
    256             )
     263            || DISPLAY_REVOCATION_ON_CHECKOUT == 'true')
    257264        {
     265          if (DISPLAY_REVOCATION_VIRTUAL_ON_CHECKOUT == 'true'
     266              && ($_SESSION['cart']->content_type == 'virtual'
     267                  || $_SESSION['cart']->content_type == 'mixed'))
     268          {
     269            $revocation_virtual == 'true';
     270          }
    258271          $js .= "\n" . '  if (!document.getElementById("checkout_payment").revocation.checked) {' . "\n" .
    259                  '    error_message = error_message + unescape("' . xtc_js_lang(JS_ERROR_REVOCATION_NOT_ACCEPTED) . '");' . "\n" .
     272                 '    error_message = error_message + unescape("' . xtc_js_lang($revocation_virtual == 'true' ? JS_ERROR_REVOCATION_NOT_ACCEPTED : JS_ERROR_REVOCATION_GENERAL_NOT_ACCEPTED) . '");' . "\n" .
    260273                 '    error = 1;' . "\n" .
    261274                 '  }' . "\n\n";
    262275        }

  • lang/english/admin/configuration.php

     
    603603define('REVOCATION_ID_TITLE','Revocation');
    604604define('REVOCATION_ID_DESC','Select content to display revocation');
    605605define('DISPLAY_REVOCATION_ON_CHECKOUT_TITLE','Display right of revocation?');
    606 define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Display right of revocation on checkout_confirmation?');
     606define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Display right of revocation on checkout?');
    607607
    608608// BOF - Tomcraft - 2009-10-03 - Paypal Express Modul
    609609define('PAYPAL_MODE_TITLE','PayPal Mode:');
    … …  
    10871087define('MODULE_NEWSLETTER_VOUCHER_AMOUNT_DESC', 'For newsletter registration gift voucher place the amount, put 0 for no amount.');
    10881088define('MODULE_NEWSLETTER_DISCOUNT_COUPON_TITLE', 'Newsletter Coupon Code');
    10891089define('MODULE_NEWSLETTER_DISCOUNT_COUPON_DESC', 'For newsletter registration coupon place the coupon code you wish to use or leave this field blank to disable.');
     1090
     1091define('DISPLAY_PRIVACY_POLICY_ON_CHECKOUT_TITLE','Display privacy policy?');
     1092define('DISPLAY_PRIVACY_POLICY_ON_CHECKOUT_DESC','Display privacy policy on checkout?');
    10901093?>
     1094 No newline at end of file

  • lang/english/english.php

     
    9898define('JS_ERROR_NO_SHIPPING_MODULE_SELECTED', '* Please choose a method of shipping for your order.\n');
    9999define('JS_ERROR_CONDITIONS_NOT_ACCEPTED', '* Unfortunately we cannot accept your order\nunless you accept our terms and conditions!\n\n');
    100100define('JS_ERROR_REVOCATION_NOT_ACCEPTED', '* Unfortunately we cannot accept your order\nunless you accept that the right of withdrawal expires for virtual products!\n\n');
     101define('JS_ERROR_REVOCATION_GENERAL_NOT_ACCEPTED', '* Unfortunately we cannot accept your order\nunless you accept that the right of withdrawal!\n\n');
     102define('JS_ERROR_PRIVACY_POLICY_NOT_ACCEPTED', '* Unfortunately we cannot accept your order\nunless you accept that the privacy policy!\n\n');
    101103define('JS_REVIEW_AUTHOR', '* Please enter your name.\n\n');
    102104
    103105/*
    … …  
    276278
    277279define('ERROR_CONDITIONS_NOT_ACCEPTED', 'Please accept our terms and conditions to proceed with your order.');
    278280define('ERROR_REVOCATION_NOT_ACCEPTED', 'Please accept that the right of withdrawal expires for virtual products.');
     281define('ERROR_REVOCATION_GENERAL_NOT_ACCEPTED', 'Please accept the right of withdrawal.');
     282define('ERROR_PRIVACY_POLICY_NOT_ACCEPTED', 'Please accept the privacy policy.');
    279283
    280284define('SUB_TITLE_OT_DISCOUNT','Discount:');
    281285

  • lang/english/lang_english.conf

     
    364364text_gccover = 'Your Voucher covers your order total amount, please accept our general terms and conditions as well as our conditions of delivery and proceed with the order.'
    365365title_comments_short = 'Your comments'
    366366text_accept_revocation = 'I accept that the right of withdrawal expires for virtual products.'
     367text_accept_revocation_general = 'I accept your right of withdrawal.'
     368text_accept_privacy_policy = 'I accept your privacy policy.'
    367369text_nopayment = 'Please accept our general terms and conditions as well as our conditions of delivery and proceed with the order.'
    368370
    369371# Selection of Dispatch options

  • lang/german/admin/configuration.php

     
    602602define('REVOCATION_ID_TITLE','Widerrufsrecht');
    603603define('REVOCATION_ID_DESC','W&auml;hle den Content zur Anzeige des Widerrufsrechts.');
    604604define('DISPLAY_REVOCATION_ON_CHECKOUT_TITLE','Anzeige Widerrufsrecht?');
    605 define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Widerrufsrecht auf checkout_confirmation anzeigen?');
     605define('DISPLAY_REVOCATION_ON_CHECKOUT_DESC','Anzeigen und Unterzeichnen des Widerrufrechts beim Bestellvorgang?');
    606606
    607607// BOF - Tomcraft - 2009-10-03 - Paypal Express Modul
    608608define('PAYPAL_MODE_TITLE','PayPal-Modus:');
    … …  
    10791079define('MODULE_NEWSLETTER_VOUCHER_AMOUNT_DESC', 'Für einen Gutschein bei der Newsletter Registrierung geben Sie den Wert des Gutscheins an, ansonsten tragen Sie hier 0 ein.');
    10801080define('MODULE_NEWSLETTER_DISCOUNT_COUPON_TITLE', 'Newsletter Coupon Code');
    10811081define('MODULE_NEWSLETTER_DISCOUNT_COUPON_DESC', 'Für einen Coupon bei der Newsletter Registrierung geben Sie den Coupon Code ein, ansonsten lassen Sie dieses Feld leer.');
     1082
     1083define('DISPLAY_PRIVACY_POLICY_ON_CHECKOUT_TITLE','Unterzeichnen der Datenschutzbestimmungen?');
     1084define('DISPLAY_PRIVACY_POLICY_ON_CHECKOUT_DESC','Anzeigen und Unterzeichnen der Datenschutzbestimmungen beim Bestellvorgang');
    10821085?>
     1086 No newline at end of file

  • lang/german/german.php

     
    9898define('JS_ERROR_NO_SHIPPING_MODULE_SELECTED', '* Bitte w&auml;hlen Sie eine Versandart f&uuml;r Ihre Bestellung.\n');
    9999define('JS_ERROR_CONDITIONS_NOT_ACCEPTED', '* Sofern Sie unsere Allgemeinen Gesch&auml;ftsbedingungen nicht akzeptieren,\nk&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!\n\n');
    100100define('JS_ERROR_REVOCATION_NOT_ACCEPTED', '* Sofern Sie das Erl&ouml;schen des Widerrufsrecht f&uuml;r virtuelle Artikel nicht akzeptieren,\nk&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!\n\n');
     101define('JS_ERROR_REVOCATION_GENERAL_NOT_ACCEPTED', '* Sofern Sie das Widerrufsrecht nicht akzeptieren,\nk&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!\n\n');
     102define('JS_ERROR_PRIVACY_POLICY_NOT_ACCEPTED', '* Sofern Sie unsere Datenschutzbestimmungen nicht akzeptieren,\nk&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!\n\n');
    101103define('JS_REVIEW_AUTHOR', '* Bitte geben Sie Ihren Namen ein.\n\n');
    102104
    103105/*
    … …  
    276278
    277279define('ERROR_CONDITIONS_NOT_ACCEPTED', '* Sofern Sie unsere Allgemeinen Gesch&auml;ftsbedingungen nicht akzeptieren, k&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!');
    278280define('ERROR_REVOCATION_NOT_ACCEPTED', '* Sofern Sie das Erl&ouml;schen des Widerrufsrecht f&uuml;r virtuelle Artikel nicht akzeptieren, k&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!');
     281define('ERROR_REVOCATION_GENERAL_NOT_ACCEPTED', '* Sofern Sie das Widerrufsrecht nicht akzeptieren, k&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!');
     282define('ERROR_PRIVACY_POLICY_NOT_ACCEPTED', '* Sofern Sie die Datenschutzbestimmungen nicht akzeptieren, k&ouml;nnen wir Ihre Bestellung bedauerlicherweise nicht entgegennehmen!');
    279283
    280284define('SUB_TITLE_OT_DISCOUNT','Rabatt:');
    281285

  • lang/german/lang_german.conf

     
    363363text_gccover = 'Ihr Coupon deckt den Warenwert, Sie m&uuml;ssen nun lediglich unsere AGB akzeptieren und den Bestellprozess mit Weiter fortsetzen'
    364364title_comments_short = 'Ihre Anmerkungen'
    365365text_accept_revocation = 'Hiermit nehme ich zur Kenntnis, dass das Widerrufsrecht bei digitalen Artikeln erlischt.'
     366text_accept_revocation_general = 'Hiermit akzeptiere ich das Widerrufsrecht.'
     367text_accept_privacy_policy = 'Hiermit akzeptiere ich die Datenschutzbestimmungen.'
    366368text_nopayment = 'Sie m&uuml;ssen nun lediglich unsere AGB akzeptieren und den Bestellprozess mit Weiter fortsetzen'
    367369
    368370# Auswahl der Versandart

  • templates/tpl_modified/module/checkout_payment.html

     
    7474      </div>
    7575      {if isset($REVOCATION_checkbox)}
    7676        <div class="checkoutconditions">
    77           {$REVOCATION_checkbox} <strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}
     77          {$REVOCATION_checkbox} <strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}
    7878        </div>
    7979      {/if}
     80      {if isset($PRIVACY_DATA_checkbox)}
     81        <div class="checkoutconditions">
     82          {$PRIVACY_DATA_checkbox} <strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}
     83        </div>
     84      {/if}
    8085    {else}
    8186      <h4 class="checkout">{#title_comments_short#}</h4>
    8287      <div class="checkoutcomment">{$COMMENTS}</div>
    8388      {if isset($REVOCATION_checkbox)}
    8489        <div class="checkoutconditions">
    85           {$REVOCATION_checkbox} <strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}
     90          {$REVOCATION_checkbox} <strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}
    8691        </div>
    8792      {/if}
     93      {if isset($PRIVACY_DATA_checkbox)}
     94        <div class="checkoutconditions">
     95          {$PRIVACY_DATA_checkbox} <strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}
     96        </div>
     97      {/if}
    8898    {/if}
    8999  </div>
    90100  {/if}

  • templates/tpl_modified_responsive/module/checkout_payment.html

     
    7676      </div>
    7777      {if isset($REVOCATION_checkbox)}
    7878        <div class="checkoutconditions">
    79           {$REVOCATION_checkbox} <strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}
     79          {$REVOCATION_checkbox} <strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}
    8080        </div>
    8181      {/if}
     82      {if isset($PRIVACY_DATA_checkbox)}
     83        <div class="checkoutconditions">
     84          {$PRIVACY_DATA_checkbox} <strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}
     85        </div>
     86      {/if}
    8287    {else}
    8388      <h4 class="checkout">{#title_comments_short#}</h4>
    8489      <div class="checkoutcomment">{$COMMENTS}</div>
    8590      {if isset($REVOCATION_checkbox)}
    8691        <div class="checkoutconditions">
    87           {$REVOCATION_checkbox} <strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}
     92          {$REVOCATION_checkbox} <strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}
    8893        </div>
    8994      {/if}
     95      {if isset($PRIVACY_DATA_checkbox)}
     96        <div class="checkoutconditions">
     97          {$PRIVACY_DATA_checkbox} <strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}
     98        </div>
     99      {/if}
    90100    {/if}
    91101  </div>
    92102  {/if}

  • templates/tpl_modified_responsive_flat/module/checkout_payment.html

     
    7676      </div>
    7777      {if isset($REVOCATION_checkbox)}
    7878        <div class="checkoutconditions">
    79           {$REVOCATION_checkbox} <strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}
     79          {$REVOCATION_checkbox} <strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}
    8080        </div>
    8181      {/if}
     82      {if isset($PRIVACY_DATA_checkbox)}
     83        <div class="checkoutconditions">
     84          {$PRIVACY_DATA_checkbox} <strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}
     85        </div>
     86      {/if}
    8287    {else}
    8388      <h4 class="checkout">{#title_comments_short#}</h4>
    8489      <div class="checkoutcomment">{$COMMENTS}</div>
    8590      {if isset($REVOCATION_checkbox)}
    8691        <div class="checkoutconditions">
    87           {$REVOCATION_checkbox} <strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}
     92          {$REVOCATION_checkbox} <strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}
    8893        </div>
    8994      {/if}
     95      {if isset($PRIVACY_DATA_checkbox)}
     96        <div class="checkoutconditions">
     97          {$PRIVACY_DATA_checkbox} <strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}
     98        </div>
     99      {/if}
    90100    {/if}
    91101  </div>
    92102  {/if}

  • templates/xtc5/module/checkout_payment.html

     
    3737      {if isset($REVOCATION_checkbox)}
    3838      <tr>
    3939        <td>{$REVOCATION_checkbox}</td>
    40         <td width="100%"><strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}</td>
     40        <td width="100%"><strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}</td>
    4141      </tr>
    4242      {/if}
     43      {if isset($PRIVACY_DATA_checkbox)}
     44      <tr>
     45        <td>{$PRIVACY_DATA_checkbox}
     46        <td width="100%"><strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}</td>
     47      </tr>
     48      {/if}
    4349    </table>
    4450  {elseif isset($REVOCATION_checkbox)}
    4551    <table width="100%" border="0" cellspacing="0" cellpadding="4">
    4652      <tr>
    4753        <td>{$REVOCATION_checkbox}</td>
    48         <td width="100%"><strong><label for="revocation">{#text_accept_revocation#}</label></strong>&nbsp;{$REVOCATION_LINK}</td>
     54        <td width="100%"><strong><label for="revocation">{if (isset($REVOCATION_VIRTUAL) && $REVOCATION_VIRTUAL == 'true')}{#text_accept_revocation#}{else}{#text_accept_revocation_general#}{/if}</label></strong>&nbsp;{$REVOCATION_LINK}</td>
    4955      </tr>
     56      {if isset($PRIVACY_DATA_checkbox)}
     57      <tr>
     58        <td>{$PRIVACY_DATA_checkbox}
     59        <td width="100%"><strong><label for="revocation">{#text_accept_privacy_policy#}</label></strong>&nbsp;{$PRIVACY_DATA_LINK}</td>
     60      </tr>
     61      {/if}
    5062    </table>
    5163  {/if}
    5264{/if}