More singularization and correct file names.
This commit is contained in:
parent
8ba479e51f
commit
19d352619e
11 changed files with 17 additions and 17 deletions
|
@ -230,13 +230,13 @@ class ServerController extends Controller
|
|||
->first();
|
||||
|
||||
$allocation = $server->allocations->pop();
|
||||
$serverVariables = [
|
||||
$ServerVariable = [
|
||||
'{{SERVER_MEMORY}}' => $server->memory,
|
||||
'{{SERVER_IP}}' => $allocation->ip,
|
||||
'{{SERVER_PORT}}' => $allocation->port,
|
||||
];
|
||||
|
||||
$processed = str_replace(array_keys($serverVariables), array_values($serverVariables), $server->startup);
|
||||
$processed = str_replace(array_keys($ServerVariable), array_values($ServerVariable), $server->startup);
|
||||
foreach ($variables as &$variable) {
|
||||
$replace = ($variable->user_viewable === 1) ? $variable->a_serverValue : '[hidden]';
|
||||
$processed = str_replace('{{' . $variable->env_variable . '}}', $replace, $processed);
|
||||
|
|
|
@ -263,7 +263,7 @@ class Server extends Model
|
|||
*/
|
||||
public function variables()
|
||||
{
|
||||
return $this->hasMany(ServerVariables::class);
|
||||
return $this->hasMany(ServerVariable::class);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -26,7 +26,7 @@ namespace Pterodactyl\Models;
|
|||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class ServerVariables extends Model
|
||||
class ServerVariable extends Model
|
||||
{
|
||||
/**
|
||||
* The table associated with the model.
|
|
@ -54,8 +54,8 @@ class ServiceVariable extends Model
|
|||
'required' => 'integer',
|
||||
];
|
||||
|
||||
public function serverVariables()
|
||||
public function ServerVariable()
|
||||
{
|
||||
return $this->hasMany(ServerVariables::class, 'variable_id');
|
||||
return $this->hasMany(ServerVariable::class, 'variable_id');
|
||||
}
|
||||
}
|
|
@ -288,7 +288,7 @@ class ServerRepository
|
|||
foreach ($variableList as $item) {
|
||||
$environmentVariables[$item['env']] = $item['val'];
|
||||
|
||||
Models\ServerVariables::create([
|
||||
Models\ServerVariable::create([
|
||||
'server_id' => $server->id,
|
||||
'variable_id' => $item['id'],
|
||||
'variable_value' => $item['val'],
|
||||
|
@ -718,7 +718,7 @@ class ServerRepository
|
|||
$environmentVariables[$item['env']] = $item['val'];
|
||||
|
||||
// Update model or make a new record if it doesn't exist.
|
||||
$model = Models\ServerVariables::firstOrNew([
|
||||
$model = Models\ServerVariable::firstOrNew([
|
||||
'variable_id' => $item['id'],
|
||||
'server_id' => $server->id,
|
||||
]);
|
||||
|
@ -787,7 +787,7 @@ class ServerRepository
|
|||
]);
|
||||
|
||||
// Remove Variables
|
||||
Models\ServerVariables::where('server_id', $server->id)->delete();
|
||||
Models\ServerVariable::where('server_id', $server->id)->delete();
|
||||
|
||||
// Remove Permissions (Foreign Key requires before Subusers)
|
||||
Models\Permission::where('server_id', $server->id)->delete();
|
||||
|
|
|
@ -76,11 +76,11 @@ class Variable
|
|||
|
||||
public function delete($id)
|
||||
{
|
||||
$variable = Models\ServiceVariable::with('serverVariables')->findOrFail($id);
|
||||
$variable = Models\ServiceVariable::with('ServerVariable')->findOrFail($id);
|
||||
|
||||
DB::beginTransaction();
|
||||
try {
|
||||
foreach ($variable->serverVariables as $svar) {
|
||||
foreach ($variable->ServerVariable as $svar) {
|
||||
$svar->delete();
|
||||
}
|
||||
$variable->delete();
|
||||
|
|
Reference in a new issue