From 3b3a595903407cc3a1e00b6a4a7e3e817f8d5935 Mon Sep 17 00:00:00 2001
From: shubham_meena <none@none>
Date: Sat, 26 Jul 2014 00:27:57 +0530
Subject: [PATCH] bug fix: added template path option in .info file

--HG--
branch : Gsoc14-ryzomAppImprovements
---
 .../ams_lib/autoload/plugincache.php          | 39 ++++++++++---------
 .../www/html/templates/layout_admin.tpl       |  2 +-
 .../www/html/templates/layout_mod.tpl         |  1 +
 .../www/html/templates/layout_plugin.tpl      |  4 +-
 .../www/html/templates/layout_user.tpl        |  2 +-
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
index ae8f1129c..c90665bc1 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/plugincache.php
@@ -1,8 +1,8 @@
- <?php
+<?php
 
 /**
  * API for loading and interacting with plugins
- *    contains getters and setters
+ *     contains getters and setters
  * 
  * @author shubham meena mentored by Matthew Lagoe 
  */
@@ -163,9 +163,8 @@ class Plugincache {
     
     /**
      * some more plugin function that requires during plugin operations
-     * 
      */
-      
+    
     /**
      * function to remove  a non empty directory
      * 
@@ -173,14 +172,14 @@ class Plugincache {
      * @return boolean 
      */
     public static function rrmdir( $dir ) {
-        $result=array_diff(scandir($dir),array('.','..'));
-        foreach($result as $item)
-        {
-			if(!@unlink($dir.'/'.$item))
-			Plugincache::rrmdir($dir.'/'.$item);
-        }
-        return rmdir($dir); 
-        } 
+        $result = array_diff( scandir( $dir ), array( '.', '..' ) );
+         foreach( $result as $item )
+         {
+            if ( !@unlink( $dir . '/' . $item ) )
+                 Plugincache :: rrmdir( $dir . '/' . $item );
+             } 
+        return rmdir( $dir );
+         } 
     
     /**
      * function to unzip the zipped files
@@ -247,20 +246,24 @@ class Plugincache {
          foreach( $ac_arr as $key => $value )
          {
             $plugin_path = Plugincache :: pluginInfoUsingId( $value['Id'], 'FileName' );
-             $pluginName = Plugincache :: pluginInfoUsingId( $value['Id'], 'Name' );
+             $template_path = json_decode( Plugincache :: pluginInfoUsingId( $value['Id'], 'Info' ) ) -> TemplatePath;
+             $plugin_name = explode( '/', $plugin_path )[4];
             
              // calling hooks in the $pluginName.php
-            include $plugin_path . '/' . strtolower( $pluginName ) . '.php';
+            include $plugin_path . '/' . $plugin_name . '.php';
              $arr = get_defined_functions();
             
              foreach( $arr['user'] as $key => $value )
              {
-                if ( stristr( $value, strtolower( $pluginName ) ) == true )
+                if ( stristr( $value, $plugin_name ) == true )
                      {
-                    $content['hook_info'][$pluginName] = call_user_func( $value );
+                    $content['hook_info'][$plugin_name] = call_user_func( $value );
                      } 
                 } 
-            } 
+            // path for the template
+            $content['hook_info'][$plugin_name]['TemplatePath'] = $template_path;
+             } 
+        
         return $content;
          } 
-    } 
+    }
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
index a0d1e49ef..db83dc8be 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl
@@ -10,7 +10,7 @@
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=sgroup_list"><i class="icon-briefcase"></i><span class="hidden-tablet"> Support Groups</span></a></li>
         <li class="nav-header hidden-tablet">Actions</li>
 	<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=plugins"><i class="icon-th-list"></i><span class="hidden-tablet"> Plugins</span></a></li>  
-       {if isset($hook_info)} {foreach from=$hook_info item=element}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&&name={$element.menu_display}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.menu_display}</span></a></li>{/foreach}{/if}
+       {if isset($hook_info)} {foreach from=$hook_info key=arrkey item=element}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&&name={$arrkey}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.menu_display}</span></a></li>{/foreach}{/if}
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=syncing"><i class="icon-th-list"></i><span class="hidden-tablet"> Syncing</span></a></li>
         <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
 {/block}
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_mod.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_mod.tpl
index e0a77d99a..cffdfdb5a 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_mod.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_mod.tpl
@@ -6,6 +6,7 @@
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
 	<li class="nav-header hidden-tablet">Admin</li>
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=userlist"><i class="icon-th-list"></i><span class="hidden-tablet"> Users</span></a></li>
+	{if isset($hook_info)} {foreach from=$hook_info key=arrkey item=element}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&&name={$arrkey}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.menu_display}</span></a></li>{/foreach}{/if}
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=show_queue&get=todo"><i class="icon-th-list"></i><span class="hidden-tablet"> Queues</span></a></li>
         <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=sgroup_list"><i class="icon-briefcase"></i><span class="hidden-tablet"> Support Groups</span></a></li>
         <li class="nav-header hidden-tablet">Actions</li>
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_plugin.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_plugin.tpl
index 5bc5938c4..9fb68400a 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_plugin.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_plugin.tpl
@@ -1,8 +1,8 @@
 {block name=content}
 <div class="row-fluid">
 {if isset($hook_info)}
-{foreach from=$hook_info item=element}
-{if $element.menu_display eq $smarty.get.name}
+{foreach from=$hook_info key=arrkey item=element}
+{if $arrkey eq $smarty.get.name}
 {include file=$element.template_path}
 {/if}
 {/foreach}
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl
index 4b452962a..57aad4c8b 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl
@@ -5,7 +5,7 @@
     <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
     <li class="nav-header hidden-tablet">Actions</li>
     <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=createticket"><i class="icon-pencil"></i><span class="hidden-tablet">Create New Ticket</span></a></li>
-    {if isset($hook_info)} {foreach from=$hook_info item=element}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&&name={$element.menu_display}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.menu_display}</span></a></li>{/foreach}{/if}	
+    {if isset($hook_info)} {foreach from=$hook_info key=arrkey item=element}<li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=layout_plugin&&name={$arrkey}"><i class="icon-th-list"></i><span class="hidden-tablet"> {$element.menu_display}</span></a></li>{/foreach}{/if}	
     <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
 {/block}