From 3b2a1c3f25d54b6001ea5427e93e9645f5984e37 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Tue, 2 Aug 2011 00:10:45 +0000
Subject: [PATCH] added: new winix function: "sort"        sorting items in a
 directory (Item::sort_index is used)

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@754 e52654a7-88a9-db11-a3e9-0013d4bc506e
---
 core/Makefile.dep                  |  24 +--
 core/dirs.cpp                      |  16 ++
 core/dirs.h                        |   1 +
 core/system.cpp                    |  18 ++
 core/system.h                      |   1 +
 functions/Makefile.dep             | 259 ++++++++++++++++-------------
 functions/Makefile.o.dep           |   2 +-
 functions/functions.cpp            |   1 +
 functions/functions.h              |   2 +
 functions/sort.cpp                 | 174 +++++++++++++++++++
 functions/sort.h                   |  66 ++++++++
 html/fun_gallery.html              |  12 +-
 html/fun_sort.html                 |  33 ++++
 html/index_head_functions_add.html |   7 +
 html/item_options.html             |   5 +-
 locale/en                          |   5 +
 locale/pl                          |   5 +
 main/Makefile.dep                  |   2 +-
 notify/Makefile.dep                |  15 +-
 plugins/export/Makefile.dep        |   2 +-
 plugins/gallery/Makefile.dep       |  19 ++-
 plugins/gallery/gallery.cpp        |   1 +
 plugins/groupitem/Makefile.dep     |  14 +-
 plugins/menu/Makefile.dep          |  14 +-
 plugins/menu/templates.cpp         |  16 +-
 plugins/stats/Makefile.dep         |  20 +--
 plugins/thread/Makefile.dep        |  34 ++--
 plugins/ticket/Makefile.dep        | 126 +++++++-------
 static/layout1/winix.css           |  24 +++
 templates/Makefile.dep             |  33 ++--
 templates/item.cpp                 |  15 ++
 templates/templates.cpp            |   3 +
 templates/templates.h              |   3 +
 templates/winix.cpp                |   3 +-
 34 files changed, 703 insertions(+), 272 deletions(-)
 create mode 100755 functions/sort.cpp
 create mode 100755 functions/sort.h
 create mode 100755 html/fun_sort.html

diff --git a/core/Makefile.dep b/core/Makefile.dep
index be3f350..4fbc06e 100755
--- a/core/Makefile.dep
+++ b/core/Makefile.dep
@@ -30,7 +30,7 @@ app.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 app.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 app.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 app.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-app.o: ../functions/specialdefault.h ../functions/stat.h
+app.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
 app.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 app.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
@@ -75,8 +75,8 @@ config.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 config.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 config.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-config.o: ../functions/specialdefault.h ../functions/stat.h
-config.o: ../functions/subject.h ../functions/template.h
+config.o: ../functions/sort.h ../functions/specialdefault.h
+config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 config.o: ../core/htmlfilter.h ../templates/templates.h
@@ -203,8 +203,8 @@ mounts.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 mounts.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 mounts.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 mounts.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-mounts.o: ../functions/specialdefault.h ../functions/stat.h
-mounts.o: ../functions/subject.h ../functions/template.h
+mounts.o: ../functions/sort.h ../functions/specialdefault.h
+mounts.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 mounts.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 mounts.o: ../core/htmlfilter.h ../templates/templates.h
@@ -240,8 +240,8 @@ plugin.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 plugin.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 plugin.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 plugin.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-plugin.o: ../functions/specialdefault.h ../functions/stat.h
-plugin.o: ../functions/subject.h ../functions/template.h
+plugin.o: ../functions/sort.h ../functions/specialdefault.h
+plugin.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 plugin.o: ../core/htmlfilter.h ../templates/templates.h
@@ -279,7 +279,7 @@ plugindata.o: ../functions/emacs.h ../functions/last.h ../functions/login.h
 plugindata.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
 plugindata.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
 plugindata.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
-plugindata.o: ../functions/reload.h ../functions/rm.h
+plugindata.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
 plugindata.o: ../functions/specialdefault.h ../functions/stat.h
 plugindata.o: ../functions/subject.h ../functions/template.h
 plugindata.o: ../functions/tinymce.h ../functions/uname.h
@@ -329,7 +329,7 @@ request.o: ../functions/emacs.h ../functions/last.h ../functions/login.h
 request.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
 request.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
 request.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
-request.o: ../functions/reload.h ../functions/rm.h
+request.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
 request.o: ../functions/specialdefault.h ../functions/stat.h
 request.o: ../functions/subject.h ../functions/template.h
 request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
@@ -386,7 +386,7 @@ sessionmanager.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
 sessionmanager.o: ../functions/mkdir.h ../functions/mv.h
 sessionmanager.o: ../functions/nicedit.h ../functions/node.h
 sessionmanager.o: ../functions/passwd.h ../functions/priv.h
-sessionmanager.o: ../functions/reload.h ../functions/rm.h
+sessionmanager.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
 sessionmanager.o: ../functions/specialdefault.h ../functions/stat.h
 sessionmanager.o: ../functions/subject.h ../functions/template.h
 sessionmanager.o: ../functions/tinymce.h ../functions/uname.h
@@ -438,8 +438,8 @@ system.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 system.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 system.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-system.o: ../functions/specialdefault.h ../functions/stat.h
-system.o: ../functions/subject.h ../functions/template.h
+system.o: ../functions/sort.h ../functions/specialdefault.h
+system.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 textstream.o: textstream.h misc.h item.h requesttypes.h
diff --git a/core/dirs.cpp b/core/dirs.cpp
index 5474b12..a8c3997 100755
--- a/core/dirs.cpp
+++ b/core/dirs.cpp
@@ -196,6 +196,22 @@ DirContainer::Iterator i;
 }
 
 
