From 6eb506062189557e5e5f40212c4cc7a1faec27fd Mon Sep 17 00:00:00 2001
From: millette <millette@controlyourself.ca>
Date: Thu, 4 Dec 2008 13:02:33 -0500
Subject: done delete own profile (see other settings)

darcs-hash:20081204180233-099f7-7728ee57876b789278aa1cc35f54e0a422593e5d.gz
---
 lib/deleteprofileaction.php | 61 ---------------------------------------------
 lib/util.php                |  4 ++-
 2 files changed, 3 insertions(+), 62 deletions(-)
 delete mode 100644 lib/deleteprofileaction.php

(limited to 'lib')

diff --git a/lib/deleteprofileaction.php b/lib/deleteprofileaction.php
deleted file mode 100644
index 5ba0e7e44..000000000
--- a/lib/deleteprofileaction.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-class DeleteAction extends Action {
-
-	function handle($args) {
-		parent::handle($args);
-		$user = common_current_user();
-		$notice_id = $this->trimmed('notice');
-		$notice = Notice::staticGet($notice_id);
-		if (!$notice) {
-			common_user_error(_('No such notice.'));
-			exit;
-		}
-
-		$profile = $notice->getProfile();
-		$user_profile = $user->getProfile();
-
-		if (!common_logged_in()) {
-			common_user_error(_('Not logged in.'));
-			exit;
-		} else if ($notice->profile_id != $user_profile->id) {
-			common_user_error(_('Can\'t delete this notice.'));
-			exit;
-		}
-	}
-
-	function show_top($arr=NULL) {
-		$instr = $this->get_instructions();
-		$output = common_markup_to_html($instr);
-		common_element_start('div', 'instructions');
-		common_raw($output);
-		common_element_end('div');
-	}
-
-	function get_title() {
-		return NULL;
-	}
-
-	function show_header() {
-		return;
-	}
-}
diff --git a/lib/util.php b/lib/util.php
index eb5667f6a..204ad511c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1107,6 +1107,8 @@ function common_fancy_url($action, $args=NULL) {
 		return common_path('settings/twitter');
  	 case 'othersettings':
 		return common_path('settings/other');
+     case 'deleteprofile':
+        return common_path('settings/delete');
 	 case 'newnotice':
 		if ($args && $args['replyto']) {
 			return common_path('notice/new?replyto='.$args['replyto']);
@@ -2160,4 +2162,4 @@ function common_memcache() {
 function common_compatible_license($from, $to) {
 	# XXX: better compatibility check needed here!
 	return ($from == $to);
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf