mojotrollz/mojotrollz.eu
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#120 realmlist, #118 state titles, removed beta code

Browse Source
This commit is contained in:
Ulf Gebhardt 2016-05-28 00:27:50 +02:00
parent b80e7acd35
commit 7099a63504
21 changed files with 116 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mojotrollz/files/autoload.inc
View File

@ -1,3 +1,4 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/content/','content');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/content/','content');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/server/','server');

1
mojotrollz/files/server/realmlist.wtf Normal file
View File

@ -0,0 +1 @@
set realmlist mojotrollz.eu

3
mojotrollz/page/autoload.inc
View File

@ -7,4 +7,5 @@ require_once dirname(__FILE__).'/default_login/autoload.inc';
require_once dirname(__FILE__).'/default_serverlist/autoload.inc';
require_once dirname(__FILE__).'/default_beta/autoload.inc';
require_once dirname(__FILE__).'/default_article/autoload.inc';
require_once dirname(__FILE__).'/default_donate/autoload.inc';
require_once dirname(__FILE__).'/default_donate/autoload.inc';
require_once dirname(__FILE__).'/default_register/autoload.inc';

4
mojotrollz/page/default_article/default_article.php
View File

@ -1,5 +1,9 @@
<?php
class default_article extends \SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_article');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_article');}
var $id = null;
public function __construct($id) {
$this->id = $id;}

23
mojotrollz/page/default_beta/default_beta.php
View File

