Merging in dmolavi's v7 changes for GUI changes and GalleryModule bug fixes
This commit is contained in:
parent
14cf53f706
commit
14c8c9f8d5
@ -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)';
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,3 @@
|
||||
name = "Module Updates"
|
||||
description = "Compares your installed module version against the ones stored in the GitHub."
|
||||
version = 5
|
||||
version = 7
|
@ -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>
|
||||
|
||||
<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 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): ?>
|
||||
<? 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 ?>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
@ -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)';
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,3 @@
|
||||
name = "Module Updates"
|
||||
description = "Compares your installed module version against the ones stored in the GitHub."
|
||||
version = 5
|
||||
version = 7
|
@ -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>
|
||||
|
||||
<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 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): ?>
|
||||
<? 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 ?>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
Reference in New Issue
Block a user