commit 4eccbabee9cc5f37c958917b10e41fad3a2d184b
parent ce16e10d1f597a92db85e058ce17553e2ce1bb3d
Author: markseu <mark2011@mayberg.se>
Date: Thu, 11 Apr 2019 21:43:30 +0200
Added usability improvements
Diffstat:
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/system/extensions/command.php b/system/extensions/command.php
@@ -4,7 +4,7 @@
// This file may be used and distributed under the terms of the public license.
class YellowCommand {
- const VERSION = "0.8.5";
+ const VERSION = "0.8.6";
const TYPE = "feature";
const PRIORITY = "3";
public $yellow; //access to API
@@ -263,12 +263,13 @@ class YellowCommand {
$statusCode = $this->checkStaticFiles($path, $location);
} else {
$statusCode = 500;
- $this->files = $this->links = 0;
+ $this->links = 0;
+ $this->errors = 1;
$fileName = $this->yellow->system->get("settingDir").$this->yellow->system->get("systemFile");
echo "ERROR checking files: Please configure StaticUrl in file '$fileName'!\n";
}
- echo "Yellow $command: $this->files file".($this->files!=1 ? "s" : "");
- echo ", $this->links link".($this->links!=1 ? "s" : "")."\n";
+ echo "Yellow $command: $this->links link".($this->links!=1 ? "s" : "");
+ echo ", $this->errors error".($this->errors!=1 ? "s" : "")."\n";
} else {
$statusCode = 400;
echo "Yellow $command: Invalid arguments\n";
@@ -279,7 +280,7 @@ class YellowCommand {
// Check static files for broken links
public function checkStaticFiles($path, $locationFilter) {
$path = rtrim(empty($path) ? $this->yellow->system->get("staticDir") : $path, "/");
- $this->files = $this->links = 0;
+ $this->links = $this->errors = 0;
$regex = "/^[^.]+$|".$this->yellow->system->get("staticDefaultFile")."$/";
$fileNames = $this->yellow->toolbox->getDirectoryEntriesRecursive($path, $regex, false, false);
list($statusCodeFiles, $links) = $this->analyseLinks($path, $locationFilter, $fileNames);
@@ -319,16 +320,17 @@ class YellowCommand {
if (defined("DEBUG") && DEBUG>=2) echo "YellowCommand::analyseLinks detected url:$url<br/>\n";
}
}
- ++$this->files;
if (defined("DEBUG") && DEBUG>=1) echo "YellowCommand::analyseLinks location:$locationSource<br/>\n";
} else {
$statusCode = 500;
+ ++$this->errors;
echo "ERROR reading files: Can't read file '$fileName'!\n";
}
}
$this->links = count($links);
} else {
$statusCode = 500;
+ ++$this->errors;
echo "ERROR reading files: Can't find files in directory '$path'!\n";
}
return array($statusCode, $links);
@@ -373,6 +375,7 @@ class YellowCommand {
} else {
$broken["$scheme://$address$base$location -> $url - ".$this->getStatusFormatted($statusCodeUrl)] = $statusCodeUrl;
}
+ ++$this->errors;
}
}
echo "\rChecking static website 100%... done\n";
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -4,7 +4,7 @@
// This file may be used and distributed under the terms of the public license.
class YellowEdit {
- const VERSION = "0.8.6";
+ const VERSION = "0.8.7";
const TYPE = "feature";
public $yellow; //access to API
public $response; //web response
@@ -23,12 +23,12 @@ class YellowEdit {
$this->yellow->system->setDefault("editKeyboardShortcuts", "ctrl+b bold, ctrl+i italic, ctrl+k strikethrough, ctrl+e code, ctrl+s save, ctrl+alt+p preview");
$this->yellow->system->setDefault("editToolbarButtons", "auto");
$this->yellow->system->setDefault("editEndOfLine", "auto");
+ $this->yellow->system->setDefault("editNewFile", "page-new-(.*).md");
$this->yellow->system->setDefault("editUserFile", "user.ini");
$this->yellow->system->setDefault("editUserPasswordMinLength", "8");
$this->yellow->system->setDefault("editUserHashAlgorithm", "bcrypt");
$this->yellow->system->setDefault("editUserHashCost", "10");
$this->yellow->system->setDefault("editUserHome", "/");
- $this->yellow->system->setDefault("editNewFile", "page-new-(.*).md");
$this->yellow->system->setDefault("editLoginRestriction", "0");
$this->yellow->system->setDefault("editLoginSessionTimeout", "2592000");
$this->yellow->system->setDefault("editBruteForceProtection", "25");
@@ -1146,7 +1146,7 @@ class YellowEditResponse {
$toolbarButtons = $this->yellow->system->get("editToolbarButtons");
if ($toolbarButtons=="auto") {
$toolbarButtons = "";
- if ($this->yellow->extensions->isExisting("markdown")) $toolbarButtons = "format, bold, italic, strikethrough, code, list, link, file";
+ if ($this->yellow->extensions->isExisting("markdown")) $toolbarButtons = "format, bold, italic, strikethrough, code, separator, list, link, file";
if ($this->yellow->extensions->isExisting("emojiawesome")) $toolbarButtons .= ", emojiawesome";
if ($this->yellow->extensions->isExisting("fontawesome")) $toolbarButtons .= ", fontawesome";
if ($this->yellow->extensions->isExisting("draft")) $toolbarButtons .= ", draft";
diff --git a/system/settings/system.ini b/system/settings/system.ini
@@ -57,12 +57,12 @@ EditUploadExtensions: .gif, .jpg, .pdf, .png, .svg, .tgz, .zip
EditKeyboardShortcuts: ctrl+b bold, ctrl+i italic, ctrl+k strikethrough, ctrl+e code, ctrl+s save, ctrl+alt+p preview
EditToolbarButtons: auto
EditEndOfLine: auto
+EditNewFile: page-new-(.*).md
EditUserFile: user.ini
EditUserPasswordMinLength: 8
EditUserHashAlgorithm: bcrypt
EditUserHashCost: 10
EditUserHome: /
-EditNewFile: page-new-(.*).md
EditLoginRestriction: 0
EditLoginSessionTimeout: 2592000
EditBruteForceProtection: 25
