From 85b427ec2da24ef3965d151e337173caf8d38123 Mon Sep 17 00:00:00 2001 From: Stefan Brannfjell Date: Sun, 2 Feb 2014 16:43:47 +0100 Subject: [PATCH] Creating developement branch for mysqli-support --- config.php | 16 ++++++++-------- engine/cache/highscores.cache.php | 2 +- engine/cache/news.cache.php | 2 +- engine/cache/support.cache.php | 2 +- engine/cache/topPlayer.cache.php | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config.php b/config.php index 91bf2b5..ced1b1f 100644 --- a/config.php +++ b/config.php @@ -14,13 +14,13 @@ // ------------------------ \\ // phpmyadmin username for OT server: (DONT USE "root" if ur hosting to public.). - $config['sqlUser'] = 'new'; + $config['sqlUser'] = 'dev'; // phpmyadmin password for OT server: - $config['sqlPassword'] = 'new'; + $config['sqlPassword'] = 'dev'; // The database name to connect to. (This is usually same as username). - $config['sqlDatabase'] = 'new'; + $config['sqlDatabase'] = 'dev'; // Hostname is usually localhost or 127.0.0.1. $config['sqlHost'] = 'localhost'; @@ -189,9 +189,9 @@ // WARNING! Account names written here will have admin access to web page! $config['page_admin_access'] = array( - 'otland0', - 'otland1', - //'znote' + //'otland0', + //'otland1', + 'znote' ); // Built-in FORUM @@ -361,7 +361,7 @@ // Write your paypal address here, and what currency you want to recieve money in. $config['paypal'] = array( 'enabled' => true, - 'email' => 'Change_Paypal_mail_in_config.php', // Example: paypal@mail.com + 'email' => 'stefan_brannfjell@live.no', // Example: paypal@mail.com 'currency' => 'EUR', 'points_per_currency' => 10, // 1 currency = ? points? [ONLY used to calculate bonuses] 'success' => "http://".$_SERVER['HTTP_HOST']."/success.php", @@ -374,7 +374,7 @@ // Giving some bonus points for higher donations will tempt users to donate more. $config['paypal_prices'] = array( // price => points, - 5 => 45, // -10% bonus + 1 => 45, // -10% bonus 10 => 100, // 0% bonus 15 => 165, // +10% bonus 20 => 240, // +20% bonus diff --git a/engine/cache/highscores.cache.php b/engine/cache/highscores.cache.php index 4f63729..e6592fd 100644 --- a/engine/cache/highscores.cache.php +++ b/engine/cache/highscores.cache.php @@ -1 +1 @@ -[false,false,false,false,false,false,false,false,false] \ No newline at end of file +[[{"value":"15","name":"Test Warrior","vocation":"Knight"},{"value":"11","name":"Test Character","vocation":"Sorcerer"},{"value":"10","name":"Znote","vocation":"Sorcerer"}],[{"value":"20","name":"Test Warrior","vocation":"Knight"},{"value":"11","name":"Test Character","vocation":"Sorcerer"},{"value":"10","name":"Znote","vocation":"Sorcerer"}],[{"value":"35","name":"Znote","vocation":"Sorcerer"},{"value":"25","name":"Test Warrior","vocation":"Knight"},{"value":"12","name":"Test Character","vocation":"Sorcerer"}],[{"value":"30","name":"Test Warrior","vocation":"Knight"},{"value":"10","name":"Znote","vocation":"Sorcerer"},{"value":"10","name":"Test Character","vocation":"Sorcerer"}],[{"value":"12","name":"Test Warrior","vocation":"Knight"},{"value":"11","name":"Test Character","vocation":"Sorcerer"},{"value":"10","name":"Znote","vocation":"Sorcerer"}],[{"value":"32","name":"Test Warrior","vocation":"Knight"},{"value":"30","name":"Znote","vocation":"Sorcerer"},{"value":"14","name":"Test Character","vocation":"Sorcerer"}],[{"value":"23","name":"Test Character","vocation":"Sorcerer"},{"value":"17","name":"Test Warrior","vocation":"Knight"},{"value":"10","name":"Znote","vocation":"Sorcerer"}],[{"level":"13","value":"23200","name":"Test Warrior","vocation":"Knight"},{"level":"12","value":"17600","name":"Test Character","vocation":"Sorcerer"},{"level":"15","value":"4200","name":"Znote","vocation":"Sorcerer"}],[{"value":"8","name":"Test Character","vocation":"Sorcerer"},{"value":"5","name":"Znote","vocation":"Sorcerer"},{"value":"3","name":"Test Warrior","vocation":"Knight"}]] \ No newline at end of file diff --git a/engine/cache/news.cache.php b/engine/cache/news.cache.php index 6718593..4544cc5 100644 --- a/engine/cache/news.cache.php +++ b/engine/cache/news.cache.php @@ -1 +1 @@ -[{"id":"7","title":"BBcode test","text":"[size=6][b]Big size 6 bold text[\/b][\/size]\r\n[img]http:\/\/media.npr.org\/assets\/img\/2013\/01\/29\/cat-bird_wide-85ce4b8383b9440d3ff03413cdd913513e9737bf-s6-c30.jpg[\/img]\r\n[center]Centered text[\/center]\r\n\r\n[b]Bold text[\/b]\r\n[color=red]Red Text[\/color]\r\n[color=green]green Text[\/color]\r\n\r\n[*]element 1[\/*]\r\n[*]element 2[\/*]\r\n[*]element 3[\/*]\r\n\r\nLink without text assigned:\r\n[link]http:\/\/otland.net\/f118\/znote-aac-1-3-forgotten-server-0-2-13-forgotten-server-0-3-6-0-4-a-166722\/[\/link]\r\n\r\nLink with text assigned:\r\n[link=http:\/\/otland.net\/f118\/znote-aac-1-3-forgotten-server-0-2-13-forgotten-server-0-3-6-0-4-a-166722\/]CLICK HERE TO VIEW ZNOTE AAC[\/link]","date":"1370778017","name":"Znote"}] \ No newline at end of file +[{"id":"1","title":"TFS 1.0!","text":"TFS 1.0 for Znote AAC is under developement!","date":"1376877999","name":"Znote"}] \ No newline at end of file diff --git a/engine/cache/support.cache.php b/engine/cache/support.cache.php index f1aa858..a21c7c7 100644 --- a/engine/cache/support.cache.php +++ b/engine/cache/support.cache.php @@ -1 +1 @@ -{"God":[{"group_id":"6","name":"Znote","online":1}]} \ No newline at end of file +{"God":[{"group_id":"6","name":"Znote","online":0}]} \ No newline at end of file diff --git a/engine/cache/topPlayer.cache.php b/engine/cache/topPlayer.cache.php index 5e8c1a7..d11c186 100644 --- a/engine/cache/topPlayer.cache.php +++ b/engine/cache/topPlayer.cache.php @@ -1 +1 @@ -[{"name":"Znote","level":"8","experience":"4200"},{"name":"Testing","level":"8","experience":"4200"},{"name":"Brannfjell","level":"8","experience":"4200"}] \ No newline at end of file +[{"name":"Test Warrior","level":"13","experience":"23200"},{"name":"Test Character","level":"12","experience":"17600"},{"name":"Znote","level":"15","experience":"4200"},{"name":"Testing Character","level":"8","experience":"4200"}] \ No newline at end of file