00001 <?php
00002
00003
00004
00005
00006
00007
00008
00009
00010
00011
00012
00013
00014
00015
00016
00017
00018
00019
00020
00021
00022
00023
00024
00025
00026
00066 class t3lib_diff {
00067
00068
00069 var $stripTags = 0;
00070 var $diffOptions = '';
00071
00072
00073 var $clearBufferIdx=0;
00074 var $differenceLgd=0;
00075
00076
00077
00086 function makeDiffDisplay($str1,$str2,$wrapTag='span') {
00087 if ($this->stripTags) {
00088 $str1 = strip_tags($str1);
00089 $str2 = strip_tags($str2);
00090 } else {
00091 $str1 = $this->tagSpace($str1);
00092 $str2 = $this->tagSpace($str2);
00093 }
00094 $str1Lines = $this->explodeStringIntoWords($str1);
00095 $str2Lines = $this->explodeStringIntoWords($str2);
00096
00097 $diffRes = $this->getDiff(implode(chr(10),$str1Lines).chr(10),implode(chr(10),$str2Lines).chr(10));
00098
00099 if (is_array($diffRes)) {
00100 reset($diffRes);
00101 $c=0;
00102 $diffResArray=array();
00103 $differenceStr = '';
00104 while(list(,$lValue)=each($diffRes)) {
00105 if (intval($lValue)) {
00106 $c=intval($lValue);
00107 $diffResArray[$c]['changeInfo']=$lValue;
00108 }
00109 if (substr($lValue,0,1)=='<') {
00110 $differenceStr.= $diffResArray[$c]['old'][] = substr($lValue,2);
00111 }
00112 if (substr($lValue,0,1)=='>') {
00113 $differenceStr.= $diffResArray[$c]['new'][] = substr($lValue,2);
00114 }
00115 }
00116
00117 $this->differenceLgd = strlen($differenceStr);
00118
00119 $outString='';
00120 $clearBuffer='';
00121 for ($a=-1;$a<count($str1Lines);$a++) {
00122 if (is_array($diffResArray[$a+1])) {
00123 if (strstr($diffResArray[$a+1]['changeInfo'],'a')) {
00124 $clearBuffer.=htmlspecialchars($str1Lines[$a]).' ';
00125 }
00126
00127 $outString.=$this->addClearBuffer($clearBuffer);
00128 $clearBuffer='';
00129 if (is_array($diffResArray[$a+1]['old'])) {
00130 $outString.='<'.$wrapTag.' class="diff-r">'.htmlspecialchars(implode(' ',$diffResArray[$a+1]['old'])).'</'.$wrapTag.'> ';
00131 }
00132 if (is_array($diffResArray[$a+1]['new'])) {
00133 $outString.='<'.$wrapTag.' class="diff-g">'.htmlspecialchars(implode(' ',$diffResArray[$a+1]['new'])).'</'.$wrapTag.'> ';
00134 }
00135 $chInfParts = explode(',',$diffResArray[$a+1]['changeInfo']);
00136 if (!strcmp($chInfParts[0],$a+1)) {
00137 $newLine = intval($chInfParts[1])-1;
00138 if ($newLine>$a) $a=$newLine;
00139 }
00140 } else {
00141 $clearBuffer.=htmlspecialchars($str1Lines[$a]).' ';
00142 }
00143 }
00144 $outString.=$this->addClearBuffer($clearBuffer,1);
00145
00146 $outString = str_replace(' ',chr(10),$outString);
00147 if (!$this->stripTags) {
00148 $outString = $this->tagSpace($outString,1);
00149 }
00150 return $outString;
00151 }
00152 }
00153
00163 function getDiff($str1,$str2) {
00164
00165 $file1 = t3lib_div::tempnam('diff1_');
00166 t3lib_div::writeFile($file1,$str1);
00167
00168 $file2 = t3lib_div::tempnam('diff2_');
00169 t3lib_div::writeFile($file2,$str2);
00170
00171 $cmd = $GLOBALS['TYPO3_CONF_VARS']['BE']['diff_path'].' '.$this->diffOptions.' '.$file1.' '.$file2;
00172 $res = array();
00173 exec($cmd,$res);
00174
00175 unlink($file1);
00176 unlink($file2);
00177
00178 return $res;
00179 }
00180
00189 function addClearBuffer($clearBuffer,$last=0) {
00190 if (strlen($clearBuffer)>200) {
00191 $clearBuffer=($this->clearBufferIdx?t3lib_div::fixed_lgd_cs($clearBuffer,70):'').'['.strlen($clearBuffer).']'.(!$last?t3lib_div::fixed_lgd_cs($clearBuffer,-70):'');
00192 }
00193 $this->clearBufferIdx++;
00194 return $clearBuffer;
00195 }
00196
00205 function explodeStringIntoWords($str) {
00206 $strArr = t3lib_div::trimExplode(chr(10),$str);
00207 $outArray=array();
00208 reset($strArr);
00209 while(list(,$lineOfWords)=each($strArr)) {
00210 $allWords = t3lib_div::trimExplode(' ',$lineOfWords,1);
00211 $outArray = array_merge($outArray,$allWords);
00212 $outArray[]='';
00213 $outArray[]='';
00214 }
00215 return $outArray;
00216 }
00217
00226 function tagSpace($str,$rev=0) {
00227 if ($rev) {
00228 return str_replace(' <','<',str_replace('> ','>',$str));
00229 } else {
00230 return str_replace('<',' <',str_replace('>','> ',$str));
00231 }
00232 }
00233 }
00234
00235 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_diff.php']) {
00236 include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_diff.php']);
00237 }
00238 ?>