Merge branch 'master' of mojotrollz.eu:hosting

This commit is contained in:
Nael 2013-08-05 13:12:41 +02:00
commit 7c9fa6bcb8
9 changed files with 23 additions and 38 deletions

11
api.php
View File

@ -1,13 +1,12 @@
<?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes
require_once 'uVote/autoload.inc.php'; //Project Classes
require_once '../system/log/register_exception_shortcut.php'; //allow ERROR() instead of \SYSTEM\LOG\ERROR()
require_once '../system/log/register_errorhandler_jsonoutput.php'; //print errors as json to caller
require_once '../system/log/register_result_shortcut.php';
require_once 'config.php';
SYSTEM\system::start($uvote_config);
\SYSTEM\system::include_ExceptionShortcut();
\SYSTEM\system::include_ResultShortcut();
\SYSTEM\system::register_errorhandler_dbwriter();
\SYSTEM\system::register_errorhandler_jsonoutput();
$api = new \SYSTEM\API\Api (new SYSTEM\verifyclass(), new ApiClass());
echo $api->CALL(array_merge($_POST,$_GET));
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_uvote',array_merge($_POST,$_GET));

View File

@ -10,5 +10,5 @@ $uvote_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTIN
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_CONFIG_LANGS, \serialize(array('deDE', 'enUS', 'huHU'))),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS', 'huHU')),
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'));

View File

@ -1,13 +1,12 @@
<?php
require_once '../system/autoload.inc.php'; //SYSTEM Classes
require_once 'uVote/autoload.inc.php'; //Project Classes
require_once '../system/log/register_exception_shortcut.php'; //allow ERROR() instead of \SYSTEM\LOG\ERROR()
require_once '../system/log/register_errorhandler_jsonoutput.php'; //print errors as json to caller
require_once '../system/log/register_result_shortcut.php';
require_once 'config.php';
SYSTEM\system::start($uvote_config);
\SYSTEM\system::include_ExceptionShortcut();
\SYSTEM\system::include_ResultShortcut();
\SYSTEM\system::register_errorhandler_dbwriter();
\SYSTEM\system::register_errorhandler_jsonoutput();
$page = new \SYSTEM\PAGE\PageApi(new SYSTEM\verifyclass(), new PageApi());
echo $page->CALL(array_merge($_POST,$_GET))->html();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true)->html();

View File

@ -1,6 +1,6 @@
<?php
class ApiClass extends \SYSTEM\API\apiloginclass {
class api_uvote extends \SYSTEM\API\api_login {
public static function call_vote_action_vote($poll_ID, $vote) {
return votes::write_vote($poll_ID, $vote);}
public static function call_vote_action_barsperusers($poll_ID){

View File

@ -1,7 +1,3 @@
<?php
$autoload = SYSTEM\autoload::getInstance();
$autoload->registerFolder(dirname(__FILE__),'');
$autoload->registerFolder(dirname(__FILE__).'/votes','');
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/votes','');

View File

@ -1,9 +1,6 @@
<?php
$autoload = SYSTEM\autoload::getInstance();
$autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
$autoload->registerFolder(dirname(__FILE__).'/tbl/','DBD');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');

View File

@ -1,6 +1,6 @@
<?php
class PageApi extends \SYSTEM\PAGE\PageClass {
class page_uvote extends \SYSTEM\API\api_default {
public static function default_page(){
return new default_page();}

View File

@ -1,9 +1,6 @@
<?php
$autoload = SYSTEM\autoload::getInstance();
$autoload->registerFolder(dirname(__FILE__),'');
$autoload->registerFolder(dirname(__FILE__).'/default_page','');
$autoload->registerFolder(dirname(__FILE__).'/default_myvote','');
$autoload->registerFolder(dirname(__FILE__).'/default_register','');
$autoload->registerFolder(dirname(__FILE__).'/default_openinfo','');
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_myvote','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_openinfo','');

View File

@ -1,5 +1,2 @@
<?php
$autoload = SYSTEM\autoload::getInstance();
$autoload->registerFolder(dirname(__FILE__),'');
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');