diff --git a/_install/Autoloader_Class.php b/_install/Autoloader_Class.php deleted file mode 100755 index 69726bcd5..000000000 --- a/_install/Autoloader_Class.php +++ /dev/null @@ -1,198 +0,0 @@ -register(); - * - * // register the base directories for the namespace prefix - * $loader->addNamespace('Foo\Bar', '/path/to/packages/foo-bar/src'); - * $loader->addNamespace('Foo\Bar', '/path/to/packages/foo-bar/tests'); - * - * The following line would cause the autoloader to attempt to load the - * \Foo\Bar\Qux\Quux class from /path/to/packages/foo-bar/src/Qux/Quux.php: - * - * prefixes[$prefix]) === false) { - $this->prefixes[$prefix] = []; - } - - // retain the base directory for the namespace prefix - if ($prepend) { - array_unshift($this->prefixes[$prefix], $base_dir); - } else { - array_push($this->prefixes[$prefix], $base_dir); - } - } - - /** - * Loads the class file for a given class name. - * - * @param string $class The fully-qualified class name. - * - * @return string|false The mapped file name on success, or boolean false on - * failure. - */ - public function loadClass($class) - { - // the current namespace prefix - $prefix = $class; - - // work backwards through the namespace names of the fully-qualified - // class name to find a mapped file name - while (false !== $pos = strrpos($prefix, '\\')) { - - // retain the trailing namespace separator in the prefix - $prefix = substr($class, 0, $pos + 1); - - // the rest is the relative class name - $relative_class = substr($class, $pos + 1); - - // try to load a mapped file for the prefix and relative class - $mapped_file = $this->loadMappedFile($prefix, $relative_class); - if ($mapped_file) { - return $mapped_file; - } - - // remove the trailing namespace separator for the next iteration - // of strrpos() - $prefix = rtrim($prefix, '\\'); - } - - // never found a mapped file - return false; - } - - /** - * Load the mapped file for a namespace prefix and relative class. - * - * @param string $prefix The namespace prefix. - * @param string $relative_class The relative class name. - * - * @return string|false Boolean false if no mapped file can be loaded, or the - * name of the mapped file that was loaded. - */ - protected function loadMappedFile($prefix, $relative_class) - { - // are there any base directories for this namespace prefix? - if (isset($this->prefixes[$prefix]) === false) { - return false; - } - - // look through base directories for this namespace prefix - foreach ($this->prefixes[$prefix] as $base_dir) { - - // replace the namespace prefix with the base directory, - // replace namespace separators with directory separators - // in the relative class name, append with .php - $file = $base_dir - .str_replace('\\', DIRECTORY_SEPARATOR, $relative_class) - .'.php'; - $file = $base_dir - .str_replace('\\', '/', $relative_class) - .'.php'; - - // if the mapped file exists, require it - if ($this->requireFile($file)) { - // yes, we're done - return $file; - } - } - - // never found it - return false; - } - - /** - * If a file exists, require it from the file system. - * - * @param string $file The file to require. - * - * @return bool True if the file exists, false if not. - */ - protected function requireFile($file) - { - if (file_exists($file)) { - require $file; - - return true; - } - - return false; - } -} diff --git a/_install/install.sh b/_install/install.sh deleted file mode 100644 index 9af1d6349..000000000 --- a/_install/install.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -echo "NNTmux Installer" -echo "----------------------" -echo "" - -echo "Getting the NNTmux app from GitHub" -echo "" -git clone https://github.com/NNTmux/newznab-tmux.git nntmux -cd nntmux -echo "" - -if type -p composer >/dev/null 2>&1; then - composer install - else if [ -f "composer.phar" ]; then - php composer.phar install - else - echo "" - echo "Getting Composer for you..." - curl -sS https://getcomposer.org/installer | php - php composer.phar install - fi -fi - -echo "" -echo "Setting cache directory permissions for you..." -sudo chown -R www-data:www-data /var/lib/php/sessions/ -chmod 755 ./ -chmod -R 755 vendor -chmod -R 777 app/resources -chmod -R 755 libraries -chmod -R 755 resources -chmod -R 777 www -chmod +x ./tmux -alias tmux='./tmux' -echo "" - -echo "" -echo "Installation complete." -echo "Now run the setup via the web site's /install page." -echo "------------------------" diff --git a/app/Models/User.php b/app/Models/User.php index 94991a66f..1ee6baf6d 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -755,6 +755,12 @@ class User extends Authenticatable return false; } + if (NN_INSTALLER === true) { + $storeips = ''; + } else { + $storeips = (int) Settings::settingValue('..storeuserips') === 1 ? $host : ''; + } + return self::query()->insertGetId( [ 'username' => $userName, @@ -762,7 +768,7 @@ class User extends Authenticatable 'email' => $email, 'user_roles_id' => $role, 'created_at' => Carbon::now(), - 'host' => (int) Settings::settingValue('..storeuserips') === 1 ? $host : '', + 'host' => $storeips, 'rsstoken' => md5(Password::getRepository()->createNewToken()), 'invites' => $invites, 'invitedby' => (int) $invitedBy === 0 ? 'NULL' : $invitedBy, diff --git a/database/migrations/2018_01_20_195739_create_gamesinfo_table.php b/database/migrations/2018_01_20_195739_create_gamesinfo_table.php index 7f4335e93..33334422d 100644 --- a/database/migrations/2018_01_20_195739_create_gamesinfo_table.php +++ b/database/migrations/2018_01_20_195739_create_gamesinfo_table.php @@ -26,7 +26,7 @@ class CreateGamesinfoTable extends Migration { $table->boolean('cover')->default(0); $table->boolean('backdrop')->default(0); $table->string('trailer', 1000)->default(''); - $table->string('classused', 10)->default('\'steam\''); + $table->string('classused', 10)->default('steam'); $table->timestamps(); }); } diff --git a/database/migrations/2018_01_20_200005_create_release_comments_table.php b/database/migrations/2018_01_20_200005_create_release_comments_table.php index e6ea708dc..1a52b665c 100644 --- a/database/migrations/2018_01_20_200005_create_release_comments_table.php +++ b/database/migrations/2018_01_20_200005_create_release_comments_table.php @@ -30,7 +30,7 @@ class CreateReleaseCommentsTable extends Migration { $table->string('shareid', 40)->default(''); $table->string('siteid', 40)->default(''); $table->bigInteger('sourceid')->unsigned()->nullable(); - $table->binary('nzb_guid', 16)->default('\'0$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$\''); + $table->binary('nzb_guid')->default('0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0'); $table->unique(['text_hash','releases_id'], 'ix_release_comments_hash_releases_id'); }); } diff --git a/database/migrations/2018_01_20_200038_create_release_unique_table.php b/database/migrations/2018_01_20_200038_create_release_unique_table.php index 7d52e9c3f..9a5a67a44 100644 --- a/database/migrations/2018_01_20_200038_create_release_unique_table.php +++ b/database/migrations/2018_01_20_200038_create_release_unique_table.php @@ -15,7 +15,7 @@ class CreateReleaseUniqueTable extends Migration { Schema::create('release_unique', function(Blueprint $table) { $table->integer('releases_id')->unsigned()->comment('FK to releases.id.'); - $table->binary('uniqueid', 16)->default('\'0$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$$UP$\'')->comment('Unique_ID from mediainfo.'); + $table->binary('uniqueid', 16)->default('0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0')->comment('Unique_ID from mediainfo.'); $table->primary(['releases_id','uniqueid']); }); } diff --git a/nntmux/config/Configure.php b/nntmux/config/Configure.php index d2394fbb5..eab75676e 100755 --- a/nntmux/config/Configure.php +++ b/nntmux/config/Configure.php @@ -79,7 +79,7 @@ class Configure } else { $file = NN_CONFIGS.$filename.'.php'; } - if (! file_exists($file) && $throwException) { + if ($throwException && ! file_exists($file)) { $errorCode = (int) ($filename === '.env'); throw new \RuntimeException( "Unable to load configuration file '$file'. Make sure it has been created and contains correct settings.",