From 7190c02ec816a465be30ae82b11a902815274d83 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 29 Jul 2013 16:53:49 +0200 Subject: [PATCH 1/4] updated system ref, fixed danube & uvote --- config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php b/config.php index d44c1e5..2434313 100644 --- a/config.php +++ b/config.php @@ -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')); \ No newline at end of file From 2a7683d50913391f423094c8bc45195869922830 Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 1 Aug 2013 14:59:17 +0200 Subject: [PATCH 2/4] updated system reference, corrected autoloads to match new system requirements --- uVote/api/autoload.inc.php | 8 ++------ uVote/dbd/autoload.inc.php | 7 ++----- uVote/page/register_page_classes.php | 13 +++++-------- uVote/path/register_path_classes.php | 5 +---- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/uVote/api/autoload.inc.php b/uVote/api/autoload.inc.php index a345682..3fced9b 100644 --- a/uVote/api/autoload.inc.php +++ b/uVote/api/autoload.inc.php @@ -1,7 +1,3 @@ registerFolder(dirname(__FILE__),''); -$autoload->registerFolder(dirname(__FILE__).'/votes',''); - +SYSTEM\autoload::registerFolder(dirname(__FILE__),''); +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/votes',''); \ No newline at end of file diff --git a/uVote/dbd/autoload.inc.php b/uVote/dbd/autoload.inc.php index d87380a..91ed195 100644 --- a/uVote/dbd/autoload.inc.php +++ b/uVote/dbd/autoload.inc.php @@ -1,9 +1,6 @@ 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'); \ No newline at end of file diff --git a/uVote/page/register_page_classes.php b/uVote/page/register_page_classes.php index 751c739..d5fe93b 100644 --- a/uVote/page/register_page_classes.php +++ b/uVote/page/register_page_classes.php @@ -1,9 +1,6 @@ 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',''); diff --git a/uVote/path/register_path_classes.php b/uVote/path/register_path_classes.php index 36d9a01..d94a324 100644 --- a/uVote/path/register_path_classes.php +++ b/uVote/path/register_path_classes.php @@ -1,5 +1,2 @@ registerFolder(dirname(__FILE__),''); \ No newline at end of file +SYSTEM\autoload::registerFolder(dirname(__FILE__),''); \ No newline at end of file From 2459262f6a99f0cb9a1e5277ed8416509764e790 Mon Sep 17 00:00:00 2001 From: rylon Date: Sun, 4 Aug 2013 18:26:30 +0200 Subject: [PATCH 3/4] updated system reference, implemneted new api into anube and uvote --- api.php | 3 +-- index.php | 3 +-- uVote/api/{ApiClass.php => api_uvote.php} | 2 +- uVote/page/{PageApi.php => page_uvote.php} | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) rename uVote/api/{ApiClass.php => api_uvote.php} (82%) rename uVote/page/{PageApi.php => page_uvote.php} (96%) diff --git a/api.php b/api.php index 0495874..9208b95 100644 --- a/api.php +++ b/api.php @@ -9,5 +9,4 @@ require_once '../system/log/register_result_shortcut.php'; require_once 'config.php'; SYSTEM\system::start($uvote_config); -$api = new \SYSTEM\API\Api (new SYSTEM\verifyclass(), new ApiClass()); -echo $api->CALL(array_merge($_POST,$_GET)); \ No newline at end of file +echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_uvote',array_merge($_POST,$_GET)); \ No newline at end of file diff --git a/index.php b/index.php index 9fbaff6..ab0d047 100644 --- a/index.php +++ b/index.php @@ -9,5 +9,4 @@ require_once '../system/log/register_result_shortcut.php'; require_once 'config.php'; SYSTEM\system::start($uvote_config); -$page = new \SYSTEM\PAGE\PageApi(new SYSTEM\verifyclass(), new PageApi()); -echo $page->CALL(array_merge($_POST,$_GET))->html(); \ No newline at end of file +echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true)->html(); \ No newline at end of file diff --git a/uVote/api/ApiClass.php b/uVote/api/api_uvote.php similarity index 82% rename from uVote/api/ApiClass.php rename to uVote/api/api_uvote.php index 5ba6588..40709df 100644 --- a/uVote/api/ApiClass.php +++ b/uVote/api/api_uvote.php @@ -1,6 +1,6 @@ Date: Sun, 4 Aug 2013 23:34:01 +0200 Subject: [PATCH 4/4] fixed uvote includes,fixed webcraft new api, fixed redestoff new api --- api.php | 8 ++++---- index.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api.php b/api.php index 9208b95..1068d56 100644 --- a/api.php +++ b/api.php @@ -1,12 +1,12 @@ html(); \ No newline at end of file