[Phpgroupware-cvs] wiki/action admin.php,1.7 save.php,1.5

[skwashd]

Update of wiki/action

Modified Files:
     Branch: MAIN
            admin.php lines: +26 -26
            save.php lines: +8 -10

Log Message:
merge from 16

====================================================
Index: wiki/action/admin.php
diff -u wiki/action/admin.php:1.6 wiki/action/admin.php:1.7
--- wiki/action/admin.php:1.6   Fri Mar  7 00:19:13 2003
+++ wiki/action/admin.php       Sun May 15 12:55:31 2005
@@ -14,43 +14,43 @@

 // Harvest script parameters.

-$REMOTE_ADDR = isset($HTTP_SERVER_VARS['REMOTE_ADDR'])
-               ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : '';
+$REMOTE_ADDR = isset($_SERVER['REMOTE_ADDR'])
+               ? $_SERVER['REMOTE_ADDR'] : '';

-if(isset($HTTP_GET_VARS['locking']))
-  { $locking = $HTTP_GET_VARS['locking']; }
-if(isset($HTTP_GET_VARS['blocking']))
-  { $blocking = $HTTP_GET_VARS['blocking']; }
+if(isset($_GET['locking']))
+  { $locking = $_GET['locking']; }
+if(isset($_GET['blocking']))
+  { $blocking = $_GET['blocking']; }
 if(!isset($locking))
 {
-  $locking  = isset($HTTP_POST_VARS['locking'])
-              ? $HTTP_POST_VARS['locking'] : '';
+  $locking  = isset($_POST['locking'])
+              ? $_POST['locking'] : '';
 }
 if(!isset($blocking))
 {
-  $blocking = isset($HTTP_POST_VARS['blocking'])
-              ? $HTTP_POST_VARS['blocking'] : '';
+  $blocking = isset($_POST['blocking'])
+              ? $_POST['blocking'] : '';
 }

-$Block   = isset($HTTP_POST_VARS['Block'])
-           ? $HTTP_POST_VARS['Block'] : '';
-$Unblock = isset($HTTP_POST_VARS['Unblock'])
-           ? $HTTP_POST_VARS['Unblock'] : '';
-$Save    = isset($HTTP_POST_VARS['Save'])
-           ? $HTTP_POST_VARS['Save'] : '';
-$address = isset($HTTP_POST_VARS['address'])
-           ? $HTTP_POST_VARS['address'] : '';
+$Block   = isset($_POST['Block'])
+           ? $_POST['Block'] : '';
+$Unblock = isset($_POST['Unblock'])
+           ? $_POST['Unblock'] : '';
+$Save    = isset($_POST['Save'])
+           ? $_POST['Save'] : '';
+$address = isset($_POST['address'])
+           ? $_POST['address'] : '';

-$count = isset($HTTP_POST_VARS['count']) ? $HTTP_POST_VARS['count'] : 0;
+$count = isset($_POST['count']) ? $_POST['count'] : 0;

 if($locking && $count > 0)
 {
   for($i = 1; $i <= $count; $i++)
   {
     $var = 'name' + $i;
-    $$var = isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : '';
+    $$var = isset($_POST[$var]) ? $_POST[$var] : '';
     $var = 'lock' + $i;
-    $$var = isset($HTTP_POST_VARS[$var]) ? $HTTP_POST_VARS[$var] : '';
+    $$var = isset($_POST[$var]) ? $_POST[$var] : '';
   }
 }

@@ -71,15 +71,15 @@
     $pagestore->lock();                 // Exclusive access to database.
     for($i = 1; $i <= $count; $i++)
     {
-      $page = urldecode($HTTP_POST_VARS['name' . $i]);
-      if(isset($HTTP_POST_VARS['lock' . $i]))
-        { $lock = $HTTP_POST_VARS['lock' . $i]; }
+      $page = urldecode($_POST['name' . $i]);
+      if(isset($_POST['lock' . $i]))
+        { $lock = $_POST['lock' . $i]; }
       else
         { $lock = 0; }
       $pg = $pagestore->page($page);
       $pg->read();
       $pg->version++;
-      $pg->hostname = gethostbyaddr($REMOTE_ADDR);
+      $pg->hostname = gethostbyaddr($_SERVER['REMOTE_ADDR']);
       $pg->username = $UserName;
       $pg->comment = '';
       $pg->text = str_replace('\\', '\\\\', $pg->text);

====================================================
Index: wiki/action/save.php
diff -u wiki/action/save.php:1.4 wiki/action/save.php:1.5
--- wiki/action/save.php:1.4    Fri Mar  7 00:19:13 2003
+++ wiki/action/save.php        Sun May 15 12:55:31 2005
@@ -9,14 +9,14 @@
 function action_save()
 {
   global $pagestore, $comment, $categories, $archive;
-  global $Save, $Preview, $SaveAndContinue, $page, $document, $nextver, 
$REMOTE_ADDR;
+  global $Save, $Preview, $SaveAndContinue, $page, $document, $nextver;
   global $MaxPostLen, $UserName, $SaveMacroEngine, $ErrorPageLocked;

   if(empty($Save))                      // Didn't click the save button.
   {
        if(!empty($Preview)) {
            include('action/preview.php');
-       action_preview();
+           action_preview();
            return;
        }
   }
@@ -45,14 +45,12 @@
   $document = substr($document, 0, $MaxPostLen);
   $document = str_replace("\r", "", $document);

-  $esc_doc = str_replace("\\", "\\\\", $document);
-  $esc_doc = str_replace("'", "\\'", $esc_doc);
+  $document = $GLOBALS['phpgw']->db->db_addslashes($document);

-  $comment = str_replace("\\", "\\\\", $comment);
-  $comment = str_replace("'", "\\'", $comment);
+  $comment = $GLOBALS['phpgw']->db->db_addslashes($comment);

-  $pg->text = $esc_doc;
-  $pg->hostname = gethostbyaddr($REMOTE_ADDR);
+  $pg->text = $document; //$esc_doc;
+  $pg->hostname = gethostbyaddr($_SERVER['REMOTE_ADDR']);
   $pg->username = $UserName;
   $pg->comment  = $comment;

@@ -67,7 +65,7 @@
     add_to_category($page, $categories);
   }

-  if ((empty($Save)) and (!empty($SaveAndContinue))) {
+  if ((empty($Save)) && (!empty($SaveAndContinue))) {
          header('Location: ' . editURL($page));
   } else {
        template_save(array('page' => $page,