Changeset 320

Timestamp:

Feb 14, 2010, 11:15:29 AM (15 years ago)

Author:

george

Message:

• Upraveno: Správné zobrazování nových řádků u textů.

Location:

trunk

Files:

• comparison.php (modified) (4 diffs)
• form.php (modified) (1 diff)

trunk/comparison.php

@@ -8 +8 @@
 function CompareString($String1, $String2)
 {
+  $Result = '';
   //TODO: barevné porovnání
   //strcasecmp($String1, $String2) == 0 je totožné
@@ -20 +21 @@
       if($ArrStr1[$i] == $ArrStr2[$i])
       {
-        echo($ArrStr1[$i].' ');
+        $Result .= $ArrStr1[$i].' ';
       } else
       {
@@ -28 +29 @@
           if(($ArrStr1[$i] == $ArrStr2[$j]) and ($find == false))
           {
-            echo($ArrStr1[$i].' ');
+            $Result .= $ArrStr1[$i].' ';
             $find = true;
           }
         }
         if($find == false)
-        echo('<span class="edit">'.$ArrStr1[$i].' </span>');
+        $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
       }
-    } else echo('<span class="edit">'.$ArrStr1[$i].' </span>');
+    } else $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
   }
   //  echo $ArrStr1[0];
+  return($Result);
 }
 
@@ -113 +115 @@
         {
           echo('<td>');
-          CompareString($Line[$i][$TextItem['Column']],$Line[$i - 1][$TextItem['Column']]);
+          echo(str_replace("\n", '<br/>', CompareString($Line[$i][$TextItem['Column']],$Line[$i - 1][$TextItem['Column']])));
           echo('</td>');
         } else echo('<td>'.$Line[$i][$TextItem['Column']].'</td>');

trunk/form.php

@@ -117 +117 @@
        else
         echo('<tr><th>'.$TextItem['Name'].'</th>');
-        echo ('<td>'.htmlspecialchars($LineAJ[$TextItem['Column']]).'</td>
+        echo ('<td>'.str_replace("\n", '<br/>', htmlspecialchars($LineAJ[$TextItem['Column']])).'</td>
       <td><textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">'.htmlspecialchars($Line[$TextItem['Column']]).'</textarea></td></tr>');
     }