24c24
<
---
>
27c27
<
<
<
<
<
<
---
>
39c34
< echo ' ' . "\n";
---
> echo ' ' . "\n";
41c36
< echo ' ' . "\n";
---
> echo ' ' . "\n";
45,47d39
< var lastoneval=' ';
< var lasttwoval=' ';
<
309c301
< $GETdata = str_replace("`", "' + String.fromCharCode(39) + '", str_replace("``", '"', str_replace("~", "'", str_replace("\\'", "'", urldecode(checkdatadata0('POST',$_POST['data']))))));
---
> $GETdata = str_replace("~", "'", str_replace("\\'", "'", urldecode(checkdatadata0('POST',$_POST['data']))));
311c303
< echo "\n paramdata='" . str_replace("\t", '
', str_replace("%09", '
', str_replace("'",'"',$GETdata))) . "'; \n setTimeout(fillindata, 300); \n setTimeout(filldata, 3000); \n"; // = decodeURIComponent(pardata); " . " \n";
---
> echo "\n paramdata='" . str_replace("'",'"',$GETdata) . "'; \n setTimeout(fillindata, 300); \n setTimeout(filldata, 3000); \n"; // = decodeURIComponent(pardata); " . " \n";
317c309
< $GETdata = str_replace("`", "' + String.fromCharCode(39) + '", str_replace("``", '"', str_replace("~", "'", str_replace("\\'", "'", urldecode(checkdatadata0('GET',$_GET['data']))))));
---
> $GETdata = str_replace("~", "'", str_replace("\\'", "'", urldecode(checkdatadata0('GET',$_GET['data']))));
321c313
< echo "\n paramdata='" . str_replace("\t", '
', str_replace("%09", '
', str_replace("'",'"',$GETdata))) . "'; \n setTimeout(fillindata, 300); \n setTimeout(filldata, 3000); \n"; // = decodeURIComponent(pardata); " . " \n";
---
> echo "\n paramdata='" . str_replace("'",'"',$GETdata) . "'; \n setTimeout(fillindata, 300); \n setTimeout(filldata, 3000); \n"; // = decodeURIComponent(pardata); " . " \n";
330,333c322,325
< $GETtitle1 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("title1=", $_SERVER['QUERY_STRING'])[1])[0]))))));
< $GETtitle2 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("title2=", $_SERVER['QUERY_STRING'])[1])[0]))))));
< $GETtext1 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("text1=", $_SERVER['QUERY_STRING'])[1])[0]))))));
< $GETtext2 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("text2=", $_SERVER['QUERY_STRING'])[1])[0]))))));
---
> $GETtitle1 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("title1=", $_SERVER['QUERY_STRING'])[1])[0])))));
> $GETtitle2 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("title2=", $_SERVER['QUERY_STRING'])[1])[0])))));
> $GETtext1 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("text1=", $_SERVER['QUERY_STRING'])[1])[0])))));
> $GETtext2 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode(explode('&',explode("text2=", $_SERVER['QUERY_STRING'])[1])[0])))));
338c330
< $GETdata = str_replace("`", "' + String.fromCharCode(39) + '", str_replace("``", '"', str_replace("~", "'", str_replace("\\'", "'", urldecode(explode('&',$bbits[1])[0])))));
---
> $GETdata = str_replace("~", "'", str_replace("\\'", "'", urldecode(explode('&',$bbits[1])[0])));
344,347c336,339
< $GETtitle1 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['title1']))))));
< $GETtitle2 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['title2']))))));
< $GETtext1 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['text1']))))));
< $GETtext2 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['text2']))))));
---
> $GETtitle1 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['title1'])))));
> $GETtitle2 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['title2'])))));
> $GETtext1 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['text1'])))));
> $GETtext2 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_POST['text2'])))));
356,359c348,351
< $GETtitle1 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['title1']))))));
< $GETtitle2 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['title2']))))));
< $GETtext1 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['text1']))))));
< $GETtext2 = str_replace("\t", "\n", str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['text2']))))));
---
> $GETtitle1 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['title1'])))));
> $GETtitle2 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['title2'])))));
> $GETtext1 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['text1'])))));
> $GETtext2 = str_replace("~~", "'", str_replace('~', '"', str_replace("`", "'", str_replace("\\'", "'", urldecode($_GET['text2'])))));
474,480c466
< if (ans.substring(0,1).toLowerCase() == 'n') {
< if (tlurl.length >= 800) {
< location.href=iftoobig('',tlurl);
< } else {
< window.open(iftoobig('',tlurl), '_blank', 'top=100,left=100,width=500,height=500');
< }
< }
---
> if (ans.substring(0,1).toLowerCase() == 'n') window.open(iftoobig('',tlurl), '_blank', 'top=100,left=100,width=500,height=500');
492,498c478
< if (ans.substring(0,1).toLowerCase() == 'w') {
< if (tltwourl.length >= 800) {
< location.href=iftoobig('',tltwourl);
< } else {
< window.open(iftoobig('',tltwourl), '_blank', 'top=100,left=100,width=500,height=500');
< }
< }
---
> if (ans.substring(0,1).toLowerCase() == 'w') window.open(iftoobig('',tltwourl), '_blank', 'top=100,left=100,width=500,height=500');
646,652c626
< if (ans.substring(0,1).toLowerCase() == 'w') {
< if (tltwourl.length >= 800) {
< location.href=iftoobig('',tltwourl);
< } else {
< window.open(iftoobig('',tltwourl), '_blank', 'top=100,left=100,width=500,height=500');
< }
< }
---
> if (ans.substring(0,1).toLowerCase() == 'w') window.open(iftoobig('',tltwourl), '_blank', 'top=100,left=100,width=500,height=500');
677,683c651
< if (ans.substring(0,1).toLowerCase() == 'n') {
< if (tlurl.length >= 800) {
< location.href=iftoobig('',tlurl);
< } else {
< window.open(iftoobig('',tlurl), '_blank', 'top=100,left=100,width=500,height=500');
< }
< }
---
> if (ans.substring(0,1).toLowerCase() == 'n') window.open(iftoobig('',tlurl), '_blank', 'top=100,left=100,width=500,height=500');
790c758
< echo ' if (parent.document.getElementById("data")) { var prewert=" data.addRows([ "; ' . "\n";
---
> echo ' var prewert=" data.addRows([ "; ' . "\n";
793,795c761
< echo ' eval(prewert); ' . "\n } else if (document.URL.indexOf('atc_title=') != -1) { \n";
< echo " var prewert=\" dataTable.addRows([[new Date(2008, 1 ,1), 30000, null, null, 40645, null, null],[new Date(2008, 1 ,2), 14045, null, null, 20374, null, null],[new Date(2008, 1 ,3), 55022, null, null, 50766, null, null],[new Date(2008, 1 ,4), 75284, null, null, 14334, 'Out of Stock', 'Ran out of stock on pens at 4pm'],[new Date(2008, 1 ,5), 41476, 'Bought Pens', 'Bought 200k pens', 66467, null, null],[new Date(2008, 1 ,6), 33322, null, null, 39463, null, null]]);\"; \n ";
< echo " eval(prewert); } \n";
---
> echo ' eval(prewert); ' . "\n";
798,799c764,765
< echo str_replace("\t", "
", str_replace("%09", "
", str_replace("~~", "'", str_replace("newDate", "new Date", str_replace("%2c", ",", str_replace("%27", "'", str_replace("%20", " ", str_replace("%28", "(", str_replace("%29", ")", str_replace("%5b", "[", str_replace("`", "'",str_replace("%5d", "]",str_replace('~,', '",', str_replace('[~', '["', str_replace(",]", ",0]", str_replace(",]", ",0]", str_replace(",]", ",0]", $GETdata)))))))))))))))));
< echo "]);\n ";
---
> echo str_replace("~~", "'", str_replace("newDate", "new Date", str_replace("%2c", ",", str_replace("%27", "'", str_replace("%20", " ", str_replace("%28", "(", str_replace("%29", ")", str_replace("%5b", "[", str_replace("`", "'",str_replace("%5d", "]",str_replace('~,', '",', str_replace('[~', '["', str_replace(",]", ",0]", str_replace(",]", ",0]", str_replace(",]", ",0]", $GETdata)))))))))))))));
> echo "]);\n";
814c780
< echo " chart.draw(dataTable, {displayAnnotations: true, allowHtml: true}); \n";
---
> echo " chart.draw(dataTable, {'displayAnnotations': true}); \n";
943,952c909
< var crfound=false;
< while (wthis.indexOf(String.fromCharCode(10)) != -1) {
< if (!crfound) {
< wthis=(encodeURIComponent(String.fromCharCode(9)) + wthis + encodeURIComponent(String.fromCharCode(9))).replace(String.fromCharCode(10),encodeURIComponent(String.fromCharCode(9)));
< } else {
< wthis=wthis.replace(String.fromCharCode(10),encodeURIComponent(String.fromCharCode(9)));
< }
< crfound=true;
< }
< return wthis.replace(/\'/g,'`').replace(/\"/g,'``');
---
> return wthis;
963c920
< window.location = iftoobig('',calwl);
---
> window.location = calwl;
966,992d922
<
< function maybeval(line_num, one_vs_two) {
< if (one_vs_two == 0) {
< if (lastoneval == ' ') {
< lastoneval=(location.search.split('ione' + line_num + 'put=')[1] ? (" value=\"" + decodeURIComponent(location.search.split('ione' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "\"") : '');
< return lastoneval.replace(/\`/g,"'"); //(location.search.split('ione' + line_num + 'put=')[1] ? (" value='" + decodeURIComponent(location.search.split('ione' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "'") : '');
< } else if (lasttwoval.trim() != '') {
< lastoneval=(location.search.split('ione' + line_num + 'put=')[1] ? (" value=\"" + decodeURIComponent(location.search.split('ione' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "\"") : lasttwoval);
< return lastoneval.replace(/\`/g,"'"); //(location.search.split('ione' + line_num + 'put=')[1] ? (" value='" + decodeURIComponent(location.search.split('ione' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "'") : '');
< } else {
< lastoneval=(location.search.split('ione' + line_num + 'put=')[1] ? (" value=\"" + decodeURIComponent(location.search.split('ione' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "\"") : '');
< return lastoneval.replace(/\`/g,"'"); //(location.search.split('ione' + line_num + 'put=')[1] ? (" value='" + decodeURIComponent(location.search.split('ione' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "'") : '');
< }
< } else {
< if (lasttwoval == ' ') {
< lasttwoval=(location.search.split('itwo' + line_num + 'put=')[1] ? (" value=\"" + decodeURIComponent(location.search.split('itwo' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "\"") : '');
< return lasttwoval.replace(/\`/g,"'");
< } else if (lastoneval.trim() != '') {
< lasttwoval=(location.search.split('itwo' + line_num + 'put=')[1] ? (" value=\"" + decodeURIComponent(location.search.split('itwo' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "\"") : lastoneval);
< return lasttwoval.replace(/\`/g,"'");
< } else {
< lasttwoval=(location.search.split('itwo' + line_num + 'put=')[1] ? (" value=\"" + decodeURIComponent(location.search.split('itwo' + line_num + 'put=')[1].split('&')[0]).replace(/\+/g,' ') + "\"") : '');
< return lasttwoval.replace(/\`/g,"'").replace(/\"/g,"''");
< }
< }
< return '';
< }
1016,1017c946
< var preurl="./annotatedtimeline_chart.php?title=" + ttitle.replace("'", "~~").replace('"', '~') + "&desc1=" + ttask1.replace("'", "~~").replace('"', '~') + "&title1=" + ttitle1.replace("'", "~~").replace('"', '~') + "&text1=" + ttext1.replace("'", "~~").replace('"', '~') + "&desc2=" + ttask2.replace("'", "~~").replace('"', '~') + "&title2=" + ttitle2.replace("'", "~~").replace('"', '~') + "&text2=" + ttext2.replace("'", "~~").replace('"', '~') + "&data=" + dt.replace("'", "~~").replace('"', '~');
< window.location = iftoobig('',preurl);
---
> window.location = "./annotatedtimeline_chart.php?title=" + ttitle.replace("'", "~~").replace('"', '~') + "&desc1=" + ttask1.replace("'", "~~").replace('"', '~') + "&title1=" + ttitle1.replace("'", "~~").replace('"', '~') + "&text1=" + ttext1.replace("'", "~~").replace('"', '~') + "&desc2=" + ttask2.replace("'", "~~").replace('"', '~') + "&title2=" + ttitle2.replace("'", "~~").replace('"', '~') + "&text2=" + ttext2.replace("'", "~~").replace('"', '~') + "&data=" + dt.replace("'", "~~").replace('"', '~');
1074c1003
< echo ' xtask = "' . str_replace("\t", "\n", str_replace('+',' ',urldecode($_GET['atc_task1']))) . '"; ttask1 = xtask; ttitle1 = xtask + " " + ttitle1; ttext1 = xtask + " " + ttext1; ' . "\n";
---
> echo ' xtask = "' . str_replace('+',' ',urldecode($_GET['atc_task1'])) . '"; ttask1 = xtask; ttitle1 = xtask + " " + ttitle1; ttext1 = xtask + " " + ttext1; ' . "\n";
1079c1008
< echo ' xtask = "' . str_replace("\t", "\n", str_replace('+',' ',urldecode($_GET['atc_title1']))) . '"; ttitle1 = xtask; ' . "\n";
---
> echo ' xtask = "' . str_replace('+',' ',urldecode($_GET['atc_title1'])) . '"; ttitle1 = xtask; ' . "\n";
1084c1013
< echo ' xtask = "' . str_replace("\t", "\n", str_replace('+',' ',urldecode($_GET['atc_text1']))) . '"; ttext1 = xtask; ' . "\n";
---
> echo ' xtask = "' . str_replace('+',' ',urldecode($_GET['atc_text1'])) . '"; ttext1 = xtask; ' . "\n";
1089c1018
< echo ' xtask = "' . str_replace("\t", "\n", str_replace('+',' ',urldecode($_GET['atc_task2']))) . '"; ttask2 = xtask; ttitle2 = xtask + " " + ttitle2; ttext2 = xtask + " " + ttext2; ' . "\n";
---
> echo ' xtask = "' . str_replace('+',' ',urldecode($_GET['atc_task2'])) . '"; ttask2 = xtask; ttitle2 = xtask + " " + ttitle2; ttext2 = xtask + " " + ttext2; ' . "\n";
1094c1023
< echo ' xtask = "' . str_replace("\t", "\n", str_replace('+',' ',urldecode($_GET['atc_title2']))) . '"; ttitle2 = xtask; ' . "\n";
---
> echo ' xtask = "' . str_replace('+',' ',urldecode($_GET['atc_title2'])) . '"; ttitle2 = xtask; ' . "\n";
1099c1028
< echo ' xtask = "' . str_replace("\t", "\n", str_replace('+',' ',urldecode($_GET['atc_text2']))) . '"; ttext2 = xtask; ' . "\n";
---
> echo ' xtask = "' . str_replace('+',' ',urldecode($_GET['atc_text2'])) . '"; ttext2 = xtask; ' . "\n";
1109,1114c1038,1043
< echo ' bits = bits + " | ";' . "\n";
< echo ' bits = bits + " | ";' . "\n";
< echo ' bits = bits + " | ";' . "\n";
< echo ' bits = bits + " | ";' . "\n";
< echo ' bits = bits + " | ";' . "\n";
< echo ' bits = bits + " | ";' . "\n";
---
> echo ' bits = bits + " | ";' . "\n";
> echo ' bits = bits + " | ";' . "\n";
> echo ' bits = bits + " | ";' . "\n";
> echo ' bits = bits + " | ";' . "\n";
> echo ' bits = bits + " | ";' . "\n";
> echo ' bits = bits + " | ";' . "\n";