Changeset 1863

Timestamp:

Feb 27, 2007, 1:32:23 PM (17 years ago)

Author:

rvelices

Message:

• function delete_user now clears asssociated data in the caddie table and the sessions table
• xml writer improvement for web service

Location:

trunk

Files:

• admin/include/functions.php (modified) (8 diffs)
• include/ws_protocols/rest_encoder.php (modified) (3 diffs, 1 prop)

trunk/admin/include/functions.php

@@ -215 +215 @@
 {
   global $conf;
-
-  // destruction of the access linked to the user
-  $query = '
-DELETE FROM '.USER_ACCESS_TABLE.'
+  $tables = array(
+    // destruction of the access linked to the user
+    USER_ACCESS_TABLE,
+    // destruction of data notification by mail for this user
+    USER_MAIL_NOTIFICATION_TABLE,
+    // destruction of data RSS notification for this user
+    USER_FEED_TABLE,
+    // deletion of calculated permissions linked to the user
+    USER_CACHE_TABLE,
+    // deletion of computed cache data linked to the user
+    USER_CACHE_CATEGORIES_TABLE,
+    // destruction of the group links for this user
+    USER_GROUP_TABLE,
+    // destruction of the favorites associated with the user
+    FAVORITES_TABLE,
+    // destruction of the caddie associated with the user
+    CADDIE_TABLE,
+    // deletion of phpwebgallery specific informations
+    USER_INFOS_TABLE,
+    );
+
+  foreach ($tables as $table)
+  {
+    $query = '
+DELETE FROM '.$table.'
   WHERE user_id = '.$user_id.'
 ;';
-  pwg_query($query);
-
-  // destruction of data notification by mail for this user
-  $query = '
-DELETE FROM '.USER_MAIL_NOTIFICATION_TABLE.'
-  WHERE user_id = '.$user_id.'
-;';
-  pwg_query($query);
-
-  // destruction of data RSS notification for this user
-  $query = '
-DELETE FROM '.USER_FEED_TABLE.'
-  WHERE user_id = '.$user_id.'
-;';
-  pwg_query($query);
-
-  // destruction of the group links for this user
-  $query = '
-DELETE FROM '.USER_GROUP_TABLE.'
-  WHERE user_id = '.$user_id.'
-;';
-  pwg_query($query);
-
-  // destruction of the favorites associated with the user
-  $query = '
-DELETE FROM '.FAVORITES_TABLE.'
-  WHERE user_id = '.$user_id.'
-;';
-  pwg_query($query);
-
-  // deletion of calculated permissions linked to the user
-  $query = '
-DELETE FROM '.USER_CACHE_TABLE.'
-  WHERE user_id = '.$user_id.'
-;';
-  pwg_query($query);
-
-  // deletion of computed cache data linked to the user
-  $query = '
-DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.'
-  WHERE user_id = '.$user_id.'
-;';
-  pwg_query($query);
-
-  // deletion of phpwebgallery specific informations
-  $query = '
-DELETE FROM '.USER_INFOS_TABLE.'
-  WHERE user_id = '.$user_id.'
+    pwg_query($query);
+  }
+
+  // destruction of the user
+  $query = '
+DELETE FROM '.SESSIONS_TABLE.'
+  WHERE data LIKE "pwg_uid|i:'.(int)$user_id.';%"
 ;';
   pwg_query($query);
@@ -525 +505 @@
   {
     $first = true;
-     
+
     $query = 'SHOW VARIABLES LIKE \'max_allowed_packet\';';
     list(, $packet_size) = mysql_fetch_row(pwg_query($query));
@@ -540 +520 @@
         $first = true;
       }
-      
+
       if ($first)
       {
@@ -554 +534 @@
     , ';
       }
-      
+
       $query .= '(';
       foreach ($dbfields as $field_id => $dbfield)
@@ -574 +554 @@
       $query .= ')';
     }
-    
+
     $query .= '
 ;';
@@ -1942 +1922 @@
       {
         array_push($all_tag_ids, $row['tag_id']);
-        
+
         if (!isset($tags_of[ $row['image_id'] ])) {
           $tags_of[ $row['image_id'] ] = array();
         }
-        
+
         array_push(
           $tags_of[ $row['image_id'] ],
@@ -1987 +1967 @@
       $xml_string.= "    <tag>".$tag_name_of[$tag_id]."</tag>\n";
     }
-    
+
     $xml_string.= "  </photo>\n";
   }
-  
+
   $xml_string.= '</export>';
   fwrite($fp, $xml_string);
@@ -2049 +2029 @@
     'EXTENSIONS' => 'http://'.PHPWG_DOMAIN.'/ext',
     );
-  if ( isset($lang_info['code']) and 
+  if ( isset($lang_info['code']) and
        in_array($lang_info['code'], array('fr','en')) )
   { /* current wiki languages are French or English */

trunk/include/ws_protocols/rest_encoder.php

@@ -4 +4 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $URL: svn+ssh://rvelices@svn.gna.org/svn/phpwebgallery/trunk/action.php $
-// | last update   : $Date: 2006-12-21 18:49:12 -0500 (Thu, 21 Dec 2006) $
-// | last modifier : $Author: rvelices $
-// | revision      : $Rev: 1678 $
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -85 +84 @@
     $this->_end_prev(false);
     $value = (string)$value;
-    $need_cdata = (strpos($value, "\r")!==false)?true:false;
-    if ($need_cdata)
-    {
-      $this->_output( '<![CDATA[' . $value . ']]>' );
-    }
-    else
-    {
-      $this->_output( htmlspecialchars( $value ) );
-    }
+    $this->_output( htmlspecialchars( $value ) );
+  }
+
+  function write_cdata($value)
+  {
+    $this->_end_prev(false);
+    $value = (string)$value;
+    $this->_output(
+      '<![CDATA['
+      . str_replace(']]>', ']]&gt;', $value)
+      . ']]>' );
   }
 
@@ -164 +165 @@
       return $ret;
     }
-
-//parent::flattenResponse($response);
 
     $this->_writer = new PwgXmlWriter();