X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fothersettings.php;h=c2f08934c0b20ca84d0302da5deb511e4db86d8f;hb=125f05563b5c7bd5b74b1afbea3c0b663795bff5;hp=d956320d898ae2061c51d1cadd0dfdcbedd5f61f;hpb=6eb506062189557e5e5f40212c4cc7a1faec27fd;p=quix0rs-gnu-social.git

diff --git a/actions/othersettings.php b/actions/othersettings.php
index d956320d89..c2f08934c0 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -21,163 +21,168 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/settingsaction.php');
 
-class OthersettingsAction extends SettingsAction {
-
-	function get_instructions() {
-		return _('Manage various other options.');
-	}
-
-	function show_form($msg=NULL, $success=false) {
-		$user = common_current_user();
-		
-		$this->form_header(_('Other Settings'), $msg, $success);
-		
-		common_element('h2', NULL, _('URL Auto-shortening'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'othersettings',
-										   'action' =>
-										   common_local_url('othersettings')));
-		common_hidden('token', common_session_token());
-
-		$services = array(
-			'' => 'None',
+class OthersettingsAction extends SettingsAction
+{
+
+    function get_instructions()
+    {
+        return _('Manage various other options.');
+    }
+
+    function show_form($msg=null, $success=false)
+    {
+        $user = common_current_user();
+
+        $this->form_header(_('Other Settings'), $msg, $success);
+
+        common_element('h2', null, _('URL Auto-shortening'));
+        common_element_start('form', array('method' => 'post',
+                                           'id' => 'othersettings',
+                                           'action' =>
+                                           common_local_url('othersettings')));
+        common_hidden('token', common_session_token());
+
+        $services = array(
+            '' => 'None',
             'ur1.ca' => 'ur1.ca (free service)',
             '2tu.us' => '2tu.us (free service)',
             'ptiturl.com' => 'ptiturl.com',
             'bit.ly' => 'bit.ly',
-			'tinyurl.com' => 'tinyurl.com',
-			'is.gd' => 'is.gd',
-			'snipr.com' => 'snipr.com',
-			'metamark.net' => 'metamark.net'
-		);
-		
-		common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), FALSE, $user->urlshorteningservice);
-		
-		common_submit('save', _('Save'));
-		
-		common_element_end('form');
-
-		common_element('h2', NULL, _('Delete my account'));
-		$this->show_delete_form();
-
-		common_show_footer();
-	}
-
-	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');
-	}
+            'tinyurl.com' => 'tinyurl.com',
+            'is.gd' => 'is.gd',
+            'snipr.com' => 'snipr.com',
+            'metamark.net' => 'metamark.net'
+        );
+
+        common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice);
+
+        common_submit('save', _('Save'));
+
+        common_element_end('form');
+
+//        common_element('h2', null, _('Delete my account'));
+//        $this->show_delete_form();
+
+        common_show_footer();
+    }
+
+    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');
+    }
 
     //TODO move to common.php (and retrace its origin)
-	function common_feed_item($feed) {
+    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('deleteprofile')));
+//
+//        common_hidden('token', common_session_token());
+//      common_element('p', null, "You can copy your notices and contacts by saving the two links below before 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 handle_post()
+    {
+
+        # CSRF protection
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
+
+        if ($this->arg('save')) {
+            $this->save_preferences();
+        }else {
+            $this->show_form(_('Unexpected form submission.'));
+        }
+    }
+
+    function save_preferences()
+    {
+
+        $urlshorteningservice = $this->trimmed('urlshorteningservice');
+
+        if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
+            $this->show_form(_('URL shortening service is too long (max 50 chars).'));
+            return;
+        }
+
         $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('deleteprofile')));
-
-		common_hidden('token', common_session_token());
-        common_element('p', null, "You can copy your notices and contacts by saving the two links below before 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 handle_post() {
-
-		# CSRF protection
-		$token = $this->trimmed('token');
-		if (!$token || $token != common_session_token()) {
-			$this->show_form(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
-
-		if ($this->arg('save')) {
-			$this->save_preferences();
-		}else {
-			$this->show_form(_('Unexpected form submission.'));
-		}
-	}
-
-	function save_preferences() {
-
-		$urlshorteningservice = $this->trimmed('urlshorteningservice');
-		
-		if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
-			$this->show_form(_('URL shortening service is too long (max 50 chars).'));
-			return;
-		}
-		
-		$user = common_current_user();
-
-		assert(!is_null($user)); # should already be checked
-
-		$user->query('BEGIN');
-
-		$original = clone($user);
-
-		$user->urlshorteningservice = $urlshorteningservice;
-
-		$result = $user->update($original);
-
-		if ($result === FALSE) {
-			common_log_db_error($user, 'UPDATE', __FILE__);
-			common_server_error(_('Couldn\'t update user.'));
-			return;
-		}
-
-		$user->query('COMMIT');
-
-		$this->show_form(_('Preferences saved.'), true);
-	}
+
+        assert(!is_null($user)); # should already be checked
+
+        $user->query('BEGIN');
+
+        $original = clone($user);
+
+        $user->urlshorteningservice = $urlshorteningservice;
+
+        $result = $user->update($original);
+
+        if ($result === false) {
+            common_log_db_error($user, 'UPDATE', __FILE__);
+            common_server_error(_('Couldn\'t update user.'));
+            return;
+        }
+
+        $user->query('COMMIT');
+
+        $this->show_form(_('Preferences saved.'), true);
+    }
 }