From 968c9579a8ed8123da46dbf778ec32330466c1e6 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 5 Jun 2016 06:50:19 +0200 Subject: [PATCH] #125 login&logut and register fixes, updated system reference --- lib/system | 2 +- mojotrollz/api/api_mojotrollz.php | 11 ++-- mojotrollz/page/default_beta/default_beta.php | 6 +- .../page/default_beta/js/default_beta.js | 10 ++-- .../page/default_login/default_login.php | 6 +- .../page/default_login/js/default_login.js | 12 ++-- .../default_register/default_register.php | 2 +- .../default_register/js/default_register.js | 18 +++--- .../default_register/tpl/default_register.tpl | 56 +++++++++---------- .../saimod_mojotrollz_beta.php | 4 +- .../saimod_mojotrollz_downloads.php | 2 +- .../saimod_mojotrollz_npc_vendor_template.php | 2 +- .../saimod_mojotrollz_server_handling.php | 2 +- .../saimod_mojotrollz_servers.php | 2 +- .../saimod_mojotrollz_teamspeak.php | 2 +- mojotrollz/sql/mysql/system_api.sql | 2 + 16 files changed, 68 insertions(+), 71 deletions(-) diff --git a/lib/system b/lib/system index 55ef099..064a84d 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 55ef099e06745bda131cbc386b115107f3899487 +Subproject commit 064a84d4655f39ca89f887163c773b94d25399d3 diff --git a/mojotrollz/api/api_mojotrollz.php b/mojotrollz/api/api_mojotrollz.php index 16691ce..a2c03ff 100644 --- a/mojotrollz/api/api_mojotrollz.php +++ b/mojotrollz/api/api_mojotrollz.php @@ -11,16 +11,19 @@ class api_mojotrollz extends \SYSTEM\API\api_system { \SYSTEM\LOG\JsonResult::fail(); } - public static function call_mojo_action_register($username, $password, $email, $wowpassword){ - if(!\SYSTEM\SECURITY\Security::available($username,$email) || !self::wow_username_available($username)){ + public static function call_account_action_create($username, $password, $email, $wowpassword){ + if(!\SYSTEM\SECURITY\security::available($username,$email) || !self::wow_username_available($username)){ throw new \SYSTEM\LOG\ERROR('EMail is already in use or Username is not available.');} - if( !\SYSTEM\SECURITY\Security::create($username, $password, $email, \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG)) || + if( !\SYSTEM\SECURITY\security::create($username, $password, $email, \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG)) || !self::wow_account_register($username,$email,$wowpassword)){ throw new ERROR("Account creation failed. Retry later.");} - return JsonResult::ok(); + return JsonResult::ok(); } + //prevent normal register + //public static function call_account_action_create($username, $password_sha, $email, $locale){ + // return JsonResult::fail();} private static function wow_username_available($username){ return \SQL\MOJO_ACCOUNT_AVAILABLE::Q1(array($username), new \SQL\mangos_realm())['count'] == 0;} diff --git a/mojotrollz/page/default_beta/default_beta.php b/mojotrollz/page/default_beta/default_beta.php index a3dc342..82120aa 100644 --- a/mojotrollz/page/default_beta/default_beta.php +++ b/mojotrollz/page/default_beta/default_beta.php @@ -6,9 +6,9 @@ class default_beta extends \SYSTEM\PAGE\Page { return \SYSTEM\PAGE\text::tag('meta_beta');} public function html(){ $vars = array(); - if(\SYSTEM\SECURITY\Security::isLoggedIn()){ - $vars['email'] = \SYSTEM\SECURITY\Security::getUser()->email; - $vars['username'] = \SYSTEM\SECURITY\Security::getUser()->username; + if(\SYSTEM\SECURITY\security::isLoggedIn()){ + $vars['email'] = \SYSTEM\SECURITY\security::getUser()->email; + $vars['username'] = \SYSTEM\SECURITY\security::getUser()->username; $res = \SQL\MOJO_ACCOUNT_MAIN_ACCOUNT::Q1(array($vars['username'],$vars['email'])); $res['online'] = $res['online'] == 1 ? 'online' : 'offline'; diff --git a/mojotrollz/page/default_beta/js/default_beta.js b/mojotrollz/page/default_beta/js/default_beta.js index 53ec57a..c5514a3 100644 --- a/mojotrollz/page/default_beta/js/default_beta.js +++ b/mojotrollz/page/default_beta/js/default_beta.js @@ -7,12 +7,12 @@ function init_beta(){ preventSubmit: true, submitError: function($form, event, errors) {}, submitSuccess: function($form, event){ - $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) { - if(data == 1){ + system.account_login($('#bt_login_user').val(),$('#bt_login_password').val(),function(data){ + if(data.status){ $('.help-block').html("Login successfull.
"); location.reload(true); } else { - $('.help-block').html("Login not successfull.
User & Password combination wrong.") + $('.help-block').html("Login not successfull.
User & Password combination wrong."); } }); event.preventDefault(); @@ -23,8 +23,8 @@ function init_beta(){ preventSubmit: true, submitError: function($form, event, errors) {}, submitSuccess: function($form, event){ - $.get('./api.php?call=account&action=logout', function (data) { - if(data == 1){ + system.account_logout(function (data) { + if(data.status){ $('.help-block').html("Logout successfull.
"); location.reload(true); } else { diff --git a/mojotrollz/page/default_login/default_login.php b/mojotrollz/page/default_login/default_login.php index 40aa50d..650e37c 100644 --- a/mojotrollz/page/default_login/default_login.php +++ b/mojotrollz/page/default_login/default_login.php @@ -8,11 +8,11 @@ class default_login extends \SYSTEM\PAGE\Page { return array(new \PPAGE('default_login/js/default_login.js'));} public function html(){ $vars = \SYSTEM\PAGE\text::tag('mojotrollz'); - if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ + if(!\SYSTEM\SECURITY\security::isLoggedIn()){ return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_login/tpl/loggedout.tpl'))->SERVERPATH(), $vars);} - $vars['email'] = \SYSTEM\SECURITY\Security::getUser()->email; - $vars['username'] = \SYSTEM\SECURITY\Security::getUser()->username; + $vars['email'] = \SYSTEM\SECURITY\security::getUser()->email; + $vars['username'] = \SYSTEM\SECURITY\security::getUser()->username; $res = \SQL\MOJO_ACCOUNT_MAIN_ACCOUNT::Q1(array($vars['username'],$vars['email'])); $res['online'] = $res['online'] == 1 ? 'online' : 'offline'; diff --git a/mojotrollz/page/default_login/js/default_login.js b/mojotrollz/page/default_login/js/default_login.js index 1a2ddf5..7b8cde4 100644 --- a/mojotrollz/page/default_login/js/default_login.js +++ b/mojotrollz/page/default_login/js/default_login.js @@ -3,12 +3,12 @@ function init_login(){ preventSubmit: true, submitError: function($form, event, errors) {}, submitSuccess: function($form, event){ - $.get('./api.php?call=account&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) { - if(data == 1){ + system.account_login($('#bt_login_user').val(),$('#bt_login_password').val(),function(data){ + if(data.status){ $('.help-block').html("Login successfull.
"); location.reload(true); } else { - $('.help-block').html("Login not successfull.
User & Password combination wrong.") + $('.help-block').html("Login not successfull.
User & Password combination wrong."); } }); event.preventDefault(); @@ -18,9 +18,9 @@ function init_login(){ $("#logout_form input").not("[type=submit]").jqBootstrapValidation({ preventSubmit: true, submitError: function($form, event, errors) {}, - submitSuccess: function($form, event){ - $.get('./api.php?call=account&action=logout', function (data) { - if(data == 1){ + submitSuccess: function($form, event){ + system.account_logout(function (data) { + if(data.status){ $('.help-block').html("Logout successfull.
"); location.reload(true); } else { diff --git a/mojotrollz/page/default_register/default_register.php b/mojotrollz/page/default_register/default_register.php index 09ddca4..54c0ca1 100644 --- a/mojotrollz/page/default_register/default_register.php +++ b/mojotrollz/page/default_register/default_register.php @@ -7,7 +7,7 @@ class default_register extends \SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz')); - return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\SECURITY\Security::isLoggedIn() ? + return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\SECURITY\security::isLoggedIn() ? (new PPAGE('default_register/tpl/register_loggedin.tpl'))->SERVERPATH() : (new PPAGE('default_register/tpl/default_register.tpl'))->SERVERPATH(), $vars); } diff --git a/mojotrollz/page/default_register/js/default_register.js b/mojotrollz/page/default_register/js/default_register.js index 179c4c7..9fc3e3c 100644 --- a/mojotrollz/page/default_register/js/default_register.js +++ b/mojotrollz/page/default_register/js/default_register.js @@ -6,18 +6,17 @@ function init_register(){ submitSuccess: function($form, event){ var username = $('#register_username').val(); var password = $('#user_register_password2').val(); - var register_data = { - call: 'mojo', - action: 'register', - username: username, - password: $.sha1(password), - email: $('#register_email').val(), - wowpassword: $.sha1(username.toUpperCase()+':'+password.toUpperCase()), - } $.ajax({ dataType: "json", url: './api.php', - data: register_data, + data: { + call: 'account', + action: 'create', + username: username, + password_sha1: $.sha1(password), + email: $('#register_email').val(), + wow_password: $.sha1(username.toUpperCase()+':'+password.toUpperCase()), + }, success: function (data) { if(data.status){ // reload -> user will be loged in system.load('beta'); @@ -26,7 +25,6 @@ function init_register(){ } } }); - event.preventDefault(); } }); diff --git a/mojotrollz/page/default_register/tpl/default_register.tpl b/mojotrollz/page/default_register/tpl/default_register.tpl index 5d8514c..b0962f4 100644 --- a/mojotrollz/page/default_register/tpl/default_register.tpl +++ b/mojotrollz/page/default_register/tpl/default_register.tpl @@ -40,41 +40,35 @@ - ${basic_password} + ${basic_password} -
+
+
+ +
+
- -
-
-
+ +
+
+ - - - -
-
- -
-
-
- -

