diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-09-03 22:53:03 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-09-03 22:53:03 -0700 |
| commit | 09187f3b3b30e6f810c6afff7332615ed472154e (patch) | |
| tree | 3018bef5d383a3da3f1a7709acb7e7910a4fe935 /core | |
| parent | 6435e18e95bc283af051d141fad204660d7f7eba (diff) | |
| parent | e5fc7b9dbeb01ac116bb132903c562c8f7d3c5b3 (diff) | |
| download | nextcloud-server-09187f3b3b30e6f810c6afff7332615ed472154e.tar.gz nextcloud-server-09187f3b3b30e6f810c6afff7332615ed472154e.zip | |
Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/controller.php | 2 | ||||
| -rw-r--r-- | core/minimizer.php | 4 | ||||
| -rw-r--r-- | core/setup.php | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 74a5be2b96f..f761e45d25f 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -42,7 +42,7 @@ class OC_Core_LostPassword_Controller { } if (OC_User::userExists($_POST['user']) && $continue) { - $token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', '')); + $token = hash('sha256', OC_Util::generateRandomBytes(30).OC_Config::getValue('passwordsalt', '')); OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash('sha256', $token)); // Hash the token again to prevent timing attacks $email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', ''); diff --git a/core/minimizer.php b/core/minimizer.php index 4da9037c413..eeeddf86a81 100644 --- a/core/minimizer.php +++ b/core/minimizer.php @@ -5,11 +5,11 @@ OC_App::loadApps(); if ($service == 'core.css') { $minimizer = new OC_Minimizer_CSS(); - $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles); + $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles); $minimizer->output($files, $service); } else if ($service == 'core.js') { $minimizer = new OC_Minimizer_JS(); - $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts); + $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts); $minimizer->output($files, $service); } diff --git a/core/setup.php b/core/setup.php index 40e30db533a..4758c23b045 100644 --- a/core/setup.php +++ b/core/setup.php @@ -33,8 +33,8 @@ $opts = array( 'hasOracle' => $hasOracle, 'hasMSSQL' => $hasMSSQL, 'directory' => $datadir, - 'secureRNG' => OC_Util::secureRNG_available(), - 'htaccessWorking' => OC_Util::ishtaccessworking(), + 'secureRNG' => OC_Util::secureRNGAvailable(), + 'htaccessWorking' => OC_Util::isHtAccessWorking(), 'vulnerableToNullByte' => $vulnerableToNullByte, 'errors' => array(), ); |