the first part of reimplementing has been done
now we have app object and singletons are only: log logn plugin and app git-svn-id: svn://ttmath.org/publicrep/winix/trunk@628 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
*/
|
||||
|
||||
#include "templates.h"
|
||||
#include "../core/data.h"
|
||||
#include "../core/request.h"
|
||||
#include "../core/misc.h"
|
||||
|
||||
@@ -28,21 +27,21 @@ void doc_title(Info & i)
|
||||
bool was_dir = false;
|
||||
|
||||
// from 1 means skipping the root directory
|
||||
for(a = 1 ; a<request.dir_table.size() ; ++a)
|
||||
for(a = 1 ; a<request->dir_table.size() ; ++a)
|
||||
{
|
||||
HtmlEscape(i.out, request.dir_table[a]->subject);
|
||||
HtmlEscape(i.out, request->dir_table[a]->subject);
|
||||
was_dir = true;
|
||||
|
||||
if( a < request.dir_table.size()-1 )
|
||||
i.out << data.title_separator;
|
||||
if( a < request->dir_table.size()-1 )
|
||||
i.out << config->title_separator;
|
||||
}
|
||||
|
||||
if( request.is_item )
|
||||
if( request->is_item )
|
||||
{
|
||||
if( was_dir )
|
||||
i.out << data.title_separator;
|
||||
i.out << config->title_separator;
|
||||
|
||||
HtmlEscape(i.out, request.item.subject);
|
||||
HtmlEscape(i.out, request->item.subject);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,32 +52,32 @@ void doc_title(Info & i)
|
||||
|
||||
void doc_base_url(Info & i)
|
||||
{
|
||||
i.out << data.base_url;
|
||||
i.out << config->base_url;
|
||||
}
|
||||
|
||||
|
||||
void doc_base_url_auth(Info & i)
|
||||
{
|
||||
i.out << data.base_url_auth;
|
||||
i.out << config->base_url_auth;
|
||||
}
|
||||
|
||||
|
||||
void doc_base_url_static(Info & i)
|
||||
{
|
||||
i.out << data.base_url_static;
|
||||
i.out << config->base_url_static;
|
||||
}
|
||||
|
||||
|
||||
void doc_base_url_common(Info & i)
|
||||
{
|
||||
i.out << data.base_url_common;
|
||||
i.out << config->base_url_common;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void doc_current_url(Info & i)
|
||||
{
|
||||
i.out << request.env_request_uri;
|
||||
i.out << request->env_request_uri;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user