Login an existing Account

diff --git a/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php b/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php index 058eb7b..73cf425 100644 --- a/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php +++ b/mojotrollz/sai/saimod_mojotrollz_beta/saimod_mojotrollz_beta.php @@ -16,7 +16,7 @@ class saimod_mojotrollz_beta extends \SYSTEM\SAI\SaiModule { if($generate){ $vars['beta_code'] = \substr(\sha1(\rand(1, 99999)), 1, 6); - if(!\SQL\BETA_INSERT_CODE::QI(array($vars['beta_code'], \SYSTEM\SECURITY\Security::getUser()->id))){ + if(!\SQL\BETA_INSERT_CODE::QI(array($vars['beta_code'], \SYSTEM\SECURITY\security::getUser()->id))){ $vars['beta_code'] = 'generate code failed. Retry!';} } @@ -30,7 +30,7 @@ class saimod_mojotrollz_beta extends \SYSTEM\SAI\SaiModule { public static function html_li_menu(){return '
  •   Beta
    • ';} public static function right_public(){return false;} - public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function right_right(){return \SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){return array(new \PSAI('saimod_mojotrollz_beta/js/saimod_mojotrollz_beta.js'));} //public static function css(){return array();} } \ No newline at end of file diff --git a/mojotrollz/sai/saimod_mojotrollz_downloads/saimod_mojotrollz_downloads.php b/mojotrollz/sai/saimod_mojotrollz_downloads/saimod_mojotrollz_downloads.php index a2d54f8..456a8a4 100644 --- a/mojotrollz/sai/saimod_mojotrollz_downloads/saimod_mojotrollz_downloads.php +++ b/mojotrollz/sai/saimod_mojotrollz_downloads/saimod_mojotrollz_downloads.php @@ -14,7 +14,7 @@ class saimod_mojotrollz_downloads extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_downloads/tpl/saimod_mojotrollz_downloads.tpl'))->SERVERPATH(),$vars);} public static function html_li_menu(){return '
  •   Downloads
    • ';} public static function right_public(){return false;} - public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function right_right(){return \SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function sai_mod__SAI_saimod_mojotrollz_downloads_action_save($id,$link,$img,$text,$subtext){ \SQL\SAIMOD_MOJOTROLLZ_DOWNLOADS_SAVE::QI(array($id,$link,$img,$text,$subtext)); diff --git a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php index 4506652..c8acd90 100644 --- a/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php +++ b/mojotrollz/sai/saimod_mojotrollz_npc_vendor_template/saimod_mojotrollz_npc_vendor_template.php @@ -137,7 +137,7 @@ class saimod_mojotrollz_npc_vendor_template extends \SYSTEM\SAI\SaiModule { } public static function html_li_menu(){return '
  •   Vendor Template
    • ';} public static function right_public(){return false;} - public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function right_right(){return \SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){return array( \LIB\lib_handlebars::js(), \LIB\lib_wow_tooltips::js(), new \PSAI('saimod_mojotrollz_npc_vendor_template/js/saimod_mojotrollz_npc_vendor_template.js'));} diff --git a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php index f4bed5a..39f442e 100644 --- a/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php +++ b/mojotrollz/sai/saimod_mojotrollz_server_handling/saimod_mojotrollz_server_handling.php @@ -16,7 +16,7 @@ class saimod_mojotrollz_server_handling extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/tpl/main.tpl', $vars);} public static function html_li_menu(){return '
  •   WoW Servers
    • ';} public static function right_public(){return false;} - public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function right_right(){return \SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){return array(new \PSAI('saimod_mojotrollz_server_handling/js/saimod_mojotrollz_server_handling.js'));} //public static function css(){} diff --git a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php index 18d20f0..165225e 100644 --- a/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php +++ b/mojotrollz/sai/saimod_mojotrollz_servers/saimod_mojotrollz_servers.php @@ -17,7 +17,7 @@ class saimod_mojotrollz_servers extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile((new \PSAI('saimod_mojotrollz_servers/tpl/saimod_mojotrollz_servers.tpl'))->SERVERPATH(),$vars);} public static function html_li_menu(){return '
  •   Vote Servers
    • ';} public static function right_public(){return false;} - public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function right_right(){return \SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function sai_mod__SAI_saimod_mojotrollz_servers_action_visible($id,$visible){ \SQL\SAIMOD_MOJOTROLLZ_VISIBLE::QI(array($visible, $id)); diff --git a/mojotrollz/sai/saimod_mojotrollz_teamspeak/saimod_mojotrollz_teamspeak.php b/mojotrollz/sai/saimod_mojotrollz_teamspeak/saimod_mojotrollz_teamspeak.php index af9effa..2ac0d09 100644 --- a/mojotrollz/sai/saimod_mojotrollz_teamspeak/saimod_mojotrollz_teamspeak.php +++ b/mojotrollz/sai/saimod_mojotrollz_teamspeak/saimod_mojotrollz_teamspeak.php @@ -14,7 +14,7 @@ class saimod_mojotrollz_teamspeak extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(dirname(__FILE__).'/tpl/main.tpl', $vars);} public static function html_li_menu(){return '
  •   Teamspeak
    • ';} public static function right_public(){return false;} - public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} + public static function right_right(){return \SYSTEM\SECURITY\security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} public static function js(){return array(new \PSAI('saimod_mojotrollz_teamspeak/js/saimod_mojotrollz_teamspeak.js'));} //public static function css(){} diff --git a/mojotrollz/sql/mysql/system_api.sql b/mojotrollz/sql/mysql/system_api.sql index 3197db3..78134f9 100644 --- a/mojotrollz/sql/mysql/system_api.sql +++ b/mojotrollz/sql/mysql/system_api.sql @@ -1,3 +1,5 @@ +REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (27, 0, 2, 11, 'create', 'wow_password', 'STRING'); + REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (200, 0, 2, 11, 'newserver', 'address', 'STRING'); REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (205, 0, 2, 11, 'vote', 'server', 'INT');