Move public accessible code into a separate directory (#2504)

ampache · Aug 16, 2020 · 63343b9 · 63343b9
1 parent 5c1c77e
commit 63343b9
Show file tree

Hide file tree

Showing 627 changed files with 226 additions and 186 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,27 +12,29 @@
 /play/.htaccess
 /rest/.htaccess
 /tmp/
+/src/public/lib/components
 bootstrap/
 components/
 core/
-cs_fixer_tmp_*
 develop/
 master/
 node_modules/
-php-cs-fixer.phar
 public/
 resources/
-robots.txt
 storage/
 vendor/
+.settings/
+.vscode/
+.idea/
+cs_fixer_tmp_*
 .buildpath
 .env
 .pc
 .php_cs.cache
 .project
-.settings/
-.vscode/
-.idea/
+php-cs-fixer.phar
+composer.phar
+robots.txt
 web.config
 phpcbf*
 phpcs*
@@ -45,4 +47,3 @@ phpcs*
 *.swp
 *.v11.suo
 *~
-composer.phar
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
  "config":
  {
  "vendor-dir": "lib/vendor",
- "component-dir": "lib/components",
+ "component-dir": "src/public/lib/components",
  "platform": {
  "ext-curl": "1.0",
  "ext-gd": "1.0",
@@ -57,7 +57,7 @@
  "maennchen/zipstream-php": "0.4.*",
  "mikealmond/musicbrainz": "dev-master",
  "needim/noty": "2.4.*",
- "oomphinc/composer-installers-extender": "^1.1",
+ "oomphinc/composer-installers-extender": "^2.0",
  "openid/php-openid": "2.*",
  "phpmailer/phpmailer": "6.1.*",
  "pklauzinski/jscroll": "2.*",
@@ -329,6 +329,15 @@
  "recurse": false,
  "replace": false,
  "merge-extra": false
+ },
+ "sort-packages": true,
+ "installer-types": ["component", "library"],
+ "installer-paths": {
+ "src/public/lib/components/noty/": ["needim/noty"],
+ "src/public/lib/components/jquery-file-upload/": ["blueimp/jquery-file-upload"],
+ "src/public/lib/components/happyworm-jplayer/": ["happyworm/jplayer"],
+ "src/public/lib/components/{$name}/": ["type:component"],
+ "lib/vendor/{$vendor}/{$name}": ["type:library"]
  }
  },
  "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/class/session.class.php b/lib/class/session.class.php
@@ -463,6 +463,10 @@ public static function _auto_init()
  return true;
  }
 
+ public static function gc() {
+
+ }
+
  /**
  * create_cookie
  *

diff --git a/lib/class/ui.class.php b/lib/class/ui.class.php
@@ -45,15 +45,18 @@ public function __construct()
  * @param string $template
  * @return string
  */
- public static function find_template($template)
+ public static function find_template($template, bool $extern = false)
  {
  $path = AmpConfig::get('theme_path') . '/templates/' . $template;
  $realpath = AmpConfig::get('prefix') . $path;
  $extension = strtolower(pathinfo($path, PATHINFO_EXTENSION));
  if (($extension != 'php' || AmpConfig::get('allow_php_themes')) && file_exists($realpath) && is_file($realpath)) {
  return $path;
  } else {
- return '/templates/' . $template;
+ if ($extern === true) {
+ return '/templates/' . $template;
+ }
+ return '/src/public/templates/' . $template;
  }
  }
 

diff --git a/lib/init-tiny.php b/lib/init-tiny.php
@@ -28,7 +28,7 @@
  throw new RuntimeException(T_("Ampache requires PHP version >= 7.1"));
 }
 
-error_reporting(E_ERROR); // Only show fatal errors in production
+//error_reporting(E_ERROR); // Only show fatal errors in production
 
 $load_time_begin = microtime(true);
 
@@ -50,6 +50,7 @@
 
 // Define some base level config options
 AmpConfig::set('prefix', $prefix);
+AmpConfig::set('prefix-public', $prefix.'/src/public');
 
 // Register autoloaders
 spl_autoload_register(array('Core', 'autoload'), true, true);

