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

Item class has been moved to a new directory 'models', a new class has been added: ItemContent

Browse Source 
and same fields from Item were moved to ItemContent

Item
- id
- parent_id
- type (file, dir, symlink)
- url
- subject
- template (html template)
- sort_index
- content_id

ItemContent
- id
- ref -> references (renamed)
- user_id
- modification_user_id
- group_id
- privileges
- date_creation
- date_modification
- guest_name
- link_to
- link_redirect
- file_path
- file_fs
- file_type
- file_size
- has_thumb -> file_has_thumb (renamed)
- hash -> file_hash (renamed)
- hash_type -> file_hash_type (renamed)
- content -> content_raw (renamed)
- content_type -> content_raw_type (renamed)
- content_parsed
- content_parsed_type
- meta
- ameta -> meta_admin (renamed)
- modify_index (removed)

WIP: #4
This commit is contained in:
Tomasz Sowa
2021-02-24 01:19:47 +01:00
parent 3d7ece15f8
commit 32e93a04c5
118 changed files with 5795 additions and 4514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
winixd/templates/dir.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -258,7 +258,7 @@ void dir_childs_tab_url(Info & i)
void dir_childs_tab_privileges(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
i.out << "0" << Toa(dir_childs_table[dir_childs_index]->privileges, 8);
i.out << "0" << Toa(dir_childs_table[dir_childs_index]->item_content.privileges, 8);
}
@@ -266,7 +266,7 @@ void dir_childs_tab_user(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
{
long user_id = dir_childs_table[dir_childs_index]->user_id;
long user_id = dir_childs_table[dir_childs_index]->item_content.user_id;
User * puser = system->users.GetUser(user_id);
if( puser )
@@ -275,8 +275,8 @@ void dir_childs_tab_user(Info & i)
{
i.out << "~";
if( !dir_childs_table[dir_childs_index]->guest_name.empty() )
i.out << dir_childs_table[dir_childs_index]->guest_name;
if( !dir_childs_table[dir_childs_index]->item_content.guest_name.empty() )
i.out << dir_childs_table[dir_childs_index]->item_content.guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}
@@ -289,7 +289,7 @@ void dir_childs_tab_group(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
{
long group_id = dir_childs_table[dir_childs_index]->group_id;
long group_id = dir_childs_table[dir_childs_index]->item_content.group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
@@ -349,13 +349,13 @@ void dir_tab_subject(Info & i)
void dir_last_link_to(Info & i)
{
i.out << cur->request->dir_tab.back()->link_to;
i.out << cur->request->dir_tab.back()->item_content.link_to;
}
void dir_last_is_link_redirect(Info & i)
{
i.res = cur->request->dir_tab.back()->link_redirect == 1;
i.res = cur->request->dir_tab.back()->item_content.link_redirect == 1;
}
@@ -367,7 +367,7 @@ void dir_last_subject(Info & i)
void dir_last_user(Info & i)
{
User * puser = system->users.GetUser(cur->request->dir_tab.back()->user_id);
User * puser = system->users.GetUser(cur->request->dir_tab.back()->item_content.user_id);
if( puser )
i.out << puser->name;
@@ -375,8 +375,8 @@ void dir_last_user(Info & i)
{
i.out << "~";
if( !cur->request->dir_tab.back()->guest_name.empty() )
i.out << cur->request->dir_tab.back()->guest_name;
if( !cur->request->dir_tab.back()->item_content.guest_name.empty() )
i.out << cur->request->dir_tab.back()->item_content.guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}
@@ -402,35 +402,35 @@ void dir_last_url_is_no(Info & i)
void dir_last_date_creation(Info & i)
{
PT::Date date = system->ToLocal(cur->request->dir_tab.back()->date_creation);
PT::Date date = system->ToLocal(cur->request->dir_tab.back()->item_content.date_creation);
i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
}
void dir_last_date_modification(Info & i)
{
PT::Date date = system->ToLocal(cur->request->dir_tab.back()->date_modification);
PT::Date date = system->ToLocal(cur->request->dir_tab.back()->item_content.date_modification);
i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
}
void dir_last_date_creation_nice(Info & i)
{
print_date_nice(i, cur->request->dir_tab.back()->date_creation);
print_date_nice(i, cur->request->dir_tab.back()->item_content.date_creation);
}
void dir_last_date_modification_nice(Info & i)
{
print_date_nice(i, cur->request->dir_tab.back()->date_modification);
print_date_nice(i, cur->request->dir_tab.back()->item_content.date_modification);
}
void dir_last_dates_equal(Info & i)
{
PT::Date & date1 = cur->request->dir_tab.back()->date_creation;
PT::Date & date2 = cur->request->dir_tab.back()->date_modification;
PT::Date & date1 = cur->request->dir_tab.back()->item_content.date_creation;
PT::Date & date2 = cur->request->dir_tab.back()->item_content.date_modification;
i.res = date1 == date2;
}
@@ -438,14 +438,14 @@ void dir_last_dates_equal(Info & i)
void dir_last_users_different(Info & i)
{
i.res = (cur->request->dir_tab.back()->user_id != cur->request->dir_tab.back()->modification_user_id);
i.res = (cur->request->dir_tab.back()->item_content.user_id != cur->request->dir_tab.back()->item_content.modification_user_id);
}
void dir_last_modification_user(Info & i)
{
User * puser = system->users.GetUser(cur->request->dir_tab.back()->modification_user_id);
print_user_name(i, puser, cur->request->dir_tab.back()->guest_name);
User * puser = system->users.GetUser(cur->request->dir_tab.back()->item_content.modification_user_id);
print_user_name(i, puser, cur->request->dir_tab.back()->item_content.guest_name);
}
@@ -464,32 +464,32 @@ void dir_last_has_html_template(Info & i)
void dir_last_meta_str(Info & i)
{
cur->request->dir_tab.back()->meta.Serialize(i.out, true, false);
cur->request->dir_tab.back()->item_content.meta.Serialize(i.out, true, false);
}
void dir_last_meta(Info & i)
{
space_value(i, cur->request->dir_tab.back()->meta);
space_value(i, cur->request->dir_tab.back()->item_content.meta);
}
void dir_last_meta_tab(Info & i)
{
space_list_tab(i, cur->request->dir_tab.back()->meta);
space_list_tab(i, cur->request->dir_tab.back()->item_content.meta);
}
void dir_last_meta_tab_value(Info & i)
{
space_list_tab_value(i, cur->request->dir_tab.back()->meta, L"dir_last_meta_tab");
space_list_tab_value(i, cur->request->dir_tab.back()->item_content.meta, L"dir_last_meta_tab");
}
void dir_last_meta_tab_has_next(Info & i)
{
space_list_tab_has_next(i, cur->request->dir_tab.back()->meta, L"dir_last_meta_tab");
space_list_tab_has_next(i, cur->request->dir_tab.back()->item_content.meta, L"dir_last_meta_tab");
}
@@ -497,31 +497,31 @@ void dir_last_meta_tab_has_next(Info & i)
void dir_last_admin_meta_str(Info & i)
{
cur->request->dir_tab.back()->ameta.Serialize(i.out, true, false);
cur->request->dir_tab.back()->item_content.meta_admin.Serialize(i.out, true, false);
}
void dir_last_admin_meta(Info & i)
{
space_value(i, cur->request->dir_tab.back()->ameta);
space_value(i, cur->request->dir_tab.back()->item_content.meta_admin);
}
void dir_last_admin_meta_tab(Info & i)
{
space_list_tab(i, cur->request->dir_tab.back()->ameta);
space_list_tab(i, cur->request->dir_tab.back()->item_content.meta_admin);
}
void dir_last_admin_meta_tab_value(Info & i)
{
space_list_tab_value(i, cur->request->dir_tab.back()->ameta, L"dir_last_admin_meta_tab");
space_list_tab_value(i, cur->request->dir_tab.back()->item_content.meta_admin, L"dir_last_admin_meta_tab");
}
void dir_last_admin_meta_tab_has_next(Info & i)
{
space_list_tab_has_next(i, cur->request->dir_tab.back()->ameta, L"dir_last_admin_meta_tab");
space_list_tab_has_next(i, cur->request->dir_tab.back()->item_content.meta_admin, L"dir_last_admin_meta_tab");
}