From cfa3651296aaa59695542608851d69cccc54dfc8 Mon Sep 17 00:00:00 2001 From: Quitta Date: Fri, 20 Sep 2013 02:41:57 +0200 Subject: [PATCH] some extra information added + changed the default hardcoded register & support url in the client_cfg.cpp --HG-- branch : quitta-gsoc-2013 --- code/ryzom/client/src/client_cfg.cpp | 4 +-- code/ryzom/tools/server/ryzom_ams/credits.txt | 4 ++- code/ryzom/tools/server/ryzom_ams/howto.txt | 7 ----- code/ryzom/tools/server/ryzom_ams/todo.txt | 7 ++++- .../tools/server/ryzom_ams/www/config.php | 27 ++++++++++++------- 5 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 code/ryzom/tools/server/ryzom_ams/howto.txt diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 5bbd90e01..bba2187cd 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -323,13 +323,13 @@ CClientConfig::CClientConfig() TexturesLoginInterface.push_back("texture_interfaces_v3_login"); DisplayAccountButtons = true; - CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php"; + CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register"; ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php"; EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php"; BetaAccountURL = "http://www.ryzom.com/profile"; ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php"; FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1"; - LoginSupportURL = "http://www.ryzom.com/en/support.html"; + LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php"; Position = CVector(0.f, 0.f, 0.f); // Default Position. Heading = CVector(0.f, 1.f, 0.f); // Default Heading. EyesHeight = 1.5f; // Default User Eyes Height. diff --git a/code/ryzom/tools/server/ryzom_ams/credits.txt b/code/ryzom/tools/server/ryzom_ams/credits.txt index 21c8eeb2a..d2878080a 100644 --- a/code/ryzom/tools/server/ryzom_ams/credits.txt +++ b/code/ryzom/tools/server/ryzom_ams/credits.txt @@ -2,4 +2,6 @@ CREDITS REGARDING THE AMS ################################################################## - Muhammad Usman (Charisma Layout http://usman.it/themes/charisma/) -- prdatur (Icon Set http://opengameart.org/users/prdatur) \ No newline at end of file +- prdatur (Icon Set http://opengameart.org/users/prdatur) +- Tobi (original Drupal Module) +- Botanic (Mentoring & original drupal module) diff --git a/code/ryzom/tools/server/ryzom_ams/howto.txt b/code/ryzom/tools/server/ryzom_ams/howto.txt deleted file mode 100644 index f930ce26f..000000000 --- a/code/ryzom/tools/server/ryzom_ams/howto.txt +++ /dev/null @@ -1,7 +0,0 @@ --Edit config .php file --Atm also edit the autoload function's paths --call the install.php function in your terminal located in the sql folder - -for mailing: --set imap settings in config file (also make sure the folder exists that you will use for mail logging and storing emails) --make sure imap is enabled. \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/todo.txt b/code/ryzom/tools/server/ryzom_ams/todo.txt index f264919a3..0611c9503 100644 --- a/code/ryzom/tools/server/ryzom_ams/todo.txt +++ b/code/ryzom/tools/server/ryzom_ams/todo.txt @@ -1,5 +1,10 @@ -Make Permission www dependend, so it can be implemented in drupal with hook_permission(); -in helpers make_folders mkdir($value); should be drupal_mkdir(); --write backwards compatible script for existing nel db! -fix the callback in add_user_to_sgroup.php and show_sgroup.php in the func dir -put mycrypt stuff from func/modify_email_of_sgroup in the setPassword itself. +-fix the error paths by making them use the ingame_path & outgame paths too + +module related: +-put the install.php stuff into the module.install file +-add extra data fields that can be changed like the gender, country + diff --git a/code/ryzom/tools/server/ryzom_ams/www/config.php b/code/ryzom/tools/server/ryzom_ams/www/config.php index 466c75004..7e0a50c3b 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/config.php +++ b/code/ryzom/tools/server/ryzom_ams/www/config.php @@ -42,23 +42,31 @@ $cfg['db']['ring']['pass'] = ''; // NNTP server on port 119 use: $nntp = imap_open ("{localhost:119/nntp}comp.test", "", ""); // To connect to a remote server replace "localhost" with the name or the IP address of the server you want to connect to. //$cfg['mail']['server'] = '{localhost:110/pop3/novalidate-cert}INBOX'; -$cfg['mail']['default_mailserver']= '{imap.gmail.com:993/imap/ssl}INBOX'; + +//imap connection string as explained above +$cfg['mail']['default_mailserver']= '{imap.gmail.com:993/imap/ssl}INBOX'; +//groupemail is the email that sends the email $cfg['mail']['default_groupemail'] = 'amsryzom@gmail.com'; +//groupname will be the name displayed as sender $cfg['mail']['default_groupname'] = 'Ryzomcore Support'; +//the username of the account $cfg['mail']['default_username'] = 'amsryzom@gmail.com'; -$cfg['mail']['default_password'] = 'lol123bol'; +//the matching password +$cfg['mail']['default_password'] = 'passw0rd'; +//the host, being used when a mail is sent from a support group: support_groups_name@host $cfg['mail']['host'] = "ryzomcore.com"; //Defines mailing related stuff $SUPPORT_GROUP_IMAP_CRYPTKEY = "azerty"; -$TICKET_MAILING_SUPPORT = true; +$TICKET_MAILING_SUPPORT = false; //You have to create this dir at first! -$MAIL_DIR = "/tmp/mail"; -$MAIL_LOG_PATH = "/tmp/mail/cron_mail.log"; +//The incoming emails will be backed up here and the log file keeps track of the mail_cron job. +$MAIL_DIR = "/home/daan/mail"; +$MAIL_LOG_PATH = "/home/daan/mail/cron_mail.log"; //terms of service url location -$TOS_URL ="http://createyourtos.com"; +$TOS_URL ="http://heregoesyourtos.com"; //crypt is being used by encrypting & decrypting of the IMAP password of the supportgroups $cfg['crypt']['key'] = 'Sup3rS3cr3tStuff'; @@ -72,15 +80,16 @@ $ALLOW_UNKNOWN = true ; // if true= the login service automaticaly create a ring user and a editor character if needed $CREATE_RING = true ; -// site paths definitions +// site paths definitions (you shouldn't have to edit these..) $AMS_LIB = dirname( dirname( __FILE__ ) ) . '/ams_lib'; $AMS_TRANS = $AMS_LIB . '/translations'; $AMS_CACHEDIR = $AMS_LIB . '/cache'; //Here your inc and func resides $SITEBASE = dirname( __FILE__ ) . '/html/' ; -$BASE_WEBPATH = 'http://localhost:40917/www/html'; -$IMAGELOC_WEBPATH = 'http://localhost:40917/ams_lib/img'; +//the paths to your website url +$BASE_WEBPATH = 'http://localhost:40917'; +$IMAGELOC_WEBPATH = 'http://localhost:40917/img'; $WEBPATH = $BASE_WEBPATH . '/index.php'; $INGAME_WEBPATH = $BASE_WEBPATH . '/index.php'; $CONFIG_PATH = dirname( __FILE__ );