mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
yWeb 2.8.a.4
- updated nhttpd - Code clean up - changes to nhttpd.conf - some changes for logo display git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@416 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
yjogol
@@ -28,7 +28,8 @@
|
||||
//=============================================================================
|
||||
// Initialization of static variables
|
||||
//=============================================================================
|
||||
pthread_mutex_t CyParser::yParser_mutex = PTHREAD_MUTEX_INITIALIZER;;
|
||||
pthread_mutex_t CyParser::yParser_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
;
|
||||
std::string CyParser::HTML_DIRS[HTML_DIR_COUNT];
|
||||
std::string CyParser::PLUGIN_DIRS[PLUGIN_DIR_COUNT];
|
||||
std::map<std::string, std::string> CyParser::ycgi_global_vars;
|
||||
@@ -39,64 +40,59 @@ std::string CyParser::yCached_blocks_content;
|
||||
//=============================================================================
|
||||
// Constructor & Destructor
|
||||
//=============================================================================
|
||||
CyParser::CyParser()
|
||||
{
|
||||
CyParser::CyParser() {
|
||||
yConfig = new CConfigFile(',');
|
||||
yCached_blocks_attrib.st_mtime = 0;
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
CyParser::~CyParser(void)
|
||||
{
|
||||
if(yConfig != NULL)
|
||||
CyParser::~CyParser(void) {
|
||||
if (yConfig != NULL)
|
||||
delete yConfig;
|
||||
}
|
||||
//-----------------------------------------------------------------------------
|
||||
void CyParser::init(CyhookHandler *hh)
|
||||
{
|
||||
if(HTML_DIRS[0] == "")
|
||||
{
|
||||
CyParser::HTML_DIRS[0]=hh->WebserverConfigList["PublicDocumentRoot"];
|
||||
HTML_DIRS[1]=hh->WebserverConfigList["PrivatDocumentRoot"];
|
||||
PLUGIN_DIRS[0]=HTML_DIRS[0];
|
||||
void CyParser::init(CyhookHandler *hh) {
|
||||
if (HTML_DIRS[0] == "") {
|
||||
CyParser::HTML_DIRS[0] = hh->WebserverConfigList["WebsiteMain.override_directory"];
|
||||
HTML_DIRS[1] = hh->WebserverConfigList["WebsiteMain.directory"];
|
||||
PLUGIN_DIRS[0] = HTML_DIRS[0];
|
||||
PLUGIN_DIRS[0].append("/scripts");
|
||||
PLUGIN_DIRS[1]=HTML_DIRS[1];
|
||||
PLUGIN_DIRS[1] = HTML_DIRS[1];
|
||||
PLUGIN_DIRS[1].append("/scripts");
|
||||
}
|
||||
}
|
||||
//=============================================================================
|
||||
// Main Dispatcher / Call definitions for /y/<dispatch>
|
||||
//=============================================================================
|
||||
const CyParser::TyCgiCall CyParser::yCgiCallList[]=
|
||||
{
|
||||
{"cgi", &CyParser::cgi, "text/html; charset=UTF-8"},
|
||||
const CyParser::TyCgiCall CyParser::yCgiCallList[] = {
|
||||
{ "cgi", &CyParser::cgi, "text/html; charset=UTF-8" },
|
||||
#ifdef Y_CONFIG_FEATURE_SHOW_SERVER_CONFIG
|
||||
{"server-config", &CyParser::cgi_server_config, "text/html"},
|
||||
{ "server-config", &CyParser::cgi_server_config, "text/html"},
|
||||
#endif
|
||||
};
|
||||
};
|
||||
//-----------------------------------------------------------------------------
|
||||
// HOOK: response_hook Handler
|
||||
// This is the main dispatcher for this module
|
||||
//-----------------------------------------------------------------------------
|
||||
THandleStatus CyParser::Hook_SendResponse(CyhookHandler *hh)
|
||||
{
|
||||
THandleStatus CyParser::Hook_SendResponse(CyhookHandler *hh) {
|
||||
hh->status = HANDLED_NONE;
|
||||
|
||||
log_level_printf(4,"yparser hook start url:%s\n",hh->UrlData["url"].c_str());
|
||||
log_level_printf(4, "yparser hook start url:%s\n",
|
||||
hh->UrlData["url"].c_str());
|
||||
init(hh);
|
||||
|
||||
CyParser *yP = new CyParser(); // create a Session
|
||||
if(hh->UrlData["fileext"] == "yhtm") // yParser for yhtm-File
|
||||
CyParser *yP = new CyParser(); // create a Session
|
||||
if (hh->UrlData["fileext"] == "yhtm") // yParser for yhtm-File
|
||||
yP->ParseAndSendFile(hh);
|
||||
else if(hh->UrlData["path"] == "/y/") // /y/<cgi> commands
|
||||
else if (hh->UrlData["path"] == "/y/") // /y/<cgi> commands
|
||||
{
|
||||
yP->Execute(hh);
|
||||
if(hh->status == HANDLED_NOT_IMPLEMENTED)
|
||||
hh->status = HANDLED_NONE; // y-calls can be implemented anywhere
|
||||
if (hh->status == HANDLED_NOT_IMPLEMENTED)
|
||||
hh->status = HANDLED_NONE; // y-calls can be implemented anywhere
|
||||
}
|
||||
delete yP;
|
||||
|
||||
// log_level_printf(4,"yparser hook end status:%d\n",(int)hh->status);
|
||||
// log_level_printf(5,"yparser hook result:%s\n",hh->yresult.c_str());
|
||||
// log_level_printf(4,"yparser hook end status:%d\n",(int)hh->status);
|
||||
// log_level_printf(5,"yparser hook result:%s\n",hh->yresult.c_str());
|
||||
|
||||
return hh->status;
|
||||
}
|
||||
@@ -104,40 +100,39 @@ THandleStatus CyParser::Hook_SendResponse(CyhookHandler *hh)
|
||||
//-----------------------------------------------------------------------------
|
||||
// URL Function Dispatching
|
||||
//-----------------------------------------------------------------------------
|
||||
void CyParser::Execute(CyhookHandler *hh)
|
||||
{
|
||||
void CyParser::Execute(CyhookHandler *hh) {
|
||||
int index = -1;
|
||||
std::string filename = hh->UrlData["filename"];
|
||||
|
||||
log_level_printf(4,"yParser.Execute filename%s\n",filename.c_str());
|
||||
log_level_printf(4, "yParser.Execute filename%s\n", filename.c_str());
|
||||
filename = string_tolower(filename);
|
||||
|
||||
// debugging informations
|
||||
if(CLogging::getInstance()->getDebug())
|
||||
{
|
||||
dprintf("Execute CGI : %s\n",filename.c_str());
|
||||
for(CStringList::iterator it = hh->ParamList.begin() ;
|
||||
it != hh->ParamList.end() ; it++)
|
||||
dprintf(" Parameter %s : %s\n",it->first.c_str(), it->second.c_str());
|
||||
if (CLogging::getInstance()->getDebug()) {
|
||||
dprintf("Execute CGI : %s\n", filename.c_str());
|
||||
for (CStringList::iterator it = hh->ParamList.begin(); it
|
||||
!= hh->ParamList.end(); it++)
|
||||
dprintf(" Parameter %s : %s\n", it->first.c_str(),
|
||||
it->second.c_str());
|
||||
}
|
||||
|
||||
// get function index
|
||||
for(unsigned int i = 0;i < (sizeof(yCgiCallList)/sizeof(yCgiCallList[0])); i++)
|
||||
if (filename == yCgiCallList[i].func_name)
|
||||
{
|
||||
for (unsigned int i = 0; i < (sizeof(yCgiCallList)
|
||||
/ sizeof(yCgiCallList[0])); i++)
|
||||
if (filename == yCgiCallList[i].func_name) {
|
||||
index = i;
|
||||
break;
|
||||
}
|
||||
if(index == -1) // function not found
|
||||
if (index == -1) // function not found
|
||||
{
|
||||
hh->SetError(HTTP_NOT_IMPLEMENTED, HANDLED_NOT_IMPLEMENTED);
|
||||
return;
|
||||
}
|
||||
|
||||
// send header
|
||||
if(std::string(yCgiCallList[index].mime_type) == "") // set by self
|
||||
if (std::string(yCgiCallList[index].mime_type) == "") // set by self
|
||||
;
|
||||
else if(std::string(yCgiCallList[index].mime_type) == "+xml") // Parameter xml?
|
||||
else if (std::string(yCgiCallList[index].mime_type) == "+xml") // Parameter xml?
|
||||
if (hh->ParamList["xml"] != "")
|
||||
hh->SetHeader(HTTP_OK, "text/xml");
|
||||
else
|
||||
@@ -146,10 +141,9 @@ void CyParser::Execute(CyhookHandler *hh)
|
||||
hh->SetHeader(HTTP_OK, yCgiCallList[index].mime_type);
|
||||
// response
|
||||
hh->status = HANDLED_READY;
|
||||
if (hh->Method == M_HEAD) // HEAD or function call
|
||||
if (hh->Method == M_HEAD) // HEAD or function call
|
||||
return;
|
||||
else
|
||||
{
|
||||
else {
|
||||
(this->*yCgiCallList[index].pfunc)(hh);
|
||||
return;
|
||||
}
|
||||
@@ -161,13 +155,11 @@ void CyParser::Execute(CyhookHandler *hh)
|
||||
//-----------------------------------------------------------------------------
|
||||
// mini cgi Engine (Entry for ycgi)
|
||||
//-----------------------------------------------------------------------------
|
||||
void CyParser::cgi(CyhookHandler *hh)
|
||||
{
|
||||
void CyParser::cgi(CyhookHandler *hh) {
|
||||
bool ydebug = false;
|
||||
std::string htmlfilename, yresult, ycmd;
|
||||
|
||||
if (hh->ParamList.size() > 0)
|
||||
{
|
||||
if (hh->ParamList.size() > 0) {
|
||||
if (hh->ParamList["tmpl"] != "") // for GET and POST
|
||||
htmlfilename = hh->ParamList["tmpl"];
|
||||
else
|
||||
@@ -183,12 +175,11 @@ void CyParser::cgi(CyhookHandler *hh)
|
||||
yresult = cgi_cmd_parsing(hh, ycmd, ydebug); // parsing engine
|
||||
}
|
||||
// parsing given file
|
||||
if(htmlfilename != "")
|
||||
if (htmlfilename != "")
|
||||
yresult = cgi_file_parsing(hh, htmlfilename, ydebug);
|
||||
}
|
||||
else
|
||||
} else
|
||||
printf("[CyParser] Y-cgi:no parameter given\n");
|
||||
if (yresult.length()<=0)
|
||||
if (yresult.length() <= 0)
|
||||
hh->SetError(HTTP_NOT_IMPLEMENTED, HANDLED_NOT_IMPLEMENTED);
|
||||
else
|
||||
hh->addResult(yresult, HANDLED_READY);
|
||||
@@ -212,17 +203,17 @@ void CyParser::cgi_server_config(CyhookHandler *hh)
|
||||
// Cofig file
|
||||
yresult += string_printf("<table border=\"1\">\n");
|
||||
CStringList::iterator i = (hh->WebserverConfigList).begin();
|
||||
for ( ; i!= (hh->WebserverConfigList).end(); i++ )
|
||||
for (; i!= (hh->WebserverConfigList).end(); i++ )
|
||||
{
|
||||
if( ((*i).first) != "mod_auth.username" && ((*i).first) != "mod_auth.password")
|
||||
yresult += string_printf("<tr><td>%s</td><td>%s</td></tr>\n", ((*i).first).c_str(), ((*i).second).c_str());
|
||||
yresult += string_printf("<tr><td>%s</td><td>%s</td></tr>\n", ((*i).first).c_str(), ((*i).second).c_str());
|
||||
}
|
||||
yresult += string_printf("</table>\n");
|
||||
// hook list
|
||||
yresult += string_printf("<br/><b>Hooks (Compiled)</b><br/>\n");
|
||||
yresult += string_printf("<table border=\"1\">\n");
|
||||
THookList::iterator j = hh->HookList.begin();
|
||||
for ( ; j!= hh->HookList.end(); j++ )
|
||||
for (; j!= hh->HookList.end(); j++ )
|
||||
{
|
||||
yresult += string_printf("<tr><td>%s</td><td>%s</td></tr>\n", ((*j)->getHookName()).c_str(), ((*j)->getHookVersion()).c_str());
|
||||
}
|
||||
@@ -235,35 +226,34 @@ void CyParser::cgi_server_config(CyhookHandler *hh)
|
||||
//=============================================================================
|
||||
// y Parsing and sending .yhtm Files (Main ENTRY)
|
||||
//=============================================================================
|
||||
void CyParser::ParseAndSendFile(CyhookHandler *hh)
|
||||
{
|
||||
void CyParser::ParseAndSendFile(CyhookHandler *hh) {
|
||||
bool ydebug = false;
|
||||
std::string yresult, ycmd;
|
||||
log_level_printf(3,"yParser.ParseAndSendFile: File: %s\n",(hh->UrlData["filename"]).c_str());
|
||||
log_level_printf(3, "yParser.ParseAndSendFile: File: %s\n",
|
||||
(hh->UrlData["filename"]).c_str());
|
||||
|
||||
hh->SetHeader(HTTP_OK, "text/html; charset=UTF-8");
|
||||
if (hh->Method == M_HEAD)
|
||||
return;
|
||||
if (hh->ParamList["debug"] != "") // switch debug on
|
||||
if (hh->ParamList["debug"] != "") // switch debug on
|
||||
ydebug = true;
|
||||
if (hh->ParamList["execute"] != "") // execute done first!
|
||||
if (hh->ParamList["execute"] != "") // execute done first!
|
||||
{
|
||||
ycmd = hh->ParamList["execute"];
|
||||
ycmd = YPARSER_ESCAPE_START + ycmd + YPARSER_ESCAPE_END;
|
||||
log_level_printf(3,"<yParser.ParseAndSendFile>: Execute!: %s\n",ycmd.c_str());
|
||||
yresult = cgi_cmd_parsing(hh, ycmd, ydebug); // parsing engine
|
||||
log_level_printf(3, "<yParser.ParseAndSendFile>: Execute!: %s\n",
|
||||
ycmd.c_str());
|
||||
yresult = cgi_cmd_parsing(hh, ycmd, ydebug); // parsing engine
|
||||
}
|
||||
// parsing given file
|
||||
yresult += cgi_file_parsing(hh, hh->UrlData["filename"], ydebug);
|
||||
if (yresult.length()<=0)
|
||||
if (yresult.length() <= 0)
|
||||
hh->SetError(HTTP_NOT_IMPLEMENTED, HANDLED_NOT_IMPLEMENTED);
|
||||
else
|
||||
{
|
||||
hh->addResult(yresult,HANDLED_READY);
|
||||
if(!ycgi_vars["cancache"].empty())
|
||||
{
|
||||
hh->HookVarList["CacheCategory"]=ycgi_vars["cancache"];
|
||||
hh->HookVarList["CacheMimeType"]= hh->ResponseMimeType;
|
||||
else {
|
||||
hh->addResult(yresult, HANDLED_READY);
|
||||
if (!ycgi_vars["cancache"].empty()) {
|
||||
hh->HookVarList["CacheCategory"] = ycgi_vars["cancache"];
|
||||
hh->HookVarList["CacheMimeType"] = hh->ResponseMimeType;
|
||||
hh->status = HANDLED_CONTINUE;
|
||||
}
|
||||
}
|
||||
@@ -275,26 +265,23 @@ void CyParser::ParseAndSendFile(CyhookHandler *hh)
|
||||
//-----------------------------------------------------------------------------
|
||||
// mini cgi Engine (file parsing)
|
||||
//-----------------------------------------------------------------------------
|
||||
std::string CyParser::cgi_file_parsing(CyhookHandler *hh, std::string htmlfilename, bool ydebug)
|
||||
{
|
||||
std::string CyParser::cgi_file_parsing(CyhookHandler *hh,
|
||||
std::string htmlfilename, bool ydebug) {
|
||||
bool found = false;
|
||||
std::string htmlfullfilename, yresult, html_template;
|
||||
|
||||
char cwd[255];
|
||||
getcwd(cwd, 254);
|
||||
for (unsigned int i=0;i<HTML_DIR_COUNT && !found;i++)
|
||||
{
|
||||
htmlfullfilename = HTML_DIRS[i]+"/"+htmlfilename;
|
||||
for (unsigned int i = 0; i < HTML_DIR_COUNT && !found; i++) {
|
||||
htmlfullfilename = HTML_DIRS[i] + "/" + htmlfilename;
|
||||
std::fstream fin(htmlfullfilename.c_str(), std::fstream::in);
|
||||
if(fin.good())
|
||||
{
|
||||
if (fin.good()) {
|
||||
found = true;
|
||||
chdir(HTML_DIRS[i].c_str()); // set working dir
|
||||
|
||||
// read whole file into html_template
|
||||
std::string ytmp;
|
||||
while (!fin.eof())
|
||||
{
|
||||
while (!fin.eof()) {
|
||||
getline(fin, ytmp);
|
||||
html_template = html_template + ytmp + "\r\n";
|
||||
}
|
||||
@@ -303,11 +290,11 @@ std::string CyParser::cgi_file_parsing(CyhookHandler *hh, std::string htmlfilena
|
||||
}
|
||||
}
|
||||
chdir(cwd);
|
||||
if (!found)
|
||||
{
|
||||
printf("[CyParser] Y-cgi:template %s not found in\n",htmlfilename.c_str());
|
||||
for (unsigned int i=0;i<HTML_DIR_COUNT;i++) {
|
||||
printf("%s\n",HTML_DIRS[i].c_str());
|
||||
if (!found) {
|
||||
printf("[CyParser] Y-cgi:template %s not found in\n",
|
||||
htmlfilename.c_str());
|
||||
for (unsigned int i = 0; i < HTML_DIR_COUNT; i++) {
|
||||
printf("%s\n", HTML_DIRS[i].c_str());
|
||||
}
|
||||
}
|
||||
return yresult;
|
||||
@@ -316,37 +303,48 @@ std::string CyParser::cgi_file_parsing(CyhookHandler *hh, std::string htmlfilena
|
||||
//-----------------------------------------------------------------------------
|
||||
// main parsing (nested and recursive)
|
||||
//-----------------------------------------------------------------------------
|
||||
std::string CyParser::cgi_cmd_parsing(CyhookHandler *hh, std::string html_template, bool ydebug)
|
||||
{
|
||||
std::string CyParser::cgi_cmd_parsing(CyhookHandler *hh,
|
||||
std::string html_template, bool ydebug) {
|
||||
std::string::size_type start, end;
|
||||
unsigned int esc_len = strlen(YPARSER_ESCAPE_START);
|
||||
bool is_cmd;
|
||||
std::string ycmd,yresult;
|
||||
std::string ycmd, yresult;
|
||||
|
||||
do // replace all {=<cmd>=} nested and recursive
|
||||
{
|
||||
is_cmd=false;
|
||||
if((end = html_template.find(YPARSER_ESCAPE_END)) != std::string::npos) // 1. find first y-end
|
||||
is_cmd = false;
|
||||
if ((end = html_template.find(YPARSER_ESCAPE_END)) != std::string::npos) // 1. find first y-end
|
||||
{
|
||||
if(ydebug) hh->printf("[ycgi debug]: END at:%d following:%s<br/>\n", end, (html_template.substr(end, 10)).c_str() );
|
||||
if((start = html_template.rfind(YPARSER_ESCAPE_START, end)) != std::string::npos) // 2. find next y-start befor
|
||||
if (ydebug)
|
||||
hh->printf("[ycgi debug]: END at:%d following:%s<br/>\n", end,
|
||||
(html_template.substr(end, 10)).c_str());
|
||||
if ((start = html_template.rfind(YPARSER_ESCAPE_START, end))
|
||||
!= std::string::npos) // 2. find next y-start befor
|
||||
{
|
||||
if(ydebug) hh->printf("[ycgi debug]: START at:%d following:%s<br/>\n", start, (html_template.substr(start+esc_len, 10)).c_str() );
|
||||
if (ydebug)
|
||||
hh->printf("[ycgi debug]: START at:%d following:%s<br/>\n",
|
||||
start,
|
||||
(html_template.substr(start + esc_len, 10)).c_str());
|
||||
|
||||
ycmd = html_template.substr(start+esc_len,end - (start+esc_len)); //3. get cmd
|
||||
if(ydebug) hh->printf("[ycgi debug]: CMD:[%s]<br/>\n", ycmd.c_str());
|
||||
yresult = YWeb_cgi_cmd( hh, ycmd ); // 4. execute cmd
|
||||
log_level_printf(5,"<yLoop>: ycmd...:%s\n",ycmd.c_str());
|
||||
log_level_printf(6,"<yLoop>: yresult:%s\n",yresult.c_str());
|
||||
if(ydebug) hh->printf("[ycgi debug]: RESULT:[%s]<br/>\n", yresult.c_str());
|
||||
html_template.replace(start,end - start + esc_len, yresult); // 5. replace cmd with output
|
||||
is_cmd = true; // one command found
|
||||
ycmd = html_template.substr(start + esc_len, end - (start
|
||||
+ esc_len)); //3. get cmd
|
||||
if (ydebug)
|
||||
hh->printf("[ycgi debug]: CMD:[%s]<br/>\n", ycmd.c_str());
|
||||
yresult = YWeb_cgi_cmd(hh, ycmd); // 4. execute cmd
|
||||
log_level_printf(5, "<yLoop>: ycmd...:%s\n", ycmd.c_str());
|
||||
log_level_printf(6, "<yLoop>: yresult:%s\n", yresult.c_str());
|
||||
if (ydebug)
|
||||
hh->printf("[ycgi debug]: RESULT:[%s]<br/>\n",
|
||||
yresult.c_str());
|
||||
html_template.replace(start, end - start + esc_len, yresult); // 5. replace cmd with output
|
||||
is_cmd = true; // one command found
|
||||
|
||||
if(ydebug) hh->printf("[ycgi debug]: STEP<br/>\n%s<br/>\n", html_template.c_str() );
|
||||
if (ydebug)
|
||||
hh->printf("[ycgi debug]: STEP<br/>\n%s<br/>\n",
|
||||
html_template.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
while(is_cmd);
|
||||
} while (is_cmd);
|
||||
return html_template;
|
||||
}
|
||||
//=============================================================================
|
||||
@@ -373,171 +371,124 @@ std::string CyParser::cgi_cmd_parsing(CyhookHandler *hh, std::string html_templ
|
||||
// L:<translation-id>
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd)
|
||||
{
|
||||
std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
|
||||
std::string ycmd_type, ycmd_name, yresult;
|
||||
|
||||
if (ySplitString(ycmd,":",ycmd_type,ycmd_name))
|
||||
{
|
||||
if(ycmd_type == "L")
|
||||
if (ySplitString(ycmd, ":", ycmd_type, ycmd_name)) {
|
||||
if (ycmd_type == "L")
|
||||
yresult = CLanguage::getInstance()->getTranslation(ycmd_name);
|
||||
else if(ycmd_type == "script")
|
||||
else if (ycmd_type == "script")
|
||||
yresult = YexecuteScript(hh, ycmd_name);
|
||||
else if(ycmd_type == "if-empty")
|
||||
{
|
||||
else if (ycmd_type == "if-empty") {
|
||||
std::string if_value, if_then, if_else;
|
||||
if(ySplitString(ycmd_name,"~",if_value,if_then))
|
||||
{
|
||||
ySplitString(if_then,"~",if_then,if_else);
|
||||
if (ySplitString(ycmd_name, "~", if_value, if_then)) {
|
||||
ySplitString(if_then, "~", if_then, if_else);
|
||||
yresult = (if_value == "") ? if_then : if_else;
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "if-equal")
|
||||
{
|
||||
} else if (ycmd_type == "if-equal") {
|
||||
std::string if_left_value, if_right_value, if_then, if_else;
|
||||
if(ySplitString(ycmd_name,"~",if_left_value,if_right_value))
|
||||
{
|
||||
if(ySplitString(if_right_value,"~",if_right_value,if_then))
|
||||
{
|
||||
ySplitString(if_then,"~",if_then,if_else);
|
||||
yresult = (if_left_value == if_right_value) ? if_then : if_else;
|
||||
if (ySplitString(ycmd_name, "~", if_left_value, if_right_value)) {
|
||||
if (ySplitString(if_right_value, "~", if_right_value, if_then)) {
|
||||
ySplitString(if_then, "~", if_then, if_else);
|
||||
yresult = (if_left_value == if_right_value) ? if_then
|
||||
: if_else;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "if-not-equal")
|
||||
{
|
||||
} else if (ycmd_type == "if-not-equal") {
|
||||
std::string if_left_value, if_right_value, if_then, if_else;
|
||||
if(ySplitString(ycmd_name,"~",if_left_value,if_right_value))
|
||||
{
|
||||
if(ySplitString(if_right_value,"~",if_right_value,if_then))
|
||||
{
|
||||
ySplitString(if_then,"~",if_then,if_else);
|
||||
yresult = (if_left_value != if_right_value) ? if_then : if_else;
|
||||
if (ySplitString(ycmd_name, "~", if_left_value, if_right_value)) {
|
||||
if (ySplitString(if_right_value, "~", if_right_value, if_then)) {
|
||||
ySplitString(if_then, "~", if_then, if_else);
|
||||
yresult = (if_left_value != if_right_value) ? if_then
|
||||
: if_else;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "if-file-exists")
|
||||
{
|
||||
} else if (ycmd_type == "if-file-exists") {
|
||||
std::string if_value, if_then, if_else;
|
||||
if(ySplitString(ycmd_name,"~",if_value,if_then))
|
||||
{
|
||||
ySplitString(if_then,"~",if_then,if_else);
|
||||
yresult = (access(if_value.c_str(), 4) == 0) ? if_then : if_else;
|
||||
if (ySplitString(ycmd_name, "~", if_value, if_then)) {
|
||||
ySplitString(if_then, "~", if_then, if_else);
|
||||
yresult = (access(if_value.c_str(), 4) == 0) ? if_then
|
||||
: if_else;
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "include")
|
||||
{
|
||||
} else if (ycmd_type == "include") {
|
||||
std::string ytmp;
|
||||
std::fstream fin(ycmd_name.c_str(), std::fstream::in);
|
||||
if(fin.good())
|
||||
{
|
||||
while (!fin.eof())
|
||||
{
|
||||
if (fin.good()) {
|
||||
while (!fin.eof()) {
|
||||
getline(fin, ytmp);
|
||||
yresult += ytmp +"\n";
|
||||
yresult += ytmp + "\n";
|
||||
}
|
||||
fin.close();
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "include-block")
|
||||
{
|
||||
} else if (ycmd_type == "include-block") {
|
||||
std::string filename, blockname, tmp, ydefault;
|
||||
if (ySplitString(ycmd_name,";",filename,tmp))
|
||||
{
|
||||
ySplitString(tmp,";",blockname, ydefault);
|
||||
if (ySplitString(ycmd_name, ";", filename, tmp)) {
|
||||
ySplitString(tmp, ";", blockname, ydefault);
|
||||
yresult = YWeb_cgi_include_block(filename, blockname, ydefault);
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "func")
|
||||
} else if (ycmd_type == "func")
|
||||
yresult = this->YWeb_cgi_func(hh, ycmd_name);
|
||||
else if(ycmd_type == "ini-get")
|
||||
{
|
||||
else if (ycmd_type == "ini-get") {
|
||||
std::string filename, varname, tmp, ydefault, yaccess;
|
||||
ySplitString(ycmd_name,"~",filename,yaccess);
|
||||
if (ySplitString(filename,";",filename,tmp))
|
||||
{
|
||||
ySplitString(tmp,";",varname, ydefault);
|
||||
ySplitString(ycmd_name, "~", filename, yaccess);
|
||||
if (ySplitString(filename, ";", filename, tmp)) {
|
||||
ySplitString(tmp, ";", varname, ydefault);
|
||||
yresult = YWeb_cgi_get_ini(hh, filename, varname, yaccess);
|
||||
if(yresult == "" && ydefault != "")
|
||||
if (yresult == "" && ydefault != "")
|
||||
yresult = ydefault;
|
||||
}
|
||||
else
|
||||
} else
|
||||
yresult = "ycgi: ini-get: no ; found";
|
||||
}
|
||||
else if(ycmd_type == "ini-set")
|
||||
{
|
||||
} else if (ycmd_type == "ini-set") {
|
||||
std::string filename, varname, varvalue, tmp, yaccess;
|
||||
ySplitString(ycmd_name,"~",filename,yaccess);
|
||||
if (ySplitString(filename,";",filename,tmp))
|
||||
{
|
||||
if(ySplitString(tmp,";",varname, varvalue))
|
||||
ySplitString(ycmd_name, "~", filename, yaccess);
|
||||
if (ySplitString(filename, ";", filename, tmp)) {
|
||||
if (ySplitString(tmp, ";", varname, varvalue))
|
||||
YWeb_cgi_set_ini(hh, filename, varname, varvalue, yaccess);
|
||||
}
|
||||
else
|
||||
} else
|
||||
yresult = "ycgi: ini-get: no ; found";
|
||||
}
|
||||
else if(ycmd_type == "var-get")
|
||||
{
|
||||
} else if (ycmd_type == "var-get") {
|
||||
yresult = ycgi_vars[ycmd_name];
|
||||
}
|
||||
else if(ycmd_type == "var-set")
|
||||
{
|
||||
} else if (ycmd_type == "var-set") {
|
||||
std::string varname, varvalue;
|
||||
if (ySplitString(ycmd_name,"=",varname,varvalue))
|
||||
if (ySplitString(ycmd_name, "=", varname, varvalue))
|
||||
ycgi_vars[varname] = varvalue;
|
||||
}
|
||||
else if(ycmd_type == "global-var-get")
|
||||
{
|
||||
pthread_mutex_lock( &yParser_mutex );
|
||||
} else if (ycmd_type == "global-var-get") {
|
||||
pthread_mutex_lock(&yParser_mutex);
|
||||
yresult = ycgi_global_vars[ycmd_name];
|
||||
pthread_mutex_unlock( &yParser_mutex );
|
||||
}
|
||||
else if(ycmd_type == "global-var-set")
|
||||
{
|
||||
pthread_mutex_unlock(&yParser_mutex);
|
||||
} else if (ycmd_type == "global-var-set") {
|
||||
std::string varname, varvalue;
|
||||
if (ySplitString(ycmd_name,"=",varname,varvalue))
|
||||
{
|
||||
pthread_mutex_lock( &yParser_mutex );
|
||||
if (ySplitString(ycmd_name, "=", varname, varvalue)) {
|
||||
pthread_mutex_lock(&yParser_mutex);
|
||||
ycgi_global_vars[varname] = varvalue;
|
||||
pthread_mutex_unlock( &yParser_mutex );
|
||||
pthread_mutex_unlock(&yParser_mutex);
|
||||
}
|
||||
}
|
||||
else if(ycmd_type == "file-action")
|
||||
{
|
||||
} else if (ycmd_type == "file-action") {
|
||||
std::string filename, actionname, content, tmp, ydefault;
|
||||
if (ySplitString(ycmd_name,";",filename,tmp))
|
||||
{
|
||||
ySplitString(tmp,";",actionname, content);
|
||||
if (ySplitString(ycmd_name, ";", filename, tmp)) {
|
||||
ySplitString(tmp, ";", actionname, content);
|
||||
replace(content, "\r\n", "\n");
|
||||
if(actionname == "add")
|
||||
{
|
||||
std::fstream fout(filename.c_str(), std::fstream::out|std::fstream::binary);
|
||||
if (actionname == "add") {
|
||||
std::fstream fout(filename.c_str(), std::fstream::out
|
||||
| std::fstream::binary);
|
||||
fout << content;
|
||||
fout.close();
|
||||
}
|
||||
else
|
||||
if(actionname == "append")
|
||||
{
|
||||
std::fstream fout(filename.c_str(), std::fstream::app|std::fstream::binary );
|
||||
} else if (actionname == "append") {
|
||||
std::fstream fout(filename.c_str(), std::fstream::app
|
||||
| std::fstream::binary);
|
||||
fout << content;
|
||||
fout.close();
|
||||
}
|
||||
else
|
||||
if(actionname == "delete")
|
||||
{
|
||||
} else if (actionname == "delete") {
|
||||
remove(filename.c_str());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
} else
|
||||
yresult = "ycgi-type unknown";
|
||||
}
|
||||
else if (hh->ParamList[ycmd] != "")
|
||||
{
|
||||
if((hh->ParamList[ycmd]).find("script") == std::string::npos)
|
||||
} else if (hh->ParamList[ycmd] != "") {
|
||||
if ((hh->ParamList[ycmd]).find("script") == std::string::npos)
|
||||
yresult = hh->ParamList[ycmd];
|
||||
else
|
||||
yresult = "<!--Not Allowed script in "+ycmd+" -->";
|
||||
yresult = "<!--Not Allowed script in " + ycmd + " -->";
|
||||
}
|
||||
|
||||
return yresult;
|
||||
@@ -547,11 +498,10 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd)
|
||||
// Get Value from ini/conf-file (filename) for var (varname)
|
||||
// yaccess = open | cache
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::YWeb_cgi_get_ini(CyhookHandler *, std::string filename, std::string varname, std::string yaccess)
|
||||
{
|
||||
std::string CyParser::YWeb_cgi_get_ini(CyhookHandler *, std::string filename,
|
||||
std::string varname, std::string yaccess) {
|
||||
std::string result;
|
||||
if((yaccess == "open") || (yaccess == ""))
|
||||
{
|
||||
if ((yaccess == "open") || (yaccess == "")) {
|
||||
yConfig->clear();
|
||||
yConfig->loadConfig(filename);
|
||||
}
|
||||
@@ -563,16 +513,15 @@ std::string CyParser::YWeb_cgi_get_ini(CyhookHandler *, std::string filename, s
|
||||
// set Value from ini/conf-file (filename) for var (varname)
|
||||
// yaccess = open | cache | save
|
||||
//-------------------------------------------------------------------------
|
||||
void CyParser::YWeb_cgi_set_ini(CyhookHandler *, std::string filename, std::string varname, std::string varvalue, std::string yaccess)
|
||||
{
|
||||
void CyParser::YWeb_cgi_set_ini(CyhookHandler *, std::string filename,
|
||||
std::string varname, std::string varvalue, std::string yaccess) {
|
||||
std::string result;
|
||||
if((yaccess == "open") || (yaccess == ""))
|
||||
{
|
||||
if ((yaccess == "open") || (yaccess == "")) {
|
||||
yConfig->clear();
|
||||
yConfig->loadConfig(filename);
|
||||
}
|
||||
yConfig->setString(varname, varvalue);
|
||||
if((yaccess == "save") || (yaccess == ""))
|
||||
if ((yaccess == "save") || (yaccess == ""))
|
||||
yConfig->saveConfig(filename);
|
||||
}
|
||||
|
||||
@@ -581,34 +530,31 @@ void CyParser::YWeb_cgi_set_ini(CyhookHandler *, std::string filename, std::str
|
||||
// The textblock starts with "start-block~<blockname>" and ends with
|
||||
// "end-block~<blockname>"
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::YWeb_cgi_include_block(std::string filename, std::string blockname, std::string ydefault)
|
||||
{
|
||||
std::string CyParser::YWeb_cgi_include_block(std::string filename,
|
||||
std::string blockname, std::string ydefault) {
|
||||
std::string ytmp, yfile, yresult;
|
||||
struct stat attrib;
|
||||
yresult = ydefault;
|
||||
|
||||
stat(filename.c_str(), &attrib);
|
||||
|
||||
pthread_mutex_lock( &yParser_mutex );
|
||||
if( (attrib.st_mtime == yCached_blocks_attrib.st_mtime) && (filename == yCached_blocks_filename) )
|
||||
{
|
||||
log_level_printf(6, "include-block: (%s) from cache\n", blockname.c_str() );
|
||||
pthread_mutex_lock(&yParser_mutex);
|
||||
if ((attrib.st_mtime == yCached_blocks_attrib.st_mtime) && (filename
|
||||
== yCached_blocks_filename)) {
|
||||
log_level_printf(6, "include-block: (%s) from cache\n",
|
||||
blockname.c_str());
|
||||
yfile = yCached_blocks_content;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
bool found = false;
|
||||
for (unsigned int i=0;i<HTML_DIR_COUNT && !found;i++)
|
||||
{
|
||||
std::string ifilename = HTML_DIRS[i]+"/"+filename;
|
||||
for (unsigned int i = 0; i < HTML_DIR_COUNT && !found; i++) {
|
||||
std::string ifilename = HTML_DIRS[i] + "/" + filename;
|
||||
std::fstream fin(ifilename.c_str(), std::fstream::in);
|
||||
if(fin.good())
|
||||
{
|
||||
if (fin.good()) {
|
||||
found = true;
|
||||
while (!fin.eof()) // read whole file into yfile
|
||||
{
|
||||
getline(fin, ytmp);
|
||||
yfile += ytmp+"\n";
|
||||
yfile += ytmp + "\n";
|
||||
}
|
||||
fin.close();
|
||||
}
|
||||
@@ -616,69 +562,65 @@ std::string CyParser::YWeb_cgi_include_block(std::string filename, std::string
|
||||
yCached_blocks_content = yfile;
|
||||
yCached_blocks_attrib = attrib;
|
||||
yCached_blocks_filename = filename;
|
||||
log_level_printf(6, "include-block: (%s) from file\n", blockname.c_str() );
|
||||
log_level_printf(6, "include-block: (%s) from file\n",
|
||||
blockname.c_str());
|
||||
}
|
||||
pthread_mutex_unlock( &yParser_mutex );
|
||||
if(yfile.length() != 0)
|
||||
{
|
||||
std::string t = "start-block~"+blockname;
|
||||
pthread_mutex_unlock(&yParser_mutex);
|
||||
if (yfile.length() != 0) {
|
||||
std::string t = "start-block~" + blockname;
|
||||
std::string::size_type start, end;
|
||||
if((start = yfile.find(t)) != std::string::npos)
|
||||
{
|
||||
if((end = yfile.find("end-block~"+blockname, start+t.length())) != std::string::npos)
|
||||
{
|
||||
yresult = yfile.substr(start+t.length(),end - (start+t.length()) );
|
||||
log_level_printf(7, "include-block: (%s) yresult:(%s)\n", blockname.c_str(), yresult.c_str() );
|
||||
}
|
||||
else
|
||||
aprintf("include-blocks: Block END not found:%s Blockname:%s\n",filename.c_str() , blockname.c_str() );
|
||||
}
|
||||
else
|
||||
aprintf("include-blocks: Block START not found:%s Blockname:%s\n",filename.c_str() , blockname.c_str() );
|
||||
}
|
||||
else
|
||||
aprintf("include-blocks: file not found:%s Blockname:%s\n",filename.c_str() , blockname.c_str() );
|
||||
if ((start = yfile.find(t)) != std::string::npos) {
|
||||
if ((end = yfile.find("end-block~" + blockname, start + t.length()))
|
||||
!= std::string::npos) {
|
||||
yresult = yfile.substr(start + t.length(), end - (start
|
||||
+ t.length()));
|
||||
log_level_printf(7, "include-block: (%s) yresult:(%s)\n",
|
||||
blockname.c_str(), yresult.c_str());
|
||||
} else
|
||||
aprintf(
|
||||
"include-blocks: Block END not found:%s Blockname:%s\n",
|
||||
filename.c_str(), blockname.c_str());
|
||||
} else
|
||||
aprintf("include-blocks: Block START not found:%s Blockname:%s\n",
|
||||
filename.c_str(), blockname.c_str());
|
||||
} else
|
||||
aprintf("include-blocks: file not found:%s Blockname:%s\n",
|
||||
filename.c_str(), blockname.c_str());
|
||||
|
||||
return yresult;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
std::string CyParser::YexecuteScript(CyhookHandler *, std::string cmd)
|
||||
{
|
||||
std::string CyParser::YexecuteScript(CyhookHandler *, std::string cmd) {
|
||||
std::string script, para, result;
|
||||
bool found = false;
|
||||
|
||||
// split script and parameters
|
||||
int pos;
|
||||
if ((pos = cmd.find_first_of(" ")) > 0)
|
||||
{
|
||||
if ((pos = cmd.find_first_of(" ")) > 0) {
|
||||
script = cmd.substr(0, pos);
|
||||
para = cmd.substr(pos+1,cmd.length() - (pos+1)); // snip
|
||||
}
|
||||
else
|
||||
script=cmd;
|
||||
para = cmd.substr(pos + 1, cmd.length() - (pos + 1)); // snip
|
||||
} else
|
||||
script = cmd;
|
||||
// get file
|
||||
std::string fullfilename;
|
||||
script += ".sh"; //add script extention
|
||||
|
||||
char cwd[255];
|
||||
getcwd(cwd, 254);
|
||||
for (unsigned int i=0;i<PLUGIN_DIR_COUNT && !found;i++)
|
||||
{
|
||||
fullfilename = PLUGIN_DIRS[i]+"/"+script;
|
||||
FILE *test =fopen(fullfilename.c_str(),"r"); // use fopen: popen does not work
|
||||
if( test != NULL )
|
||||
{
|
||||
for (unsigned int i = 0; i < PLUGIN_DIR_COUNT && !found; i++) {
|
||||
fullfilename = PLUGIN_DIRS[i] + "/" + script;
|
||||
FILE *test = fopen(fullfilename.c_str(), "r"); // use fopen: popen does not work
|
||||
if (test != NULL) {
|
||||
fclose(test);
|
||||
chdir(PLUGIN_DIRS[i].c_str());
|
||||
FILE *f = popen( (fullfilename+" "+para).c_str(),"r"); //execute
|
||||
if (f != NULL)
|
||||
{
|
||||
FILE *f = popen((fullfilename + " " + para).c_str(), "r"); //execute
|
||||
if (f != NULL) {
|
||||
found = true;
|
||||
|
||||
char output[1024];
|
||||
while (fgets(output,1024,f)) // get script output
|
||||
while (fgets(output, 1024, f)) // get script output
|
||||
result += output;
|
||||
pclose(f);
|
||||
}
|
||||
@@ -686,13 +628,12 @@ std::string CyParser::YexecuteScript(CyhookHandler *, std::string cmd)
|
||||
}
|
||||
chdir(cwd);
|
||||
|
||||
if (!found)
|
||||
{
|
||||
printf("<yparser> script %s not found in\n",script.c_str());
|
||||
for (unsigned int i=0;i<PLUGIN_DIR_COUNT;i++) {
|
||||
printf("%s\n",PLUGIN_DIRS[i].c_str());
|
||||
if (!found) {
|
||||
printf("<yparser> script %s not found in\n", script.c_str());
|
||||
for (unsigned int i = 0; i < PLUGIN_DIR_COUNT; i++) {
|
||||
printf("%s\n", PLUGIN_DIRS[i].c_str());
|
||||
}
|
||||
result="error";
|
||||
result = "error";
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -704,42 +645,40 @@ std::string CyParser::YexecuteScript(CyhookHandler *, std::string cmd)
|
||||
// - Versions of httpd, yParser, Hooks,
|
||||
//=============================================================================
|
||||
|
||||
const CyParser::TyFuncCall CyParser::yFuncCallList[]=
|
||||
{
|
||||
{"get_request_data", &CyParser::func_get_request_data},
|
||||
{"get_header_data", &CyParser::func_get_header_data},
|
||||
{"get_config_data", &CyParser::func_get_config_data},
|
||||
{"do_reload_httpd_config", &CyParser::func_do_reload_httpd_config},
|
||||
{"httpd_change", &CyParser::func_change_httpd},
|
||||
{"get_languages_as_dropdown", &CyParser::func_get_languages_as_dropdown},
|
||||
{"set_language", &CyParser::func_set_language},
|
||||
const CyParser::TyFuncCall CyParser::yFuncCallList[] = {
|
||||
{ "get_request_data", &CyParser::func_get_request_data },
|
||||
{ "get_header_data", &CyParser::func_get_header_data },
|
||||
{ "get_config_data", &CyParser::func_get_config_data },
|
||||
{ "do_reload_httpd_config", &CyParser::func_do_reload_httpd_config },
|
||||
{ "httpd_change", &CyParser::func_change_httpd },
|
||||
{ "get_languages_as_dropdown", &CyParser::func_get_languages_as_dropdown },
|
||||
{ "set_language", &CyParser::func_set_language },
|
||||
};
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : dispatching and executing
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::YWeb_cgi_func(CyhookHandler *hh, std::string ycmd)
|
||||
{
|
||||
std::string func, para, yresult="ycgi func not found";
|
||||
std::string CyParser::YWeb_cgi_func(CyhookHandler *hh, std::string ycmd) {
|
||||
std::string func, para, yresult = "ycgi func not found";
|
||||
bool found = false;
|
||||
ySplitString(ycmd," ",func, para);
|
||||
ySplitString(ycmd, " ", func, para);
|
||||
|
||||
for(unsigned int i = 0;i < (sizeof(yFuncCallList)/sizeof(yFuncCallList[0])); i++)
|
||||
if (func == yFuncCallList[i].func_name)
|
||||
{
|
||||
for (unsigned int i = 0; i < (sizeof(yFuncCallList)
|
||||
/ sizeof(yFuncCallList[0])); i++)
|
||||
if (func == yFuncCallList[i].func_name) {
|
||||
yresult = (this->*yFuncCallList[i].pfunc)(hh, para);
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
log_level_printf(8,"<yparser: func>:%s Result:%s\n", func.c_str(), yresult.c_str() );
|
||||
log_level_printf(8, "<yparser: func>:%s Result:%s\n", func.c_str(),
|
||||
yresult.c_str());
|
||||
return yresult;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : get_request_data
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::func_get_request_data(CyhookHandler *hh, std::string para)
|
||||
{
|
||||
std::string CyParser::func_get_request_data(CyhookHandler *hh, std::string para) {
|
||||
std::string yresult;
|
||||
if (para == "client_addr")
|
||||
yresult = hh->UrlData["clientaddr"]; //compatibility TODO in yhtms
|
||||
@@ -750,16 +689,14 @@ std::string CyParser::func_get_request_data(CyhookHandler *hh, std::string para
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : get_header_data
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::func_get_header_data(CyhookHandler *hh, std::string para)
|
||||
{
|
||||
std::string CyParser::func_get_header_data(CyhookHandler *hh, std::string para) {
|
||||
return hh->HeaderList[para];
|
||||
}
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : get_header_data
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::func_get_config_data(CyhookHandler *hh, std::string para)
|
||||
{
|
||||
if(para != "mod_auth.username" && para != "mod_auth.password")
|
||||
std::string CyParser::func_get_config_data(CyhookHandler *hh, std::string para) {
|
||||
if (para != "mod_auth.username" && para != "mod_auth.password")
|
||||
return hh->WebserverConfigList[para];
|
||||
else
|
||||
return "empty";
|
||||
@@ -768,9 +705,8 @@ std::string CyParser::func_get_config_data(CyhookHandler *hh, std::string para)
|
||||
// y-func : Reload the httpd.conf
|
||||
//-------------------------------------------------------------------------
|
||||
extern void yhttpd_reload_config();
|
||||
std::string CyParser::func_do_reload_httpd_config(CyhookHandler *, std::string )
|
||||
{
|
||||
log_level_printf(1,"func_do_reload_httpd_config: raise USR1 !!!\n");
|
||||
std::string CyParser::func_do_reload_httpd_config(CyhookHandler *, std::string) {
|
||||
log_level_printf(1, "func_do_reload_httpd_config: raise USR1 !!!\n");
|
||||
//raise(SIGUSR1); // Send HUP-Signal to Reload Settings
|
||||
yhttpd_reload_config();
|
||||
return "";
|
||||
@@ -779,48 +715,47 @@ std::string CyParser::func_do_reload_httpd_config(CyhookHandler *, std::string
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : Change httpd (process image) on the fly
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::func_change_httpd(CyhookHandler *hh, std::string para)
|
||||
{
|
||||
if(para != "" && access(para.c_str(), 4) == 0)
|
||||
{
|
||||
std::string CyParser::func_change_httpd(CyhookHandler *hh, std::string para) {
|
||||
if (para != "" && access(para.c_str(), 4) == 0) {
|
||||
hh->status = HANDLED_ABORT;
|
||||
int err = execvp(para.c_str(), NULL); // no return if successful
|
||||
return "ERROR [change_httpd]: execvp returns error code: "+err;
|
||||
}
|
||||
else
|
||||
return "ERROR [change_httpd]: para has not path to a file";
|
||||
return "ERROR [change_httpd]: execvp returns error code: " + err;
|
||||
} else
|
||||
return "ERROR [change_httpd]: para has not path to a file";
|
||||
}
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : get_header_data
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::func_get_languages_as_dropdown(CyhookHandler *, std::string)
|
||||
{
|
||||
std::string CyParser::func_get_languages_as_dropdown(CyhookHandler *,
|
||||
std::string) {
|
||||
std::string yresult, sel;
|
||||
DIR *d;
|
||||
DIR *d;
|
||||
struct dirent *dir;
|
||||
|
||||
std::string act_language = CLanguage::getInstance()->language;
|
||||
d = opendir( (CLanguage::getInstance()->language_dir).c_str() );
|
||||
if( d != NULL ) {
|
||||
while( ( dir = readdir( d ) ) ) {
|
||||
if( strcmp( dir->d_name, "." ) == 0 || strcmp( dir->d_name, ".." ) == 0 )
|
||||
d = opendir((CLanguage::getInstance()->language_dir).c_str());
|
||||
if (d != NULL) {
|
||||
while ((dir = readdir(d))) {
|
||||
if (strcmp(dir->d_name, ".") == 0 || strcmp(dir->d_name, "..") == 0)
|
||||
continue;
|
||||
if( dir->d_type != DT_DIR ) {
|
||||
sel=(act_language==std::string(dir->d_name)) ? "selected=\"selected\"" : "";
|
||||
if (dir->d_type != DT_DIR) {
|
||||
sel
|
||||
= (act_language == std::string(dir->d_name)) ? "selected=\"selected\""
|
||||
: "";
|
||||
yresult += string_printf("<option value=%s %s>%s</option>\n",
|
||||
dir->d_name, sel.c_str(), (encodeString(std::string(dir->d_name))).c_str());
|
||||
dir->d_name, sel.c_str(), (encodeString(std::string(
|
||||
dir->d_name))).c_str());
|
||||
}
|
||||
}
|
||||
closedir( d );
|
||||
closedir(d);
|
||||
}
|
||||
return yresult;
|
||||
}
|
||||
//-------------------------------------------------------------------------
|
||||
// y-func : get_header_data
|
||||
//-------------------------------------------------------------------------
|
||||
std::string CyParser::func_set_language(CyhookHandler *, std::string para)
|
||||
{
|
||||
if(para != ""){
|
||||
std::string CyParser::func_set_language(CyhookHandler *, std::string para) {
|
||||
if (para != "") {
|
||||
CConfigFile *Config = new CConfigFile(',');
|
||||
Config->loadConfig(HTTPD_CONFIGFILE);
|
||||
Config->setString("Language.selected", para);
|
||||
|
||||
Reference in New Issue
Block a user