Changeset 364 for trunk

Timestamp:

Mar 8, 2010, 5:07:33 PM (15 years ago)

Author:

maron

Message:

• Opraveno: Exportování lua souborů. * Opraveno: Zobrazování hlavní stránky AoWoW.

Location:

trunk

Files:

• aowow/index.php (modified) (2 diffs)
• aowow/main.php (modified) (1 diff)
• export/export.php (modified) (2 diffs)

trunk/aowow/index.php

@@ -54 +54 @@
         'path' => '[]'
 );
+
 
 // В зависимости от раздела, выбираем что открывать:
@@ -131 +132 @@
                 break;
 }
-
+die('');
 ?>

trunk/aowow/main.php

@@ -5 +5 @@
         if($rows)
                 $smarty->assign('news', $rows);
-
         global $page;
         $smarty->assign('page', $page);
         $smarty->display('main.tpl');
+        
 ?>

trunk/export/export.php

@@ -306 +306 @@
             $DbRow = $DbResult2->fetch_assoc();
             $Value['Text'] = addslashes($DbRow['Text']);
-            $Value['Comment'] = addslashes($DbRow['Comment']);
+            // Escape new line control characters
+            $Value['Text'] = str_replace("\n", '\n', $Value['Text']);
+            $Value['Text'] = str_replace("\r", '', $Value['Text']);
+            $Value['Comment'] = $DbRow['Comment'];
+            // Only one line comments allowed
+            $Value['Comment'] = str_replace("\n", ' ', $Value['Comment']);
+            $Value['Comment'] = str_replace("\r", '', $Value['Comment']);
             //echo('.');
           }
@@ -313 +319 @@
           $NewLine .= "\n";
           $File2->WriteLine($NewLine);
-        } else $File2->WriteLine($Line."\n");
+        } else $File2->WriteLine($Line."");
       }
       echo('Hotovo <br/>');