Revert 88797f8

also removes 3da1900
ampache · Nov 13, 2021 · e797430 · e797430
1 parent 410d940
commit e797430
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,6 @@ public/develop
 public/master
 public/foam
 public/ample
-*_cached_by_ampache_*.*
 storage/
 tmp/
 /vendor/

diff --git a/public/templates/header.inc.php b/public/templates/header.inc.php
@@ -28,7 +28,6 @@
 use Ampache\Module\System\AutoUpdate;
 use Ampache\Module\System\Core;
 use Ampache\Module\Util\AjaxUriRetrieverInterface;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\Mailer;
 use Ampache\Module\Util\Ui;
 use Ampache\Repository\PrivateMessageRepositoryInterface;
@@ -100,9 +99,9 @@
  <script src="<?php echo $web_path; ?>/lib/components/jQuery-File-Upload/js/jquery.iframe-transport.js" defer></script>
  <script src="<?php echo $web_path; ?>/lib/components/jQuery-File-Upload/js/jquery.fileupload.js" defer></script>
  <script src="<?php echo $web_path; ?>/lib/components/jQuery-contextMenu/dist/jquery.contextMenu.js"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/base.js'); ?>" defer></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/ajax.js'); ?>" defer></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/tools.js'); ?>" defer></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/base.js" defer></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js" defer></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/tools.js" defer></script>
 
  <script>
  $(document).ready(function(){

diff --git a/public/templates/show_debug.inc.php b/public/templates/show_debug.inc.php
@@ -52,9 +52,6 @@
  <li>
  <a href="<?php echo $web_path; ?>/admin/system.php?action=clear_cache&type=album"><?php echo Ui::get_icon('cog', T_('Clear Albums Cache')) . ' ' . T_('Clear Albums Cache'); ?></a>
  </li>
- <li>
- <a href="<?php echo $web_path; ?>/admin/system.php?action=clear_cache&type=asset"><?php echo Ui::get_icon('cog', T_('Clear Assets Cache')) . ' ' . T_('Clear Assets Cache'); ?></a>
- </li>
  </ul>
  </div>
 

diff --git a/public/templates/show_html5_player_headers.inc.php b/public/templates/show_html5_player_headers.inc.php
@@ -4,7 +4,6 @@
 use Ampache\Module\Broadcast\Broadcast_Server;
 use Ampache\Module\Playback\Stream;
 use Ampache\Module\Util\AjaxUriRetrieverInterface;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\Ui;
 
 global $dic;
@@ -30,9 +29,9 @@
 <script src="<?php echo $web_path; ?>/lib/components/jquery/jquery.min.js"></script>
 <script src="<?php echo $web_path; ?>/lib/components/jquery-ui/jquery-ui.min.js"></script>
 <script src="<?php echo $web_path; ?>/lib/components/js-cookie/js-cookie-built.js"></script>
-<script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/base.js'); ?>"></script>
-<script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/ajax.js'); ?>"></script>
-<script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/tools.js'); ?>"></script>
+<script src="<?php echo $web_path; ?>/lib/javascript/base.js"></script>
+<script src="<?php echo $web_path; ?>/lib/javascript/ajax.js"></script>
+<script src="<?php echo $web_path; ?>/lib/javascript/tools.js"></script>
 <script>
 var jsAjaxServer = "<?php echo $ajaxUriRetriever->getAjaxServerUri(); ?>";
 var jsAjaxUrl = "<?php echo $ajaxUriRetriever->getAjaxUri(); ?>";

diff --git a/public/templates/show_registration_confirmation.inc.php b/public/templates/show_registration_confirmation.inc.php
@@ -21,7 +21,6 @@
  */
 
 use Ampache\Config\AmpConfig;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\Ui;
 
 $htmllang = str_replace("_", "-", AmpConfig::get('lang'));
@@ -43,8 +42,8 @@
  <a href="<?php echo $web_path; ?>"><h1 id="headerlogo"></h1></a>
  </div>
  <script src="<?php echo $web_path; ?>/lib/components/jquery/jquery.min.js"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/base.js'); ?>"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/ajax.js'); ?>"></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/base.js"></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js"></script>
  <div id="content">
  <div id="guts">
  <?php

diff --git a/public/templates/show_user_activate.inc.php b/public/templates/show_user_activate.inc.php
@@ -21,7 +21,6 @@
  */
 
 use Ampache\Config\AmpConfig;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\Ui;
 
 $htmllang = str_replace("_", "-", AmpConfig::get('lang'));
@@ -42,8 +41,8 @@
  <span><?php echo T_('Registration Validation'); ?>.</span>
  </div>
  <script src="<?php echo $web_path; ?>/lib/components/jquery/jquery.min.js"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/base.js'); ?>"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/ajax.js'); ?>"></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/base.js"></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js"></script>
  <div>
 <?php
  if ($validationResult) {

diff --git a/public/templates/show_user_registration.inc.php b/public/templates/show_user_registration.inc.php
@@ -25,7 +25,6 @@
 use Ampache\Module\System\AmpError;
 use Ampache\Module\System\Core;
 use Ampache\Module\User\Registration;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\Captcha\captcha;
 use Ampache\Module\Util\Ui;
 
@@ -50,8 +49,8 @@
 
 <body id="registerPage">
  <script src="<?php echo $web_path; ?>/lib/components/jquery/jquery.min.js"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/base.js'); ?>"></script>
- <script src="<?php echo AssetCache::get_url($web_path . '/lib/javascript/ajax.js'); ?>"></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/base.js"></script>
+ <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js"></script>
 
  <div id="maincontainer">
  <div id="header">

diff --git a/public/templates/stylesheets.inc.php b/public/templates/stylesheets.inc.php
@@ -21,7 +21,6 @@
  */
 
 use Ampache\Config\AmpConfig;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\Ui;
 
 $web_path = AmpConfig::get('web_path');
@@ -32,16 +31,16 @@
  $theme_css_base = array($theme_css_base);
 }
 foreach ($theme_css_base as $css_base) { ?>
- <link rel="stylesheet" href="<?php echo AssetCache::get_url($web_path . $theme_path . '/' . $css_base[0]); ?>" type="text/css" media="<?php echo $css_base[1]; ?>" />
+ <link rel="stylesheet" href="<?php echo $web_path . $theme_path . '/' . $css_base[0]; ?>" type="text/css" media="<?php echo $css_base[1]; ?>" />
 <?php
 } ?>
