haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-14 06:11:16 +00:00
Code Issues Releases Wiki Activity

Fix bug in HTTP_REFERER

Browse Source
This commit is contained in:
xiez
2012-06-05 19:38:28 +08:00
parent 07e74346f3
commit c5daf3879a
10 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
group/views.py
View File

@@ -66,7 +66,7 @@ def group_remove(request, group_id):
return go_error(request, e.msg) return go_error(request, e.msg)
if request.GET.get('src', '') == 'groupadmin': if request.GET.get('src', '') == 'groupadmin':
return HttpResponseRedirect(request.META['HTTP_REFERER']) return HttpResponseRedirect(reverse('group_admin'))
else: else:
return HttpResponseRedirect(reverse('group_list', args=[])) return HttpResponseRedirect(reverse('group_list', args=[]))

7
notifications/views.py
View File

@@ -14,10 +14,11 @@ def notification_close(request, note_id):
note_id += ',' note_id += ','
topinfo_close = request.COOKIES.get('topinfo', '') topinfo_close = request.COOKIES.get('topinfo', '')
topinfo_close += note_id topinfo_close += note_id
res = HttpResponseRedirect(request.META['HTTP_REFERER']) next = request.GET.get('next', '/')
res = HttpResponseRedirect(next)
res.set_cookie("topinfo", topinfo_close, max_age=14*24*60*60) res.set_cookie("topinfo", topinfo_close, max_age=14*24*60*60)
return res return res
@login_required @login_required

3
profile/views.py
View File

@@ -1,3 +1,4 @@
from django.core.urlresolvers import reverse
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404 from django.shortcuts import render_to_response, get_object_or_404
from django.template import Context, RequestContext from django.template import Context, RequestContext
@@ -28,4 +29,4 @@ def logout_relay(request):
except SearpcError, e: except SearpcError, e:
return go_error(request, e.msg) return go_error(request, e.msg)
return HttpResponseRedirect(request.META['HTTP_REFERER']) return HttpResponseRedirect(reverse('list_userids'))

2
settings.py
View File

@@ -127,7 +127,7 @@ REGISTRATION_SEND_MAIL = False
HTTP_SERVER_ROOT = "http://localhost:8082" HTTP_SERVER_ROOT = "http://localhost:8082"
# ccnet-applet address and port, used in repo download # ccnet-applet address and port, used in repo download
CCNET_APPLET_ROOT = "http://localhost:8081" CCNET_APPLET_ROOT = "http://localhost:13420"
SEAFILE_VERSION = '0.9.2' SEAFILE_VERSION = '0.9.2'

2
templates/base.html
View File

@@ -16,7 +16,7 @@
{% if request.user.is_authenticated and request.cur_note %} {% if request.user.is_authenticated and request.cur_note %}
<div id="info-bar"> <div id="info-bar">
<span class="info">{{ request.cur_note.message|urlize }}</span> <span class="info">{{ request.cur_note.message|urlize }}</span>
<a href="{{ SITE_ROOT }}notification/close/{{ request.cur_note.id }}/"><span class="close"></span></a> <a href="{{ SITE_ROOT }}notification/close/{{ request.cur_note.id }}/?next={{ request.path }}"><span class="close"></span></a>
</div> </div>
{% endif %} {% endif %}

2
templates/myhome.html
View File

@@ -66,7 +66,7 @@
<td> <td>
<img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.props.id }}" class="download-btn vh" title="下载" alt="下载" /> <img src="{{ MEDIA_URL }}img/download-20.png" data="{{ repo.props.id }}" class="download-btn vh" title="下载" alt="下载" />
<img src="{{ MEDIA_URL }}img/share-20.png" data="{{ repo.props.id }}" class="repo-share-btn vh" title="共享" alt="共享" /> <img src="{{ MEDIA_URL }}img/share-20.png" data="{{ repo.props.id }}" class="repo-share-btn vh" title="共享" alt="共享" />
<img src="{{ MEDIA_URL }}img/delete-20.png" data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn vh" title="删除" alt="删除" /> <img src="{{ MEDIA_URL }}img/delete-20.png" data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" class="repo-delete-btn vh" title="删除" alt="删除" />
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