@ -1,21 +1,16 @@
<?php
class default_beta extends \SYSTEM\PAGE\Page {
private $key = null;
public function __construct($key=null) {
$this->key=$key;}
public static function title(){
return \SYSTEM\PAGE\text::get('title_beta');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_beta');}
public function html(){
if(!\SAI\saimod_mojotrollz_beta::code_check($this->key)){
$vars = array();
$vars['invalid_key'] = ($this->key && !\SYSTEM\SECURITY\Security::isLoggedIn()) ? '<p><font color="red">Your key is invalid or already in use!</font></p>' : '';
$vars['beta_area'] = \SYSTEM\SECURITY\Security::isLoggedIn() ?
\SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedin.tpl'))->SERVERPATH(), array('email' => \SYSTEM\SECURITY\Security::getUser()->email,'username' => \SYSTEM\SECURITY\Security::getUser()->username)) :
\SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedout.tpl'))->SERVERPATH());
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz'));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta.tpl'))->SERVERPATH(), $vars);
}
$vars['key'] = $this->key;
$vars = array();
$vars['beta_area'] = \SYSTEM\SECURITY\Security::isLoggedIn() ?
\SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedin.tpl'))->SERVERPATH(), array('email' => \SYSTEM\SECURITY\Security::getUser()->email,'username' => \SYSTEM\SECURITY\Security::getUser()->username)) :
\SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_loggedout.tpl'))->SERVERPATH());
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz'));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta_register.tpl'))->SERVERPATH(), $vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_beta/tpl/beta.tpl'))->SERVERPATH(), $vars);
}
public static function js(){
return array( new PPAGE('default_beta/js/default_beta.js'),

35
mojotrollz/page/default_beta/js/default_beta.js
View File

@ -1,39 +1,6 @@
function init_beta(){
$("#btn_beta").click(function(){
system.load('beta;key.'+$('#input_beta_key').val());
});
//jqBootstrapValidation
$("#register_user_form input").not("[type=submit]").jqBootstrapValidation({
preventSubmit: true,
submitError: function (form, event, errors) {},
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()),
betakey: $('#beta_key').val()
}
$.ajax({
dataType: "json",
url: './api.php',
data: register_data,
success: function (data) {
if(data.status){ // reload -> user will be loged in
location.reload();
}else{ // show errors
$('.help-block').html(data.result.message);
}
}
});
event.preventDefault();
}
system.load('register');
});
$("#login_form input").not("[type=submit]").jqBootstrapValidation({

4
mojotrollz/page/default_beta/tpl/beta.tpl
View File

@ -1,8 +1,8 @@
<div style="padding-left: 10px; padding-right: 10px;">
<div class="row">
<div class="col-md-8">
<!--<div class="col-md-8">
${invalid_key}
</div>
</div>-->
<div class="col-md-8">
${mojotrollz_progressive}
</div>

7
mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
View File

@ -3,6 +3,13 @@
<div class="panel-body">
You are logged in as <b>${email}</b><br>
Your Website Account-Name is: <b>${username}</b>
<br><br>
<h4>Mojotrollz 2.4.3 TBC Progressive</h4>
<p>
<b>Realmlist: </b><a href="./api.php?call=files&cat=server&id=realmlist.wtf" target="blank">set realmlist mojotrollz.eu</a>
<br>
<b>Client: </b><a href="${link_wow_2_4_3}" target="blank">${mojotrollz_wow_2_4_3}</a>
</p>
</div>
</div>
<div class="panel panel-default">

11
mojotrollz/page/default_beta/tpl/beta_loggedout.tpl
View File

@ -1,8 +1,15 @@
<div class="panel panel-success">
<div class="panel-heading"><h4>Join the Beta Here</h4></div>
<div class="panel-heading"><h4>Public Beta</h4></div>
<div class="panel-body">
<input id="input_beta_key" type="text" maxlength="6" placeholder="Enter Your Beta Key" style="width: 95%;"/>
<!--<input id="input_beta_key" type="text" maxlength="6" placeholder="Enter Your Beta Key" style="width: 95%;"/>
<br><br>
<button id="btn_beta" class="btn btn-success btn-lg" style="width: 95%;">Join the Mojotribe</button>-->
<h4>Mojotrollz 2.4.3 TBC Progressive</h4>
<p>
<b>Realmlist: </b><a href="./api.php?call=files&cat=server&id=realmlist.wtf" target="blank">set realmlist mojotrollz.eu</a>
<br>
<b>Client: </b><a href="${link_wow_2_4_3}" target="blank">${mojotrollz_wow_2_4_3}</a>
</p>
<button id="btn_beta" class="btn btn-success btn-lg" style="width: 95%;">Join the Mojotribe</button>
</div>
</div>

7
mojotrollz/page/default_donate/default_donate.php
View File

@ -1,10 +1,11 @@
<?php
class default_donate extends \SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_donate');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_donate');}
public function html(){
$vars = \SYSTEM\PAGE\text::tag('mojotrollz');
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_donate/tpl/donate.tpl'))->SERVERPATH(), $vars);
}
//public static function js(){
// return array( new PPAGE('default_beta/js/default_beta.js'),
// \LIB\lib_jqbootstrapvalidation::js());}
}

4
mojotrollz/page/default_impressum/default_impressum.php
View File

@ -1,5 +1,9 @@
<?php
class default_impressum extends \SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_impressum');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_impressum');}
public function html(){
$vars['impressum'] = \SYSTEM\PAGE\text::get('webcraft_impressum');
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/tpl/impressum.tpl'))->SERVERPATH(), $vars);

8
mojotrollz/page/default_login/default_login.php
View File

@ -1,11 +1,9 @@
<?php
class default_login extends \SYSTEM\PAGE\Page {
public static function title(){
return 'Mojotrollz - Login';}
//public static function meta(){
// return array('keywords' => 'abc',
// 'description' => 'cde');
//}
return \SYSTEM\PAGE\text::get('title_login');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_login');}
public static function js(){
return array(new \PPAGE('default_login/js/default_login.js'));}
public function html(){

2
mojotrollz/page/default_register/autoload.inc Normal file
View File

@ -0,0 +1,2 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');

15
mojotrollz/page/default_register/default_register.php Normal file
View File

@ -0,0 +1,15 @@
<?php
class default_register extends \SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_register');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_register');}
public function html(){
$vars = array();
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz'));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_register/tpl/default_register.tpl'))->SERVERPATH(), $vars);
}
public static function js(){
return array( new PPAGE('default_register/js/default_register.js'),
\LIB\lib_jqbootstrapvalidation::js());}
}

