Merge branch 'master' of mojotrollz.eu:hosting
This commit is contained in:
commit
7c9fa6bcb8
11
api.php
11
api.php
@ -1,13 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once '../system/autoload.inc.php'; //SYSTEM Classes
|
require_once '../system/autoload.inc.php'; //SYSTEM Classes
|
||||||
require_once 'uVote/autoload.inc.php'; //Project 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';
|
require_once 'config.php';
|
||||||
SYSTEM\system::start($uvote_config);
|
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 \SYSTEM\API\api::run('\SYSTEM\API\verify','api_uvote',array_merge($_POST,$_GET));
|
||||||
echo $api->CALL(array_merge($_POST,$_GET));
|
|
||||||
@ -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_PASSWORD, 'dsjgfasudzfsvad'),
|
||||||
array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'host_uVote'),
|
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_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'));
|
array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'));
|
||||||
11
index.php
11
index.php
@ -1,13 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once '../system/autoload.inc.php'; //SYSTEM Classes
|
require_once '../system/autoload.inc.php'; //SYSTEM Classes
|
||||||
require_once 'uVote/autoload.inc.php'; //Project 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';
|
require_once 'config.php';
|
||||||
SYSTEM\system::start($uvote_config);
|
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 \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true)->html();
|
||||||
echo $page->CALL(array_merge($_POST,$_GET))->html();
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?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) {
|
public static function call_vote_action_vote($poll_ID, $vote) {
|
||||||
return votes::write_vote($poll_ID, $vote);}
|
return votes::write_vote($poll_ID, $vote);}
|
||||||
public static function call_vote_action_barsperusers($poll_ID){
|
public static function call_vote_action_barsperusers($poll_ID){
|
||||||
@ -1,7 +1,3 @@
|
|||||||
<?php
|
<?php
|
||||||
|
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
|
||||||
$autoload = SYSTEM\autoload::getInstance();
|
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/votes','');
|
||||||
|
|
||||||
$autoload->registerFolder(dirname(__FILE__),'');
|
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/votes','');
|
|
||||||
|
|
||||||
@ -1,9 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
|
||||||
$autoload = SYSTEM\autoload::getInstance();
|
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
|
||||||
|
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
|
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/tbl/','DBD');
|
|
||||||
//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
|
//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
|
||||||
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
|
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
|
||||||
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');
|
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');
|
||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
class PageApi extends \SYSTEM\PAGE\PageClass {
|
class page_uvote extends \SYSTEM\API\api_default {
|
||||||
|
|
||||||
public static function default_page(){
|
public static function default_page(){
|
||||||
return new default_page();}
|
return new default_page();}
|
||||||
@ -1,9 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
|
||||||
$autoload = SYSTEM\autoload::getInstance();
|
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
|
||||||
|
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_myvote','');
|
||||||
$autoload->registerFolder(dirname(__FILE__),'');
|
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register','');
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/default_page','');
|
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_openinfo','');
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/default_myvote','');
|
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/default_register','');
|
|
||||||
$autoload->registerFolder(dirname(__FILE__).'/default_openinfo','');
|
|
||||||
|
|||||||
@ -1,5 +1,2 @@
|
|||||||
<?php
|
<?php
|
||||||
|
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
|
||||||
$autoload = SYSTEM\autoload::getInstance();
|
|
||||||
|
|
||||||
$autoload->registerFolder(dirname(__FILE__),'');
|
|
||||||
Loading…
x
Reference in New Issue
Block a user