Update backend

1 files changed, 68 insertions, 68 deletions

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 35c44bd6..4ae59333 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -23,89 +23,89 @@
 
 return [
 	'routes' => [
-		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
+		['name' => 'page#index', 'url' => '/',          'verb' => 'GET'],
 		['name' => 'page#index', 'url' => '/not-found', 'verb' => 'GET', 'postfix' => 'notfound'],
 		['name' => 'page#index', 'url' => '/list/{id}', 'verb' => 'GET', 'postfix' => 'list'],
 		['name' => 'page#index', 'url' => '/vote/{id}', 'verb' => 'GET', 'postfix' => 'vote'],
-		['name' => 'page#vote_public', 'url' => '/s/{token}', 'verb' => 'GET', 'postfix' => 'public'],
+
+		['name' => 'page#vote_public', 'url' => '/s/{token}',    'verb' => 'GET', 'postfix' => 'public'],
 		['name' => 'page#vote_public', 'url' => '/poll/{token}', 'verb' => 'GET', 'postfix' => 'oldpublic'],
 
-		['name' => 'subscription#get', 'url' => '/subscription/{pollId}', 'verb' => 'GET'],
-		['name' => 'subscription#set', 'url' => '/subscription', 'verb' => 'POST'],
-
-		['name' => 'comment#getByToken', 'url' => '/comments/s/{token}', 'verb' => 'GET'],
-		['name' => 'comment#get', 'url' => '/comments/{pollId}', 'verb' => 'GET'],
-		['name' => 'comment#add', 'url' => '/comment/add', 'verb' => 'POST'],
-		['name' => 'comment#delete', 'url' => '/comment/delete', 'verb' => 'POST'],
-
-		['name' => 'vote#getByToken', 'url' => '/votes/get/s/{token}', 'verb' => 'GET'],
-		['name' => 'vote#setByToken', 'url' => '/vote/set/s', 'verb' => 'POST'],
-		['name' => 'vote#get', 'url' => '/votes/get/{pollId}', 'verb' => 'GET'],
-		['name' => 'vote#set', 'url' => '/vote/set', 'verb' => 'POST'],
-		// ['name' => 'vote#write', 'url' => '/vote/write/', 'verb' => 'POST'],
-		['name' => 'vote#delete', 'url' => '/votes/delete', 'verb' => 'POST'],
-
-		['name' => 'option#get', 'url' => '/options/get/{pollId}', 'verb' => 'GET'],
-		['name' => 'option#add', 'url' => '/option/add', 'verb' => 'POST'],
-		['name' => 'option#update', 'url' => '/option/update', 'verb' => 'POST'],
-		['name' => 'option#reorder', 'url' => '/option/reorder', 'verb' => 'POST'],
-		['name' => 'option#remove', 'url' => '/option/remove', 'verb' => 'POST'],
-		['name' => 'option#getByToken', 'url' => '/options/get/s/{token}', 'verb' => 'GET'],
-
-		['name' => 'poll#get', 'url' => '/polls/get/{pollId}', 'verb' => 'GET', 'postfix' => 'auth'],
-		['name' => 'poll#get', 'url' => '/polls/get/s/{token}', 'verb' => 'GET', 'postfix' => 'public'],
-		['name' => 'poll#add', 'url' => '/polls/add', 'verb' => 'POST'],
-		['name' => 'poll#update', 'url' => '/polls/update/{pollId}', 'verb' => 'PUT'],
-
-		['name' => 'poll#list', 'url' => '/polls/list', 'verb' => 'GET'],
-		['name' => 'poll#delete', 'url' => '/polls/delete/{pollId}', 'verb' => 'GET'],
+		['name' => 'poll#get',               'url' => '/polls/get/{pollId}',              'verb' => 'GET', 'postfix' => 'auth'],
+		['name' => 'poll#get',               'url' => '/polls/get/s/{token}',             'verb' => 'GET', 'postfix' => 'public'],
+		['name' => 'poll#add',               'url' => '/polls/add',                       'verb' => 'POST'],
+		['name' => 'poll#update',            'url' => '/polls/update/{pollId}',           'verb' => 'PUT'],
+		['name' => 'poll#list',              'url' => '/polls/list',                      'verb' => 'GET'],
+		['name' => 'poll#delete',            'url' => '/polls/delete/{pollId}',           'verb' => 'GET'],
 		['name' => 'poll#deletePermanently', 'url' => '/polls/delete/permanent/{pollId}', 'verb' => 'GET'],
-		['name' => 'poll#clone', 'url' => '/polls/clone/{pollId}', 'verb' => 'GET'],
+		['name' => 'poll#clone',             'url' => '/polls/clone/{pollId}',            'verb' => 'GET'],
+
+		['name' => 'option#add',         'url' => '/option',                    'verb' => 'POST'],
+		['name' => 'option#update',      'url' => '/option/{optionId}',         'verb' => 'PUT'],
+		['name' => 'option#delete',      'url' => '/option/{optionId}',         'verb' => 'DELETE'],
+		['name' => 'option#confirm',     'url' => '/option/{optionId}/confirm', 'verb' => 'PUT'],
+		['name' => 'option#reorder',     'url' => '/option/reorder',            'verb' => 'POST'],
+		// ['name' => 'option#list',        'url' => '/options/get/{pollId}',      'verb' => 'GET'],
+		// ['name' => 'option#listByToken', 'url' => '/options/get/s/{token}',     'verb' => 'GET'],
+
+		['name' => 'vote#set',        'url' => '/vote/set',            'verb' => 'POST'],
+		['name' => 'vote#setByToken', 'url' => '/vote/set/s',          'verb' => 'POST'],
+		['name' => 'vote#delete',     'url' => '/votes/delete',        'verb' => 'POST'],
+		// ['name' => 'vote#get',        'url' => '/votes/get/{pollId}',  'verb' => 'GET'],
+		// ['name' => 'vote#getByToken', 'url' => '/votes/get/s/{token}', 'verb' => 'GET'],
+
+		['name' => 'share#add',            'url' => '/share/add',            'verb' => 'POST'],
+		['name' => 'share#personal',       'url' => '/share/personal',       'verb' => 'POST'],
+		['name' => 'share#delete',         'url' => '/share/delete/{token}', 'verb' => 'DELETE'],
+		['name' => 'share#sendInvitation', 'url' => '/share/send/{token}',   'verb' => 'POST'],
 
-		['name' => 'share#add', 'url' => '/share/add', 'verb' => 'POST'],
-		['name' => 'share#delete', 'url' => '/share/delete', 'verb' => 'POST'],
-		['name' => 'share#createPersonalShare', 'url' => '/share/create/s', 'verb' => 'POST'],
-		['name' => 'share#sendInvitation', 'url' => '/share/send/{token}', 'verb' => 'POST'],
+		['name' => 'subscription#get', 'url' => '/subscription/{pollId}', 'verb' => 'GET'],
+		['name' => 'subscription#set', 'url' => '/subscription',          'verb' => 'POST'],
 
-		// ['name' => 'share#getShares', 'url' => '/shares/get/{pollId}', 'verb' => 'GET'],
-		// ['name' => 'share#get', 'url' => '/share/get/{token}', 'verb' => 'GET'],
+		['name' => 'comment#add',        'url' => '/comment',             'verb' => 'POST'],
+		['name' => 'comment#delete',     'url' => '/comment/{commentId}', 'verb' => 'DELETE'],
+		// ['name' => 'comment#list',       'url' => '/comments/{pollId}',   'verb' => 'GET'],
+		// ['name' => 'comment#getByToken', 'url' => '/comments/s/{token}',  'verb' => 'GET'],
 
-		['name' => 'acl#getByToken', 'url' => '/acl/get/s/{token}', 'verb' => 'GET'],
-		['name' => 'acl#get', 'url' => '/acl/get/{id}', 'verb' => 'GET'],
+		// ['name' => 'acl#getByToken', 'url' => '/acl/get/s/{token}', 'verb' => 'GET'],
+		// ['name' => 'acl#get',        'url' => '/acl/get/{id}',      'verb' => 'GET'],
 
-		['name' => 'system#get_site_users_and_groups', 'url' => '/siteusers/get', 'verb' => 'POST'],
-		['name' => 'system#validate_public_username', 'url' => '/check/username', 'verb' => 'POST'],
+		['name' => 'system#get_site_users_and_groups', 'url' => '/siteusers/get',  'verb' => 'POST'],
+		['name' => 'system#validate_public_username',  'url' => '/check/username', 'verb' => 'POST'],
 
 		// REST-API calls
-		['name' => 'poll_api#get', 'url' => '/api/v1.0/poll/{pollId}', 'verb' => 'GET'],
-		['name' => 'poll_api#list', 'url' => '/api/v1.0/polls', 'verb' => 'GET'],
-		['name' => 'poll_api#add', 'url' => '/api/v1.0/poll/add', 'verb' => 'POST'],
-		['name' => 'poll_api#clone', 'url' => '/api/v1.0/poll/clone/{pollId}', 'verb' => 'POST'],
+		['name' => 'poll_api#list',   'url' => '/api/v1.0/polls',         'verb' => 'GET'],
+		['name' => 'poll_api#get',    'url' => '/api/v1.0/poll/{pollId}', 'verb' => 'GET'],
+		['name' => 'poll_api#add',    'url' => '/api/v1.0/poll',          'verb' => 'POST'],
 		['name' => 'poll_api#update', 'url' => '/api/v1.0/poll/{pollId}', 'verb' => 'PUT'],
 		['name' => 'poll_api#delete', 'url' => '/api/v1.0/poll/{pollId}', 'verb' => 'DELETE'],
-		['name' => 'poll_api#delete', 'url' => '/api/v1.0/poll/permanent/{pollId}', 'verb' => 'DELETE'],
-		['name' => 'poll_api#enum', 'url' => '/api/v1.0/poll/enum', 'verb' => 'GET'],
-
-		['name' => 'option_api#list', 'url' => '/api/v1.0/poll/{pollId}/options', 'verb' => 'GET'],
-		['name' => 'option_api#add', 'url' => '/api/v1.0/option', 'verb' => 'POST'],
-		['name' => 'option_api#update', 'url' => '/api/v1.0/option', 'verb' => 'PUT'],
-		['name' => 'option_api#delete', 'url' => '/api/v1.0/option/{optionId}', 'verb' => 'DELETE'],
-
-		['name' => 'comment_api#list', 'url' => '/api/v1.0/poll/{pollId}/comments', 'verb' => 'GET'],
-		['name' => 'comment_api#add', 'url' => '/api/v1.0/comment', 'verb' => 'POST'],
-		['name' => 'comment_api#delete', 'url' => '/api/v1.0/comment/{commentId}', 'verb' => 'DELETE'],
-
-		['name' => 'share_api#list', 'url' => '/api/v1.0/poll/{pollId}/shares', 'verb' => 'GET'],
-		['name' => 'share_api#get', 'url' => '/api/v1.0/share/{token}', 'verb' => 'GET'],
-		['name' => 'share_api#add', 'url' => '/api/v1.0/share', 'verb' => 'POST'],
-		['name' => 'share_api#delete', 'url' => '/api/v1.0/share/{token}', 'verb' => 'DELETE'],
-		['name' => 'share_api#sendInvitation', 'url' => '/api/v1.0/share/send/{token}', 'verb' => 'POST'],
-
-		['name' => 'subscription_api#get', 'url' => '/api/v1.0/poll/{pollId}/subscription', 'verb' => 'GET'],
-		['name' => 'subscription_api#subscribe', 'url' => '/api/v1.0/poll/{pollId}/subscription', 'verb' => 'PUT'],
-		['name' => 'subscription_api#unsubscribe', 'url' => '/api/v1.0/poll/{pollId}/subscription', 'verb' => 'DELETE'],
+		['name' => 'poll_api#clone',  'url' => '/api/v1.0/poll/{pollId}/clone', 'verb' => 'POST'],
+		['name' => 'poll_api#trash',  'url' => '/api/v1.0/poll/{pollId}/trash', 'verb' => 'POST'],
+		['name' => 'poll_api#enum',   'url' => '/api/v1.0/enum/poll',           'verb' => 'GET'],
+
+		['name' => 'option_api#list',     'url' => '/api/v1.0/poll/{pollId}/options',              'verb' => 'GET'],
+		['name' => 'option_api#add',      'url' => '/api/v1.0/poll/{pollId}/option',               'verb' => 'POST'],
+		['name' => 'option_api#update',   'url' => '/api/v1.0/option/{optionId}',                  'verb' => 'PUT'],
+		['name' => 'option_api#delete',   'url' => '/api/v1.0/option/{optionId}',                  'verb' => 'DELETE'],
+		['name' => 'option_api#setOrder', 'url' => '/api/v1.0/option/{optionId}/setorder/{order}', 'verb' => 'PUT'],
+		['name' => 'option_api#confirm',  'url' => '/api/v1.0/option/{optionId}/confirm',          'verb' => 'PUT'],
 
 		['name' => 'vote_api#list', 'url' => '/api/v1.0/poll/{pollId}/votes', 'verb' => 'GET'],
-		['name' => 'vote_api#set', 'url' => '/api/v1.0/vote', 'verb' => 'POST'],
+		['name' => 'vote_api#set',  'url' => '/api/v1.0/vote',                'verb' => 'POST'],
+
+		['name' => 'share_api#list',           'url' => '/api/v1.0/poll/{pollId}/shares', 'verb' => 'GET'],
+		['name' => 'share_api#get',            'url' => '/api/v1.0/share/{token}',        'verb' => 'GET'],
+		['name' => 'share_api#add',            'url' => '/api/v1.0/share',                'verb' => 'POST'],
+		['name' => 'share_api#delete',         'url' => '/api/v1.0/share/{token}',        'verb' => 'DELETE'],
+		['name' => 'share_api#sendInvitation', 'url' => '/api/v1.0/share/send/{token}',   'verb' => 'POST'],
+
+		['name' => 'subscription_api#get',         'url' => '/api/v1.0/poll/{pollId}/subscription', 'verb' => 'GET'],
+		['name' => 'subscription_api#subscribe',   'url' => '/api/v1.0/poll/{pollId}/subscription', 'verb' => 'PUT'],
+		['name' => 'subscription_api#unsubscribe', 'url' => '/api/v1.0/poll/{pollId}/subscription', 'verb' => 'DELETE'],
+
+		['name' => 'comment_api#list',   'url' => '/api/v1.0/poll/{pollId}/comments', 'verb' => 'GET'],
+		['name' => 'comment_api#add',    'url' => '/api/v1.0/comment',                'verb' => 'POST'],
+		['name' => 'comment_api#delete', 'url' => '/api/v1.0/comment/{commentId}',    'verb' => 'DELETE'],
+
 	]
 ];