33
mojotrollz/page/default_register/js/default_register.js Normal file
View File

@ -0,0 +1,33 @@
function init_register(){
//jqBootstrapValidation
$("#register_user_form input").not("[type=submit]").jqBootstrapValidation({
preventSubmit: true,
submitError: function (form, event, errors) {},
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,
success: function (data) {
if(data.status){ // reload -> user will be loged in
location.reload();
}else{ // show errors
$('.help-block').html(data.result.message);
}
}
});
event.preventDefault();
}
});
}

4
mojotrollz/page/default_beta/tpl/beta_register.tpl → mojotrollz/page/default_register/tpl/default_register.tpl
View File

@ -1,7 +1,6 @@
<div class="row-fluid">
<div class="col-md-12 mojotrollz_col mojotrollz_col_content">
<div class="col-md-12">
<h2>Mojotrollz Beta Register Form</h2>
<p class="label label-success">Your Beta Key is: <b>${key}</b></p>
<br><br>
<form class="textbox" id="register_user_form">
<div class="control-group" id="register_username_control_group">
@ -73,5 +72,6 @@
<button class="btn-sm btn-primary" type="submit"><i class="icon-ok icon-white"></i> ${basic_register}</button>
</div>
</form>
<br>
</div>
</div>

5
mojotrollz/page/default_serverlist/default_serverlist.php
View File

@ -1,8 +1,11 @@
<?php
class default_serverlist extends \SYSTEM\PAGE\Page {
//public static function title(){
// return \SYSTEM\PAGE\text::get('title_serverlist');}
//public static function meta(){
// return \SYSTEM\PAGE\text::tag('meta_serverlist');}
public static function js(){
return array( new PPAGE('default_serverlist/js/default_serverlist.js'));}
public function html(){
$vars = array();
$vars['server_list'] = '';

5
mojotrollz/page/default_start/default_start.php
View File

@ -1,8 +1,11 @@
<?php
class default_start extends \SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_start');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_start');}
public static function js(){
return array(new PPAGE('default_start/js/default_start.js'));}
private static function downloads(){
$result = '';
$res = \SQL\MOJOTROLLZ_DOWNLOADS::QQ();

7
mojotrollz/page/page_mojotrollz.php
View File

@ -22,12 +22,15 @@ class page_mojotrollz extends \SYSTEM\API\api_default {
public static function page_serverlist(){
return (new default_serverlist())->html();}
public static function page_beta($key=null){
return (new default_beta($key))->html();}
public static function page_beta(/*$key=null*/){
return (new default_beta(/*$key*/))->html();}
public static function page_article($id){
return (new default_article($id))->html();}
public static function page_donate(){
return (new default_donate())->html();}
public static function page_register(){
return (new default_register())->html();}
}

2
mojotrollz/sql/mysql/system_api.sql
View File

@ -7,7 +7,7 @@ REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `na
REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (213, 0, 2, 11, 'register', 'wowpassword', 'STRING');
REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (214, 0, 3, 11, 'register', 'betakey', 'STRING');
REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 1, 3, 1, 'beta', 'key', 'STRING');
-- REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (210, 1, 3, 1, 'beta', 'key', 'STRING');
REPLACE INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (215, 1, 2, 1, 'article', 'id', 'STRING');

3
mojotrollz/sql/mysql/system_page.sql
View File

@ -5,7 +5,8 @@ REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'login', 'login', -1, 0, 0, '#content', './?page=login', 'init_login', 'default_login');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta&key=${key}', 'init_beta', 'default_beta');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta', 'init_beta', 'default_beta');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (26, 1, 'register', 'register', -1, 0, 0, '#content', './?page=register', 'init_register', 'default_register');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (30, 1, 'article', 'article', -1, 0, 0, '#content', './?page=article&id=${article}', 'init_article', 'default_article');