+
+
+void Dirs::MakePath(const std::vector<Item*> dir_tab, std::wstring & path, bool clear_path)
+{
+	if( clear_path )
+		path.clear();
+
+	for(size_t i=0 ; i<dir_tab.size() ; ++i)
+	{
+		path += dir_tab[i]->url;
+		path += '/';
+	}
+}
+
+
+
 size_t Dirs::DirLevel(long id)
 {
 DirContainer::Iterator i;
diff --git a/core/dirs.h b/core/dirs.h
index b809a51..ae9db6d 100755
--- a/core/dirs.h
+++ b/core/dirs.h
@@ -40,6 +40,7 @@ public:
 	bool IsDir(long dir_id);
 	bool GetDirChilds(long parent_id, std::vector<Item*> & childs_tab); // !! zamienic na GetChilds()
 	bool MakePath(long dir_id, std::wstring & path, bool clear_path = true);
+	void MakePath(const std::vector<Item*> dir_tab, std::wstring & path, bool clear_path = true);
 	bool ChangeParent(long dir_id, long new_parent_id);
 
 	bool HasParent(long dir_id, long parent_id);
diff --git a/core/system.cpp b/core/system.cpp
index 0463064..639177b 100755
--- a/core/system.cpp
+++ b/core/system.cpp
@@ -402,6 +402,7 @@ bool System::DirsHaveReadExecPerm()
 
 
 // if we don't have access we only remove the item from the table
+// !! moze zamienic nazwe na CheckReadAccessToItems ?
 void System::CheckAccessToItems(std::vector<Item> & item_tab)
 {
 size_t i = 0;
@@ -420,6 +421,23 @@ size_t i = 0;
 }
 
 
+void System::CheckWriteAccessToItems(std::vector<Item> & item_tab)
+{
+size_t i = 0;
+
+	while( i < item_tab.size() )
+	{
+		if( !HasWriteAccess(item_tab[i]) )
+		{
+			item_tab.erase(item_tab.begin() + i);
+		}
+		else
+		{
+			i += 1;
+		}
+	}
+}
+
 
 bool System::CanUseHtml(long user_id)
 {
diff --git a/core/system.h b/core/system.h
index e3437c4..492ea7e 100755
--- a/core/system.h
+++ b/core/system.h
@@ -94,6 +94,7 @@ public:
 	bool HasReadExecAccessToPath(const std::vector<Item*> & dir_tab);
 	bool DirsHaveReadExecPerm();
 	void CheckAccessToItems(std::vector<Item> & item_tab);
+	void CheckWriteAccessToItems(std::vector<Item> & item_tab);
 
 	bool CanUseHtml(long user_id);
 	bool CanUseBBCode(long user_id);
diff --git a/functions/Makefile.dep b/functions/Makefile.dep
index 29b4d5c..70e468c 100755
--- a/functions/Makefile.dep
+++ b/functions/Makefile.dep
@@ -19,7 +19,7 @@ adduser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 adduser.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 adduser.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h
 adduser.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-adduser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+adduser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 adduser.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 adduser.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 adduser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -47,8 +47,8 @@ cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 cat.o: functions.h functionparser.h ../core/cur.h adduser.h chmod.h
 cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h
-cat.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
-cat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+cat.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+cat.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
 cat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 cat.o: ../templates/htmltextstream.h ../notify/notifythread.h
 cat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
@@ -74,7 +74,7 @@ chmod.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 chmod.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 chmod.o: adduser.h cat.h chown.h privchanger.h ckeditor.h cp.h default.h
 chmod.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-chmod.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+chmod.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 chmod.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 chmod.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 chmod.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -102,7 +102,7 @@ chown.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 chown.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 chown.o: adduser.h cat.h chmod.h privchanger.h ckeditor.h cp.h default.h
 chown.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-chown.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+chown.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 chown.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 chown.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 chown.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -132,9 +132,9 @@ ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 ckeditor.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 ckeditor.o: privchanger.h chown.h cp.h default.h download.h emacs.h last.h
 ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h
-ckeditor.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
-ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
-ckeditor.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+ckeditor.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+ckeditor.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
+ckeditor.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 ckeditor.o: ../templates/htmltextstream.h ../notify/notifythread.h
 ckeditor.o: ../core/basethread.h ../core/synchro.h
 ckeditor.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -160,15 +160,16 @@ cp.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 cp.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 cp.o: privchanger.h chown.h ckeditor.h default.h download.h emacs.h last.h
 cp.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h
-cp.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h
-cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-cp.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-cp.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-cp.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-cp.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-cp.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
-cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
-cp.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h
+cp.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+cp.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+cp.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+cp.o: ../templates/htmltextstream.h ../notify/notifythread.h
+cp.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+cp.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+cp.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h
+cp.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
+cp.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
+cp.o: ../core/misc.h
 default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 default.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -188,7 +189,7 @@ default.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 default.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 default.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 default.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-default.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+default.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 default.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 default.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 default.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -218,9 +219,9 @@ download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 download.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 download.o: privchanger.h chown.h ckeditor.h cp.h default.h emacs.h last.h
 download.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h
-download.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
-download.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
-download.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+download.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+download.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
+download.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 download.o: ../templates/htmltextstream.h ../notify/notifythread.h
 download.o: ../core/basethread.h ../core/synchro.h
 download.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -246,7 +247,7 @@ emacs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 emacs.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 emacs.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 emacs.o: default.h download.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-emacs.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+emacs.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 emacs.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 emacs.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 emacs.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -279,7 +280,7 @@ functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 functionbase.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 functionbase.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h
 functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-functionbase.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+functionbase.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 functionbase.o: specialdefault.h stat.h subject.h template.h tinymce.h
 functionbase.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 functionbase.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -311,7 +312,7 @@ functionparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 functionparser.o: ../../ezc/src/pattern.h functions.h adduser.h cat.h chmod.h
 functionparser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h
 functionparser.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h
-functionparser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+functionparser.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 functionparser.o: specialdefault.h stat.h subject.h template.h tinymce.h
 functionparser.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 functionparser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -351,7 +352,7 @@ functions.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
 functions.o: ../core/synchro.h functionparser.h ../core/cur.h adduser.h cat.h
 functions.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h
 functions.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h
-functions.o: mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h
+functions.o: mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h sort.h
 functions.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 functions.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h ../core/log.h
 functions.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h
@@ -377,16 +378,16 @@ last.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 last.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 last.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h mv.h
-last.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h specialdefault.h
-last.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
-last.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
-last.o: ../templates/htmltextstream.h ../notify/notifythread.h
-last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-last.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
-last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
-last.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
-last.o: ../core/synchro.h
+last.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
+last.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
+last.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+last.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
+last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
+last.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+last.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
+last.o: ../core/threadmanager.h ../core/synchro.h
 ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h
 ln.o: ../core/item.h ../core/requesttypes.h ../core/error.h
@@ -405,16 +406,16 @@ ln.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 ln.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 ln.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 ln.o: last.h login.h logout.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h
-ln.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h
-ln.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-ln.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-ln.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-ln.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-ln.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-ln.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
-ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
-ln.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h
-ln.o: ../functions/functions.h
+ln.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+ln.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+ln.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+ln.o: ../templates/htmltextstream.h ../notify/notifythread.h
+ln.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+ln.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+ln.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h
+ln.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
+ln.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
+ln.o: ../core/misc.h ../functions/functions.h
 login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 login.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
@@ -433,7 +434,7 @@ login.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 login.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 login.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 login.o: default.h download.h emacs.h last.h logout.h ln.h ls.h mkdir.h mv.h
-login.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+login.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 login.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 login.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 login.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -462,7 +463,7 @@ logout.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 logout.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 logout.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 logout.o: default.h download.h emacs.h last.h login.h ln.h ls.h mkdir.h mv.h
-logout.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+logout.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 logout.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 logout.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 logout.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -490,15 +491,15 @@ ls.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 ls.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 ls.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 ls.o: last.h login.h logout.h ln.h mkdir.h mv.h nicedit.h node.h passwd.h
-ls.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h
-ls.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-ls.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-ls.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
-ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
-ls.o: ../core/threadmanager.h ../core/synchro.h
+ls.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+ls.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+ls.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+ls.o: ../templates/htmltextstream.h ../notify/notifythread.h
+ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+ls.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h
+ls.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
+ls.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
 mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 mkdir.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
@@ -517,7 +518,7 @@ mkdir.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 mkdir.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 mkdir.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 mkdir.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h mv.h
-mkdir.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+mkdir.o: nicedit.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 mkdir.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 mkdir.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 mkdir.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -546,8 +547,8 @@ mount.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 mount.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 mount.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 mount.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-mount.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
-mount.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+mount.o: sort.h specialdefault.h stat.h subject.h template.h tinymce.h
+mount.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 mount.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
 mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -573,15 +574,15 @@ mv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 mv.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 mv.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 mv.o: last.h login.h logout.h ln.h ls.h mkdir.h nicedit.h node.h passwd.h
-mv.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h
-mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h
-mv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-mv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
-mv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
-mv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
-mv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
-mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
-mv.o: ../core/threadmanager.h ../core/synchro.h
+mv.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h subject.h
+mv.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
+mv.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+mv.o: ../templates/htmltextstream.h ../notify/notifythread.h
+mv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
+mv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
+mv.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h
+mv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
+mv.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
 nicedit.o: nicedit.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -601,7 +602,7 @@ nicedit.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 nicedit.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 nicedit.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 nicedit.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
-nicedit.o: mkdir.h mv.h node.h passwd.h priv.h reload.h rm.h run.h
+nicedit.o: mkdir.h mv.h node.h passwd.h priv.h reload.h rm.h run.h sort.h
 nicedit.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 nicedit.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 nicedit.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -629,7 +630,7 @@ node.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 node.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 node.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 node.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
-node.o: mkdir.h mv.h nicedit.h passwd.h priv.h reload.h rm.h run.h
+node.o: mkdir.h mv.h nicedit.h passwd.h priv.h reload.h rm.h run.h sort.h
 node.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 node.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 node.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -658,7 +659,7 @@ passwd.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 passwd.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 passwd.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 passwd.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
-passwd.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h
+passwd.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h sort.h
 passwd.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 passwd.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 passwd.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -687,7 +688,7 @@ priv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 priv.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 priv.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 priv.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
-priv.o: mkdir.h mv.h nicedit.h node.h passwd.h reload.h rm.h run.h
+priv.o: mkdir.h mv.h nicedit.h node.h passwd.h reload.h rm.h run.h sort.h
 priv.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 priv.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 priv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -718,9 +719,9 @@ privchanger.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 privchanger.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h chown.h
 privchanger.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h
 privchanger.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h
-privchanger.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
-privchanger.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
-privchanger.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
+privchanger.o: priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+privchanger.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
+privchanger.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
 privchanger.o: ../templates/htmltextstream.h ../notify/notifythread.h
 privchanger.o: ../core/basethread.h ../core/synchro.h
 privchanger.o: ../notify/templatesnotify.h ../core/users.h
@@ -747,7 +748,7 @@ reload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 reload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 reload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 reload.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
-reload.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h rm.h run.h
+reload.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h rm.h run.h sort.h
 reload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
 reload.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 reload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
@@ -778,7 +779,7 @@ rm.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 rm.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 rm.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h
-rm.o: passwd.h priv.h reload.h run.h specialdefault.h stat.h subject.h
+rm.o: passwd.h priv.h reload.h run.h sort.h specialdefault.h stat.h subject.h
 rm.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
 rm.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 rm.o: ../templates/htmltextstream.h ../notify/notifythread.h
@@ -810,7 +811,7 @@ run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 run.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 run.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 run.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h
-run.o: passwd.h priv.h reload.h rm.h specialdefault.h stat.h subject.h
+run.o: passwd.h priv.h reload.h rm.h sort.h specialdefault.h stat.h subject.h
 run.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
 run.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 run.o: ../templates/htmltextstream.h ../notify/notifythread.h
@@ -819,6 +820,34 @@ run.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
 run.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h
 run.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
 run.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h
+sort.o: sort.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
+sort.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
+sort.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h
+sort.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
+sort.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+sort.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
+sort.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h
+sort.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
+sort.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
+sort.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h
+sort.o: ../core/confparser.h ../core/request.h ../core/config.h
+sort.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
+sort.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h
+sort.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h
+sort.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
+sort.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
+sort.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
+sort.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
+sort.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
+sort.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
+sort.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+sort.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
+sort.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+sort.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+sort.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
+sort.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+sort.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
+sort.o: ../core/threadmanager.h ../core/synchro.h
 specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h
 specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h
@@ -841,8 +870,8 @@ specialdefault.o: ../../ezc/src/pattern.h functions.h functionparser.h
 specialdefault.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h
 specialdefault.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h
 specialdefault.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h passwd.h
-specialdefault.o: priv.h reload.h rm.h run.h stat.h subject.h template.h
-specialdefault.o: tinymce.h uname.h upload.h uptime.h who.h vim.h
+specialdefault.o: priv.h reload.h rm.h run.h sort.h stat.h subject.h
+specialdefault.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h
 specialdefault.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 specialdefault.o: ../templates/htmltextstream.h ../notify/notifythread.h
 specialdefault.o: ../core/basethread.h ../core/synchro.h
@@ -871,15 +900,15 @@ stat.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 stat.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 stat.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 stat.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-stat.o: specialdefault.h subject.h template.h tinymce.h uname.h upload.h
-stat.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
-stat.o: ../templates/htmltextstream.h ../notify/notifythread.h
-stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-stat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
-stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
-stat.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
-stat.o: ../core/synchro.h
+stat.o: sort.h specialdefault.h subject.h template.h tinymce.h uname.h
+stat.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+stat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
+stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
+stat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+stat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
+stat.o: ../core/threadmanager.h ../core/synchro.h
 subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 subject.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -900,8 +929,8 @@ subject.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 subject.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 subject.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 subject.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-subject.o: specialdefault.h stat.h template.h tinymce.h uname.h upload.h
-subject.o: uptime.h who.h vim.h ../core/htmlfilter.h
+subject.o: sort.h specialdefault.h stat.h template.h tinymce.h uname.h
+subject.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 subject.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
 subject.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 subject.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -929,11 +958,11 @@ template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h
 template.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 template.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h
 template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h
-template.o: node.h passwd.h priv.h reload.h rm.h run.h specialdefault.h
-template.o: stat.h subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h
-template.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
-template.o: ../templates/htmltextstream.h ../notify/notifythread.h
-template.o: ../core/basethread.h ../core/synchro.h
+template.o: node.h passwd.h priv.h reload.h rm.h run.h sort.h
+template.o: specialdefault.h stat.h subject.h tinymce.h uname.h upload.h
+template.o: uptime.h who.h vim.h ../core/htmlfilter.h
+template.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
+template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
 template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
 template.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
@@ -959,8 +988,8 @@ tinymce.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 tinymce.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 tinymce.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 tinymce.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-tinymce.o: specialdefault.h stat.h subject.h template.h uname.h upload.h
-tinymce.o: uptime.h who.h vim.h ../core/htmlfilter.h
+tinymce.o: sort.h specialdefault.h stat.h subject.h template.h uname.h
+tinymce.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
 tinymce.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
 tinymce.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 tinymce.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -987,15 +1016,15 @@ uname.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 uname.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 uname.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 uname.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-uname.o: specialdefault.h stat.h subject.h template.h tinymce.h upload.h
-uname.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h
-uname.o: ../templates/htmltextstream.h ../notify/notifythread.h
-uname.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
-uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
-uname.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h
-uname.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
-uname.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
-uname.o: ../core/synchro.h
+uname.o: sort.h specialdefault.h stat.h subject.h template.h tinymce.h
+uname.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h
+uname.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
+uname.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
+uname.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
+uname.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h
+uname.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h
+uname.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
+uname.o: ../core/threadmanager.h ../core/synchro.h
 upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
 upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
 upload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h
@@ -1016,8 +1045,8 @@ upload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 upload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 upload.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 upload.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-upload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
-upload.o: uptime.h who.h vim.h ../core/htmlfilter.h
+upload.o: sort.h specialdefault.h stat.h subject.h template.h tinymce.h
+upload.o: uname.h uptime.h who.h vim.h ../core/htmlfilter.h
 upload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
 upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -1049,8 +1078,8 @@ uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h
 uptime.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h
 uptime.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h
 uptime.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h run.h
-uptime.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h
-uptime.o: upload.h who.h vim.h ../core/htmlfilter.h
+uptime.o: sort.h specialdefault.h stat.h subject.h template.h tinymce.h
+uptime.o: uname.h upload.h who.h vim.h ../core/htmlfilter.h
 uptime.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
 uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
 uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
@@ -1076,8 +1105,8 @@ vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 vim.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 vim.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h
-vim.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
-vim.o: template.h tinymce.h uname.h upload.h uptime.h who.h
+vim.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+vim.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h
 vim.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 vim.o: ../templates/htmltextstream.h ../notify/notifythread.h
 vim.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
@@ -1103,8 +1132,8 @@ who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
 who.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h
 who.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h
 who.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h
-who.o: passwd.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h
-who.o: template.h tinymce.h uname.h upload.h uptime.h vim.h
+who.o: passwd.h priv.h reload.h rm.h run.h sort.h specialdefault.h stat.h
+who.o: subject.h template.h tinymce.h uname.h upload.h uptime.h vim.h
 who.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h
 who.o: ../templates/htmltextstream.h ../notify/notifythread.h
 who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
diff --git a/functions/Makefile.o.dep b/functions/Makefile.o.dep
index 2813efe..45d281c 100755
--- a/functions/Makefile.o.dep
+++ b/functions/Makefile.o.dep
@@ -1 +1 @@
-o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o reload.o rm.o run.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o 
+o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o reload.o rm.o run.o sort.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o 
diff --git a/functions/functions.cpp b/functions/functions.cpp
index 3a77082..a36bd48 100755
--- a/functions/functions.cpp
+++ b/functions/functions.cpp
@@ -195,6 +195,7 @@ void Functions::CreateFunctions()
 	Add(fun_reload);
 	Add(fun_rm);
 	Add(fun_run);
+	Add(fun_sort);
 	Add(fun_special_default);
 	Add(fun_stat);
 	Add(fun_subject);
diff --git a/functions/functions.h b/functions/functions.h
index 7bdd2c6..eb351cd 100755
--- a/functions/functions.h
+++ b/functions/functions.h
@@ -37,6 +37,7 @@
 #include "reload.h"
 #include "rm.h"
 #include "run.h"
+#include "sort.h"
 #include "specialdefault.h"
 #include "stat.h"
 #include "subject.h"
@@ -82,6 +83,7 @@ public:
 	Fun::Reload		fun_reload;
 	Fun::Rm			fun_rm;
 	Fun::Run		fun_run;
+	Fun::Sort		fun_sort;
 	Fun::SpecialDefault fun_special_default;
 	Fun::Stat		fun_stat;
 	Fun::Subject	fun_subject;
diff --git a/functions/sort.cpp b/functions/sort.cpp
new file mode 100755
index 0000000..b473768
--- /dev/null
+++ b/functions/sort.cpp
@@ -0,0 +1,174 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ * 
+ * Copyright (c) 2011, Tomasz Sowa
+ * All rights reserved.
+ * 
+ */
+ 
+#include "sort.h"
+
+
+
+namespace Fun
+{
+
+Sort::Sort()
+{
+	fun.url = L"sort";
+}
+
+
+bool Sort::HasAccess()
+{
+	if( cur->request->is_item )
+		return system->HasWriteAccess(cur->request->item);
+
+	// for directories we always return true
+	// (permissions are checked later)
+	return true;
+}
+
+
+
+void Sort::GetDirContent()
+{
+	iq.sel_content = false;
+	iq.WhereParentId(cur->request->dir_tab.back()->id);
+	db->GetItems(cur->request->item_tab, iq);
+	system->CheckWriteAccessToItems(cur->request->item_tab);
+}
+
+
+bool Sort::SortHelper::operator()(size_t t1, size_t t2)
+{
+	return psort->cur->request->item_tab[t1].id < psort->cur->request->item_tab[t2].id;
+}
+
+
+bool Sort::SortFun2(const SortPair & s1, const SortPair & s2)
+{
+	return s1.id < s2.id;
+}
+
+
+
+void Sort::CreateItemTab()
+{
+	size_t len = cur->request->item_tab.size();
+	item_tab.resize(len);
+
+	for(size_t i=0 ; i<len ; ++i)
+		item_tab[i] = i;
+
+	std::sort(item_tab.begin() , item_tab.end(), SortHelper(this));
+}
+
+
+
+void Sort::CreateItemTab2()
+{
+PostTab::iterator i2 = cur->request->post_tab.begin();
+SortPair sp;
+
+	item_tab2.clear();
+	item_tab2.reserve(cur->request->post_tab.size());
+
+	// post_tab is sorted in lexicographical order but we should sort it by numbers
+
+	for( ; i2 != cur->request->post_tab.end() ; ++i2 )
+	{
+		if( IsSubStringNoCase(L"sort", i2->first.c_str()) )
+		{
+			sp.id = Tol(i2->first.c_str() + 4);
+			sp.sort_index = Toi(i2->second);
+
+			item_tab2.push_back(sp);
+		}
+	}
+
+	std::sort(item_tab2.begin(), item_tab2.end(), SortFun2);
+}
+
+
+void Sort::UpdateSortIndex(Item & item, int sort_index)
+{
+	item.sort_index = sort_index;
+
+	if( db->EditSortIndexItemById(item.id, sort_index) == WINIX_ERR_OK )
+	{
+		log << log2
+			<< "Sort: updated sort index, item_id=" << item.id
+			<< ", url=" << item.url
+			<< ", sort_index=" << sort_index << logend;
+	}
+}
+
+
+
+void Sort::UpdateSortIndexes()
+{
+size_t i1 = 0;
+size_t i2 = 0;
+
+	while( i1 < item_tab.size() && i2 < item_tab2.size() )
+	{
+		long id1 = cur->request->item_tab[item_tab[i1]].id;
+		long id2 = item_tab2[i2].id;
+
+		if( id1 == id2 )
+		{
+			int sort_index = item_tab2[i2].sort_index;
+			Item & item    = cur->request->item_tab[item_tab[i1]];
+
+			if( system->HasWriteAccess(item) )
+				UpdateSortIndex(item, sort_index);
+
+			++i1;
+			++i2;
+		}
+		else
+		if( id1 < id2 )
+		{
+			++i1;
+		}
+		else
+		{
+			++i2;
+		}
+	}
+}
+
+
+
+void Sort::MakePost()
+{
+	if( cur->request->is_item )
+	{
+		int sort_index = Toi(cur->request->PostVar(L"sortindex"));
+		UpdateSortIndex(cur->request->item, sort_index);
+	}
+	else
+	{
+		GetDirContent();
+		CreateItemTab();
+		CreateItemTab2();
+		UpdateSortIndexes();
+	}
+
+	system->RedirectToLastItem();
+}
+
+
+void Sort::MakeGet()
+{
+	if( !cur->request->is_item )
+		GetDirContent();
+}
+
+
+
+
+} // namespace
+
diff --git a/functions/sort.h b/functions/sort.h
new file mode 100755
index 0000000..775e876
--- /dev/null
+++ b/functions/sort.h
@@ -0,0 +1,66 @@
+/*
+ * This file is a part of Winix
+ * and is not publicly distributed
+ * 
+ * Copyright (c) 2011, Tomasz Sowa
+ * All rights reserved.
+ * 
+ */
+ 
+#ifndef headerfile_winix_functions_sort
+#define headerfile_winix_functions_sort
+
+#include "functionbase.h"
+
+
+
+namespace Fun
+{
+
+
+class Sort : public FunctionBase
+{
+public:
+
+	Sort();
+	bool HasAccess();
+	void MakeGet();
+	void MakePost();
+
+
+private:
+	
+	DbItemQuery iq;
+	std::vector<size_t> item_tab; // indexes to cur->request->item_tab
+
+	struct SortPair
+	{
+		long id;
+		int  sort_index;
+	};
+
+	std::vector<SortPair> item_tab2; // from post table
+
+	// for sorting item_tab
+	struct SortHelper
+	{
+		Sort * psort;
+
+		SortHelper(Sort * s) : psort(s) {}
+		bool operator()(size_t t1, size_t t2);
+	};
+
+	// for sorting item_tab2
+	static bool SortFun2(const SortPair & s1, const SortPair & s2);
+
+	void GetDirContent();
+	void CreateItemTab();
+	void CreateItemTab2();
+	void UpdateSortIndex(Item & item, int sort_index);
+	void UpdateSortIndexes();
+};
+
+
+} // namespace
+
+#endif
diff --git a/html/fun_gallery.html b/html/fun_gallery.html
index 41ea194..bc6bb95 100755
--- a/html/fun_gallery.html
+++ b/html/fun_gallery.html
@@ -24,12 +24,16 @@
 		[end]
 		</ul>
 		
-		[if gallery_mount_theme_arg_is "white"]
-			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/white/galleria.white.js');</script>
+		[if gallery_mount_theme_arg_is "transparent"]
+			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/transparent/galleria.transparent.js');</script>
 		[else]
-			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/classic/galleria.classic.js');</script>
+			[if gallery_mount_theme_arg_is "white"]
+				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/white/galleria.white.js');</script>
+			[else]
+				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/classic/galleria.classic.js');</script>
+			[end]
 		[end]
-		
+	
 		[if-no winix_function_param_is "image"]
 			<script type="text/javascript">$('.galleryimages').galleria();</script>
 		[else]
diff --git a/html/fun_sort.html b/html/fun_sort.html
new file mode 100755
index 0000000..858656a
--- /dev/null
+++ b/html/fun_sort.html
@@ -0,0 +1,33 @@
+<h1>{sort_header}</h1>
+
+[if item_is]
+
+	<form id="additem" action="[doc_base_url][dir][item_url]/sort" method="post">
+	<div>
+		<p class="withnext">{sort_current_sortindex}:</p>
+		<input class="editshort" type="text" name="sortindex" value="[item_sort]">
+		<input class="submit" type="submit" value="{change}">
+	</div>
+	</form>
+
+[else]
+
+	[if item_tab]
+	<form id="additem" action="[doc_base_url][dir]sort" method="post">
+	<div>
+		<ul id="sortable">
+		[for item_tab]
+			<li id="li[item_tab_index]">
+			<input type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
+			[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
+			[item_tab_url]
+			</li>
+		[end]
+		</ul>
+
+		<input class="submit" type="submit" value="{change}">
+	</div>
+	</form>
+	[end]
+
+[end]
diff --git a/html/index_head_functions_add.html b/html/index_head_functions_add.html
index 58f462b..e2cdad0 100755
--- a/html/index_head_functions_add.html
+++ b/html/index_head_functions_add.html
@@ -98,6 +98,13 @@
 [end]
 
 
+[if winix_function_is "sort"]
+	[if-no item_is]
+	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.6.1.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jquery-ui-1.8.13/js/jquery-ui-1.8.13.custom.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/sort.js"></script>
+	[end]
+[end]
 
 
 
diff --git a/html/item_options.html b/html/item_options.html
index 50caa2d..a28623d 100755
--- a/html/item_options.html
+++ b/html/item_options.html
@@ -29,8 +29,9 @@
 		<h2>{admin_options}:</h2>
 		<ul class="itemmenu">
 		<li><a href="[doc_base_url][dir]ls">{admin_ls}</a></li>
-		[if-one dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
-		[if-one dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
+		[if dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
+		[if dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
+		[if-no item_is]<li><a href="[doc_base_url][dir]sort">{admin_sort}</a></li>[end]
 		[if-any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm">{admin_rm}</a></li>[end]
 		</ul>
 	</div>
diff --git a/locale/en b/locale/en
index a68e730..c988bf4 100755
--- a/locale/en
+++ b/locale/en
@@ -240,6 +240,7 @@ admin_tinymce_add = Add page (tinymce)
 admin_tinymce_edit = Edit page (tinymce)
 admin_rm = Remove page (rm)
 admin_upload = File manager (upload)
+admin_sort = Sort items (sort)
 
 
 login_header = Login
@@ -307,6 +308,10 @@ mount_exists = This mount point already exists
 slog_turn_over = Session's log turned over due to size greater than
 
 
+sort_header = Sort
+sort_current_sortindex = Current sort index
+
+
 stat_header = Stat
 stat_item_type = type
 stat_item_type_file = file
diff --git a/locale/pl b/locale/pl
index 52eb6bb..3941186 100755
--- a/locale/pl
+++ b/locale/pl
@@ -250,6 +250,7 @@ admin_tinymce_add = Dodaj stronę (tinymce)
 admin_tinymce_edit = Edytuj stronę (tinymce)
 admin_rm = Usuń stronę (rm)
 admin_upload = Menedżer plików (upload)
+admin_sort = Sortuj elementy (sort)
 
 login_header = Logowanie
 
@@ -314,6 +315,10 @@ skipped_static_mount = Pominięto statyczny (static) punkt montowania
 mount_exists = Ten punkt montowania jest już zdefiniowany
 slog_turn_over = Log sesji wyczyszczony w związku z przekroczeniem wielkości
 
+
+sort_header = Sortuj
+sort_current_sortindex = Bieżący indeks sortowania
+
 stat_header = Stat
 stat_item_type = typ
 stat_item_type_file = plik
diff --git a/main/Makefile.dep b/main/Makefile.dep
index f899aa9..a98a375 100755
--- a/main/Makefile.dep
+++ b/main/Makefile.dep
@@ -35,7 +35,7 @@ main.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 main.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 main.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 main.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-main.o: ../functions/specialdefault.h ../functions/stat.h
+main.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
 main.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 main.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 main.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
diff --git a/notify/Makefile.dep b/notify/Makefile.dep
index 6f2925d..52b89ea 100755
--- a/notify/Makefile.dep
+++ b/notify/Makefile.dep
@@ -38,8 +38,8 @@ notify.o: ../functions/last.h ../functions/login.h ../functions/logout.h
 notify.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
 notify.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
 notify.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
-notify.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h
-notify.o: ../functions/subject.h ../functions/template.h
+notify.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
+notify.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 notifypool.o: notifypool.h ../templates/locale.h ../core/confparser.h
@@ -101,11 +101,12 @@ templatesnotify.o: ../functions/mkdir.h ../functions/mv.h
 templatesnotify.o: ../functions/nicedit.h ../functions/node.h
 templatesnotify.o: ../functions/passwd.h ../functions/priv.h
 templatesnotify.o: ../functions/reload.h ../functions/rm.h
-templatesnotify.o: ../functions/specialdefault.h ../functions/stat.h
-templatesnotify.o: ../functions/subject.h ../functions/template.h
-templatesnotify.o: ../functions/tinymce.h ../functions/uname.h
-templatesnotify.o: ../functions/upload.h ../functions/uptime.h
-templatesnotify.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
+templatesnotify.o: ../functions/sort.h ../functions/specialdefault.h
+templatesnotify.o: ../functions/stat.h ../functions/subject.h
+templatesnotify.o: ../functions/template.h ../functions/tinymce.h
+templatesnotify.o: ../functions/uname.h ../functions/upload.h
+templatesnotify.o: ../functions/uptime.h ../functions/who.h
+templatesnotify.o: ../functions/vim.h ../core/htmlfilter.h
 templatesnotify.o: ../templates/templates.h ../templates/patterncacher.h
 templatesnotify.o: ../templates/indexpatterns.h ../templates/localefilter.h
 templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h
diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep
index d800909..c35b72f 100755
--- a/plugins/export/Makefile.dep
+++ b/plugins/export/Makefile.dep
@@ -45,7 +45,7 @@ init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 init.o: ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep
index bf1dcb9..fb42434 100755
--- a/plugins/gallery/Makefile.dep
+++ b/plugins/gallery/Makefile.dep
@@ -74,7 +74,7 @@ init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 init.o: ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -128,11 +128,12 @@ templates.o: ../../functions/ls.h ../../functions/mkdir.h
 templates.o: ../../functions/mv.h ../../functions/nicedit.h
 templates.o: ../../functions/node.h ../../functions/passwd.h
 templates.o: ../../functions/priv.h ../../functions/reload.h
-templates.o: ../../functions/rm.h ../../functions/specialdefault.h
-templates.o: ../../functions/stat.h ../../functions/subject.h
-templates.o: ../../functions/template.h ../../functions/tinymce.h
-templates.o: ../../functions/uname.h ../../functions/upload.h
-templates.o: ../../functions/uptime.h ../../functions/who.h
-templates.o: ../../functions/vim.h ../../core/htmlfilter.h
-templates.o: ../../templates/templates.h ../../templates/patterncacher.h
-templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
+templates.o: ../../functions/rm.h ../../functions/sort.h
+templates.o: ../../functions/specialdefault.h ../../functions/stat.h
+templates.o: ../../functions/subject.h ../../functions/template.h
+templates.o: ../../functions/tinymce.h ../../functions/uname.h
+templates.o: ../../functions/upload.h ../../functions/uptime.h
+templates.o: ../../functions/who.h ../../functions/vim.h
+templates.o: ../../core/htmlfilter.h ../../templates/templates.h
+templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
+templates.o: ../../core/sessionmanager.h
diff --git a/plugins/gallery/gallery.cpp b/plugins/gallery/gallery.cpp
index 19d2be1..3fb241f 100755
--- a/plugins/gallery/gallery.cpp
+++ b/plugins/gallery/gallery.cpp
@@ -58,6 +58,7 @@ void Gallery::MakeGetDir()
 	iq.sel_url = true;
 	iq.sel_type = true;
 	iq.sel_file = true;
+	iq.sel_sort_index = true;
 
 	iq.WhereParentId(cur->request->dir_tab.back()->id);
 	iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
diff --git a/plugins/groupitem/Makefile.dep b/plugins/groupitem/Makefile.dep
index f37b7c1..7e18ad1 100755
--- a/plugins/groupitem/Makefile.dep
+++ b/plugins/groupitem/Makefile.dep
@@ -43,7 +43,7 @@ init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 init.o: ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -98,9 +98,9 @@ templates.o: ../../functions/ls.h ../../functions/mkdir.h
 templates.o: ../../functions/mv.h ../../functions/nicedit.h
 templates.o: ../../functions/node.h ../../functions/passwd.h
 templates.o: ../../functions/priv.h ../../functions/reload.h
-templates.o: ../../functions/rm.h ../../functions/specialdefault.h
-templates.o: ../../functions/stat.h ../../functions/subject.h
-templates.o: ../../functions/template.h ../../functions/tinymce.h
-templates.o: ../../functions/uname.h ../../functions/upload.h
-templates.o: ../../functions/uptime.h ../../functions/who.h
-templates.o: ../../functions/vim.h
+templates.o: ../../functions/rm.h ../../functions/sort.h
+templates.o: ../../functions/specialdefault.h ../../functions/stat.h
+templates.o: ../../functions/subject.h ../../functions/template.h
+templates.o: ../../functions/tinymce.h ../../functions/uname.h
+templates.o: ../../functions/upload.h ../../functions/uptime.h
+templates.o: ../../functions/who.h ../../functions/vim.h
diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep
index 856679b..4477ac9 100755
--- a/plugins/menu/Makefile.dep
+++ b/plugins/menu/Makefile.dep
@@ -43,7 +43,7 @@ init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 init.o: ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -98,10 +98,10 @@ templates.o: ../../functions/ls.h ../../functions/mkdir.h
 templates.o: ../../functions/mv.h ../../functions/nicedit.h
 templates.o: ../../functions/node.h ../../functions/passwd.h
 templates.o: ../../functions/priv.h ../../functions/reload.h
-templates.o: ../../functions/rm.h ../../functions/specialdefault.h
-templates.o: ../../functions/stat.h ../../functions/subject.h
-templates.o: ../../functions/template.h ../../functions/tinymce.h
-templates.o: ../../functions/uname.h ../../functions/upload.h
-templates.o: ../../functions/uptime.h ../../functions/who.h
-templates.o: ../../functions/vim.h ../../core/log.h
+templates.o: ../../functions/rm.h ../../functions/sort.h
+templates.o: ../../functions/specialdefault.h ../../functions/stat.h
+templates.o: ../../functions/subject.h ../../functions/template.h
+templates.o: ../../functions/tinymce.h ../../functions/uname.h
+templates.o: ../../functions/upload.h ../../functions/uptime.h
+templates.o: ../../functions/who.h ../../functions/vim.h ../../core/log.h
 templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/misc.h
diff --git a/plugins/menu/templates.cpp b/plugins/menu/templates.cpp
index dafe8ac..b1a6689 100755
--- a/plugins/menu/templates.cpp
+++ b/plugins/menu/templates.cpp
@@ -60,6 +60,7 @@ void menu_dir_load_menu(long parent_id)
 	menu_dir_iq.SetAll(false, false);
 	menu_dir_iq.sel_subject = true;
 	menu_dir_iq.sel_url     = true;
+	menu_dir_iq.sel_sort_index = true;
 	menu_dir_iq.WhereParentId(parent_id);
 
 	// !! directories will not be read with WINIX_ITEM_FILETYPE_NONE
@@ -77,12 +78,13 @@ void menu_dir_init(const std::wstring & path)
 	if( cur->request->id != menu_dir_reqid || menu_dir_last_dir != path )
 	{
 		menu_dir_reqid    = cur->request->id;
-		menu_dir_last_dir = path;
 		menu_dir_items.clear();
 
 		if( path.empty() )
 		{
-			log << log1 << "Menu: you should provide a path for menu" << logend;
+			// current directory
+			menu_dir_load_menu(cur->request->dir_tab.back()->id);
+			system->dirs.MakePath(cur->request->dir_tab, menu_dir_last_dir);
 		}
 		else
 		if( path[0] != '/' )
@@ -91,6 +93,7 @@ void menu_dir_init(const std::wstring & path)
 		}
 		else
 		{
+			menu_dir_last_dir = path;
 			Item * pdir = system->dirs.GetDir(path);
 
 			if( pdir )
@@ -145,6 +148,14 @@ void menu_dir_tab_link(Info & i)
 
 
 
+void menu_dir_tab_is_current(Info & i)
+{
+	if( menu_dir_index < menu_dir_items.size() )
+	{
+		i.res = (menu_dir_items[menu_dir_index].id == cur->request->last_item->id);
+	}
+}
+
 
 void AddEzcFunctions(PluginInfo & info)
 {
@@ -155,6 +166,7 @@ void AddEzcFunctions(PluginInfo & info)
 	fun->Insert("menu_dir_tab_subject",        menu_dir_tab_subject);
 	fun->Insert("menu_dir_tab_url",            menu_dir_tab_url);
 	fun->Insert("menu_dir_tab_link",           menu_dir_tab_link);
+	fun->Insert("menu_dir_tab_is_current",     menu_dir_tab_is_current);
 }
 
 
diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep
index 7f163af..80835b2 100755
--- a/plugins/stats/Makefile.dep
+++ b/plugins/stats/Makefile.dep
@@ -44,7 +44,7 @@ init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 init.o: ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -106,12 +106,12 @@ templates.o: ../../functions/ls.h ../../functions/mkdir.h
 templates.o: ../../functions/mv.h ../../functions/nicedit.h
 templates.o: ../../functions/node.h ../../functions/passwd.h
 templates.o: ../../functions/priv.h ../../functions/reload.h
-templates.o: ../../functions/rm.h ../../functions/specialdefault.h
-templates.o: ../../functions/stat.h ../../functions/subject.h
-templates.o: ../../functions/template.h ../../functions/tinymce.h
-templates.o: ../../functions/uname.h ../../functions/upload.h
-templates.o: ../../functions/uptime.h ../../functions/who.h
-templates.o: ../../functions/vim.h ../../core/htmlfilter.h
-templates.o: ../../templates/templates.h ../../templates/patterncacher.h
-templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
-templates.o: ../../core/misc.h stats.h
+templates.o: ../../functions/rm.h ../../functions/sort.h
+templates.o: ../../functions/specialdefault.h ../../functions/stat.h
+templates.o: ../../functions/subject.h ../../functions/template.h
+templates.o: ../../functions/tinymce.h ../../functions/uname.h
+templates.o: ../../functions/upload.h ../../functions/uptime.h
+templates.o: ../../functions/who.h ../../functions/vim.h
+templates.o: ../../core/htmlfilter.h ../../templates/templates.h
+templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
+templates.o: ../../core/sessionmanager.h ../../core/misc.h stats.h
diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep
index 02e691d..0aec54f 100755
--- a/plugins/thread/Makefile.dep
+++ b/plugins/thread/Makefile.dep
@@ -47,12 +47,13 @@ createthread.o: ../../functions/ls.h ../../functions/mkdir.h
 createthread.o: ../../functions/mv.h ../../functions/nicedit.h
 createthread.o: ../../functions/node.h ../../functions/passwd.h
 createthread.o: ../../functions/priv.h ../../functions/reload.h
-createthread.o: ../../functions/rm.h ../../functions/specialdefault.h
-createthread.o: ../../functions/stat.h ../../functions/subject.h
-createthread.o: ../../functions/template.h ../../functions/tinymce.h
-createthread.o: ../../functions/uname.h ../../functions/upload.h
-createthread.o: ../../functions/uptime.h ../../functions/who.h
-createthread.o: ../../functions/vim.h ../../core/htmlfilter.h
+createthread.o: ../../functions/rm.h ../../functions/sort.h
+createthread.o: ../../functions/specialdefault.h ../../functions/stat.h
+createthread.o: ../../functions/subject.h ../../functions/template.h
+createthread.o: ../../functions/tinymce.h ../../functions/uname.h
+createthread.o: ../../functions/upload.h ../../functions/uptime.h
+createthread.o: ../../functions/who.h ../../functions/vim.h
+createthread.o: ../../core/htmlfilter.h
 funthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
 funthread.o: funthread.h ../../functions/functionbase.h ../../core/item.h
 funthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
@@ -129,7 +130,7 @@ init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 init.o: ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -179,7 +180,7 @@ reply.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h
 reply.o: ../../functions/mkdir.h ../../functions/mv.h
 reply.o: ../../functions/nicedit.h ../../functions/node.h
 reply.o: ../../functions/passwd.h ../../functions/priv.h
-reply.o: ../../functions/reload.h ../../functions/rm.h
+reply.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 reply.o: ../../functions/specialdefault.h ../../functions/stat.h
 reply.o: ../../functions/subject.h ../../functions/template.h
 reply.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -270,14 +271,15 @@ templates.o: ../../functions/ls.h ../../functions/mkdir.h
 templates.o: ../../functions/mv.h ../../functions/nicedit.h
 templates.o: ../../functions/node.h ../../functions/passwd.h
 templates.o: ../../functions/priv.h ../../functions/reload.h
-templates.o: ../../functions/rm.h ../../functions/specialdefault.h
-templates.o: ../../functions/stat.h ../../functions/subject.h
-templates.o: ../../functions/template.h ../../functions/tinymce.h
-templates.o: ../../functions/uname.h ../../functions/upload.h
-templates.o: ../../functions/uptime.h ../../functions/who.h
-templates.o: ../../functions/vim.h ../../core/htmlfilter.h
-templates.o: ../../templates/templates.h ../../templates/patterncacher.h
-templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
+templates.o: ../../functions/rm.h ../../functions/sort.h
+templates.o: ../../functions/specialdefault.h ../../functions/stat.h
+templates.o: ../../functions/subject.h ../../functions/template.h
+templates.o: ../../functions/tinymce.h ../../functions/uname.h
+templates.o: ../../functions/upload.h ../../functions/uptime.h
+templates.o: ../../functions/who.h ../../functions/vim.h
+templates.o: ../../core/htmlfilter.h ../../templates/templates.h
+templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
+templates.o: ../../core/sessionmanager.h
 threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h
 threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
 threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep
index 1ca2cb7..c00bc4b 100755
--- a/plugins/ticket/Makefile.dep
+++ b/plugins/ticket/Makefile.dep
@@ -47,13 +47,14 @@ createticket.o: ../../functions/ls.h ../../functions/mkdir.h
 createticket.o: ../../functions/mv.h ../../functions/nicedit.h
 createticket.o: ../../functions/node.h ../../functions/passwd.h
 createticket.o: ../../functions/priv.h ../../functions/reload.h
-createticket.o: ../../functions/rm.h ../../functions/specialdefault.h
-createticket.o: ../../functions/stat.h ../../functions/subject.h
-createticket.o: ../../functions/template.h ../../functions/tinymce.h
-createticket.o: ../../functions/uname.h ../../functions/upload.h
-createticket.o: ../../functions/uptime.h ../../functions/who.h
-createticket.o: ../../functions/vim.h ../../core/htmlfilter.h sessiondata.h
-createticket.o: ../../core/plugindata.h ../../functions/rm.h
+createticket.o: ../../functions/rm.h ../../functions/sort.h
+createticket.o: ../../functions/specialdefault.h ../../functions/stat.h
+createticket.o: ../../functions/subject.h ../../functions/template.h
+createticket.o: ../../functions/tinymce.h ../../functions/uname.h
+createticket.o: ../../functions/upload.h ../../functions/uptime.h
+createticket.o: ../../functions/who.h ../../functions/vim.h
+createticket.o: ../../core/htmlfilter.h sessiondata.h ../../core/plugindata.h
+createticket.o: ../../functions/rm.h
 editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 editticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 editticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
@@ -97,14 +98,15 @@ editticket.o: ../../functions/ls.h ../../functions/mkdir.h
 editticket.o: ../../functions/mv.h ../../functions/nicedit.h
 editticket.o: ../../functions/node.h ../../functions/passwd.h
 editticket.o: ../../functions/priv.h ../../functions/reload.h
-editticket.o: ../../functions/rm.h ../../functions/specialdefault.h
-editticket.o: ../../functions/stat.h ../../functions/subject.h
-editticket.o: ../../functions/template.h ../../functions/tinymce.h
-editticket.o: ../../functions/uname.h ../../functions/upload.h
-editticket.o: ../../functions/uptime.h ../../functions/who.h
-editticket.o: ../../functions/vim.h ../../core/htmlfilter.h
-editticket.o: ../../functions/functionbase.h ../../core/synchro.h
-editticket.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
+editticket.o: ../../functions/rm.h ../../functions/sort.h
+editticket.o: ../../functions/specialdefault.h ../../functions/stat.h
+editticket.o: ../../functions/subject.h ../../functions/template.h
+editticket.o: ../../functions/tinymce.h ../../functions/uname.h
+editticket.o: ../../functions/upload.h ../../functions/uptime.h
+editticket.o: ../../functions/who.h ../../functions/vim.h
+editticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h
+editticket.o: ../../core/synchro.h sessiondata.h ../../core/plugindata.h
+editticket.o: ../../functions/rm.h
 funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
 funticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
@@ -148,17 +150,18 @@ funticket.o: ../../functions/mkdir.h ../../functions/mv.h
 funticket.o: ../../functions/nicedit.h ../../functions/node.h
 funticket.o: ../../functions/passwd.h ../../functions/priv.h
 funticket.o: ../../functions/reload.h ../../functions/rm.h
-funticket.o: ../../functions/specialdefault.h ../../functions/stat.h
-funticket.o: ../../functions/subject.h ../../functions/template.h
-funticket.o: ../../functions/tinymce.h ../../functions/uname.h
-funticket.o: ../../functions/upload.h ../../functions/uptime.h
-funticket.o: ../../functions/who.h ../../functions/vim.h
-funticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h
-funticket.o: ../../core/synchro.h ../../core/plugin.h pluginmsg.h
-funticket.o: ../../core/system.h ../../core/sessionmanager.h
-funticket.o: ../../core/sessioncontainer.h ../../templates/templates.h
-funticket.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
-funticket.o: ../../core/sessionmanager.h ../../plugins/thread/pluginmsg.h
+funticket.o: ../../functions/sort.h ../../functions/specialdefault.h
+funticket.o: ../../functions/stat.h ../../functions/subject.h
+funticket.o: ../../functions/template.h ../../functions/tinymce.h
+funticket.o: ../../functions/uname.h ../../functions/upload.h
+funticket.o: ../../functions/uptime.h ../../functions/who.h
+funticket.o: ../../functions/vim.h ../../core/htmlfilter.h
+funticket.o: ../../functions/functionbase.h ../../core/synchro.h
+funticket.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
+funticket.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+funticket.o: ../../templates/templates.h ../../templates/patterncacher.h
+funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
+funticket.o: ../../plugins/thread/pluginmsg.h
 init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
 init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
@@ -199,7 +202,7 @@ init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ln.h
 init.o: ../../functions/ls.h ../../functions/mkdir.h ../../functions/mv.h
 init.o: ../../functions/nicedit.h ../../functions/node.h
 init.o: ../../functions/passwd.h ../../functions/priv.h
-init.o: ../../functions/reload.h ../../functions/rm.h
+init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/sort.h
 init.o: ../../functions/specialdefault.h ../../functions/stat.h
 init.o: ../../functions/subject.h ../../functions/template.h
 init.o: ../../functions/tinymce.h ../../functions/uname.h
@@ -262,17 +265,17 @@ showtickets.o: ../../functions/mkdir.h ../../functions/mv.h
 showtickets.o: ../../functions/nicedit.h ../../functions/node.h
 showtickets.o: ../../functions/passwd.h ../../functions/priv.h
 showtickets.o: ../../functions/reload.h ../../functions/rm.h
-showtickets.o: ../../functions/specialdefault.h ../../functions/stat.h
-showtickets.o: ../../functions/subject.h ../../functions/template.h
-showtickets.o: ../../functions/tinymce.h ../../functions/uname.h
-showtickets.o: ../../functions/upload.h ../../functions/uptime.h
-showtickets.o: ../../functions/who.h ../../functions/vim.h
-showtickets.o: ../../core/htmlfilter.h ../../functions/functionbase.h
-showtickets.o: ../../core/synchro.h pluginmsg.h
-showtickets.o: ../../plugins/thread/pluginmsg.h ../../core/plugin.h
-showtickets.o: ../../core/system.h ../../core/sessionmanager.h
-showtickets.o: ../../core/sessioncontainer.h ../../templates/templates.h
-showtickets.o: ../../templates/patterncacher.h
+showtickets.o: ../../functions/sort.h ../../functions/specialdefault.h
+showtickets.o: ../../functions/stat.h ../../functions/subject.h
+showtickets.o: ../../functions/template.h ../../functions/tinymce.h
+showtickets.o: ../../functions/uname.h ../../functions/upload.h
+showtickets.o: ../../functions/uptime.h ../../functions/who.h
+showtickets.o: ../../functions/vim.h ../../core/htmlfilter.h
+showtickets.o: ../../functions/functionbase.h ../../core/synchro.h
+showtickets.o: pluginmsg.h ../../plugins/thread/pluginmsg.h
+showtickets.o: ../../core/plugin.h ../../core/system.h
+showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h
 showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
 tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
 tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
@@ -320,20 +323,20 @@ templates.o: ../../functions/mkdir.h ../../functions/mv.h
 templates.o: ../../functions/nicedit.h ../../functions/node.h
 templates.o: ../../functions/passwd.h ../../functions/priv.h
 templates.o: ../../functions/reload.h ../../functions/rm.h
-templates.o: ../../functions/specialdefault.h ../../functions/stat.h
-templates.o: ../../functions/subject.h ../../functions/template.h
-templates.o: ../../functions/tinymce.h ../../functions/uname.h
-templates.o: ../../functions/upload.h ../../functions/uptime.h
-templates.o: ../../functions/who.h ../../functions/vim.h
-templates.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h
-templates.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
-templates.o: editticket.h ../../functions/functionbase.h ../../core/synchro.h
-templates.o: createticket.h ../../core/misc.h ../../core/plugin.h pluginmsg.h
-templates.o: ../../core/system.h ../../core/sessionmanager.h
-templates.o: ../../core/sessioncontainer.h ../../templates/templates.h
-templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
-templates.o: ../../core/sessionmanager.h sessiondata.h
-templates.o: ../../core/plugindata.h ../../functions/rm.h
+templates.o: ../../functions/sort.h ../../functions/specialdefault.h
+templates.o: ../../functions/stat.h ../../functions/subject.h
+templates.o: ../../functions/template.h ../../functions/tinymce.h
+templates.o: ../../functions/uname.h ../../functions/upload.h
+templates.o: ../../functions/uptime.h ../../functions/who.h
+templates.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h
+templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
+templates.o: ../../core/error.h editticket.h ../../functions/functionbase.h
+templates.o: ../../core/synchro.h createticket.h ../../core/misc.h
+templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
+templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
+templates.o: ../../templates/templates.h ../../templates/patterncacher.h
+templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
+templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
 templates.o: ../../plugins/thread/pluginmsg.h
 ticketconf.o: ticketconf.h
 ticketinfo.o: ticketinfo.h ticket.h ticketparser.h ticketconf.h
@@ -378,14 +381,15 @@ ticketinfo.o: ../../functions/ls.h ../../functions/mkdir.h
 ticketinfo.o: ../../functions/mv.h ../../functions/nicedit.h
 ticketinfo.o: ../../functions/node.h ../../functions/passwd.h
 ticketinfo.o: ../../functions/priv.h ../../functions/reload.h
-ticketinfo.o: ../../functions/rm.h ../../functions/specialdefault.h
-ticketinfo.o: ../../functions/stat.h ../../functions/subject.h
-ticketinfo.o: ../../functions/template.h ../../functions/tinymce.h
-ticketinfo.o: ../../functions/uname.h ../../functions/upload.h
-ticketinfo.o: ../../functions/uptime.h ../../functions/who.h
-ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h
-ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
-ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h
-ticketinfo.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
+ticketinfo.o: ../../functions/rm.h ../../functions/sort.h
+ticketinfo.o: ../../functions/specialdefault.h ../../functions/stat.h
+ticketinfo.o: ../../functions/subject.h ../../functions/template.h
+ticketinfo.o: ../../functions/tinymce.h ../../functions/uname.h
+ticketinfo.o: ../../functions/upload.h ../../functions/uptime.h
+ticketinfo.o: ../../functions/who.h ../../functions/vim.h
+ticketinfo.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h
+ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
+ticketinfo.o: ../../core/log.h ../../core/misc.h sessiondata.h
+ticketinfo.o: ../../core/plugindata.h ../../functions/rm.h
 ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h
 ticketparser.o: ../../core/misc.h
diff --git a/static/layout1/winix.css b/static/layout1/winix.css
index 05009ce..6d1023b 100755
--- a/static/layout1/winix.css
+++ b/static/layout1/winix.css
@@ -841,3 +841,27 @@ td.slogerror {
 background: red;
 color: white;
 }
+
+ul#sortable li{
+list-style-type: none;
+display: block;
+padding: 0.2em 1em 0.2em 1em;
+border: 1px solid #D3D3D3;
+background: #EDEDED;
+margin: 0.3em 0 0.3em 0;
+}
+
+ul#sortable input{
+width: 30px;
+margin: 0 10px 0 0;
+}
+
+ul#sortable img {
+height: 50px;
+}
+
+
+div#fileupload {
+font-size: 0.8em;
+}
+
diff --git a/templates/Makefile.dep b/templates/Makefile.dep
index 0989949..c7c2057 100755
--- a/templates/Makefile.dep
+++ b/templates/Makefile.dep
@@ -59,7 +59,7 @@ dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 dir.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-dir.o: ../functions/specialdefault.h ../functions/stat.h
+dir.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
 dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
 dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
 dir.o: ../functions/who.h ../functions/vim.h
@@ -331,10 +331,10 @@ priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h
 priv.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
 priv.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
 priv.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
-priv.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h
-priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
-priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
-priv.o: ../functions/who.h ../functions/vim.h
+priv.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
+priv.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
+priv.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h
 rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -443,10 +443,11 @@ sys.o: ../functions/last.h ../functions/login.h ../functions/logout.h
 sys.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
 sys.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
 sys.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
-sys.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h
-sys.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
-sys.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
-sys.o: ../functions/who.h ../functions/vim.h ../templates/templates.h
+sys.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
+sys.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+sys.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
+sys.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
+sys.o: ../templates/templates.h
 template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
 template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -513,11 +514,11 @@ templates.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 templates.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 templates.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 templates.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-templates.o: ../functions/specialdefault.h ../functions/stat.h
-templates.o: ../functions/subject.h ../functions/template.h
-templates.o: ../functions/tinymce.h ../functions/uname.h
-templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
-templates.o: ../functions/vim.h ../templates/templates.h
+templates.o: ../functions/sort.h ../functions/specialdefault.h
+templates.o: ../functions/stat.h ../functions/subject.h
+templates.o: ../functions/template.h ../functions/tinymce.h
+templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
+templates.o: ../functions/who.h ../functions/vim.h ../templates/templates.h
 upload.o: ../core/request.h templates.h ../../ezc/src/ezc.h
 upload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 upload.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
@@ -655,8 +656,8 @@ winix.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
 winix.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
 winix.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
 winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
-winix.o: ../functions/specialdefault.h ../functions/stat.h
-winix.o: ../functions/subject.h ../functions/template.h
+winix.o: ../functions/sort.h ../functions/specialdefault.h
+winix.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
 winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 winix.o: ../templates/templates.h ../core/misc.h
diff --git a/templates/item.cpp b/templates/item.cpp
index 43325b1..0304712 100755
--- a/templates/item.cpp
+++ b/templates/item.cpp
@@ -359,6 +359,10 @@ void item_file_size(Info & i)
 	i.res = cur->request->item.file_size;
 }
 
+void item_sort(Info & i)
+{
+	i.out << cur->request->item.sort_index;
+}
 
 
 
@@ -372,6 +376,12 @@ void item_tab(Info & i)
 }
 
 
+void item_tab_index(Info & i)
+{
+	i.out << item_index;
+}
+
+
 void item_tab_id(Info & i)
 {
 	if( item_index < cur->request->item_tab.size() )
@@ -690,6 +700,11 @@ void item_tab_file_size(Info & i)
 		i.out << cur->request->item_tab[item_index].file_size;
 }
 
+void item_tab_sort(Info & i)
+{
+	if( item_index < cur->request->item_tab.size() )
+		i.out << cur->request->item_tab[item_index].sort_index;
+}
 
 void item_tab_has_next(Info & i)
 {
diff --git a/templates/templates.cpp b/templates/templates.cpp
index 51f139e..6a9152e 100755
--- a/templates/templates.cpp
+++ b/templates/templates.cpp
@@ -261,8 +261,10 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("item_link_to",               item_link_to);
 	ezc_functions.Insert("item_is_link_redirect",      item_is_link_redirect);
 	ezc_functions.Insert("item_file_size",             item_file_size);
+	ezc_functions.Insert("item_sort",                  item_sort);
 
 	ezc_functions.Insert("item_tab",                   item_tab);
+	ezc_functions.Insert("item_tab_index",             item_tab_index);
 	ezc_functions.Insert("item_tab_id",                item_tab_id);
 	ezc_functions.Insert("item_tab_subject",           item_tab_subject);
 	ezc_functions.Insert("item_tab_subject_noescape",  item_tab_subject_noescape);
@@ -297,6 +299,7 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("item_tab_link_to",           item_tab_link_to);
 	ezc_functions.Insert("item_tab_is_link_redirect",  item_tab_is_link_redirect);
 	ezc_functions.Insert("item_tab_file_size",         item_tab_file_size);
+	ezc_functions.Insert("item_tab_sort",              item_tab_sort);
 	ezc_functions.Insert("item_tab_has_next",          item_tab_has_next);
 	
 		
diff --git a/templates/templates.h b/templates/templates.h
index 023537d..96e2088 100755
--- a/templates/templates.h
+++ b/templates/templates.h
@@ -190,8 +190,10 @@ namespace TemplatesFunctions
 	void item_link_to(Info & i);
 	void item_is_link_redirect(Info & i);
 	void item_file_size(Info & i);
+	void item_sort(Info & i);
 
 	void item_tab(Info & i);
+	void item_tab_index(Info & i);
 	void item_tab_id(Info & i);
 	void item_tab_subject(Info & i);
 	void item_tab_subject_noescape(Info & i);
@@ -226,6 +228,7 @@ namespace TemplatesFunctions
 	void item_tab_link_to(Info & i);
 	void item_tab_is_link_redirect(Info & i);
 	void item_tab_file_size(Info & i);
+	void item_tab_sort(Info & i);
 	void item_tab_has_next(Info & i);
 
 
diff --git a/templates/winix.cpp b/templates/winix.cpp
index 9e450aa..7e60ebb 100755
--- a/templates/winix.cpp
+++ b/templates/winix.cpp
@@ -209,7 +209,8 @@ void winix_show_content_in_full_window(Info & i)
 				 cur->request->function == &functions->fun_tinymce		||
 				 cur->request->function == &functions->fun_nicedit		||
 				 cur->request->function == &functions->fun_vim			||
-				 cur->request->function == &functions->fun_emacs );
+				 cur->request->function == &functions->fun_emacs		||
+				 cur->request->function == &functions->fun_upload );
 }