diff options
author | Matthias Held <ilovemilk@wusa.io> | 2018-09-10 23:58:37 +0300 |
---|---|---|
committer | Matthias Held <ilovemilk@wusa.io> | 2018-09-10 23:58:37 +0300 |
commit | 722f04af3a186055c9e8f3418615a7215c63f846 (patch) | |
tree | bf871db05b93117cea6cda8af4ed977b7539b109 | |
parent | 7c2ba742257689eba6704240917c1979b5033d12 (diff) |
Use CamelCase
Signed-off-by: Matthias Held <matthias.held@uni-konstanz.de>
-rw-r--r-- | js/filelist.js | 4 | ||||
-rw-r--r-- | js/scan.js | 6 | ||||
-rw-r--r-- | lib/Analyzer/SequenceAnalyzer.php | 24 | ||||
-rw-r--r-- | lib/Controller/BasicController.php | 8 | ||||
-rw-r--r-- | lib/Controller/ScanController.php | 4 | ||||
-rw-r--r-- | lib/Settings/Personal.php | 2 |
6 files changed, 24 insertions, 24 deletions
diff --git a/js/filelist.js b/js/filelist.js index 5404ecc..6d45741 100644 --- a/js/filelist.js +++ b/js/filelist.js @@ -83,11 +83,11 @@ this.$fileList = {}; $.getJSON(self.getDebugModeUrl, function(debug) { - if (debug.debug_mode == 1) { + if (debug.debugMode == 1) { self.debug = 1; } $.getJSON(self.getColorModeUrl, function(schema) { - if (schema.color_mode == 1) { + if (schema.colorMode == 1) { Utils.colors = {red: 'color-blind-red', orange: 'color-blind-orange', yellow: 'color-blind-yellow', green: 'color-blind-green'}; Utils.colorsText = {red: 'color-blind-red-text', orange: 'color-blind-orange', yellow: 'color-blind-yellow-text', green: 'color-blind-green-text'}; } @@ -82,7 +82,7 @@ this.$fileList = {}; $.getJSON(self.getDebugModeUrl, function(debug) { - if (debug.debug_mode == 1) { + if (debug.debugMode == 1) { self.debug = 1; } $.getJSON(self.filesUrl, function(data) { @@ -207,7 +207,7 @@ if (self.sequencesToScan.length > 0) { var count = 0; $.getJSON(self.getColorModeUrl, function(schema) { - if (schema.color_mode == 1) { + if (schema.colorMode == 1) { Utils.colors = {red: 'color-blind-red', orange: 'color-blind-orange', yellow: 'color-blind-yellow', green: 'color-blind-green'}; Utils.colorsText = {red: 'color-blind-red-text', orange: 'color-blind-orange', yellow: 'color-blind-yellow-text', green: 'color-blind-green-text'}; } @@ -222,7 +222,7 @@ $('#scanned').text(count); if (response.status === "success") { self.$section[index] = self._createSection(index); - self.$table[index] = Utils._createTableSkeleton(index, response.suspicion_score); + self.$table[index] = Utils._createTableSkeleton(index, response.suspicionScore); self.$fileList[index] = self.$table[index].find('tbody.file-list'); self.files[index] = []; $.each(response.sequence, function(i, file) { diff --git a/lib/Analyzer/SequenceAnalyzer.php b/lib/Analyzer/SequenceAnalyzer.php index 30aa520..e1b8c6c 100644 --- a/lib/Analyzer/SequenceAnalyzer.php +++ b/lib/Analyzer/SequenceAnalyzer.php @@ -90,7 +90,7 @@ class SequenceAnalyzer return $sequenceResult; } - $files = ['written' => [], 'size_written' => 0, 'deleted' => [], 'size_deleted' => 0, 'suspicious' => [], 'maybe_suspicious' => [], 'not_suspicious' => []]; + $files = ['written' => [], 'sizeWritten' => 0, 'deleted' => [], 'sizeDeleted' => 0, 'suspicious' => [], 'maybeSuspicious' => [], 'notSuspicious' => []]; $suspicionScore = 0; foreach ($sequence as $file) { @@ -98,7 +98,7 @@ class SequenceAnalyzer switch ($file->getCommand()) { case Monitor::WRITE: $files['written'][] = $file; - $files['size_written'] = $files['size_written'] + $file->getSize(); + $files['sizeWritten'] = $files['sizeWritten'] + $file->getSize(); break; case Monitor::READ: break; @@ -106,7 +106,7 @@ class SequenceAnalyzer break; case Monitor::DELETE: $files['deleted'][] = $file; - $files['size_deleted'] = $files['size_deleted'] + $file->getSize(); + $files['sizeDeleted'] = $files['sizeDeleted'] + $file->getSize(); break; case Monitor::CREATE: break; @@ -118,10 +118,10 @@ class SequenceAnalyzer $files['suspicious'][] = $file; break; case Classifier::MAYBE_SUSPICIOUS: - $files['maybe_suspicious'][] = $file; + $files['maybeSuspicious'][] = $file; break; case Classifier::NOT_SUSPICIOUS: - $files['not_suspicious'][] = $file; + $files['notSuspicious'][] = $file; break; case Classifier::NO_INFORMATION: break; @@ -133,10 +133,10 @@ class SequenceAnalyzer // compare files written and files deleted if (sizeof($files['written']) > 0 && sizeof($files['deleted']) > 0) { - $sequenceResult->setSizeWritten($files['size_written']); - $sequenceResult->setSizeDeleted($files['size_deleted']); + $sequenceResult->setSizeWritten($files['sizeWritten']); + $sequenceResult->setSizeDeleted($files['sizeDeleted']); $upperBound = sizeof($files['deleted']) + self::NUMBER_OF_INFO_FILES; - if (sizeof($writtenFiles) <= $upperBound && sizeof($files['written']) >= sizeof($files['deleted'])) { + if (sizeof($files['written']) <= $upperBound && sizeof($files['written']) >= sizeof($files['deleted'])) { if ($this->sequenceSizeAnalyzer->analyze($sequence) === SequenceSizeAnalyzer::EQUAL_SIZE) { $sequenceResult->setQuantities(2); $suspicionScore += 2; @@ -147,16 +147,16 @@ class SequenceAnalyzer } } - $numberOfWrittenFiles = sizeof($files['suspicious']) + sizeof($files['maybe_suspicious']) + sizeof($files['not_suspicious']); + $numberOfWrittenFiles = sizeof($files['suspicious']) + sizeof($files['maybeSuspicious']) + sizeof($files['notSuspicious']); // remove info files from the weight $numberOfInfoFiles = self::NUMBER_OF_INFO_FILES; - if (sizeof($files['not_suspicious']) < self::NUMBER_OF_INFO_FILES) { - $numberOfInfoFiles = sizeof($files['not_suspicious']); + if (sizeof($files['notSuspicious']) < self::NUMBER_OF_INFO_FILES) { + $numberOfInfoFiles = sizeof($files['notSuspicious']); } // weight the suspicion levels. - $suspicionSum = (sizeof($files['suspicious']) * 1) + (sizeof($files['maybe_suspicious']) * 0.5) + ((sizeof($files['not_suspicious']) - $numberOfInfoFiles) * 0.25); + $suspicionSum = (sizeof($files['suspicious']) * 1) + (sizeof($files['maybeSuspicious']) * 0.5) + ((sizeof($files['notSuspicious']) - $numberOfInfoFiles) * 0.25); // check for division by zero. if (($numberOfWrittenFiles - $numberOfInfoFiles) > 0) { diff --git a/lib/Controller/BasicController.php b/lib/Controller/BasicController.php index f63f978..2d72f50 100644 --- a/lib/Controller/BasicController.php +++ b/lib/Controller/BasicController.php @@ -72,7 +72,7 @@ class BasicController extends OCSController { $debugMode = $this->config->getAppValue(Application::APP_ID, 'debug', 0); - return new JSONResponse(['status' => 'success', 'message' => 'Get debug mode.', 'debug_mode' => $debugMode], Http::STATUS_ACCEPTED); + return new JSONResponse(['status' => 'success', 'message' => 'Get debug mode.', 'debugMode' => $debugMode], Http::STATUS_ACCEPTED); } /** @@ -84,9 +84,9 @@ class BasicController extends OCSController */ public function getColorMode() { - $colorMode = $this->config->getUserValue($this->userId, Application::APP_ID, 'colorMode', 0); + $colorMode = $this->config->getUserValue($this->userId, Application::APP_ID, 'color_mode', 0); - return new JSONResponse(['status' => 'success', 'message' => 'Get color mode.', 'color_mode' => $colorMode], Http::STATUS_ACCEPTED); + return new JSONResponse(['status' => 'success', 'message' => 'Get color mode.', 'colorMode' => $colorMode], Http::STATUS_ACCEPTED); } /** @@ -100,7 +100,7 @@ class BasicController extends OCSController */ public function changeColorMode($colorMode) { - $this->config->setUserValue($this->userId, Application::APP_ID, 'colorMode', $colorMode); + $this->config->setUserValue($this->userId, Application::APP_ID, 'color_mode', $colorMode); return new JSONResponse(['status' => 'success', 'message' => 'Color mode changed.'], Http::STATUS_ACCEPTED); } diff --git a/lib/Controller/ScanController.php b/lib/Controller/ScanController.php index 984a86c..da840b5 100644 --- a/lib/Controller/ScanController.php +++ b/lib/Controller/ScanController.php @@ -223,7 +223,7 @@ class ScanController extends OCSController $sequencesArray[] = $sequence; $end = time(); - return new JSONResponse(['status' => 'success', 'sequences' => $sequencesArray, 'number_of_files' => $storageStructure->getNumberOfFiles(), 'scan_duration' => $end - $start], Http::STATUS_OK); + return new JSONResponse(['status' => 'success', 'sequences' => $sequencesArray, 'numberOfFiles' => $storageStructure->getNumberOfFiles(), 'scanDuration' => $end - $start], Http::STATUS_OK); } /** @@ -256,7 +256,7 @@ class ScanController extends OCSController } if (count($fileOperationSequence) > 0) { $sequenceResult = $this->sequenceAnalyzer->analyze(0, $fileOperationSequence); - return new JSONResponse(['status' => 'success', 'suspicion_score' => $sequenceResult->getSuspicionScore(), 'sequence' => $jsonSequence], Http::STATUS_OK); + return new JSONResponse(['status' => 'success', 'suspicionScore' => $sequenceResult->getSuspicionScore(), 'sequence' => $jsonSequence], Http::STATUS_OK); } else { return new JSONResponse(['status' => 'error', 'message' => 'The file(s) requested do(es) not exist.']); } diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php index 1e7ee8e..11c8198 100644 --- a/lib/Settings/Personal.php +++ b/lib/Settings/Personal.php @@ -67,7 +67,7 @@ class Personal implements ISettings */ public function getForm() { - $colorMode = $this->config->getUserValue($this->userId, Application::APP_ID, 'colorMode', 0); + $colorMode = $this->config->getUserValue($this->userId, Application::APP_ID, 'color_mode', 0); if ($colorMode === 0) { $colorActive = ['code' => 0, 'name' => 'Normal']; |