Merge with rc-botanic-webdev
This commit is contained in:
commit
cbf5b8cbdc
5 changed files with 263 additions and 308 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
class Helpers{
|
class Helpers{
|
||||||
|
|
||||||
public function loadTemplate( $template, $vars = array () )
|
public function loadTemplate( $template, $vars = array (), $forcelibrender = false )
|
||||||
{
|
{
|
||||||
global $AMS_LIB;
|
global $AMS_LIB;
|
||||||
global $SITEBASE;
|
global $SITEBASE;
|
||||||
|
@ -14,7 +14,10 @@ class Helpers{
|
||||||
// caching must be disabled for multi-language support
|
// caching must be disabled for multi-language support
|
||||||
$smarty -> caching = false;
|
$smarty -> caching = false;
|
||||||
$smarty -> cache_lifetime = 120;
|
$smarty -> cache_lifetime = 120;
|
||||||
if ( !helpers :: check_if_game_client () ){
|
|
||||||
|
helpers :: create_folders ();
|
||||||
|
|
||||||
|
if ( !helpers :: check_if_game_client () or $forcelibrender = true ){
|
||||||
$smarty -> template_dir = $AMS_LIB . '/ingame_templates/';
|
$smarty -> template_dir = $AMS_LIB . '/ingame_templates/';
|
||||||
$smarty -> setConfigDir( $AMS_LIB . '/configs' );
|
$smarty -> setConfigDir( $AMS_LIB . '/configs' );
|
||||||
}else{
|
}else{
|
||||||
|
@ -44,6 +47,23 @@ class Helpers{
|
||||||
$smarty -> display( $template . '.tpl' );
|
$smarty -> display( $template . '.tpl' );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function create_folders(){
|
||||||
|
$arr = array( $AMS_LIB . '/ingame_templates/',
|
||||||
|
$AMS_LIB . '/configs',
|
||||||
|
$AMS_LIB . '/cache',
|
||||||
|
$SITEBASE . '/cache/',
|
||||||
|
$SITEBASE . '/templates/',
|
||||||
|
$SITEBASE . '/templates_c/',
|
||||||
|
$SITEBASE . '/configs'
|
||||||
|
);
|
||||||
|
foreach ( $arr as & $value ){
|
||||||
|
if ( !file_exists( $value ) ){
|
||||||
|
mkdir( $value );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public function check_if_game_client()
|
public function check_if_game_client()
|
||||||
{
|
{
|
||||||
// if HTTP_USER_AGENT is not set then its ryzom core
|
// if HTTP_USER_AGENT is not set then its ryzom core
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
class Users{
|
class Users{
|
||||||
|
|
||||||
function add_user(){
|
public function add_user(){
|
||||||
// check if values exist
|
// check if values exist
|
||||||
if ( isset( $_POST["Username"] ) and isset( $_POST["Password"] ) and isset( $_POST["Email"] ) )
|
if ( isset( $_POST["Username"] ) and isset( $_POST["Password"] ) and isset( $_POST["Email"] ) )
|
||||||
{
|
{
|
||||||
|
@ -67,6 +67,7 @@ class Users{
|
||||||
}
|
}
|
||||||
return $pageElements;
|
return $pageElements;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function checkUser
|
* Function checkUser
|
||||||
|
|
|
@ -1,14 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
/*
|
|
||||||
Here is the current code and progress on the drupal 7 ryzom core module
|
|
||||||
//////////////////////////
|
|
||||||
todo
|
|
||||||
//////////////////////////
|
|
||||||
disable user hook
|
|
||||||
delete user hook --- ring_open -> ring users ---- nel user & nel permission ---- hook_user_cancel ---- remove character data on server
|
|
||||||
menu items that do stuff
|
|
||||||
|
|
||||||
*/
|
|
||||||
/*
|
/*
|
||||||
Drupal 7 ryzom core module
|
Drupal 7 ryzom core module
|
||||||
Copyright (C) 2013 Matthew Lagoe (Botanic) & Paige Offerdahl (Tobi)
|
Copyright (C) 2013 Matthew Lagoe (Botanic) & Paige Offerdahl (Tobi)
|
||||||
|
@ -26,6 +17,9 @@ GNU Affero General Public License for more details.
|
||||||
You should have received a copy of the GNU Affero General Public License
|
You should have received a copy of the GNU Affero General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
require_once("/ams_lib/libinclude.php");
|
||||||
|
|
||||||
//output template
|
//output template
|
||||||
function loadTemplate($template,$vars)
|
function loadTemplate($template,$vars)
|
||||||
{
|
{
|
||||||
|
|
|
@ -10,16 +10,6 @@ $DBHOST = 'localhost' ;
|
||||||
$DBUSERNAME = 'shard' ;
|
$DBUSERNAME = 'shard' ;
|
||||||
$DBPASSWORD = '' ;
|
$DBPASSWORD = '' ;
|
||||||
|
|
||||||
$RINGDBNAME = 'ring_open' ;
|
|
||||||
$RINGDBUSERNAME = 'shard' ;
|
|
||||||
$RINGDBPASSWORD = '' ;
|
|
||||||
|
|
||||||
$NTDBName = 'nel_tool' ;
|
|
||||||
$NTUserName = 'shard' ;
|
|
||||||
$NTPassword = '' ;
|
|
||||||
|
|
||||||
$LOGRELATIVEPATH = 'logs/' ;
|
|
||||||
|
|
||||||
// If true= the server will add automatically unknown user in the database
|
// If true= the server will add automatically unknown user in the database
|
||||||
// (in nel.user= nel.permission= ring.ring_user and ring.characters
|
// (in nel.user= nel.permission= ring.ring_user and ring.characters
|
||||||
$ALLOW_UNKNOWN = true ;
|
$ALLOW_UNKNOWN = true ;
|
||||||
|
@ -27,57 +17,8 @@ $ALLOW_UNKNOWN = true ;
|
||||||
$CREATE_RING = true ;
|
$CREATE_RING = true ;
|
||||||
|
|
||||||
// site paths definitions
|
// site paths definitions
|
||||||
$AMS_LIB = dirname(dirname( __FILE__ )) . '/ams_lib';
|
$AMS_LIB = dirname( dirname( __FILE__ ) ) . '/ams_lib';
|
||||||
$AMS_TRANS = $AMS_LIB . '/translations';
|
$AMS_TRANS = $AMS_LIB . '/translations';
|
||||||
$AMS_CACHEDIR = $AMS_LIB . '/cache';
|
$AMS_CACHEDIR = $AMS_LIB . '/cache';
|
||||||
$SITEBASE = dirname( __FILE__ ) . '/html/' ;
|
|
||||||
$NELTOOL_SYSTEMBASE = dirname( dirname( __FILE__ ) ) . '/admin/' ;
|
|
||||||
$NELTOOL_LOGBASE = $NELTOOL_SYSTEMBASE . '/logs/' ;
|
|
||||||
$NELTOOL_IMGBASE = $NELTOOL_SYSTEMBASE . '/imgs/' ;
|
|
||||||
|
|
||||||
|
$DEFAULT_LANGUAGE = 'en';
|
||||||
$NELTOOL_RRDTOOL = '/usr/bin/rrdtool' ;
|
|
||||||
$NELTOOL_RRDSYSBASE = $NELTOOL_SYSTEMBASE . 'graphs_output/' ;
|
|
||||||
$NELTOOL_RRDWEBBASE = $SITEBASE . 'graphs_output/' ;
|
|
||||||
|
|
||||||
// SQL table names
|
|
||||||
$NELDB_PREFIX = 'neltool_' ;
|
|
||||||
|
|
||||||
// for later use
|
|
||||||
// the config table will gather some of the settings
|
|
||||||
// that are currently written in this config.php file
|
|
||||||
$NELDB_CONFIG_TABLE = $NELDB_PREFIX . 'config';
|
|
||||||
$NELDB_USER_TABLE = $NELDB_PREFIX . 'users' ;
|
|
||||||
$NELDB_GROUP_TABLE = $NELDB_PREFIX . 'groups' ;
|
|
||||||
|
|
||||||
$NELDB_LOG_TABLE = $NELDB_PREFIX . 'logs' ;
|
|
||||||
$NELDB_NOTE_TABLE = $NELDB_PREFIX . 'notes' ;
|
|
||||||
|
|
||||||
$NELDB_STAT_HD_TIME_TABLE = $NELDB_PREFIX . 'stats_hd_times' ;
|
|
||||||
$NELDB_STAT_HD_TABLE = $NELDB_PREFIX . 'stats_hd_datas' ;
|
|
||||||
|
|
||||||
$NELDB_ANNOTATION_TABLE = $NELDB_PREFIX . 'annotations' ;
|
|
||||||
$NELDB_LOCK_TABLE = $NELDB_PREFIX . 'locks' ;
|
|
||||||
|
|
||||||
$NELDB_APPLICATION_TABLE = $NELDB_PREFIX . 'applications' ;
|
|
||||||
$NELDB_GROUP_APPLICATION_TABLE = $NELDB_PREFIX . 'group_applications' ;
|
|
||||||
$NELDB_USER_APPLICATION_TABLE = $NELDB_PREFIX . 'user_applications' ;
|
|
||||||
|
|
||||||
$NELDB_DOMAIN_TABLE = $NELDB_PREFIX . 'domains' ;
|
|
||||||
$NELDB_USER_DOMAIN_TABLE = $NELDB_PREFIX . 'user_domains' ;
|
|
||||||
$NELDB_GROUP_DOMAIN_TABLE = $NELDB_PREFIX . 'group_domains' ;
|
|
||||||
|
|
||||||
$NELDB_SHARD_TABLE = $NELDB_PREFIX . 'shards' ;
|
|
||||||
$NELDB_USER_SHARD_TABLE = $NELDB_PREFIX . 'user_shards' ;
|
|
||||||
$NELDB_GROUP_SHARD_TABLE = $NELDB_PREFIX . 'group_shards' ;
|
|
||||||
|
|
||||||
$NELDB_RESTART_GROUP_TABLE = $NELDB_PREFIX . 'restart_groups' ;
|
|
||||||
$NELDB_RESTART_MESSAGE_TABLE = $NELDB_PREFIX . 'restart_messages' ;
|
|
||||||
$NELDB_RESTART_SEQUENCE_TABLE = $NELDB_PREFIX . 'restart_sequences' ;
|
|
||||||
|
|
||||||
$VIEW_DELAY = 0 ;
|
|
||||||
$HARDWARE_REFRESH = 600 ;
|
|
||||||
$LOCK_TIMEOUT = 1800 ;
|
|
||||||
$BG_IMG = 'imgs/bg_live.png' ;
|
|
||||||
|
|
||||||
$DEFAULT_LANGUAGE = 'en';
|
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
function add_user(){
|
function add_user(){
|
||||||
|
|
||||||
//add user locally here
|
// add user locally here
|
||||||
|
$return = users :: add_user();
|
||||||
$return = users::add_user();
|
return $return;
|
||||||
return $return;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function checkUser(){
|
function checkUser(){
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue