From 14c8c9f8d51c283952fc8f5e2058f2c33be18812 Mon Sep 17 00:00:00 2001
From: brentil <forums@inner-ninja.com>
Date: Sun, 23 Jan 2011 21:57:15 -0500
Subject: [PATCH] Merging in dmolavi's v7 changes for GUI changes and
 GalleryModule bug fixes

---
 .../controllers/admin_moduleupdates.php       |  7 +-
 .../helpers/moduleupdates_event.php           |  2 +-
 .../helpers/moduleupdates_installer.php       |  6 +-
 3.0/modules/moduleupdates/module.info         |  2 +-
 .../views/admin_moduleupdates.html.php        | 73 +++++++++++--------
 .../controllers/admin_moduleupdates.php       |  7 +-
 .../helpers/moduleupdates_event.php           |  2 +-
 .../helpers/moduleupdates_installer.php       |  6 +-
 3.1/modules/moduleupdates/module.info         |  2 +-
 .../views/admin_moduleupdates.html.php        | 73 +++++++++++--------
 10 files changed, 104 insertions(+), 76 deletions(-)

diff --git a/3.0/modules/moduleupdates/controllers/admin_moduleupdates.php b/3.0/modules/moduleupdates/controllers/admin_moduleupdates.php
index 8c06c351..a469fe67 100755
--- a/3.0/modules/moduleupdates/controllers/admin_moduleupdates.php
+++ b/3.0/modules/moduleupdates/controllers/admin_moduleupdates.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.");/**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
 		$view = new Admin_View("admin.html");
 		$view->page_title = t("Gallery 3 :: Manage Module Updates");
 		$view->content = new View("admin_moduleupdates.html");
+		$view->content->mu_version = module::get_version("moduleupdates");
 
 		$refreshCache = false;
     
@@ -140,7 +141,7 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
             if($this_gm_repo == "30"){
               $gh_dlink = "http://www.gallerymodules.com/update/".$this_module_name;
             } else {
-              $gh_dlink = "http://www.gallerymodules.com/update".this_gm_repo."/".$this_module_name;
+              $gh_dlink = "http://www.gallerymodules.com/update".$this_gm_repo."/".$this_module_name;
             }
             
           }
@@ -282,7 +283,7 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
               if($this_gm_repo == "30"){
                 $file = fopen ("http://www.gallerymodules.com/m/".$module_name, "r");
               } else {
-                $file = fopen ("http://www.gallerymodules.com/".this_gm_repo."m/".$module_name, "r");
+                $file = fopen ("http://www.gallerymodules.com/".$this_gm_repo."m/".$module_name, "r");
               }
               if ($file != null) {
                 $server = '(GH)';
diff --git a/3.0/modules/moduleupdates/helpers/moduleupdates_event.php b/3.0/modules/moduleupdates/helpers/moduleupdates_event.php
index dd6efc9c..ebafb880 100644
--- a/3.0/modules/moduleupdates/helpers/moduleupdates_event.php
+++ b/3.0/modules/moduleupdates/helpers/moduleupdates_event.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.");/**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/moduleupdates/helpers/moduleupdates_installer.php b/3.0/modules/moduleupdates/helpers/moduleupdates_installer.php
index 911f6b81..1e60a2cb 100644
--- a/3.0/modules/moduleupdates/helpers/moduleupdates_installer.php
+++ b/3.0/modules/moduleupdates/helpers/moduleupdates_installer.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.");/**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ class moduleupdates_installer {
   
     $version = module::get_version("moduleupdates");
     if ($version < 1) {
-      module::set_version("moduleupdates", 5);
+      module::set_version("moduleupdates", 7);
       //Remove the ModuleUpdates cache entry 'JIC'
       Cache::instance()->delete("ModuleUpdates");
       //create the blank ModuleUpdates cache entry with an expiration of 0 days
@@ -34,7 +34,7 @@ class moduleupdates_installer {
   }
 
   static function upgrade($version) {
-    module::set_version("moduleupdates", 5);
+    module::set_version("moduleupdates", 7);
     //Remove the ModuleUpdates cache entry 'JIC'
     Cache::instance()->delete("ModuleUpdates");
     //Empty the ModuleUpdates cache entry so our new version starts from scratch
diff --git a/3.0/modules/moduleupdates/module.info b/3.0/modules/moduleupdates/module.info
index 34868eaf..bbf3516a 100755
--- a/3.0/modules/moduleupdates/module.info
+++ b/3.0/modules/moduleupdates/module.info
@@ -1,3 +1,3 @@
 name = "Module Updates"
 description = "Compares your installed module version against the ones stored in the GitHub."
-version = 5
\ No newline at end of file
+version = 7
\ No newline at end of file
diff --git a/3.0/modules/moduleupdates/views/admin_moduleupdates.html.php b/3.0/modules/moduleupdates/views/admin_moduleupdates.html.php
index a5dc4a0b..ea3fa7f7 100644
--- a/3.0/modules/moduleupdates/views/admin_moduleupdates.html.php
+++ b/3.0/modules/moduleupdates/views/admin_moduleupdates.html.php
@@ -2,7 +2,7 @@
 
 
 <div id="g-admin-moduleupdates" class="g-block">
-  <h1> <?= t("Module Updates v5.0") ?> </h1>
+  <h1> <?= t("Module Updates v".$mu_version.".0") ?> </h1>
   <?= t("Compares your installed module version against the ones stored in the GitHub and GalleryModules.") ?>
   
   <div class="g-block-content">
@@ -26,34 +26,47 @@
     <ul id="g-action-status" class="g-message-block">
       <li class="g-warning"><?= t("Versions are compared from GitHub for Gallery Core (GC), Gallery Community Contributions (GCC), and GalleryModules.com (GM).  Versions downloaded from the forums will not be shown.") ?></li>
     </ul>
-
-    <table>
-      <tr>
-        <th> <?= t("Module")                        ?> </th>
-        <th><center> <?= t("Local /<br>Installed")  ?> </center></th>
-        <th width=50><center> <?= t("GC")           ?> </center></th>
-        <th width=50><center> <?= t("GCC")          ?> </center></th>
-        <th width=85><center> <?= t("GM")           ?> </center></th>
-        <th> <?= t("Description")                   ?> </th>
-      </tr>
-      <? foreach ($vars as $module_name): ?>
-      <tr class="<?= text::alternate("g-odd", "g-even") ?>">
-        <td> <?= t($module_name['name'])                                    ?> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_local'].">";   ?> <? if($module_name['font_color_local'] != "black"){ echo "<b><u>*"; } ?> <? if (is_numeric($module_name['code_version'])) echo $module_name['code_version']; ?><? if (is_numeric($module_name['version'])) echo " / ".$module_name['version']; ?> <? if($module_name['font_color_local'] != "black"){ echo "*</b></u>"; } ?> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_core'].">";    ?> <? if($module_name['font_color_core'] != "black" and $module_name['font_color_core'] != "" ){ echo "<b><u>*"; }        ?> <? if(is_numeric($module_name['core_version'])) if($module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['core_dlink']."\" target=\"_blank\">".$module_name['core_version']."</a>";} else { echo $module_name['core_version']; }                ?> <? if($module_name['font_color_core'] != "black"){ echo "*</b></u>"; }     ?> </font> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_contrib'].">"; ?> <? if($module_name['font_color_contrib'] != "black" and $module_name['font_color_contrib'] != "" ){ echo "<b><u>*"; }  ?> <? if(is_numeric($module_name['contrib_version'])) if($module_name['contrib_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['contrib_dlink']."\" target=\"_blank\">".$module_name['contrib_version']."</a>";} else { echo $module_name['contrib_version']; } ?> <? if($module_name['font_color_contrib'] != "black"){ echo "*</b></u>"; }  ?> </font> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_gh'].">";      ?> <? if($module_name['font_color_gh'] != "black" and $module_name['font_color_gh'] != "" ){ echo "<b><u>*"; }            ?> <? if(is_numeric($module_name['gh_version'])) if($module_name['gh_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['gh_dlink']."\" target=\"_blank\">".$module_name['gh_version']."</a>";} else { echo $module_name['gh_version']; }                          ?> <? if($module_name['font_color_gh'] != "black"){ echo "*</b></u>"; }       ?> </font> </td>
-        <td> <?= t($module_name['description'])                             ?> </td>
-      </tr>
-      <? endforeach ?>
-      <tr>
-        <th> <?= t("Module")                        ?> </th>
-        <th><center> <?= t("Local /<br>Installed")  ?> </center></th>
-        <th width=50><center> <?= t("GC")           ?> </center></th>
-        <th width=50><center> <?= t("GCC")          ?> </center></th>
-        <th width=85><center> <?= t("GM")           ?> </center></th>
-        <th> <?= t("Description")                   ?> </th>
-      </tr>
-    </table>
+	<fieldset>
+		<legend>Core Modules</legend>
+		<table>
+		  <tr>
+			<th> <?= t("Module")                        ?> </th>
+			<th><center> <?= t("Local /<br>Installed")  ?> </center></th>
+			<th width=50><center> <?= t("GC")           ?> </center></th>
+			<th> <?= t("Description")                   ?> </th>
+		  </tr>
+		  <? foreach ($vars as $index=>$module_name): ?>
+		  <? if(is_numeric($module_name['core_version'])) { ?>
+		  <tr class="<?= text::alternate("g-odd", "g-even") ?>">
+			<td> <?= t($module_name['name'])                                    ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_local'].">";   ?> <? if($module_name['font_color_local'] != "black"){ echo "<b><u>*"; } ?> <? if (is_numeric($module_name['code_version'])) echo $module_name['code_version']; ?><? if (is_numeric($module_name['version'])) echo " / ".$module_name['version']; ?> <? if($module_name['font_color_local'] != "black"){ echo "*</b></u>"; } ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_core'].">";    ?> <? if($module_name['font_color_core'] != "black" and $module_name['font_color_core'] != "" ){ echo "<b><u>*"; }        ?> <? if(is_numeric($module_name['core_version'])) if($module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['core_dlink']."\" target=\"_blank\">".$module_name['core_version']."</a>";} else { echo $module_name['core_version']; }                ?> <? if($module_name['font_color_core'] != "black"){ echo "*</b></u>"; }     ?> </font> </td>
+			<td> <?= t($module_name['description'])                             ?> </td>
+		  </tr>
+		  <? unset($vars[$index]); }?>
+		  <? endforeach ?>
+		</table>
+	</fieldset>
+	<fieldset>
+		<legend>Community Contributed Modules</legend>
+		<table>
+		  <tr>
+			<th> <?= t("Module")                        ?> </th>
+			<th><center> <?= t("Local /<br>Installed")  ?> </center></th>
+			<th width=50><center> <?= t("GCC")          ?> </center></th>
+			<th width=85><center> <?= t("GM")           ?> </center></th>
+			<th> <?= t("Description")                   ?> </th>
+		  </tr>
+		  <? foreach ($vars as $index=>$module_name): ?>
+		  <tr class="<?= text::alternate("g-odd", "g-even") ?>">
+			<td> <?= t($module_name['name'])                                    ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_local'].">";   ?> <? if($module_name['font_color_local'] != "black"){ echo "<b><u>*"; } ?> <? if (is_numeric($module_name['code_version'])) echo $module_name['code_version']; ?><? if (is_numeric($module_name['version'])) echo " / ".$module_name['version']; ?> <? if($module_name['font_color_local'] != "black"){ echo "*</b></u>"; } ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_contrib'].">"; ?> <? if($module_name['font_color_contrib'] != "black" and $module_name['font_color_contrib'] != "" ){ echo "<b><u>*"; }  ?> <? if(is_numeric($module_name['contrib_version'])) if($module_name['contrib_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['contrib_dlink']."\" target=\"_blank\">".$module_name['contrib_version']."</a>";} else { echo $module_name['contrib_version']; } ?> <? if($module_name['font_color_contrib'] != "black"){ echo "*</b></u>"; }  ?> </font> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_gh'].">";      ?> <? if($module_name['font_color_gh'] != "black" and $module_name['font_color_gh'] != "" ){ echo "<b><u>*"; }            ?> <? if(is_numeric($module_name['gh_version'])) if($module_name['gh_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['gh_dlink']."\" target=\"_blank\">".$module_name['gh_version']."</a>";} else { echo $module_name['gh_version']; }                          ?> <? if($module_name['font_color_gh'] != "black"){ echo "*</b></u>"; }       ?> </font> </td>
+			<td> <?= t($module_name['description'])                             ?> </td>
+		  </tr>
+		  <? endforeach ?>
+		  </table>
+	</fieldset>
   </div>
 </div>
\ No newline at end of file
diff --git a/3.1/modules/moduleupdates/controllers/admin_moduleupdates.php b/3.1/modules/moduleupdates/controllers/admin_moduleupdates.php
index 8c06c351..a469fe67 100755
--- a/3.1/modules/moduleupdates/controllers/admin_moduleupdates.php
+++ b/3.1/modules/moduleupdates/controllers/admin_moduleupdates.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.");/**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
 		$view = new Admin_View("admin.html");
 		$view->page_title = t("Gallery 3 :: Manage Module Updates");
 		$view->content = new View("admin_moduleupdates.html");
+		$view->content->mu_version = module::get_version("moduleupdates");
 
 		$refreshCache = false;
     
@@ -140,7 +141,7 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
             if($this_gm_repo == "30"){
               $gh_dlink = "http://www.gallerymodules.com/update/".$this_module_name;
             } else {
-              $gh_dlink = "http://www.gallerymodules.com/update".this_gm_repo."/".$this_module_name;
+              $gh_dlink = "http://www.gallerymodules.com/update".$this_gm_repo."/".$this_module_name;
             }
             
           }
@@ -282,7 +283,7 @@ class Admin_Moduleupdates_Controller extends Admin_Controller {
               if($this_gm_repo == "30"){
                 $file = fopen ("http://www.gallerymodules.com/m/".$module_name, "r");
               } else {
-                $file = fopen ("http://www.gallerymodules.com/".this_gm_repo."m/".$module_name, "r");
+                $file = fopen ("http://www.gallerymodules.com/".$this_gm_repo."m/".$module_name, "r");
               }
               if ($file != null) {
                 $server = '(GH)';
diff --git a/3.1/modules/moduleupdates/helpers/moduleupdates_event.php b/3.1/modules/moduleupdates/helpers/moduleupdates_event.php
index dd6efc9c..ebafb880 100644
--- a/3.1/modules/moduleupdates/helpers/moduleupdates_event.php
+++ b/3.1/modules/moduleupdates/helpers/moduleupdates_event.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.");/**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/moduleupdates/helpers/moduleupdates_installer.php b/3.1/modules/moduleupdates/helpers/moduleupdates_installer.php
index 911f6b81..1e60a2cb 100644
--- a/3.1/modules/moduleupdates/helpers/moduleupdates_installer.php
+++ b/3.1/modules/moduleupdates/helpers/moduleupdates_installer.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.");/**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ class moduleupdates_installer {
   
     $version = module::get_version("moduleupdates");
     if ($version < 1) {
-      module::set_version("moduleupdates", 5);
+      module::set_version("moduleupdates", 7);
       //Remove the ModuleUpdates cache entry 'JIC'
       Cache::instance()->delete("ModuleUpdates");
       //create the blank ModuleUpdates cache entry with an expiration of 0 days
@@ -34,7 +34,7 @@ class moduleupdates_installer {
   }
 
   static function upgrade($version) {
-    module::set_version("moduleupdates", 5);
+    module::set_version("moduleupdates", 7);
     //Remove the ModuleUpdates cache entry 'JIC'
     Cache::instance()->delete("ModuleUpdates");
     //Empty the ModuleUpdates cache entry so our new version starts from scratch
diff --git a/3.1/modules/moduleupdates/module.info b/3.1/modules/moduleupdates/module.info
index 34868eaf..bbf3516a 100755
--- a/3.1/modules/moduleupdates/module.info
+++ b/3.1/modules/moduleupdates/module.info
@@ -1,3 +1,3 @@
 name = "Module Updates"
 description = "Compares your installed module version against the ones stored in the GitHub."
-version = 5
\ No newline at end of file
+version = 7
\ No newline at end of file
diff --git a/3.1/modules/moduleupdates/views/admin_moduleupdates.html.php b/3.1/modules/moduleupdates/views/admin_moduleupdates.html.php
index a5dc4a0b..ea3fa7f7 100644
--- a/3.1/modules/moduleupdates/views/admin_moduleupdates.html.php
+++ b/3.1/modules/moduleupdates/views/admin_moduleupdates.html.php
@@ -2,7 +2,7 @@
 
 
 <div id="g-admin-moduleupdates" class="g-block">
-  <h1> <?= t("Module Updates v5.0") ?> </h1>
+  <h1> <?= t("Module Updates v".$mu_version.".0") ?> </h1>
   <?= t("Compares your installed module version against the ones stored in the GitHub and GalleryModules.") ?>
   
   <div class="g-block-content">
@@ -26,34 +26,47 @@
     <ul id="g-action-status" class="g-message-block">
       <li class="g-warning"><?= t("Versions are compared from GitHub for Gallery Core (GC), Gallery Community Contributions (GCC), and GalleryModules.com (GM).  Versions downloaded from the forums will not be shown.") ?></li>
     </ul>
-
-    <table>
-      <tr>
-        <th> <?= t("Module")                        ?> </th>
-        <th><center> <?= t("Local /<br>Installed")  ?> </center></th>
-        <th width=50><center> <?= t("GC")           ?> </center></th>
-        <th width=50><center> <?= t("GCC")          ?> </center></th>
-        <th width=85><center> <?= t("GM")           ?> </center></th>
-        <th> <?= t("Description")                   ?> </th>
-      </tr>
-      <? foreach ($vars as $module_name): ?>
-      <tr class="<?= text::alternate("g-odd", "g-even") ?>">
-        <td> <?= t($module_name['name'])                                    ?> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_local'].">";   ?> <? if($module_name['font_color_local'] != "black"){ echo "<b><u>*"; } ?> <? if (is_numeric($module_name['code_version'])) echo $module_name['code_version']; ?><? if (is_numeric($module_name['version'])) echo " / ".$module_name['version']; ?> <? if($module_name['font_color_local'] != "black"){ echo "*</b></u>"; } ?> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_core'].">";    ?> <? if($module_name['font_color_core'] != "black" and $module_name['font_color_core'] != "" ){ echo "<b><u>*"; }        ?> <? if(is_numeric($module_name['core_version'])) if($module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['core_dlink']."\" target=\"_blank\">".$module_name['core_version']."</a>";} else { echo $module_name['core_version']; }                ?> <? if($module_name['font_color_core'] != "black"){ echo "*</b></u>"; }     ?> </font> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_contrib'].">"; ?> <? if($module_name['font_color_contrib'] != "black" and $module_name['font_color_contrib'] != "" ){ echo "<b><u>*"; }  ?> <? if(is_numeric($module_name['contrib_version'])) if($module_name['contrib_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['contrib_dlink']."\" target=\"_blank\">".$module_name['contrib_version']."</a>";} else { echo $module_name['contrib_version']; } ?> <? if($module_name['font_color_contrib'] != "black"){ echo "*</b></u>"; }  ?> </font> </td>
-        <td align=center> <? echo "<font color=".$module_name['font_color_gh'].">";      ?> <? if($module_name['font_color_gh'] != "black" and $module_name['font_color_gh'] != "" ){ echo "<b><u>*"; }            ?> <? if(is_numeric($module_name['gh_version'])) if($module_name['gh_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['gh_dlink']."\" target=\"_blank\">".$module_name['gh_version']."</a>";} else { echo $module_name['gh_version']; }                          ?> <? if($module_name['font_color_gh'] != "black"){ echo "*</b></u>"; }       ?> </font> </td>
-        <td> <?= t($module_name['description'])                             ?> </td>
-      </tr>
-      <? endforeach ?>
-      <tr>
-        <th> <?= t("Module")                        ?> </th>
-        <th><center> <?= t("Local /<br>Installed")  ?> </center></th>
-        <th width=50><center> <?= t("GC")           ?> </center></th>
-        <th width=50><center> <?= t("GCC")          ?> </center></th>
-        <th width=85><center> <?= t("GM")           ?> </center></th>
-        <th> <?= t("Description")                   ?> </th>
-      </tr>
-    </table>
+	<fieldset>
+		<legend>Core Modules</legend>
+		<table>
+		  <tr>
+			<th> <?= t("Module")                        ?> </th>
+			<th><center> <?= t("Local /<br>Installed")  ?> </center></th>
+			<th width=50><center> <?= t("GC")           ?> </center></th>
+			<th> <?= t("Description")                   ?> </th>
+		  </tr>
+		  <? foreach ($vars as $index=>$module_name): ?>
+		  <? if(is_numeric($module_name['core_version'])) { ?>
+		  <tr class="<?= text::alternate("g-odd", "g-even") ?>">
+			<td> <?= t($module_name['name'])                                    ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_local'].">";   ?> <? if($module_name['font_color_local'] != "black"){ echo "<b><u>*"; } ?> <? if (is_numeric($module_name['code_version'])) echo $module_name['code_version']; ?><? if (is_numeric($module_name['version'])) echo " / ".$module_name['version']; ?> <? if($module_name['font_color_local'] != "black"){ echo "*</b></u>"; } ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_core'].">";    ?> <? if($module_name['font_color_core'] != "black" and $module_name['font_color_core'] != "" ){ echo "<b><u>*"; }        ?> <? if(is_numeric($module_name['core_version'])) if($module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['core_dlink']."\" target=\"_blank\">".$module_name['core_version']."</a>";} else { echo $module_name['core_version']; }                ?> <? if($module_name['font_color_core'] != "black"){ echo "*</b></u>"; }     ?> </font> </td>
+			<td> <?= t($module_name['description'])                             ?> </td>
+		  </tr>
+		  <? unset($vars[$index]); }?>
+		  <? endforeach ?>
+		</table>
+	</fieldset>
+	<fieldset>
+		<legend>Community Contributed Modules</legend>
+		<table>
+		  <tr>
+			<th> <?= t("Module")                        ?> </th>
+			<th><center> <?= t("Local /<br>Installed")  ?> </center></th>
+			<th width=50><center> <?= t("GCC")          ?> </center></th>
+			<th width=85><center> <?= t("GM")           ?> </center></th>
+			<th> <?= t("Description")                   ?> </th>
+		  </tr>
+		  <? foreach ($vars as $index=>$module_name): ?>
+		  <tr class="<?= text::alternate("g-odd", "g-even") ?>">
+			<td> <?= t($module_name['name'])                                    ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_local'].">";   ?> <? if($module_name['font_color_local'] != "black"){ echo "<b><u>*"; } ?> <? if (is_numeric($module_name['code_version'])) echo $module_name['code_version']; ?><? if (is_numeric($module_name['version'])) echo " / ".$module_name['version']; ?> <? if($module_name['font_color_local'] != "black"){ echo "*</b></u>"; } ?> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_contrib'].">"; ?> <? if($module_name['font_color_contrib'] != "black" and $module_name['font_color_contrib'] != "" ){ echo "<b><u>*"; }  ?> <? if(is_numeric($module_name['contrib_version'])) if($module_name['contrib_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['contrib_dlink']."\" target=\"_blank\">".$module_name['contrib_version']."</a>";} else { echo $module_name['contrib_version']; } ?> <? if($module_name['font_color_contrib'] != "black"){ echo "*</b></u>"; }  ?> </font> </td>
+			<td align=center> <? echo "<font color=".$module_name['font_color_gh'].">";      ?> <? if($module_name['font_color_gh'] != "black" and $module_name['font_color_gh'] != "" ){ echo "<b><u>*"; }            ?> <? if(is_numeric($module_name['gh_version'])) if($module_name['gh_version'] > $module_name['version'] or $module_name['core_version'] > $module_name['code_version']) { echo "<a href=\"".$module_name['gh_dlink']."\" target=\"_blank\">".$module_name['gh_version']."</a>";} else { echo $module_name['gh_version']; }                          ?> <? if($module_name['font_color_gh'] != "black"){ echo "*</b></u>"; }       ?> </font> </td>
+			<td> <?= t($module_name['description'])                             ?> </td>
+		  </tr>
+		  <? endforeach ?>
+		  </table>
+	</fieldset>
   </div>
 </div>
\ No newline at end of file