2
templates/repos.html
View File

@@ -16,7 +16,7 @@
<td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td> <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
<td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td> <td><a href="{{ SITE_ROOT }}useradmin/info/{{ repo.owner }}/">{{ repo.owner}}</a></td>
<td>{{ repo.props.desc }}</td> <td>{{ repo.props.desc }}</td>
<td><button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn">删除</button></td> <td><button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" class="repo-delete-btn">删除</button></td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

2
templates/userinfo.html
View File

@@ -27,7 +27,7 @@
<td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td> <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
<td>{{ repo.props.desc }}</td> <td>{{ repo.props.desc }}</td>
<td> <td>
<button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/" class="repo-delete-btn">删除</button> <button data="{{ SITE_ROOT }}repo/remove/{{ repo.props.id }}/?next={{ request.path }}" class="repo-delete-btn">删除</button>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}

8
urls.py
View File

@@ -4,8 +4,8 @@ from django.views.generic.simple import direct_to_template
from seahub.views import root, peers, myhome, \ from seahub.views import root, peers, myhome, \
repo, repo_history, modify_token, remove_repo, seafadmin, useradmin, \ repo, repo_history, modify_token, remove_repo, seafadmin, useradmin, \
role_add, role_remove, activate_user, user_add, user_remove, \ activate_user, user_add, user_remove, \
ownerhome, remove_fetched_repo, repo_history_dir, repo_history_revert, \ ownerhome, repo_history_dir, repo_history_revert, \
user_info, repo_set_access_property, repo_access_file, \ user_info, repo_set_access_property, repo_access_file, \
repo_add_share, repo_list_share, repo_remove_share, repo_download, \ repo_add_share, repo_list_share, repo_remove_share, repo_download, \
seafile_access_check, back_local, group_admin, repo_history_changes seafile_access_check, back_local, group_admin, repo_history_changes
@@ -54,8 +54,8 @@ urlpatterns = patterns('',
url(r'^useradmin/$', useradmin, name='useradmin'), url(r'^useradmin/$', useradmin, name='useradmin'),
(r'^useradmin/add/$', user_add), (r'^useradmin/add/$', user_add),
(r'^useradmin/info/(?P<email>[^/]+)/$', user_info), (r'^useradmin/info/(?P<email>[^/]+)/$', user_info),
(r'^useradmin/(?P<user_id>[^/]+)/role/add/$', role_add), # (r'^useradmin/(?P<user_id>[^/]+)/role/add/$', role_add),
(r'^useradmin/(?P<user_id>[^/]+)/role/remove/$', role_remove), # (r'^useradmin/(?P<user_id>[^/]+)/role/remove/$', role_remove),
(r'^useradmin/(?P<user_id>[^/]+)/user/remove/$', user_remove), (r'^useradmin/(?P<user_id>[^/]+)/user/remove/$', user_remove),
(r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user), (r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user),

82
views.py
View File

@@ -531,14 +531,15 @@ def remove_repo(request, repo_id):
return go_permission_error(request, u'删除同步目录失败') return go_permission_error(request, u'删除同步目录失败')
seafserv_threaded_rpc.remove_repo(repo_id) seafserv_threaded_rpc.remove_repo(repo_id)
return HttpResponseRedirect(request.META['HTTP_REFERER']) next = request.GET.get('next', '/')
return HttpResponseRedirect(next)
@login_required #@login_required
def remove_fetched_repo(request, user_id, repo_id): #def remove_fetched_repo(request, user_id, repo_id):
if user_id and repo_id: # if user_id and repo_id:
seafserv_threaded_rpc.remove_fetched_repo (user_id, repo_id) # seafserv_threaded_rpc.remove_fetched_repo (user_id, repo_id)
#
return HttpResponseRedirect(request.META['HTTP_REFERER']) # return HttpResponseRedirect(request.META['HTTP_REFERER'])
@login_required @login_required
def myhome(request): def myhome(request):
@@ -601,11 +602,10 @@ def ownerhome(request, owner_name):
@login_required @login_required
def repo_set_access_property(request, repo_id): def repo_set_access_property(request, repo_id):
if repo_id: ap = request.GET.get('ap', '')
ap = request.GET.get('ap', '') seafserv_threaded_rpc.repo_set_access_property(repo_id, ap)
seafserv_threaded_rpc.repo_set_access_property(repo_id, ap)
return HttpResponseRedirect(reverse('repo', args=[repo_id]))
return HttpResponseRedirect(request.META['HTTP_REFERER'])
def repo_access_file(request, repo_id, obj_id): def repo_access_file(request, repo_id, obj_id):
if repo_id: if repo_id:
@@ -814,8 +814,13 @@ def repo_remove_share(request):
return go_permission_error(request, u'取消共享失败') return go_permission_error(request, u'取消共享失败')
from seahub.group.views import group_unshare_repo from seahub.group.views import group_unshare_repo
group_unshare_repo(request, repo_id, group_id_int, from_email) group_unshare_repo(request, repo_id, group_id_int, from_email)
return HttpResponseRedirect(request.META['HTTP_REFERER']) referer = request.META.get('HTTP_REFERER', None)
if not referer:
referer = 'repo_list_share'
return HttpResponseRedirect(reverse(referer))
else:
return HttpResponseRedirect(referer)
@login_required @login_required
def mypeers(request): def mypeers(request):
@@ -916,29 +921,28 @@ def user_info(request, email):
}, },
context_instance=RequestContext(request)) context_instance=RequestContext(request))
@login_required #@login_required
def role_add(request, user_id): #def role_add(request, user_id):
if not request.user.is_staff: # if not request.user.is_staff:
raise Http404 # raise Http404
#
# if request.method == 'POST':
# role = request.POST.get('role', '')
# if role and len(role) <= 16:
# ccnet_rpc.add_role(user_id, role)
#
# return HttpResponseRedirect(request.META['HTTP_REFERER'])
if request.method == 'POST': #@login_required
role = request.POST.get('role', '') #def role_remove(request, user_id):
if role and len(role) <= 16: # if not request.user.is_staff:
ccnet_rpc.add_role(user_id, role) # raise Http404
#
return HttpResponseRedirect(request.META['HTTP_REFERER']) # role = request.REQUEST.get('role', '')
# if role and len(role) <= 16:
# ccnet_rpc.remove_role(user_id, role)
@login_required #
def role_remove(request, user_id): # return HttpResponseRedirect(request.META['HTTP_REFERER'])
if not request.user.is_staff:
raise Http404
role = request.REQUEST.get('role', '')
if role and len(role) <= 16:
ccnet_rpc.remove_role(user_id, role)
return HttpResponseRedirect(request.META['HTTP_REFERER'])
@login_required @login_required
def user_remove(request, user_id): def user_remove(request, user_id):
@@ -950,7 +954,7 @@ def user_remove(request, user_id):
ccnetuser = get_ccnetuser(userid=int(user_id)) ccnetuser = get_ccnetuser(userid=int(user_id))
ccnetuser.delete() ccnetuser.delete()
return HttpResponseRedirect(request.META['HTTP_REFERER']) return HttpResponseRedirect(reverse('useradmin'))
@login_required @login_required
def activate_user(request, user_id): def activate_user(request, user_id):
@@ -962,8 +966,8 @@ def activate_user(request, user_id):
ccnetuser = get_ccnetuser(userid=int(user_id)) ccnetuser = get_ccnetuser(userid=int(user_id))
ccnetuser.is_active = True ccnetuser.is_active = True
ccnetuser.save() ccnetuser.save()
return HttpResponseRedirect(request.META['HTTP_REFERER']) return HttpResponseRedirect(reverse('useradmin'))
@login_required @login_required
def user_add(request): def user_add(request):