2.0a (3f47409b) · Commits · jan.koester / blogi

editor/edit.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ bool blogi::webedit::WebEditor::checkEditorGPO(json_object *request, const char
		return false;
		}

		void blogi::webedit::WebEditor::initTables(dbpp::Database &db) {
		void blogi::webedit::WebEditor::initTables(dbpp::ReplicatedDatabase &db) {
		dbpp::SQL sql;
		dbpp::DBResult res;

		@@ -153,7 +153,7 @@ void blogi::webedit::WebEditor::initTables(dbpp::Database &db) {

		// Table 2: editor_template_revisions — stores XML data with revision history
		sql << "CREATE TABLE IF NOT EXISTS editor_template_revisions ("
		<< "id integer PRIMARY KEY " << db.autoincrement(sql) << ","
		<< "id " << db.getUUIDType(sql) << " PRIMARY KEY,"
		<< "template_id " << db.getUUIDType(sql) << " NOT NULL,"
		<< "revision integer NOT NULL DEFAULT 1,"
		<< "xml_data text NOT NULL,"

editor/edit.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ namespace blogi {
		class WebEditor{
		public:
		WebEditor(PluginArgs &plgags);
		void initTables(dbpp::Database &db);
		void initTables(dbpp::ReplicatedDatabase &db);
		void Editor(libhttppp::HttpRequest& curreq, const int tid, const std::string &sessionid);
		void Renderer(
		libhttppp::HttpRequest& curreq,

plugins/content/content.cpp

+122 −101

File changed.

Preview size limit exceeded, changes collapsed.

plugins/gameinfo/gameinfo.cpp

+12 −5

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <gameinfoplus/exception.h>

		#include <dbpp/database.h>
		#include <uuidp.h>

		#include <json-c/json.h>

		@@ -81,12 +82,12 @@ namespace blogi {


		sql << "CREATE TABLE IF NOT EXISTS gameserver_protocols("
		<< "id integer PRIMARY KEY " << Args->database[0]->autoincrement(sql) << ","
		<< "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY,"
		<< "pname character varying(255) NOT NULL"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS gameserver("
		<< "id integer PRIMARY KEY " << Args->database[0]->autoincrement(sql) << ","
		<< "protocol integer,"
		<< "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY,"
		<< "protocol " << Args->database[0]->getUUIDType(sql) << ","
		<< "addr character varying(255) NOT NULL,"
		<< "port integer,"
		<< "FOREIGN KEY (protocol) REFERENCES gameserver_protocols (id)"
		@@ -159,7 +160,10 @@ namespace blogi {
		dbpp::SQL sql;
		dbpp::DBResult res;
		std::vector<char> buf;
		sql << "INSERT INTO gameserver_protocols (pname) VALUES ('"
		uuid::uuid protoId;
		protoId.generate();
		sql << "INSERT INTO gameserver_protocols (id,pname) VALUES ('"
		<< protoId.c_str() << "','"
		<< sql.escaped(buf, formProtoName.c_str()) << "')";
		Args->database[tid]->exec(sql,res);
		saved = true;
		@@ -180,7 +184,10 @@ namespace blogi {
		dbpp::SQL sql;
		dbpp::DBResult res;
		std::vector<char> buf;
		sql << "INSERT INTO gameserver (protocol,addr,port) VALUES ('"
		uuid::uuid servId;
		servId.generate();
		sql << "INSERT INTO gameserver (id,protocol,addr,port) VALUES ('"
		<< servId.c_str() << "','"
		<< sql.escaped(buf, formProtocol.c_str()) << "','"
		<< sql.escaped(buf, formAddr.c_str()) << "','"
		<< sql.escaped(buf, formPort.c_str()) << "')";

plugins/navbar/navbar.cpp

+11 −6

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <string>

		#include <dbpp/database.h>
		#include <uuidp.h>

		#include "plugin.h"
		#include "theme.h"
		@@ -69,16 +70,16 @@ namespace blogi {
		dbpp::DBResult res;

		sql << "CREATE TABLE IF NOT EXISTS navbar("
		<< "id integer PRIMARY KEY " << Args->database[0]->autoincrement(sql) << ","
		<< "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY,"
		<< "name character varying(255) NOT NULL,"
		<< "container_id character varying(255) NOT NULL"
		<< "); "
		<< "CREATE TABLE IF NOT EXISTS navbar_items("
		<< "id integer PRIMARY KEY " << Args->database[0]->autoincrement(sql) << ","
		<< "id " << Args->database[0]->getUUIDType(sql) << " PRIMARY KEY,"
		<< "name character varying(255) NOT NULL,"
		<< "url character varying(255) NOT NULL,"
		<< "type integer default 0,"
		<< "navbar_id integer,"
		<< "navbar_id " << Args->database[0]->getUUIDType(sql) << ","
		<< "FOREIGN KEY (navbar_id) REFERENCES navbar (id)"
		<< ");";
		Args->database[0]->exec(sql,res);
		@@ -294,8 +295,10 @@ namespace blogi {


		if(!newitem_name.empty() && !newitem_url.empty() && !newitem_type.empty()){
		sql << "INSERT INTO navbar_items (name,url,navbar_id,type) VALUES('"
		<< sql.escaped(sbuf,newitem_name.c_str()) << "','" << sql.escaped(sbuf,newitem_url.c_str())
		uuid::uuid itemId;
		itemId.generate();
		sql << "INSERT INTO navbar_items (id,name,url,navbar_id,type) VALUES('"
		<< itemId.c_str() << "','" << sql.escaped(sbuf,newitem_name.c_str()) << "','" << sql.escaped(sbuf,newitem_url.c_str())
		<< "','" << navid << "'," << newitem_type.c_str() <<")";
		Args->database[tid]->exec(sql,res);
		sql.clear();
		@@ -487,7 +490,9 @@ namespace blogi {
		dbpp::DBResult res;
		std::vector<char> sbuf;

		sql << "INSERT INTO navbar (name,container_id) VALUES ('" << sql.escaped(sbuf,navname.c_str()) <<"','" << sql.escaped(sbuf,navcontainer.c_str()) << "')";
		uuid::uuid navId;
		navId.generate();
		sql << "INSERT INTO navbar (id,name,container_id) VALUES ('" << navId.c_str() << "','" << sql.escaped(sbuf,navname.c_str()) <<"','" << sql.escaped(sbuf,navcontainer.c_str()) << "')";

		Args->database[tid]->exec(sql,res);