Merge branch 'master' of github.com:dignajar/bludit
This commit is contained in:
Diego Najar
commit
2bc925cced
|
|
@ -149,12 +149,20 @@ class Url
|
|||
|
||||
public function pageNumber()
|
||||
{
|
||||
if(isset($this->parameters['page'])) {
|
||||
if (isset($this->parameters['page'])) {
|
||||
return (int)$this->parameters['page'];
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
public function parameter($field)
|
||||
{
|
||||
if (isset($this->parameters[$field])) {
|
||||
return $this->parameters[$field];
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public function setNotFound()
|
||||
{
|
||||
$this->setWhereAmI('page');
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"native": "Deutsch (Schweiz)",
|
||||
"english-name": "German",
|
||||
"locale": "de, de_CH",
|
||||
"last-update": "2018-01-17",
|
||||
"last-update": "2018-02-27",
|
||||
"authors": [
|
||||
"Clickwork https:\/\/clickwork.ch",
|
||||
"blog2read https:\/\/github.com\/blog2read",
|
||||
|
|
@ -277,28 +277,28 @@
|
|||
"next-page": "Nächste Seite",
|
||||
"scheduled": "Veröffentlichung geplant",
|
||||
"this-token-is-similar-to-a-password-it-should-not-be-shared": "Dieser Token ist genauso wichtig wie ein Passwort und sollte nicht weitergegen werden.",
|
||||
"congratulations-you-have-successfully-installed-your-bludit": "Gratulation, **Bludit** wurde erfolgreich installiert!",
|
||||
"congratulations-you-have-successfully-installed-your-bludit": "Gratulation, Bludit wurde erfolgreich installiert!",
|
||||
"this-theme-may-not-be-supported-by-this-version-of-bludit": "Dieses Theme wird möglicherweise von der installierten Version von Bludit nicht unterstützt.",
|
||||
"read-more": "Weiterlesen",
|
||||
"remember-me": "Angemeldet bleiben",
|
||||
"plugins-position": "Plugin position",
|
||||
"plugins-sorted": "Plugins sorted",
|
||||
"plugins-position-changed": "Plugin position changed",
|
||||
"drag-and-drop-to-set-the-position-of-the-plugin": "Drag and Drop to set the position of the plugins",
|
||||
"change-the-position-of-the-plugins": "Change the position of the plugins",
|
||||
"plugins-position-changed": "Die Reihenfolge der Plugins wurde geändert.",
|
||||
"drag-and-drop-to-set-the-position-of-the-plugin": "Die Reihenfolge der Plugins kann mit \"Drag and Drop\" geändert werden",
|
||||
"change-the-position-of-the-plugins": "Reihenfolge der Plugins bearbeiten",
|
||||
"reading-time": "Reading time",
|
||||
"minutes": "minutes",
|
||||
"minute": "minute",
|
||||
"example-page-1-slug": "create-your-own-content",
|
||||
"example-page-1-title": "Create your own content",
|
||||
"example-page-1-content": "Start writing your own content or edit the current to fit your needs. To create, edit or remove content you need to login to the [admin panel](.\/admin) with the username `admin` and the password you set on the installation process.",
|
||||
"example-page-2-slug": "set-up-your-new-site",
|
||||
"example-page-2-title": "Set up your new site",
|
||||
"example-page-2-content": "Update the settings of your site from the [admin panel](.\/admin), you can change the title, description and the social networks from [Settings > General](.\/admin\/settings-general).",
|
||||
"minutes": "Minuten",
|
||||
"minute": "Minute",
|
||||
"example-page-1-slug": "veroeffentliche-deine-inhalte",
|
||||
"example-page-1-title": "Veröffentliche deine Inhalte",
|
||||
"example-page-1-content": "Veröffentliche deine eigenen Inhalte oder passe die vorhandenen deinen Bedürfnissen an. Um Inhalte zu veröffentlichen, zu bearbeiten oder zu löschen, musst du dich im [Administrationsbereich](.\/admin) anmelden mit dem Benutzernamen `admin` und dem Passwort, das Du bei der Installation eingegeben hast.",
|
||||
"example-page-2-slug": "richte-deine-website-ein",
|
||||
"example-page-2-title": "Richte deine Website ein",
|
||||
"example-page-2-content": "Passe die Einstellungen deiner Website im [Administrationsbereich](.\/admin) an. Unter [Einstellungen > Allgemein](.\/admin\/settings-general) kannst Du beispielsweise den Titel und die Beschreibung der Website ändern oder Links zu sozialen Netzwerken eingeben.",
|
||||
"example-page-3-slug": "follow-bludit",
|
||||
"example-page-3-title": "Follow Bludit",
|
||||
"example-page-3-content": "Get information about news, new releases, new themes or new plugins on our social networks [Facebook](https:\/\/www.facebook.com\/bluditcms\/), [Twitter](https:\/\/twitter.com\/bludit) and [GooglePlus](https:\/\/plus.google.com\/+Bluditcms) or visit our [Blog](https:\/\/blog.bludit.com).",
|
||||
"example-page-4-slug": "about",
|
||||
"example-page-4-title": "About",
|
||||
"example-page-4-slug": "ueber",
|
||||
"example-page-4-title": "Über",
|
||||
"example-page-4-content": "Your About page is typically one of the most visited pages on your site, need to be simple with a few key things, such as your name, who are you, how can contact you, a small story, etc."
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
"name": "Backup",
|
||||
"description": "Einfach Backups erstellen und wiederherstellen."
|
||||
},
|
||||
"create-backup": "Create Backup",
|
||||
"download": "Download",
|
||||
"restore-backup": "Restore Backup",
|
||||
"delete-backup": "Delete Backup"
|
||||
}
|
||||
"create-backup": "Backup erstellen",
|
||||
"download": "Backup herunterladen",
|
||||
"restore-backup": "Backup wiederherstellen",
|
||||
"delete-backup": "Backup löschen"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
"name": "Backup",
|
||||
"description": "Einfach Backups erstellen und wiederherstellen."
|
||||
},
|
||||
"create-backup": "Create Backup",
|
||||
"download": "Download",
|
||||
"restore-backup": "Restore Backup",
|
||||
"delete-backup": "Delete Backup"
|
||||
}
|
||||
"create-backup": "Backup erstellen",
|
||||
"download": "Backup herunterladen",
|
||||
"restore-backup": "Backup wiederherstellen",
|
||||
"delete-backup": "Backup löschen"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,6 +82,15 @@ class pluginRSS extends Plugin {
|
|||
$this->createXML();
|
||||
}
|
||||
|
||||
public function post()
|
||||
{
|
||||
// Call the method
|
||||
parent::post();
|
||||
|
||||
// After POST request
|
||||
$this->createXML();
|
||||
}
|
||||
|
||||
public function afterPageCreate()
|
||||
{
|
||||
$this->createXML();
|
||||
|
|
|
|||
|
|
@ -59,6 +59,15 @@ class pluginSitemap extends Plugin {
|
|||
$this->createXML();
|
||||
}
|
||||
|
||||
public function post()
|
||||
{
|
||||
// Call the method
|
||||
parent::post();
|
||||
|
||||
// After POST request
|
||||
$this->createXML();
|
||||
}
|
||||
|
||||
public function afterPageCreate()
|
||||
{
|
||||
$this->createXML();
|
||||
|
|
|
|||
45
install.php
45
install.php
|
|
@ -190,17 +190,46 @@ function checkSystem()
|
|||
$stdOut = array();
|
||||
$dirpermissions = 0755;
|
||||
|
||||
// Check .htaccess file for different webservers
|
||||
if (!file_exists(PATH_ROOT.'.htaccess')) {
|
||||
// Try to create .htaccess file if not exists
|
||||
$htaccessContent = 'AddDefaultCharset UTF-8
|
||||
|
||||
if ( !isset($_SERVER['SERVER_SOFTWARE']) ||
|
||||
stripos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false ||
|
||||
stripos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false
|
||||
) {
|
||||
$errorText = 'Missing file, upload the file .htaccess (ERROR_204)';
|
||||
<IfModule mod_rewrite.c>
|
||||
|
||||
# Enable rewrite rules
|
||||
RewriteEngine on
|
||||
|
||||
# Deny direct access to .txt files
|
||||
RewriteRule ^bl-content/(.*)\.txt$ - [R=404,L]
|
||||
|
||||
# All URL process by index.php
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteRule ^(.*) index.php [PT,L]
|
||||
|
||||
</IfModule>';
|
||||
|
||||
if ( !file_exists(PATH_ROOT.'.htaccess') || (filesize(PATH_ROOT.'.htaccess')<1) ) {
|
||||
if (!file_put_contents(PATH_ROOT.'.htaccess', $htaccessContent)) {
|
||||
if (!empty($_SERVER['SERVER_SOFTWARE'])) {
|
||||
$webserver = Text::lowercase($_SERVER['SERVER_SOFTWARE']);
|
||||
if (Text::stringContains($webserver, 'apache') || Text::stringContains($webserver, 'litespeed')) {
|
||||
$errorText = 'Missing file, upload the file .htaccess (ERROR_204)';
|
||||
error_log($errorText, 0);
|
||||
|
||||
$tmp['title'] = 'File .htaccess';
|
||||
$tmp['errorText'] = $errorText;
|
||||
array_push($stdOut, $tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check mod_rewrite module
|
||||
if (function_exists('apache_get_modules') ) {
|
||||
if (!in_array('mod_rewrite', apache_get_modules())) {
|
||||
$errorText = 'Module mod_rewrite is not installed or loaded.';
|
||||
error_log($errorText, 0);
|
||||
|
||||
$tmp['title'] = 'File .htaccess';
|
||||
$tmp['title'] = 'Apache mod_rewrite module';
|
||||
$tmp['errorText'] = $errorText;
|
||||
array_push($stdOut, $tmp);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue