webcraftmedia/u-vote.eu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system reference updated config excluded, old reference deleted

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-05-20 17:37:24 +02:00
parent 95491115a4
commit c32d76ef31
7 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "lib/system"]
path = lib/system
url = git@mojotrollz.eu:system.git

8
api.php
View File

@ -1,9 +1,9 @@
<?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes
require_once 'uVote/autoload.inc.php'; //Project Classes
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
require_once 'uvote/autoload.inc'; //Project Classes
require_once '/home/web/web/config/get_config.php';
require_once 'config.php';
SYSTEM\system::start($uvote_config);
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
\SYSTEM\system::include_ExceptionShortcut();
\SYSTEM\system::include_ResultShortcut();
\SYSTEM\system::register_errorhandler_dbwriter();

19
config.php
View File

@ -1,19 +0,0 @@
<?php
$uvote_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, 'http://www.u-vote.eu/'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/uVote/'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT_JSON),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, ''),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER, 'mojotrolls_dev'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'dsjgfasudzfsvad'),
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'host_uVote'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG, '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://www.u-vote.eu/sai.php?'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'mojotrollz - Admin Area'),
array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://www.u-vote.eu/" target="_blank">uVote</a>, &copy; WebCraft Media 2013'),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'));

12
index.php
View File

@ -1,13 +1,13 @@
<?php
require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'uVote/autoload.inc.php'; //Project Classes
require_once 'config.php';
SYSTEM\system::start($uvote_config);
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
require_once 'uvote/autoload.inc'; //Project Classes
require_once '/home/web/web/config/get_config.php';
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
\SYSTEM\system::include_ExceptionShortcut();
\SYSTEM\system::include_ResultShortcut();
\SYSTEM\system::register_errorhandler_dbwriter();
\SYSTEM\system::register_errorhandler_jsonoutput();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true)->html();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true);
new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");

1
lib/system Submodule

@ -0,0 +1 @@
Subproject commit 90ce83ba36c6081b1395b555575260cb13358693

12
sai.php
View File

@ -1,17 +1,13 @@
<?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes
require_once 'uVote/autoload.inc.php'; //Project Classes
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
require_once 'uvote/autoload.inc'; //Project Classes
require_once '/home/web/web/config/get_config.php';
require_once 'config.php'; //Server config
SYSTEM\system::start($uvote_config); //Start System time + config
\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
SYSTEM\system::include_ExceptionShortcut(); //allow ERROR() instead of \SYSTEM\LOG\ERROR()
SYSTEM\system::include_ResultShortcut(); //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
SYSTEM\system::register_errorhandler_dbwriter(); //write errors to database (must be first errorhandler to register)
SYSTEM\system::register_errorhandler_jsonoutput(); //print errors as json to caller
require_once '../system/sai/autoload.inc.php';
require_once 'uVote/sai/autoload.inc.php';
require_once 'uVote/sai/register_modules.php';
$sai = new SYSTEM\SAI\saigui();
echo $sai->html();

1
system

@ -1 +0,0 @@
Subproject commit c61ed753e0b7150c61852ea7e470676153f8654b