TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Parameters -> Parameter 

(Models should be singular)
This commit is contained in:
Samuel Georges 2016-05-31 08:17:25 +10:00
parent 85f081ce3e
commit 74a6a71bcb
9 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/layouts/_head.htm
View File

@ -11,7 +11,7 @@
<?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSetting::get('app_name')) ?>
</title>
<?php
$coreBuild = System\Models\Parameters::get('system::core.build', 1);
$coreBuild = System\Models\Parameter::get('system::core.build', 1);
?>
<link href="<?= URL::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">

2
modules/backend/widgets/ReportContainer.php
View File

@ -7,7 +7,7 @@ use Request;
use Backend\Classes\WidgetBase;
use Backend\Classes\WidgetManager;
use Backend\Models\UserPreference;
use System\Models\Parameters as SystemParameters;
use System\Models\Parameter as SystemParameters;
use ApplicationException;
/**

8
modules/cms/classes/Theme.php
View File

@ -9,7 +9,7 @@ use Cache;
use Event;
use Config;
use Cms\Models\ThemeData;
use System\Models\Parameters;
use System\Models\Parameter;
use October\Rain\Halcyon\Datasource\FileDatasource;
use ApplicationException;
use SystemException;
@ -150,11 +150,11 @@ class Theme
if (App::hasDatabase()) {
try {
$dbResult = Cache::remember(self::ACTIVE_KEY, 1440, function() {
return Parameters::applyKey(self::ACTIVE_KEY)->pluck('value');
return Parameter::applyKey(self::ACTIVE_KEY)->pluck('value');
});
}
catch (Exception $ex) {
$dbResult = Parameters::applyKey(self::ACTIVE_KEY)->pluck('value');
$dbResult = Parameter::applyKey(self::ACTIVE_KEY)->pluck('value');
}
if ($dbResult !== null && static::exists($dbResult)) {
@ -204,7 +204,7 @@ class Theme
{
self::resetCache();
Parameters::set(self::ACTIVE_KEY, $code);
Parameter::set(self::ACTIVE_KEY, $code);
Event::fire('cms.theme.setActiveTheme', compact('code'));
}

14
modules/cms/classes/ThemeManager.php
View File

@ -2,7 +2,7 @@
use File;
use ApplicationException;
use System\Models\Parameters;
use System\Models\Parameter;
use Cms\Classes\Theme as CmsTheme;
/**
@ -25,7 +25,7 @@ class ThemeManager
*/
public function getInstalled()
{
return Parameters::get('system::theme.history', []);
return Parameter::get('system::theme.history', []);
}
/**
@ -35,7 +35,7 @@ class ThemeManager
*/
public function isInstalled($name)
{
return array_key_exists($name, Parameters::get('system::theme.history', []));
return array_key_exists($name, Parameter::get('system::theme.history', []));
}
/**
@ -49,9 +49,9 @@ class ThemeManager
$dirName = strtolower(str_replace('.', '-', $code));
}
$history = Parameters::get('system::theme.history', []);
$history = Parameter::get('system::theme.history', []);
$history[$code] = $dirName;
Parameters::set('system::theme.history', $history);
Parameter::set('system::theme.history', $history);
}
/**
@ -60,12 +60,12 @@ class ThemeManager
*/
public function setUninstalled($code)
{
$history = Parameters::get('system::theme.history', []);
$history = Parameter::get('system::theme.history', []);
if (array_key_exists($code, $history)) {
unset($history[$code]);
}
Parameters::set('system::theme.history', $history);
Parameter::set('system::theme.history', $history);
}
/**

24
modules/system/classes/UpdateManager.php
View File

@ -11,7 +11,7 @@ use Schema;
use Config;
use ApplicationException;
use Cms\Classes\ThemeManager;
use System\Models\Parameters;
use System\Models\Parameter;
use System\Models\PluginVersion;
use System\Helpers\Cache as CacheHelper;
use October\Rain\Filesystem\Zip;
@ -141,7 +141,7 @@ class UpdateManager
$this->updatePlugin($plugin);
}
Parameters::set('system::update.count', 0);
Parameter::set('system::update.count', 0);
CacheHelper::clear();
/*
@ -168,7 +168,7 @@ class UpdateManager
/*
* Already know about updates, never retry.
*/
$oldCount = Parameters::get('system::update.count');
$oldCount = Parameter::get('system::update.count');
if ($oldCount > 0) {
return $oldCount;
}
@ -176,7 +176,7 @@ class UpdateManager
/*
* Retry period not passed, skipping.
*/
if (!$force && ($retryTimestamp = Parameters::get('system::update.retry'))) {
if (!$force && ($retryTimestamp = Parameter::get('system::update.retry'))) {
if (Carbon::createFromTimeStamp($retryTimestamp)->isFuture()) {
return $oldCount;
}
@ -193,8 +193,8 @@ class UpdateManager
/*
* Remember update count, set retry date
*/
Parameters::set('system::update.count', $newCount);
Parameters::set('system::update.retry', Carbon::now()->addHours(24)->timestamp);
Parameter::set('system::update.count', $newCount);
Parameter::set('system::update.retry', Carbon::now()->addHours(24)->timestamp);
return $newCount;
}
@ -212,7 +212,7 @@ class UpdateManager
$icons = $installed->lists('icon', 'code');
$frozen = $installed->lists('is_frozen', 'code');
$updatable = $installed->lists('is_updatable', 'code');
$build = Parameters::get('system::core.build');
$build = Parameter::get('system::core.build');
$params = [
'core' => $this->getHash(),
@ -228,7 +228,7 @@ class UpdateManager
* Inject known core build
*/
if ($core = array_get($result, 'core')) {
$core['old_build'] = Parameters::get('system::core.build');
$core['old_build'] = Parameter::get('system::core.build');
$result['core'] = $core;
}
@ -283,7 +283,7 @@ class UpdateManager
$updateCount += count($themes);
$result['hasUpdates'] = $updateCount > 0;
$result['update'] = $updateCount;
Parameters::set('system::update.count', $updateCount);
Parameter::set('system::update.count', $updateCount);
return $result;
}
@ -352,7 +352,7 @@ class UpdateManager
*/
public function getHash()
{
return Parameters::get('system::core.hash', md5('NULL'));
return Parameter::get('system::core.hash', md5('NULL'));
}
/**
@ -419,7 +419,7 @@ class UpdateManager
// Database may fall asleep after this long process
Db::reconnect();
Parameters::set([
Parameter::set([
'system::core.hash' => $hash,
'system::core.build' => $build
]);
@ -834,7 +834,7 @@ class UpdateManager
{
$postData['server'] = base64_encode(serialize(['php' => PHP_VERSION, 'url' => URL::to('/')]));
if ($projectId = Parameters::get('system::project.id')) {
if ($projectId = Parameter::get('system::project.id')) {
$postData['project'] = $projectId;
}

16
modules/system/controllers/Updates.php
View File

@ -13,7 +13,7 @@ use Response;
use BackendMenu;
use Cms\Classes\ThemeManager;
use Backend\Classes\Controller;
use System\Models\Parameters;
use System\Models\Parameter;
use System\Models\PluginVersion;
use System\Classes\UpdateManager;
use System\Classes\PluginManager;
@ -56,10 +56,10 @@ class Updates extends Controller
*/
public function index()
{
$this->vars['coreBuild'] = Parameters::get('system::core.build');
$this->vars['projectId'] = Parameters::get('system::project.id');
$this->vars['projectName'] = Parameters::get('system::project.name');
$this->vars['projectOwner'] = Parameters::get('system::project.owner');
$this->vars['coreBuild'] = Parameter::get('system::core.build');
$this->vars['projectId'] = Parameter::get('system::project.id');
$this->vars['projectName'] = Parameter::get('system::project.name');
$this->vars['projectOwner'] = Parameter::get('system::project.owner');
$this->vars['pluginsActiveCount'] = PluginVersion::applyEnabled()->count();
$this->vars['pluginsCount'] = PluginVersion::count();
return $this->asExtension('ListController')->index();
@ -576,7 +576,7 @@ class Updates extends Controller
$manager = UpdateManager::instance();
$result = $manager->requestProjectDetails($projectId);
Parameters::set([
Parameter::set([
'system::project.id' => $projectId,
'system::project.name' => $result['name'],
'system::project.owner' => $result['owner'],
@ -592,7 +592,7 @@ class Updates extends Controller
public function onDetachProject()
{
Parameters::set([
Parameter::set([
'system::project.id' => null,
'system::project.name' => null,
'system::project.owner' => null,
@ -873,7 +873,7 @@ class Updates extends Controller
protected function getInstalledThemes()
{
$history = Parameters::get('system::theme.history', []);
$history = Parameter::get('system::theme.history', []);
$manager = UpdateManager::instance();
$installed = $manager->requestProductDetails(array_keys($history), 'theme');

2
modules/system/models/Parameters.php → modules/system/models/Parameter.php
View File

@ -11,7 +11,7 @@ use Exception;
* @package october\system
* @author Alexey Bobkov, Samuel Georges
*/
class Parameters extends Model
class Parameter extends Model
{
use \October\Rain\Support\Traits\KeyParser;

4
modules/system/reportwidgets/Status.php
View File

@ -2,7 +2,7 @@
use Lang;
use BackendAuth;
use System\Models\Parameters;
use System\Models\Parameter;
use System\Classes\UpdateManager;
use Backend\Classes\ReportWidgetBase;
use System\Models\EventLog;
@ -57,7 +57,7 @@ class Status extends ReportWidgetBase
$this->vars['canUpdate'] = BackendAuth::getUser()->hasAccess('system.manage_updates');
$this->vars['updates'] = $manager->check();
$this->vars['warnings'] = $this->getSystemWarnings();
$this->vars['coreBuild'] = Parameters::get('system::core.build');
$this->vars['coreBuild'] = Parameter::get('system::core.build');
$this->vars['eventLog'] = EventLog::count();
$this->vars['requestLog'] = RequestLog::count();
$this->vars['appBirthday'] = PluginVersion::orderBy('created_at')->pluck('created_at');

4
modules/system/traits/AssetMaker.php
View File

@ -2,7 +2,7 @@
use Url;
use Html;
use System\Models\Parameters;
use System\Models\Parameter;
use System\Models\PluginVersion;
/**
@ -244,7 +244,7 @@ trait AssetMaker
$build = $asset['attributes']['build'];
if ($build == 'core') {
$build = 'v' . Parameters::get('system::core.build', 1);
$build = 'v' . Parameter::get('system::core.build', 1);
}
elseif ($pluginVersion = PluginVersion::getVersion($build)) {
$build = 'v' . $pluginVersion;