X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/72229403aae25f742c07d07d625bdc1e313b401d..91002d861d8e0729e84f9ef65a19001d515d7dbe:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index f5687699..ca6b8d21 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -1,13 +1,32 @@ -#include +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Boris Mikhailenko + */ -#include -#include +#include "stgconfig.h" -#include "stg/tariffs.h" -#include "stg/admins.h" -#include "stg/users.h" #include "stg/plugin_creator.h" -#include "stgconfig.h" +#include "stg/common.h" + +#include +#include + +#include //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -50,11 +69,6 @@ return stgc.GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -std::string STG_CONFIG::GetVersion() const -{ -return "Stg configurator v.0.08"; -} -//----------------------------------------------------------------------------- STG_CONFIG::STG_CONFIG() : errorStr(), stgConfigSettings(), @@ -63,12 +77,7 @@ STG_CONFIG::STG_CONFIG() isRunning(false), logger(GetPluginLogger(GetStgLogger(), "conf_sg")), config(logger), - users(NULL), - admins(NULL), - tariffs(NULL), - store(NULL), - settings(), - stgSettings(NULL) + settings() { } //----------------------------------------------------------------------------- @@ -88,11 +97,6 @@ if (isRunning) nonstop = true; config.SetPort(stgConfigSettings.GetPort()); -config.SetAdmins(admins); -config.SetUsers(users); -config.SetTariffs(tariffs); -config.SetStgSettings(stgSettings); -config.SetStore(store); if (config.Prepare()) { @@ -119,8 +123,7 @@ if (!isRunning) config.Stop(); //5 seconds to thread stops itself -int i; -for (i = 0; i < 25; i++) +for (int i = 0; i < 25; i++) { if (!isRunning) break;