mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed blending out temporary file path in Linux

Browse Source
This commit is contained in:
Martin Raiber 2011-09-05 17:59:09 +02:00
parent cc73a6e4fd
commit b85c5cc3a1
4 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
urbackup/serverinterface/json.cpp
View File

@ -177,12 +177,34 @@ namespace JSON
{
init(val);
}
Value::Value(const char *val)
{
init(val);
}
Value::Value(const wchar_t *val)
{
init(val);
}
void Value::init(void)
{
data_type=null_type;
data=NULL;
}
void Value::init(const char *val)
{
data_type=str_type;
data=new std::string(val);
}
void Value::init(const wchar_t *val)
{
data_type=wstr_type;
data=new std::wstring(val);
}
void Value::init(const std::string &val)
{

10
urbackup/serverinterface/json.h
View File

@ -72,13 +72,19 @@ namespace JSON
Value(const std::string &val);
Value(const std::wstring &val);
Value(const Object &val);
Value(const Array &val);
Value(const Array &val)
;
Value(bool val);
Value(int val);
Value(unsigned int val);
Value(_i64 val);
Value(uint64 val);
Value(double val);
Value(const char* val);
Value(const wchar_t* val);
~Value();
Value & operator=(const Value &other);
@ -111,6 +117,8 @@ namespace JSON
void init(_i64 val);
void init(uint64 val);
void init(double val);
void init(const char* val);
void init(const wchar_t* val);
std::string escape(const std::string &t);

7
urbackup/serverinterface/settings.cpp
View File

@ -521,6 +521,13 @@ ACTION_IMPL(settings)
obj.set("max_active_clients", settings.max_active_clients);
obj.set("tmpdir", settings.tmpdir);
obj.set("cleanup_window", settings.cleanup_window);
#ifdef _WIN32
obj.set("ONLY_WIN32_BEGIN","");
obj.set("ONLY_WIN32_END","");
#else
obj.set("ONLY_WIN32_BEGIN","<!--");
obj.set("ONLY_WIN32_END","-->");
#endif //_WIN32
ret.set("settings", obj);
}

3
urbackup/www/urbackup.js
View File

@ -882,6 +882,9 @@ function show_settings2(data)
data.settings.no_compname_end="-->";
data.settings.client_plural="s";
data.settings.ONLY_WIN32_BEGIN=unescapeHTML(data.settings.ONLY_WIN32_BEGIN);
data.settings.ONLY_WIN32_END=unescapeHTML(data.settings.ONLY_WIN32_END);
data.settings.settings_inv=tmpls.settings_inv_row.evaluate(data.settings);
ndata+=tmpls.settings_general.evaluate(data.settings);