flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added a WebAdmin interface to view users their groups, and the permissions of groups.

Browse Source 
cChunk::Tick did an assertion in cCSLock, I used a cCSUnlock to fix it, but not sure if this is correct.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@194 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth
2012-01-30 16:47:26 +00:00
parent 51dc47bc70
commit 9dfa0f1f15
12 changed files with 185 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/cWebPlugin_Lua.cpp
View File

@@ -84,18 +84,21 @@ std::string cWebPlugin_Lua::HandleRequest( HTTPRequest* a_Request )
tolua_pushusertype( LuaState, a_Request, "HTTPRequest" );
LOGINFO("Calling bound function! :D");
int s = lua_pcall( LuaState, 1, 1, 0);
if( report_errors( LuaState, s ) )
{
LOGINFO("error. Stack size: %i", lua_gettop(LuaState) );
return false;
}
if ( s != 0 )
{
std::string err = lua_tostring(LuaState, -1);
LOGERROR("-- %s", err.c_str() );
lua_pop(LuaState, 1);
LOGINFO("error. Stack size: %i", lua_gettop(LuaState) );
return err; // Show the error message in the web page, looks cool
}
if( !lua_isstring( LuaState, -1 ) )
{
LOGWARN("WARNING: WebPlugin tab '%s' did not return a string!", Tab->Title.c_str() );
lua_pop(LuaState, 1); // Pop return value
return "";
return std::string("WARNING: WebPlugin tab '") + Tab->Title + std::string("' did not return a string!");
}
RetVal += tolua_tostring(LuaState, -1, 0);