fix for getting client working + possibly auto login for ingame part

--HG--
branch : quitta-gsoc-2013

code/nel/src/gui/widget_manager.cpp

@@ -3156,6 +3156,7 @@ namespace NLGUI
 
 	CWidgetManager::CWidgetManager()
 	{
+		LinkHack();
 		CStringShared::createStringMapper();
 
 		CReflectableRegister::registerClasses();

code/ryzom/client/data/gamedev/interfaces_v3/help.xml

@@ -863,8 +863,10 @@
       </group>
     </group>
   </group>
+  <!--<define id="cs_url"
+          value="http://app.ryzom.com/ticket_system/index.php?mode=load" />-->
   <define id="cs_url"
-          value="http://app.ryzom.com/ticket_system/index.php?mode=load" />
+          value="http://localhost:40917/www/html/index.php" />
   <group type="container"
          id="cs_browser"
          w="410"

code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php

@@ -17,7 +17,7 @@ class Helpers{
 
          helpers :: create_folders ();
 
-         if ( helpers :: check_if_game_client () or $forcelibrender = false ){
+         if ( helpers::check_if_game_client() or $forcelibrender = false ){
              $smarty -> template_dir = $AMS_LIB . '/ingame_templates/';
              $smarty -> setConfigDir( $AMS_LIB . '/configs' );
              }else{
@@ -34,17 +34,21 @@ class Helpers{
          foreach ( $variables[$template] as $key => $value ){
              $smarty -> assign( $key, $value );
              }
-          if( isset($vars['permission']) && $vars['permission'] == 3 ){
+          if (! helpers :: check_if_game_client ()){
-               $inherited = "extends:layout_admin.tpl|";
+               if( isset($vars['permission']) && $vars['permission'] == 3 ){
-          }else if( isset($vars['permission']) && $vars['permission'] == 2){
+                    $inherited = "extends:layout_admin.tpl|";
-               $inherited = "extends:layout_mod.tpl|";
+               }else if( isset($vars['permission']) && $vars['permission'] == 2){
-          }else if( isset($vars['permission']) && $vars['permission'] == 1){
+                    $inherited = "extends:layout_mod.tpl|";
-               $inherited = "extends:layout_user.tpl|";
+               }else if( isset($vars['permission']) && $vars['permission'] == 1){
+                    $inherited = "extends:layout_user.tpl|";
+               }else{
+                    $inherited ="";
+               }
+              // extends:' . $inherited .'|register.tpl
+             $smarty -> display( $inherited . $template . '.tpl' );
           }else{
-               $inherited ="";
+               $smarty -> display($template . '.tpl' );
           }
-         // extends:' . $inherited .'|register.tpl
-        $smarty -> display( $inherited . $template . '.tpl' );
          }
 
      static public function create_folders(){
@@ -70,7 +74,7 @@ class Helpers{
      static public function check_if_game_client()
     {
          // if HTTP_USER_AGENT is not set then its ryzom core
-          if ( !isset( $_SERVER['HTTP_USER_AGENT'] ) ){
+          if ( strpos($_SERVER['HTTP_USER_AGENT'],"Ryzom") === 0){
              return true;
           }else{
              return false;
@@ -113,4 +117,24 @@ class Helpers{
           global $TIME_FORMAT;
           return date($TIME_FORMAT,strtotime($time));
      }
+     
+     static public function  check_login_ingame(){
+          if ( helpers :: check_if_game_client () or $forcelibrender = false ){
+               $dbr = new DBLayer("ring");
+               if (isset($_GET['UserId']) && isset($_COOKIE['ryzomId'])){
+                    $id = $_GET['UserId'];
+                    $statement = $dbr->execute("SELECT * FROM ring_users WHERE user_id=:id AND cookie =:cookie", array('id' => $id, 'cookie' => $_COOKIE['ryzomId']));
+                    if ($statement->rowCount() ){
+                         $entry = $statement->fetch();
+                         return array('id' => $id, 'name' => $entry['user_name']); 
+                    }else{
+                         return "FALSE";
+                    }
+               }else{
+                    return "FALSE";
+               }
+          }else{
+               return "FALSE";
+          }
+     }
 }

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl

@@ -0,0 +1,53 @@
+{block name=content}
+
+
+	<div class="sortable row-fluid ui-sortable">
+		<a data-original-title="6 new members." data-rel="tooltip" class="well span3 top-block" href="#">
+			<span class="icon32 icon-red icon-user"></span>
+			<div>Total Members</div>
+			<div>507</div>
+			<span class="notification">6</span>
+		</a>
+	
+		<a data-original-title="4 new pro members." data-rel="tooltip" class="well span3 top-block" href="#">
+			<span class="icon32 icon-color icon-star-on"></span>
+			<div>Pro Members</div>
+			<div>228</div>
+			<span class="notification green">4</span>
+		</a>
+	
+		<a data-original-title="$34 new sales." data-rel="tooltip" class="well span3 top-block" href="#">
+			<span class="icon32 icon-color icon-cart"></span>
+			<div>Sales</div>
+			<div>$13320</div>
+			<span class="notification yellow">$34</span>
+		</a>
+	
+		<a data-original-title="12 new messages." data-rel="tooltip" class="well span3 top-block" href="#">
+			<span class="icon32 icon-color icon-envelope-closed"></span>
+			<div>Messages</div>
+			<div>25</div>
+			<span class="notification red">12</span>
+		</a>
+	</div>
+	
+	<div class="row-fluid">
+		<div class="box span12">
+			<div class="box-header well">
+				<h2><i class="icon-info-sign"></i> {$home_title}</h2>
+				<div class="box-icon">
+					<a href="#" class="btn btn-round" onclick="javascript:show_help('intro');return false;"><i class="icon-info-sign"></i></a>
+					<a href="#" class="btn btn-setting btn-round"><i class="icon-cog"></i></a>
+					<a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
+					<a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
+				</div>
+			</div>
+			<div class="box-content">
+				<p><strong>{$home_info}</strong></p>
+	
+				<div class="clearfix"></div>
+			</div>
+		</div>
+	</div>
+{/block}
+

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/login.tpl

@@ -0,0 +1,40 @@
+		<p>&nbsp;</p>
+		<table cellpadding = "10"><tr><td>
+		<div class="alert alert-info">
+			<h3>{$login_info}</h3>
+		</div>
+		<form method="post" action="index.php" class="form-horizontal">
+			<br/>
+			<p>
+				Username:
+				<input type="text" value="" id="Username" name="Username" class="input-large span10" placeholder="Username">
+			</p>
+
+
+			<p>
+				Password:
+				<input type="text" value="" id="Password" name="Password" class="input-large span10" placeholder="Password">
+			</p>
+			
+			<p>
+				Remember me:
+				<label for="remember" class="remember"><div class="checker" id="uniform-remember"><span><input type="checkbox" id="remember" style="opacity: 0;"></span></div>Remember me</label>
+			</p>
+		
+			<p>
+			<input type="hidden" name="function" value="login"/>
+			<input type="submit" value="Login"/>
+			</p>
+
+		</form>
+		
+		{if isset($login_error) and $login_error eq "TRUE"}
+		<p>
+			<strong><font color="red">{$login_error_message}</font></strong>
+		</p>
+		{/if}
+		<p>
+		<font color="green">{$login_register_message} <a href="?page=register">{$login_register_message_here}</a></font>!
+		</p>
+		</td></tr>
+		</table>

code/ryzom/tools/server/ryzom_ams/www/config.php

@@ -25,6 +25,12 @@ $cfg['db']['shard']['name']    = 'nel';
 $cfg['db']['shard']['user']    = 'shard';
 $cfg['db']['shard']['pass']    = '';
 
+$cfg['db']['ring']['host']    = 'localhost';
+$cfg['db']['ring']['port']    = '3306';
+$cfg['db']['ring']['name']    = 'ring_open';
+$cfg['db']['ring']['user']    = 'shard';
+$cfg['db']['ring']['pass']    = '';
+
 //-----------------------------------------------------------------------------------------
 // If true= the server will add automatically unknown user in the database
 // (in nel.user= nel.permission= ring.ring_user and ring.characters

code/ryzom/tools/server/ryzom_ams/www/html/index.php

@@ -6,11 +6,15 @@ require( '../../ams_lib/libinclude.php' );
 session_start();
 
 //Decide what page to load
-if(isset($_SESSION['user'])){
+if ( ! isset( $_GET["page"]) ){
-     $page = 'home';
+     if(isset($_SESSION['user'])){
+          $page = 'home';
+     }else{
+          //default page
+          $page = 'login';   
+     }
 }else{
-     //default page
+     $page = $_GET["page"];
-     $page = 'login';   
 }
 
 //perform an action in case one is specified
@@ -18,13 +22,12 @@ if(isset($_SESSION['user'])){
 if ( isset( $_POST["function"] ) ){
      require( "func/" . $_POST["function"] . ".php" );
      $return = $_POST["function"]();
-}else if ( isset( $_GET["page"] ) ){
+}else{
-     $filename = 'inc/' . $_GET["page"] . '.php';
+     $filename = 'inc/' . $page . '.php';
      if(is_file($filename)){
           require_once($filename);
-          $return = $_GET["page"]();
+          $return = $page();
      }
-     $page = $_GET["page"];
 }
 
 //add username to the return array in case logged in.