-<link rel="stylesheet" href="<?php echo AssetCache::get_url($web_path . '/templates/base.css'); ?>" type="text/css" media="screen" />
-<link rel="stylesheet" href="<?php echo AssetCache::get_url($web_path . $theme_path . '/' . $theme_color . '.css'); ?>" type="text/css" media="screen" />
-<link rel="stylesheet" href="<?php echo AssetCache::get_url($web_path . '/templates/print.css'); ?>" type="text/css" media="print" />
+<link rel="stylesheet" href="<?php echo $web_path . '/templates/base.css'; ?>" type="text/css" media="screen" />
+<link rel="stylesheet" href="<?php echo $web_path . $theme_path . '/' . $theme_color . '.css'; ?>" type="text/css" media="screen" />
+<link rel="stylesheet" href="<?php echo $web_path . '/templates/print.css'; ?>" type="text/css" media="print" />
 <?php
 if (is_rtl(AmpConfig::get('lang'))
  && is_file(__DIR__ . '/../../public/' . $theme_path . '/rtl.css')) { ?>
-<link rel="stylesheet" href="<?php echo AssetCache::get_url($web_path . $theme_path . '/rtl.css'); ?>" type="text/css" media="screen" />
+<link rel="stylesheet" href="<?php echo $web_path . $theme_path; ?>/rtl.css" type="text/css" media="screen" />
 <?php } ?>
 <link rel="stylesheet" href="<?php echo $web_path . '/lib/components/prettyphoto/css/prettyPhoto.css'; ?>" type="text/css" media="screen" />
 <link rel="stylesheet" href="<?php echo $web_path . '/templates/jquery-ui.custom.css'; ?>" type="text/css" media="screen" />

diff --git a/src/Module/Application/Admin/System/ClearCacheAction.php b/src/Module/Application/Admin/System/ClearCacheAction.php
@@ -33,7 +33,6 @@
 use Ampache\Module\Application\Exception\AccessDeniedException;
 use Ampache\Module\Authorization\AccessLevelEnum;
 use Ampache\Module\Authorization\GuiGatekeeperInterface;
-use Ampache\Module\Util\AssetCache;
 use Ampache\Module\Util\UiInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -80,9 +79,6 @@ public function run(ServerRequestInterface $request, GuiGatekeeperInterface $gat
  case 'album':
  Album::clear_cache();
  break;
- case 'asset':
- AssetCache::clear_cache();
- break;
  }
 
  $this->ui->showConfirmation(

diff --git a/src/Module/System/AutoUpdate.php b/src/Module/System/AutoUpdate.php
@@ -26,7 +26,6 @@
 
 use Ampache\Config\AmpConfig;
 use Ampache\Config\ConfigContainerInterface;
-use Ampache\Module\Util\AssetCache;
 use Exception;
 use Ampache\Repository\Model\Preference;
 use Requests;
@@ -315,7 +314,6 @@ public static function update_files($api = false)
  if (!$api) {
  echo T_('Done') . '<br />';
  }
- AssetCache::clear_cache();
  ob_flush();
  self::get_latest_version(true);
  }

diff --git a/src/Module/Util/AssetCache.php b/src/Module/Util/AssetCache.php