Merge pull request #1203 from virtualmix/small-fixes
Correct small typos
This commit is contained in:
commit
212f68b5ac
|
@ -6,11 +6,11 @@ class Plugin {
|
|||
// Ex: sitemap
|
||||
public $directoryName;
|
||||
|
||||
// (string) Absoulute database filename and path
|
||||
// (string) Absolute database filename and path
|
||||
// Ex: /www/bludit/bl-content/plugins/sitemap/db.php
|
||||
public $filenameDb;
|
||||
|
||||
// (string) Absoulute metadata filename and path
|
||||
// (string) Absolute metadata filename and path
|
||||
// Ex: /www/bludit/bl-plugins/sitemap/metadata.json
|
||||
public $filenameMetadata;
|
||||
|
||||
|
@ -112,7 +112,7 @@ class Plugin {
|
|||
return PATH_PLUGINS_DATABASES.$this->directoryName.DS;
|
||||
}
|
||||
|
||||
// Returns the value of the key from the metadata of the plugin, FALSE if the key doen't exit
|
||||
// Returns the value of the key from the metadata of the plugin, FALSE if the key doesn't exist
|
||||
public function getMetadata($key)
|
||||
{
|
||||
if(isset($this->metadata[$key])) {
|
||||
|
@ -270,7 +270,7 @@ class Plugin {
|
|||
|
||||
public function init()
|
||||
{
|
||||
// This method is used on childre classes.
|
||||
// This method is used on children classes.
|
||||
// The user can define his own field of the database
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
function showAlert(text) {
|
||||
console.log("[INFO] Function showAlert() called.");
|
||||
$("#alert").html(text);
|
||||
$("#alert").slideDown().delay(<?php echo ALERT_DISSAPEAR_IN*1000 ?>).slideUp();
|
||||
$("#alert").slideDown().delay(<?php echo ALERT_DISAPPEAR_IN*1000 ?>).slideUp();
|
||||
}
|
||||
|
||||
<?php if (Alert::defined()): ?>
|
||||
|
|
|
@ -92,8 +92,8 @@ define('SESSION_GC_MAXLIFETIME', 3600);
|
|||
// The value 0 means until the browser is closed
|
||||
define('SESSION_COOKIE_LIFE_TIME', 0);
|
||||
|
||||
// Alert notification dissappear in X seconds
|
||||
define('ALERT_DISSAPEAR_IN', 3);
|
||||
// Alert notification disappear in X seconds
|
||||
define('ALERT_DISAPPEAR_IN', 3);
|
||||
|
||||
// Number of images to show in the media manager per page
|
||||
define('MEDIA_MANAGER_NUMBER_OF_FILES', 5);
|
||||
|
|
|
@ -34,7 +34,7 @@ function buildErrorPage() {
|
|||
|
||||
// This function is only used from the rule 69.pages.php, DO NOT use this function!
|
||||
// This function generate a particular page from the current slug of the url
|
||||
// If the slug has not a page associacted returns FALSE and set not-found as true
|
||||
// If the slug has not a page associated returns FALSE and set not-found as true
|
||||
function buildThePage() {
|
||||
global $url;
|
||||
|
||||
|
@ -311,7 +311,7 @@ function createPage($args) {
|
|||
}
|
||||
}
|
||||
|
||||
// The user is always the one loggued
|
||||
// The user is always the one logged
|
||||
$args['username'] = Session::get('username');
|
||||
if (empty($args['username'])) {
|
||||
Log::set('Function createPage()'.LOG_SEP.'Empty username.', LOG_TYPE_ERROR);
|
||||
|
@ -677,7 +677,7 @@ function changeUserPassword($args) {
|
|||
return false;
|
||||
}
|
||||
|
||||
// Returns true if the user is allowed to procceded
|
||||
// Returns true if the user is allowed to proceed
|
||||
function checkRole($allowRoles, $redirect=true) {
|
||||
global $login;
|
||||
global $L;
|
||||
|
|
|
@ -44,7 +44,7 @@ class Login {
|
|||
}
|
||||
}
|
||||
|
||||
Log::set(__METHOD__.LOG_SEP.'FingerPrint are differents. ['.Session::get('fingerPrint').'] != ['.$this->fingerPrint().']');
|
||||
Log::set(__METHOD__.LOG_SEP.'FingerPrints are different. ['.Session::get('fingerPrint').'] != ['.$this->fingerPrint().']');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -71,7 +71,7 @@ class Login {
|
|||
Cookie::set(REMEMBER_COOKIE_USERNAME, $username, REMEMBER_COOKIE_EXPIRE_IN_DAYS);
|
||||
Cookie::set(REMEMBER_COOKIE_TOKEN, $token, REMEMBER_COOKIE_EXPIRE_IN_DAYS);
|
||||
|
||||
Log::set(__METHOD__.LOG_SEP.'Cookies seted for Remember Me.');
|
||||
Log::set(__METHOD__.LOG_SEP.'Cookies set for Remember Me.');
|
||||
}
|
||||
|
||||
public function invalidateRememberMe()
|
||||
|
@ -100,7 +100,7 @@ class Login {
|
|||
}
|
||||
|
||||
if (Text::length($password)<PASSWORD_LENGTH) {
|
||||
Log::set(__METHOD__.LOG_SEP.'Password lenght less than required.');
|
||||
Log::set(__METHOD__.LOG_SEP.'Password length is shorter than required.');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -113,7 +113,7 @@ class Login {
|
|||
$passwordHash = $this->users->generatePasswordHash($password, $user->salt());
|
||||
if ($passwordHash===$user->password()) {
|
||||
$this->setLogin($username, $user->role());
|
||||
Log::set(__METHOD__.LOG_SEP.'User logged succeeded by username and password - Username ['.$username.']');
|
||||
Log::set(__METHOD__.LOG_SEP.'Successful user login by username and password - Username ['.$username.']');
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ class Syslog extends dbJSON {
|
|||
return false;
|
||||
}
|
||||
|
||||
// Insert at beggining of the database
|
||||
// Insert at beginning of the database
|
||||
array_unshift($this->db, $data);
|
||||
|
||||
// Keep just NOTIFICATIONS_AMOUNT notifications
|
||||
|
|
|
@ -52,11 +52,11 @@ class Url
|
|||
// $filterFull = '/base_url/category/'
|
||||
$filterFull = ltrim($filterURI, '/');
|
||||
$filterFull = HTML_PATH_ROOT.$filterFull;
|
||||
$filterFullLenght = Text::length($filterFull);
|
||||
$filterFullLength = Text::length($filterFull);
|
||||
|
||||
$subString = mb_substr($this->uri, 0, $filterFullLenght, CHARSET);
|
||||
$subString = mb_substr($this->uri, 0, $filterFullLength, CHARSET);
|
||||
|
||||
// Check coincidence without the last slash at the end, this case is notfound
|
||||
// Check coincidence without the last slash at the end, this case is not found
|
||||
if ($subString==$filterURIwoSlash) {
|
||||
$this->setNotFound();
|
||||
return false;
|
||||
|
@ -64,7 +64,7 @@ class Url
|
|||
|
||||
// Check coincidence with complete filterURI
|
||||
if ($subString==$filterFull) {
|
||||
$this->slug = mb_substr($this->uri, $filterFullLenght);
|
||||
$this->slug = mb_substr($this->uri, $filterFullLength);
|
||||
$this->setWhereAmI($filterName);
|
||||
$this->activeFilter = $filterURI;
|
||||
|
||||
|
|
Loading…
Reference in New Issue