diff --git a/lib/themes.php b/lib/themes.php
@@ -30,7 +30,7 @@
 function get_themes()
 {
  /* Open the themes dir and start reading it */
- $handle = opendir(AmpConfig::get('prefix') . '/themes');
+ $handle = opendir(AmpConfig::get('prefix-public') . '/themes');
 
  if (!is_resource($handle)) {
  debug_event('themes', 'Failed to open /themes directory', 2);
@@ -75,7 +75,7 @@ function get_theme($name)
  return $_mapcache[$name];
  }
 
- $config_file = AmpConfig::get('prefix') . "/themes/" . $name . "/theme.cfg.php";
+ $config_file = AmpConfig::get('prefix-public') . "/themes/" . $name . "/theme.cfg.php";
  if (file_exists($config_file)) {
  $results = parse_ini_file($config_file);
  $results['path'] = $name;
@@ -101,7 +101,7 @@ function get_theme($name)
  */
 function get_theme_author($theme_name)
 {
- $theme_path = AmpConfig::get('prefix') . '/themes/' . $theme_name . '/theme.cfg.php';
+ $theme_path = AmpConfig::get('prefix-public') . '/themes/' . $theme_name . '/theme.cfg.php';
  $results = read_config($theme_path);
 
  return $results['author'];
@@ -115,7 +115,7 @@ function get_theme_author($theme_name)
  */
 function theme_exists($theme_name)
 {
- $theme_path = AmpConfig::get('prefix') . '/themes/' . $theme_name . '/theme.cfg.php';
+ $theme_path = AmpConfig::get('prefix-public') . '/themes/' . $theme_name . '/theme.cfg.php';
 
  if (!file_exists($theme_path)) {
  return false;

diff --git a/php-cs-fixer b/php-cs-fixer
diff --git a/admin/access.php → src/public/admin/access.php b/admin/access.php → src/public/admin/access.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 100)) {
  UI::access_denied();

diff --git a/admin/catalog.php → src/public/admin/catalog.php b/admin/catalog.php → src/public/admin/catalog.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 require_once AmpConfig::get('prefix') . '/modules/catalog/local/local.catalog.php';
 
 if (!Access::check('interface', 75)) {

diff --git a/admin/duplicates.php → src/public/admin/duplicates.php b/admin/duplicates.php → src/public/admin/duplicates.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 75)) {
  UI::access_denied();

diff --git a/admin/export.php → src/public/admin/export.php b/admin/export.php → src/public/admin/export.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 75)) {
  UI::access_denied();

diff --git a/admin/index.php → src/public/admin/index.php b/admin/index.php → src/public/admin/index.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 75)) {
  UI::access_denied();

diff --git a/admin/license.php → src/public/admin/license.php b/admin/license.php → src/public/admin/license.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 75)) {
  UI::access_denied();

diff --git a/admin/mail.php → src/public/admin/mail.php b/admin/mail.php → src/public/admin/mail.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 75)) {
  UI::access_denied();

diff --git a/admin/modules.php → src/public/admin/modules.php b/admin/modules.php → src/public/admin/modules.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Core::get_global('user')->has_access(100)) {
  UI::access_denied();

diff --git a/admin/shout.php → src/public/admin/shout.php b/admin/shout.php → src/public/admin/shout.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 100)) {
  UI::access_denied();

diff --git a/admin/system.php → src/public/admin/system.php b/admin/system.php → src/public/admin/system.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 100) || AmpConfig::get('demo_mode')) {
  UI::access_denied();

diff --git a/admin/users.php → src/public/admin/users.php b/admin/users.php → src/public/admin/users.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once '../lib/init.php';
+require_once __DIR__.'/../../../lib/init.php';
 
 if (!Access::check('interface', 100)) {
  UI::access_denied();

diff --git a/albums.php → src/public/albums.php b/albums.php → src/public/albums.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once 'lib/init.php';
+require_once __DIR__.'/../../lib/init.php';
 
 require_once AmpConfig::get('prefix') . UI::find_template('header.inc.php');
 

diff --git a/artists.php → src/public/artists.php b/artists.php → src/public/artists.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once 'lib/init.php';
+require_once __DIR__ . '/../../lib/init.php';
 
 UI::show_header();