last update: Sat, 14 Jan 2012 11:26:07 +0000
  1. <?
  2. require_once('common.php');
  3. require_once('compare2.php');
  4. require_once('codehighlighter.php');
  5. require_once('code_css.php');
  7. //main template
  8. $smarty->assign('main_template', 'comparer.tpl');
  9. //title
  10. $pageTitle = 'Compare Code: Online Diff Tool';
  13. $additional_headers = array();
  15. $additional_headers[] = '<script>
  16. function update_a()
  17. {
  18. var a = document.getElementById("a");
  19. var b = document.getElementById("b");
  20. b.scrollTop = a.scrollTop;
  21. b.scrollLeft = a.scrollLeft;
  22. }
  24. function update_b()
  25. {
  26. var a = document.getElementById("a");
  27. var b = document.getElementById("b");
  28. a.scrollTop = b.scrollTop;
  29. a.scrollLeft = b.scrollLeft;
  30. }
  31. </script>';
  33. function strip_markup($s)
  34. {
  35. return str_replace('##', '', str_replace('', '', $s));
  36. }
  38. $s1 = null;
  39. $s2 = null;
  40. $default_lang1 = null;
  41. $default_lang2 = null;
  43. if ((isset($_GET['id1'])) && (isset($_GET['id2'])))
  44. {
  45. //echo code_css();
  47. $id1 = intval($_GET['id1']);
  48. $id2 = intval($_GET['id2']);
  49. $orderby = ($id1 > $id2) ? 'ORDER BY `id` DESC' : 'ORDER BY `id` ASC';
  50. $query = 'SELECT *
  51. FROM `mapping_nopaste_jass`
  52. WHERE `key` LIKE ""
  53. AND (`id` = "'.$id1.'" OR `id` = "'.$id2.'")
  54. '.$orderby.';';
  55. $data = mysql_query($query, $mysqlconnection);
  56. echo mysql_error();
  57. $row = mysql_fetch_array($data);
  58. $s1 = strip_markup($row['jass_code']);
  59. $default_lang1 = $row['codetype'];
  60. $row = mysql_fetch_array($data);
  61. $s2 = strip_markup($row['jass_code']);
  62. $default_lang2 = $row['codetype'];
  68. }
  69. else if ((isset($_POST['code1'])) && (isset($_POST['code2'])))
  70. {
  71. $s1 = $_POST['code1'];
  72. $s2 = $_POST['code2'];
  73. $default_lang1 = $default_lang2 = $_POST['lang'];
  75. if ($_POST['save'])
  76. {
  77. $query = 'SELECT `id` as x FROM `mapping_nopaste_jass` ORDER BY `id` DESC;';
  78. $count = mysql_fetch_array(mysql_query($query, $mysqlconnection));
  80. $id = $count['x'] + 1;
  82. $code_type = mysql_real_escape_string($_POST['lang']);
  83. //remember to check this value later
  84. //check value
  85. $query = 'SELECT name FROM languages WHERE `name` = "'.$code_type.'";';
  86. $row = mysql_fetch_array(mysql_query($query));
  87. if (isset($row['name']) && ($row['name'] != $code_type))
  88. {
  89. die('unbekannte Sprache.');
  90. }
  92. $code = unescape_string($s1);
  93. $code = str_replace("<", "<", $code);
  94. $code = str_replace(">", ">", $code);
  96. $query = 'INSERT INTO
  97. `mapping_nopaste_jass` (`id`, `jass_code`, `datum`, `userid`, `codetype` )
  98. VALUES ("'.$id.'", "'.escape_string($code).'", NOW(), "'.session_get_userid_secure().'", "'.$code_type.'")
  99. ';
  100. $temp = mysql_query($query, $mysqlconnection);
  101. echo mysql_error();
  103. $id++;
  104. $code = unescape_string($s2);
  105. $code = str_replace("<", "<", $code);
  106. $code = str_replace(">", ">", $code);
  108. $query = 'INSERT INTO
  109. `mapping_nopaste_jass` (`id`, `jass_code`, `datum`, `userid`, `codetype` )
  110. VALUES ("'.$id.'", "'.escape_string($code).'", NOW(), "'.session_get_userid_secure().'", "'.$code_type.'")
  111. ';
  112. $temp = mysql_query($query, $mysqlconnection);
  113. echo mysql_error();
  115. $additional_headers[] ='<script>document.location="comparer.php?id1='.($id-1).'&id2='.$id.'";</script>';
  116. $s1 = $s2 = null;
  118. $smarty->assign('id1', $id -1);
  119. $smarty->assign('id2', $id);
  120. }
  121. }
  122. else
  123. {
  124. $query = 'SELECT name FROM languages;';
  125. $data = mysql_query($query);
  126. $languages = array();
  127. while ($row = mysql_fetch_array($data))
  128. {
  129. $languages[] = $row['name'];
  130. }
  131. $smarty->assign('languages', $languages);
  132. }
  134. if (($s1) && ($s2))
  135. {
  137. $lines1 = fill_line_array($s1);
  138. $lines2 = fill_line_array($s2);
  141. $linearray_comparer = new linearraycomparer($lines1, $lines2);
  143. $Alines1 = $linearray_comparer->make_same_lines_same_height(0);
  144. $Alines2 = $linearray_comparer->make_same_lines_same_height(1);
  146. $Blines1 = array();
  147. $Blines1_pos = 0;
  148. $Blines2 = array();
  149. $Blines2_pos = 0;
  151. $lineComparerInvocations = 0;
  155. for ($i = 0; $i < max(sizeof($Alines1),sizeof($Alines2)); ++$i)
  156. {
  158. if (!isset($Alines1[$i])) $Alines1[$i] = "";
  159. if (!isset($Alines2[$i])) $Alines2[$i] = "";
  160. $line1 = unescape_string(($Alines1[$i]));
  161. $line2 = unescape_string(($Alines2[$i]));
  163. //$bg1 = ' bgcolor="#90ff60"';
  164. //$bg2 = ' bgcolor="#90ff60"';
  165. ++$Blines1_pos;
  166. ++$Blines2_pos;
  168. if ($line1 != $line2)
  169. {
  171. if ($line1 == "////////////////")
  172. {
  173. //$bg1 = ' bgcolor="#CCccCC"';
  174. --$Blines1_pos;
  175. if (!(isset($Blines1[$Blines1_pos]))) {
  176. if ($Blines1_pos > 0) {
  177. $Blines1[$Blines1_pos] = '';
  178. } else {
  179. // dirty hack, i hat me for doing it^^
  180. $Blines1[$Blines1_pos] = '!!!FIRSTLINE-SKIPTHIS!!!';
  181. }
  182. }
  183. $line1 = $Blines1[$Blines1_pos]."\n";
  184. $line2 = "##".$line2; // mark added line yellow
  185. //$Blines1[$Blines1_pos].="\n";
  186. }
  187. elseif ($line2 == "////////////////")
  188. {
  189. //$bg2 = ' bgcolor="#CCccCC"';
  190. --$Blines2_pos;
  191. if (!(isset($Blines2[$Blines2_pos]))) {
  192. if ($Blines2_pos > 0) {
  193. $Blines2[$Blines2_pos] = '';
  194. } else {
  195. // dirty hack, i hat me for doing it^^
  196. $Blines2[$Blines2_pos] = '!!!FIRSTLINE-SKIPTHIS!!!';
  197. }
  198. }
  199. $line2 = $Blines2[$Blines2_pos]."\n";
  200. $line1 = "##".$line1; // mark added line yellow
  201. //$Blines2[$Blines2_pos].="\n";
  202. }
  203. else
  204. {
  205. //$bg1 = ' bgcolor="#ffff66"';
  206. //$bg2 = ' bgcolor="#ffff66"';
  208. if ($lineComparerInvocations < 100) {
  209. $line_comparer = new linecomparer($line1, $line2);
  210. $line1 = "##".$line_comparer->markup_string_difference(0, "", "");
  211. $line2 = "##".$line_comparer->markup_string_difference(1, "", "");
  213. $lineComparerInvocations ++;
  214. } else {
  215. // TOO many differences, just highlight the lines
  216. $line1 = "##".$line1;
  217. $line2 = "##".$line2;
  218. }
  219. }
  220. }
  222. //if (!(($line1 == $line2) && ($line1 == "////////////////")))
  223. if (($line1 != $line2) || ($line1 != "////////////////"))
  224. {
  226. $Blines1[$Blines1_pos] = $line1;
  227. $Blines2[$Blines2_pos] = $line2;
  228. }
  229. }
  234. /*
  235. include('language_data_jass.php');
  236. $ld = new languagedata();
  237. $ld->load_array($language_data);
  239. include('style_data_html.php');
  240. $hs = new highlightstyle();
  241. $hs->load_array($style_data);
  244. $ch1 = new codehighlighter($Blines1);
  245. $ch2 = new codehighlighter($Blines2);
  247. $output_lines1 = $ch1->parse_code($ld, $hs);
  248. $output_lines2 = $ch2->parse_code($ld, $hs);
  249. */
  251. $ech1 = new easycodehighlighter($Blines1, $default_lang1);
  252. $ech2 = new easycodehighlighter($Blines2, $default_lang2);
  254. $additional_headers[] = $ech1->code_css;
  256. $output_lines1 = $ech1->output;
  257. $output_lines2 = $ech2->output;
  259. $output_lines1 = str_replace('class="codebox"', 'class="codebox" style="position:absolute;width:49%;left:0px;margin-left:5px;height:500px;" id="a" onscroll="update_a();"', $output_lines1);
  260. $output_lines2 = str_replace('class="codebox"', 'class="codebox" style="position:absolute;width:49%;right:0px;margin-right:5px;height:500px;" id="b" onscroll="update_b();"', $output_lines2);
  262. $smarty->assign('output_lines1', $output_lines1);
  263. $smarty->assign('output_lines2', $output_lines2);
  266. }
  268. finish($smarty, "comparer.tpl", $additional_headers)
  270. ?>

goto line:
Compare with:
text copy window edit this code post new code