| '.$Language->g('Title').' | -'.$Language->g('URL').' | -'.( ((ORDER_BY=='position') || ($type!='published'))?$Language->g('Position'):$Language->g('Creation date')).' | +'.$Language->g('Title').' | +'.$Language->g('URL').' | +Actions |
|---|---|---|---|---|---|
| - ' - .($page->title()?$page->title():''.$Language->g('Empty title').' ') - .' + echo ' |
+
+
+
'.( ((ORDER_BY=='position') || ($type!='published'))?'Position: '.$page->position():$page->relativeTime() ).' + | ';
$friendlyURL = Text::isEmpty($url->filters('page')) ? '/'.$page->key() : '/'.$url->filters('page').'/'.$page->key();
- echo ''.$friendlyURL.' | '; + echo ''.$friendlyURL.' | '; - echo ''.( ((ORDER_BY=='position') || ($type!='published'))?$page->position():$page->dateRaw(ADMIN_PANEL_DATE_FORMAT) ).' | '; + echo ''.PHP_EOL; + echo 'Edit'.PHP_EOL; + echo ''.PHP_EOL; + echo ' | '; echo ''.($user->enabled()?''.$L->g('Enabled').'':$L->g('Disabled')).' | '; if ($user->role()=='admin') { echo ''.$L->g('Administrator').' | '; - } elseif ($user->role()=='moderator') { - echo ''.$L->g('Moderator').' | '; } elseif ($user->role()=='editor') { echo ''.$L->g('Editor').' | '; } else { diff --git a/bl-kernel/ajax/user-logged.php b/bl-kernel/ajax/user-logged.php index 12385a33..61456736 100644 --- a/bl-kernel/ajax/user-logged.php +++ b/bl-kernel/ajax/user-logged.php @@ -21,4 +21,4 @@ exit (json_encode(array( ))); -?> +?> \ No newline at end of file diff --git a/bl-kernel/boot/rules/99.security.php b/bl-kernel/boot/rules/99.security.php index bbbea0e2..f9fd0c0a 100644 --- a/bl-kernel/boot/rules/99.security.php +++ b/bl-kernel/boot/rules/99.security.php @@ -16,15 +16,15 @@ // POST Method // ============================================================================ -if( $_SERVER['REQUEST_METHOD'] == 'POST' ) -{ +if ($_SERVER['REQUEST_METHOD'] == 'POST') { $token = isset($_POST['tokenCSRF']) ? Sanitize::html($_POST['tokenCSRF']) : false; - if( !$security->validateTokenCSRF($token) ) { - Log::set(__FILE__.LOG_SEP.'Error occurred when trying to validate the tokenCSRF. Token CSRF ID: '.$token); + if (!$security->validateTokenCSRF($token)) { + Log::set(__FILE__.LOG_SEP.'Error occurred when trying to validate the tokenCSRF.', ALERT_STATUS_FAIL); + Log::set(__FILE__.LOG_SEP.'Token via POST ['.$token.']', ALERT_STATUS_FAIL); + Session::destroy(); Redirect::page('login'); - } - else { + } else { unset( $_POST['tokenCSRF'] ); } } diff --git a/bl-kernel/dbpages.class.php b/bl-kernel/dbpages.class.php index 8f46be84..9048afd0 100644 --- a/bl-kernel/dbpages.class.php +++ b/bl-kernel/dbpages.class.php @@ -57,7 +57,9 @@ class dbPages extends dbJSON { // Check values on args and set default values if not exists foreach ($this->dbFields as $field=>$value) { - if (isset($args[$field])) { + if ($field=='tags') { + $finalValue = $this->generateTags($args['tags']); + } elseif (isset($args[$field])) { // Sanitize if will be stored on database $finalValue = Sanitize::html($args[$field]); } else { @@ -100,11 +102,6 @@ class dbPages extends dbJSON { $row['uuid'] = $this->generateUUID(); } - // Tags - if (!empty($row['tags'])) { - $row['tags'] = $this->generateTags($args['tags']); - } - // Validate date if (!Valid::date($row['date'], DB_DATE_FORMAT)) { $row['date'] = Date::current(DB_DATE_FORMAT); @@ -150,7 +147,9 @@ class dbPages extends dbJSON { // Check values on args or set default values foreach ($this->dbFields as $field=>$value) { - if (isset($args[$field])) { + if ($field=='tags') { + $finalValue = $this->generateTags($args['tags']); + } elseif (isset($args[$field])) { // Sanitize if will be stored on database $finalValue = Sanitize::html($args[$field]); } else { @@ -794,23 +793,17 @@ class dbPages extends dbJSON { public function generateTags($tags) { $tmp = array(); - $tags = trim($tags); - - if(empty($tags)) { + if (empty($tags)) { return $tmp; } - // Make array $tags = explode(',', $tags); - - foreach($tags as $tag) - { + foreach ($tags as $tag) { $tag = trim($tag); $tagKey = Text::cleanUrl($tag); $tmp[$tagKey] = $tag; } - return $tmp; } diff --git a/bl-kernel/dbusers.class.php b/bl-kernel/dbusers.class.php index ffd45556..90e535a2 100644 --- a/bl-kernel/dbusers.class.php +++ b/bl-kernel/dbusers.class.php @@ -5,7 +5,8 @@ class dbUsers extends dbJSON { public $dbFields = array( 'firstName'=>'', 'lastName'=>'', - 'role'=>'editor', // admin, moderator, editor, reader + 'nickname'=>'', + 'role'=>'editor', // admin, editor, reader 'password'=>'', 'salt'=>'!Pink Floyd!Welcome to the machine!', 'email'=>'', diff --git a/bl-kernel/helpers/log.class.php b/bl-kernel/helpers/log.class.php index c589ba17..3dfe5c48 100644 --- a/bl-kernel/helpers/log.class.php +++ b/bl-kernel/helpers/log.class.php @@ -4,8 +4,11 @@ class Log { public static function set($text, $type=LOG_TYPE_INFO) { - $messageType = 0; + if (!DEBUG_MODE) { + return false; + } + $messageType = 0; if (is_array($text) ) { error_log('------------------------', $messageType); error_log('Array', $messageType); diff --git a/bl-kernel/helpers/theme.class.php b/bl-kernel/helpers/theme.class.php index 723c90a2..8fd7cbad 100644 --- a/bl-kernel/helpers/theme.class.php +++ b/bl-kernel/helpers/theme.class.php @@ -137,6 +137,11 @@ class Theme { return ''.PHP_EOL; } + public static function src($file, $base=DOMAIN_THEME) + { + return $base.$file; + } + public static function css($files, $base=DOMAIN_THEME) { if( !is_array($files) ) { diff --git a/bl-kernel/js/bludit-ajax.php b/bl-kernel/js/bludit-ajax.php index 07de7487..880685c2 100644 --- a/bl-kernel/js/bludit-ajax.php +++ b/bl-kernel/js/bludit-ajax.php @@ -20,7 +20,7 @@ class bluditAjax { title: title, content: content }, - url: "ajax/save-as-draft" + url: HTML_PATH_ADMIN_ROOT+"ajax/save-as-draft" }); ajaxRequest.done(function (response, textStatus, jqXHR) { @@ -52,7 +52,7 @@ class bluditAjax { data: { tokenCSRF: tokenCSRF // token from env variables }, - url: "ajax/user-logged" + url: HTML_PATH_ADMIN_ROOT+"ajax/user-logged" }); ajaxRequest.done(function (response, textStatus, jqXHR) { @@ -82,7 +82,7 @@ class bluditAjax { parentKey: parentKey, currentKey: currentKey }, - url: "" + url: HTML_PATH_ADMIN_ROOT+"ajax/generate-slug" }); ajaxRequest.done(function (response, textStatus, jqXHR) { diff --git a/bl-kernel/login.class.php b/bl-kernel/login.class.php index 5a7daf4f..089ceec9 100644 --- a/bl-kernel/login.class.php +++ b/bl-kernel/login.class.php @@ -44,7 +44,7 @@ class Login { } } - Log::set(__METHOD__.LOG_SEP.'FingerPrint are differents. Current fingerPrint: '.Session::get('fingerPrint').' !== Current fingerPrint: '.$this->fingerPrint()); + Log::set(__METHOD__.LOG_SEP.'FingerPrint are differents. ['.Session::get('fingerPrint').'] != ['.$this->fingerPrint().']'); return false; } @@ -56,7 +56,7 @@ class Login { Session::set('fingerPrint', $this->fingerPrint()); Session::set('sessionTime', time()); - Log::set(__METHOD__.LOG_SEP.'User logged, fingerprint: '.$this->fingerPrint()); + Log::set(__METHOD__.LOG_SEP.'User logged, fingerprint ['.$this->fingerPrint().']'); } public function setRememberMe($username) @@ -113,7 +113,7 @@ class Login { $passwordHash = $this->dbUsers->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.'User logged succeeded by username and password - Username ['.$username.']'); return true; } diff --git a/bl-kernel/pagex.class.php b/bl-kernel/pagex.class.php index 5c8e622b..61cb2b8e 100644 --- a/bl-kernel/pagex.class.php +++ b/bl-kernel/pagex.class.php @@ -205,12 +205,19 @@ class PageX { return false; } - // Returns the user object - public function user() + // Returns the user object or passing the method returns the object User method + public function user($method=false) { - global $dbUsers; $username = $this->username(); - return $dbUsers->getUser($username); + try { + $user = new User($username); + if ($method) { + return $user->{$method}(); + } + return $user; + } catch (Exception $e) { + return false; + } } public function template() @@ -226,23 +233,22 @@ class PageX { // Returns the tags separated by comma // (boolean) $returnsArray, TRUE to get the tags as an array, FALSE to get the tags separeted by comma + // The tags in array format returns array( tagKey => tagName ) public function tags($returnsArray=false) { $tags = $this->getValue('tags'); - - if($returnsArray) { - if($tags==false) { + if ($returnsArray) { + if (empty($tags)) { return array(); } return $tags; } - else { - if($tags==false) { - return false; - } - // Return string with tags separeted by comma. - return implode(', ', $tags); + + if (empty($tags)) { + return ''; } + // Return string with tags separeted by comma. + return implode(', ', $tags); } public function json($returnsArray=false) diff --git a/bl-kernel/security.class.php b/bl-kernel/security.class.php index 0c9747ec..7f406d1a 100644 --- a/bl-kernel/security.class.php +++ b/bl-kernel/security.class.php @@ -22,7 +22,7 @@ class Security extends dbJSON { $token = sha1( uniqid().time() ); Session::set('tokenCSRF', $token); - Log::set('New Token CSRF: '.$token); + Log::set(__METHOD__.LOG_SEP.'New Token CSRF ['.$token.']'); } // Validate the token diff --git a/bl-kernel/url.class.php b/bl-kernel/url.class.php index 6630987f..3aa0b998 100644 --- a/bl-kernel/url.class.php +++ b/bl-kernel/url.class.php @@ -118,15 +118,13 @@ class Url return $this->uri; } - // Return the filter used + // Return the filter filter by type public function filters($type, $trim=true) { $filter = $this->filters[$type]; - - if($trim) { + if ($trim) { $filter = trim($filter, '/'); } - return $filter; } diff --git a/bl-kernel/user.class.php b/bl-kernel/user.class.php index 00d20b8d..6a96a489 100644 --- a/bl-kernel/user.class.php +++ b/bl-kernel/user.class.php @@ -49,6 +49,11 @@ class User { return $this->getValue('username'); } + public function nickname() + { + return $this->getValue('nickname'); + } + public function firstName() { return $this->getValue('firstName'); diff --git a/index.php b/index.php index 10db1134..d72a1827 100644 --- a/index.php +++ b/index.php @@ -40,7 +40,3 @@ if ($url->whereAmI()==='admin') { else { require(PATH_BOOT.'site.php'); } - -$endLoadTime = microtime(true); -$time = $endLoadTime - $loadTime; -var_dump($time); \ No newline at end of file