tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: column 'guest_name' to 'item' table

Browse Source 
used when user_id is -1
added: mount parameters: thread_with_info, thread_with_header
added: function rm can remove threads



git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@506 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2009-06-07 02:40:27 +00:00
parent 1eb42446f8
commit f99c993d96
20 changed files with 283 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
content/content.cpp
View File

@@ -59,33 +59,33 @@ void Content::SetDefaultFunctionForFile()
void Content::SetDefaultFunctionForDir()
{
long default_item = request.dir_table.back()->default_item;
if( default_item != -1 )
{
request.session->IncrementTimersIfExist();
log << log3 << "Content: Default item: id: " << default_item << logend;
RedirectTo(default_item);
return;
}
if( data.mounts.CurrentMountType() == Mount::thread )
{
request.pfunction = data.functions.GetFunction(FUN_THREAD);
if( request.pfunction )
log << log3 << "Content: default function: " << request.pfunction->item.url << logend;
}
else
{
long default_item = request.dir_table.back()->default_item;
if( default_item == -1 )
{
request.pfunction = data.functions.GetFunction(FUN_LS);
// cms
request.pfunction = data.functions.GetFunction(FUN_LS);
if( request.pfunction )
log << log3 << "Content: default function: " << request.pfunction->item.url << logend;
}
else
{
request.session->IncrementTimersIfExist();
log << log3 << "Content: Default item: id: " << default_item << logend;
RedirectTo(default_item);
}
}
if( request.pfunction )
log << log3 << "Content: default function: " << request.pfunction->item.url << logend;
}
}

11
content/emacs.cpp
View File

@@ -25,7 +25,16 @@ void Content::PostFunEmacsAdd()
request.is_item = true;
request.item.user_id = request.session->puser ? request.session->puser->id : -1;
if( request.session->puser )
{
request.item.user_id = request.session->puser->id;
}
else
{
request.item.user_id = -1;
request.item.guest_name = request.PostVar("guestname");
}
request.item.group_id = -1;
request.item.privileges = 0644; // !! tymczasowo, bedzie uzyte umask
request.item.parent_id = request.dir_table.back()->id;

12
content/mkdir.cpp
View File

@@ -33,7 +33,17 @@ void Content::PostFunMkdir(bool add_to_dir_table, int mask)
item.subject = request.PostVar("subject");
item.url = request.PostVar("url");
item.parent_id = request.dir_table.back()->id;
item.user_id = request.session->puser ? request.session->puser->id : -1;
if( request.session->puser )
{
item.user_id = request.session->puser->id;
}
else
{
item.user_id = -1;
item.guest_name = request.PostVar("guestname");
}
item.group_id = -1;
item.privileges = mask;
item.default_item = -1;

3
content/rm.cpp
View File

@@ -98,6 +98,9 @@ void Content::FunRm()
request.session->done_status = Error::ok;
log << log2 << "Content: deleted item: subject: " << request.item.subject << ", id: " << request.item.id << logend;
TemplatesFunctions::pattern_cacher.DeletePattern(request.item);
if( data.mounts.CurrentMountType() == Mount::thread )
db.EditThreadRemoveItem(request.item.parent_id);
}
else
{