moving delete profile to its own space.

darcs-hash:20081203192658-099f7-37d26abf7409ab2996a22de4aa71cb7a5f68d205.gz

1 files changed, 2 insertions, 166 deletions

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index f0083b219..ed2623c9b 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -35,8 +35,8 @@ class ProfilesettingsAction extends SettingsAction {
 		$this->show_avatar_form();
 		common_element('h2', NULL, _('Change password'));
 		$this->show_password_form();
-		common_element('h2', NULL, _('Delete my account'));
-		$this->show_delete_form();
+//		common_element('h2', NULL, _('Delete my account'));
+//		$this->show_delete_form();
 		common_show_footer();
 	}
 
@@ -56,8 +56,6 @@ class ProfilesettingsAction extends SettingsAction {
 			$this->upload_avatar();
 		} else if ($this->arg('changepass')) {
 			$this->change_password();
-		} else if ($this->arg('deleteaccount')) {
-			$this->delete_account();
 		}
 
 	}
@@ -192,75 +190,6 @@ class ProfilesettingsAction extends SettingsAction {
 		common_element_end('form');
 	}
 
-
-	function show_feeds_list($feeds) {
-		common_element_start('div', array('class' => 'feedsdel'));
-		common_element('p', null, 'Feeds:');
-		common_element_start('ul', array('class' => 'xoxo'));
-
-		foreach ($feeds as $key => $value) {
-			$this->common_feed_item($feeds[$key]);
-		}
-		common_element_end('ul');
-		common_element_end('div');
-	}
-
-	function common_feed_item($feed) {
-        $user = common_current_user();
-		$nickname = $user->nickname;
-
-		switch($feed['item']) {
-			case 'notices': default:
-				$feed_classname = $feed['type'];
-				$feed_mimetype = "application/".$feed['type']."+xml";
-				$feed_title = "$nickname's ".$feed['version']." notice feed";
-				$feed['textContent'] = "RSS";
-				break;
-
-			case 'foaf':
-				$feed_classname = "foaf";
-				$feed_mimetype = "application/".$feed['type']."+xml";
-				$feed_title = "$nickname's FOAF file";
-				$feed['textContent'] = "FOAF";
-				break;
-		}
-		common_element_start('li');
-		common_element('a', array('href' => $feed['href'],
-								  'class' => $feed_classname,
-								  'type' => $feed_mimetype,
-								  'title' => $feed_title),
-							$feed['textContent']);
-		common_element_end('li');
-	}
-
-	function show_delete_form() {
-		$user = common_current_user();
-        $notices = DB_DataObject::factory('notice');
-        $notices->profile_id = $user->id;
-        $notice_count = (int) $notices->count();
-
-		common_element_start('form', array('method' => 'POST',
-										   'id' => 'delete',
-										   'action' =>
-										   common_local_url('profilesettings')));
-
-		common_hidden('token', common_session_token());
-        common_element('p', null, "You can copy your notices and contacts by saving the two links belowxbefore deleting your account. Be careful, this operation cannot be undone.");
-
-
-		$this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)), 
-											  'type' => 'rss',
-											  'version' => 'RSS 1.0',
-											  'item' => 'notices'),
-									 1=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
-											  'type' => 'rdf',
-											  'version' => 'FOAF',
-											  'item' => 'foaf')));
-
-		common_submit('deleteaccount', _('Delete my account'));
-		common_element_end('form');
-	}
-
 	function save_profile() {
 		$nickname = $this->trimmed('nickname');
 		$fullname = $this->trimmed('fullname');
@@ -507,97 +436,4 @@ class ProfilesettingsAction extends SettingsAction {
 
 		$this->show_form(_('Password saved.'), true);
 	}
-
-	function delete_account() {
-		$user = common_current_user();
-		assert(!is_null($user)); # should already be checked
-
-        // deleted later through the profile
-        /*
-        $avatar = new Avatar;
-        $avatar->profile_id = $user->id;
-        $n_avatars_deleted = $avatar->delete();
-        */
-
-        $fave = new Fave;
-        $fave->user_id = $user->id;
-        $n_faves_deleted = $fave->delete(); 
-
-        $confirmation = new Confirm_address;
-        $confirmation->user_id = $user->id;
-        $n_confirmations_deleted = $confirmation->delete();
-
-        // TODO foreign stuff...
-
-        $invitation = new Invitation;
-        $invitation->user_id = $user->id;
-        $n_invitations_deleted = $invitation->delete();
-
-        $message_from = new Message;
-        $message_from->from_profile = $user->id;
-        $n_messages_from_deleted = $message_from->delete();
-
-        $message_to = new Message;
-        $message_to->to_profile = $user->id;
-        $n_messages_to_deleted = $message_to->delete();
-
-        $notice = new Notice;
-        $notice->profile_id = $user->id;
-        $n_notices_deleted = $notice->delete();
-
-        $notice_inbox = new Notice_inbox;
-        $notice_inbox->user_id = $user->id;
-        $n_notices_inbox_deleted = $notice_inbox->delete();
-
-        $profile_tagger = new Profile_tag;
-        $profile_tagger->tagger = $user->id;
-        $n_profiles_tagger_deleted = $profile_tagger->delete();
-
-        $profile_tagged = new Profile_tag;
-        $profile_tagged->tagged = $user->id;
-        $n_profiles_tagged_deleted = $profile_tagged->delete();
-               
-        $remember_me = new Remember_me;
-        $remember_me->user_id = $user->id;
-        $n_remember_mes_deleted = $remember_me->delete();
-
-        $reply_from = new Reply;
-        $reply_from->profile_id = $user->id;
-        $n_replies_from_deleted = $reply_from->delete();
-
-        // not sure if this should be deleted...
-        //TODO: test
-        if (1) {
-            $reply_to = new Reply;
-            $reply_to->replied_id = $user->id;
-            $reply_to->find();
-            while ($reply_to->fetch()) {
-                $str = print_r($reply_to, true);
-            }
-//            $n_replies_to_deleted = $reply_to->delete();
-        }
-
-        $subscriber = new Subscription;
-        $subscriber->subscriber = $user->id;
-        $n_subscribers_deleted = $subscriber->delete();
-
-        $subscribed = new Subscription;
-        $subscribed->subscribed = $user->id;
-        $n_subscribeds_deleted = $subscribed->delete();
-
-        $user_openid = new User_openid;
-        $user_openid->user_id = $user->id;
-        $n_user_openids_deleted = $user_openid->delete();
-
-        // last steps
-        if (0) {
-            $profile = new Profile;
-            $profile->id = $user->id;
-            $profile->delete_avatars();
-            $n_profiles_deleted = $profile->delete();
-            $n_users_deleted = $user->delete();
-        }
-
-		$this->show_form(_("Your account has been deleted. ($str)"), true);
-    }
 }