From 6ccc60660acb584edbe1b09d46ed62c43a758cc3 Mon Sep 17 00:00:00 2001
From: Quitta <none@none>
Date: Tue, 3 Sep 2013 04:55:51 +0200
Subject: [PATCH] added amsblock and a menu item for the ams page

--HG--
branch : quitta-gsoc-2013
---
 .../ryzommanage/ryzommanage.module            | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module
index 647cf453e..4a812578a 100644
--- a/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module
+++ b/code/ryzom/tools/server/ryzom_ams/drupal_module/ryzommanage/ryzommanage.module
@@ -11,6 +11,7 @@ menu items that do stuff
 */
 error_reporting(E_ALL);
 ini_set('display_errors', 'on');
+ini_set('display_startup_errors', TRUE);
 
 global $TOS_URL;
 global $cfg;
@@ -103,7 +104,7 @@ function ryzommanage_menu()
         'page arguments' => array(1, 2),
         'access callback' => 'user_access',
         'access arguments' => array('access content'),
-        'type' => MENU_CALLBACK,
+        'type' => MENU_CALLBACK
 	);
     
     $items['login'] = array(
@@ -112,16 +113,15 @@ function ryzommanage_menu()
         'page arguments' => array(1, 2),
         'access callback' => 'user_access',
         'access arguments' => array('access content'),
-        'type' => MENU_CALLBACK,
+        'type' => MENU_CALLBACK
 	);
     
     $items['ams'] = array(
-        'title' => 'Account Management System',
-        'page callback' => '_collect_ams',
-        'page arguments' => array(1, 2),
+        'title' => 'Ryzom Account Management System',
+        'page callback' => '_ams_callback',
         'access callback' => 'user_access',
         'access arguments' => array('access content'),
-        'type' => MENU_CALLBACK,
+        'type' => MENU_NORMAL_ITEM
 	);
     
     //main menu item
@@ -163,6 +163,12 @@ function ryzommanage_menu()
 }
 
 
+function _ams_callback(){
+    //an empty call back function, because we need an empty page!
+    //without this the page gets access denied, perhaps for later use..
+   return array();
+}
+
 /**
  *
  * Function ryzommanage_menu 
@@ -198,6 +204,15 @@ function ryzommanage_block_info()
         'region' => '-1', // Not usually provided. 
         'visibility' => BLOCK_VISIBILITY_LISTED // Not usually provided. 
     );
+    
+    $blocks['ryzommanage_amsblock'] = array(
+        // info: The name of the block.
+        'info' => t('Ryzom AMS Block'),
+        'status' => TRUE,
+        'region' => '-1', // Not usually provided. 
+        'visibility' => BLOCK_VISIBILITY_LISTED, 
+        'pages' => 'ams'
+    );
     return $blocks;
 }
 /**
@@ -219,6 +234,11 @@ function ryzommanage_block_view($delta = '')
             $block['subject'] = t("uppercase this please");
             $block['content'] = top_bar();
             break;
+        
+        case 'ryzommanage_amsblock':
+            $block['subject'] = t("uppercase this please");
+            $block['content'] = ams_handler();
+            break;
     }
     return $block;
 }
@@ -467,6 +487,11 @@ function top_bar()
     }
 }
 
+function ams_handler()
+{
+    return "This is a placeholder."; 
+}
+
 function ryzommanage_user_presave(&$edit, $account, $category)
 {
     if (isset($edit['unhashpass'])) {