From 0f6a8a43f8c33c8006506f4278190e66dfdd76cb Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sat, 30 May 2015 22:06:55 -0300 Subject: [PATCH] Static objects names --- admin/controllers/add-user.php | 4 +- admin/controllers/dashboard.php | 2 +- admin/controllers/edit-user.php | 4 +- admin/controllers/new-page.php | 2 +- admin/controllers/new-post.php | 2 +- admin/themes/default/css/installer.css | 3 + admin/themes/default/index.php | 2 +- admin/themes/default/init.php | 2 +- admin/themes/default/login.php | 2 +- admin/views/add-user.php | 2 +- admin/views/dashboard.php | 2 +- admin/views/edit-page.php | 2 +- admin/views/edit-post.php | 2 +- admin/views/login.php | 2 +- admin/views/manage-pages.php | 2 +- admin/views/manage-posts.php | 2 +- admin/views/new-page.php | 2 +- admin/views/new-post.php | 2 +- admin/views/themes.php | 2 +- admin/views/users.php | 2 +- features.txt | 2 + install.php | 12 +- kernel/abstract/db_content.class.php | 2 +- kernel/abstract/dbjson.class.php | 2 +- kernel/abstract/filecontent.class.php | 4 +- kernel/abstract/plugin.class.php | 2 +- kernel/ajax/slug.php | 2 +- kernel/boot/admin.php | 2 +- kernel/boot/rules/80.plugins.php | 2 +- kernel/boot/rules/99.header.php | 2 +- kernel/boot/site.php | 2 +- kernel/db_pages.class.php | 92 ---------- kernel/db_posts.class.php | 121 ------------ kernel/db_users.class.php | 26 --- kernel/dblanguage.class.php | 6 +- kernel/dbpages.class.php | 28 +-- kernel/dbposts.class.php | 16 +- kernel/dbsite.class.php | 2 +- kernel/dbusers.class.php | 2 +- kernel/helpers/category.class.php | 30 --- kernel/helpers/filesystem.class.php | 2 +- kernel/helpers/image.class.php | 35 ---- kernel/helpers/language.class.php | 45 ----- kernel/helpers/log.class.php | 2 +- kernel/helpers/number.class.php | 20 -- kernel/helpers/page.class.php | 57 ------ kernel/helpers/pager.class.php | 107 ----------- kernel/helpers/plugin.class.php | 23 --- kernel/helpers/post.class.php | 243 ------------------------ kernel/helpers/redirect.class.php | 2 +- kernel/helpers/resize.class.php | 244 ------------------------- kernel/helpers/site.class.php | 19 -- kernel/helpers/social.class.php | 42 ----- kernel/helpers/text.class.php | 26 ++- kernel/helpers/url.static.class.php | 140 -------------- kernel/helpers/video.class.php | 89 --------- kernel/js/functions.php | 2 +- kernel/language.class.php | 4 +- kernel/url.class.php | 8 +- themes/pure/css/blog.css | 13 +- themes/pure/index.php | 2 +- themes/pure/php/footer.php | 2 +- themes/pure/php/home.php | 2 +- themes/pure/php/page.php | 2 +- themes/pure/php/post.php | 2 +- themes/pure/php/sidebar.php | 7 +- 66 files changed, 120 insertions(+), 1422 deletions(-) delete mode 100644 kernel/db_pages.class.php delete mode 100644 kernel/db_posts.class.php delete mode 100644 kernel/db_users.class.php delete mode 100644 kernel/helpers/category.class.php delete mode 100644 kernel/helpers/image.class.php delete mode 100644 kernel/helpers/language.class.php delete mode 100644 kernel/helpers/number.class.php delete mode 100644 kernel/helpers/page.class.php delete mode 100644 kernel/helpers/pager.class.php delete mode 100644 kernel/helpers/plugin.class.php delete mode 100644 kernel/helpers/post.class.php delete mode 100644 kernel/helpers/resize.class.php delete mode 100644 kernel/helpers/site.class.php delete mode 100644 kernel/helpers/social.class.php delete mode 100644 kernel/helpers/url.static.class.php delete mode 100644 kernel/helpers/video.class.php diff --git a/admin/controllers/add-user.php b/admin/controllers/add-user.php index 1cb13fe7..07f5fdac 100644 --- a/admin/controllers/add-user.php +++ b/admin/controllers/add-user.php @@ -18,14 +18,14 @@ function addUser($args) global $dbUsers; // Check if the username already exist in db. - if( $dbUsers->userExists($args['username']) || helperText::isEmpty($args['username']) ) + if( $dbUsers->userExists($args['username']) || Text::isEmpty($args['username']) ) { Alert::set('Username already exists or is empty'); return false; } // Validate password. - if( ($args['password'] != $args['confirm-password'] ) || helperText::isEmpty($args['password']) ) + if( ($args['password'] != $args['confirm-password'] ) || Text::isEmpty($args['password']) ) { Alert::set('The password and confirmation password do not match'); return false; diff --git a/admin/controllers/dashboard.php b/admin/controllers/dashboard.php index 78b194a9..7bc1095a 100644 --- a/admin/controllers/dashboard.php +++ b/admin/controllers/dashboard.php @@ -4,4 +4,4 @@ $dbPosts->regenerate(); $dbPages->regenerate(); -?> \ No newline at end of file +?> diff --git a/admin/controllers/edit-user.php b/admin/controllers/edit-user.php index f2fe4d9e..f84fbff2 100644 --- a/admin/controllers/edit-user.php +++ b/admin/controllers/edit-user.php @@ -10,7 +10,7 @@ function editUser($args) if(isset($args['password'])) { - if( ($args['password']===$args['confirm-password']) && !helperText::isEmpty($args['password']) ) { + if( ($args['password']===$args['confirm-password']) && !Text::isEmpty($args['password']) ) { return $dbUsers->set($args); } else { @@ -59,4 +59,4 @@ if($_user===false) { Redirect::page('admin', 'users'); } -$_user['username'] = $layout['parameters']; \ No newline at end of file +$_user['username'] = $layout['parameters']; diff --git a/admin/controllers/new-page.php b/admin/controllers/new-page.php index dbe3b4f1..e88da934 100644 --- a/admin/controllers/new-page.php +++ b/admin/controllers/new-page.php @@ -27,4 +27,4 @@ function addPage($args) if( $_SERVER['REQUEST_METHOD'] == 'POST' ) { addPage($_POST); -} \ No newline at end of file +} diff --git a/admin/controllers/new-post.php b/admin/controllers/new-post.php index 26024b9a..b8e5e2a7 100644 --- a/admin/controllers/new-post.php +++ b/admin/controllers/new-post.php @@ -27,4 +27,4 @@ function addPost($args) if( $_SERVER['REQUEST_METHOD'] == 'POST' ) { addPost($_POST); -} \ No newline at end of file +} diff --git a/admin/themes/default/css/installer.css b/admin/themes/default/css/installer.css index 8b77bd52..60ad067e 100644 --- a/admin/themes/default/css/installer.css +++ b/admin/themes/default/css/installer.css @@ -23,3 +23,6 @@ h1.title { font-size: 4em; } +td { + text-align: center; +} \ No newline at end of file diff --git a/admin/themes/default/index.php b/admin/themes/default/index.php index 673c36c1..f14a3f95 100644 --- a/admin/themes/default/index.php +++ b/admin/themes/default/index.php @@ -90,4 +90,4 @@ $(document).ready(function() { echo "DEBUG: Load time: ".(microtime(true) - $loadTime).'
'; ?> - \ No newline at end of file + diff --git a/admin/themes/default/init.php b/admin/themes/default/init.php index 9da2c6a9..00c835f6 100644 --- a/admin/themes/default/init.php +++ b/admin/themes/default/init.php @@ -25,4 +25,4 @@ function makeNavbar($type) echo ''.$nav['text'].''; } echo ''; -} \ No newline at end of file +} diff --git a/admin/themes/default/login.php b/admin/themes/default/login.php index 26f13283..1de024ab 100644 --- a/admin/themes/default/login.php +++ b/admin/themes/default/login.php @@ -50,4 +50,4 @@ echo "DEBUG: Load time: ".(microtime(true) - $loadTime).'
'; ?> - \ No newline at end of file + diff --git a/admin/views/add-user.php b/admin/views/add-user.php index 3661d93a..ef9c3319 100644 --- a/admin/views/add-user.php +++ b/admin/views/add-user.php @@ -35,4 +35,4 @@ Cancel - \ No newline at end of file + diff --git a/admin/views/dashboard.php b/admin/views/dashboard.php index cfd6a8e8..bfb28c1c 100644 --- a/admin/views/dashboard.php +++ b/admin/views/dashboard.php @@ -1,2 +1,2 @@

Dashboard

-

Not implemented...

\ No newline at end of file +

Not implemented...

diff --git a/admin/views/edit-page.php b/admin/views/edit-page.php index 59d03513..da8d346f 100644 --- a/admin/views/edit-page.php +++ b/admin/views/edit-page.php @@ -123,4 +123,4 @@ $(document).ready(function() }); - \ No newline at end of file + diff --git a/admin/views/edit-post.php b/admin/views/edit-post.php index 88e7042b..d6de8cda 100644 --- a/admin/views/edit-post.php +++ b/admin/views/edit-post.php @@ -75,4 +75,4 @@ $(document).ready(function() }); - \ No newline at end of file + diff --git a/admin/views/login.php b/admin/views/login.php index 87ea81f9..a8fa4153 100644 --- a/admin/views/login.php +++ b/admin/views/login.php @@ -10,4 +10,4 @@

- \ No newline at end of file + diff --git a/admin/views/manage-pages.php b/admin/views/manage-pages.php index 0ad90d3d..c98724e4 100644 --- a/admin/views/manage-pages.php +++ b/admin/views/manage-pages.php @@ -32,4 +32,4 @@ ?> - \ No newline at end of file + diff --git a/admin/views/manage-posts.php b/admin/views/manage-posts.php index 18d17298..fd2ddab6 100644 --- a/admin/views/manage-posts.php +++ b/admin/views/manage-posts.php @@ -24,4 +24,4 @@ ?> - \ No newline at end of file + diff --git a/admin/views/new-page.php b/admin/views/new-page.php index 0d087544..6cf2c0ad 100644 --- a/admin/views/new-page.php +++ b/admin/views/new-page.php @@ -107,4 +107,4 @@ $(document).ready(function() }); - \ No newline at end of file + diff --git a/admin/views/new-post.php b/admin/views/new-post.php index 7641d004..6ea631d9 100644 --- a/admin/views/new-post.php +++ b/admin/views/new-post.php @@ -72,4 +72,4 @@ $(document).ready(function() }); - \ No newline at end of file + diff --git a/admin/views/themes.php b/admin/views/themes.php index 90f376de..6e521df3 100644 --- a/admin/views/themes.php +++ b/admin/views/themes.php @@ -1,2 +1,2 @@

Themes

-

Not implemented...

\ No newline at end of file +

Not implemented...

diff --git a/admin/views/users.php b/admin/views/users.php index 578506a0..08da0ecb 100644 --- a/admin/views/users.php +++ b/admin/views/users.php @@ -29,4 +29,4 @@ } ?> - \ No newline at end of file + diff --git a/features.txt b/features.txt index 44b24ef1..6c854fb1 100644 --- a/features.txt +++ b/features.txt @@ -5,6 +5,7 @@ Diego Najar Implementar - Links a Google+, Facebook y Twitter - Plugins +- Plugins SEO, description, opengaph, etc.. - Comentarios - Notificaciones - Dashboard, parecido a Nibbleblog, me gusta. @@ -37,6 +38,7 @@ helperUrl:: find . -type f -name "*.php" -print0 | xargs -0 sed -i 's/Text/helperText/g' find . -type f -name "*.php" -print0 | xargs -0 sed -i 's/Url/helperUrl/g' +find . -type f -name '*.php' -exec sed -i '' s/helperText/Text/ {} + ———— Editar una pagina diff --git a/install.php b/install.php index 3258a233..8812670b 100644 --- a/install.php +++ b/install.php @@ -47,35 +47,35 @@ function checkSystem() if(!file_exists(PATH_ROOT.'.htaccess')) { - $errorText = 'Missing file, upload the file .htaccess'; + $errorText = 'Missing file, upload the file .htaccess (ERR_201)'; error_log($errorText, 0); array_push($stdOut, $errorText); } if(!version_compare(phpversion(), '5.2', '>')) { - $errorText = 'Current PHP version '.phpversion().', but you need > 5.3'; + $errorText = 'Current PHP version '.phpversion().', you need > 5.3. (ERR_202)'; error_log($errorText, 0); array_push($stdOut, $errorText); } if(!in_array('dom', $phpModules)) { - $errorText = 'PHP module DOM does not exist'; + $errorText = 'PHP module DOM does not exist. (ERR_203)'; error_log($errorText, 0); array_push($stdOut, $errorText); } if(!in_array('json', $phpModules)) { - $errorText = 'PHP module JSON does not exist'; + $errorText = 'PHP module JSON does not exist. (ERR_204)'; error_log($errorText, 0); array_push($stdOut, $errorText); } if(!is_writable(PATH_CONTENT)) { - $errorText = 'Writing test on content directory failed'; + $errorText = 'Writing test failure, check directory content permissions. (ERR_205)'; error_log($errorText, 0); array_push($stdOut, $errorText); } @@ -319,4 +319,4 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' ) - \ No newline at end of file + diff --git a/kernel/abstract/db_content.class.php b/kernel/abstract/db_content.class.php index cbf074fa..3b341b21 100644 --- a/kernel/abstract/db_content.class.php +++ b/kernel/abstract/db_content.class.php @@ -76,7 +76,7 @@ class Content $parts = array_map('trim', explode(':', $line, 2)); // Lowercase variable - $parts[0] = helperText::lowercase($parts[0]); + $parts[0] = Text::lowercase($parts[0]); if($parts[0]==='content') { diff --git a/kernel/abstract/dbjson.class.php b/kernel/abstract/dbjson.class.php index d51aa59d..1abf1083 100644 --- a/kernel/abstract/dbjson.class.php +++ b/kernel/abstract/dbjson.class.php @@ -77,4 +77,4 @@ class dbJSON var_dump($this->db); } -} \ No newline at end of file +} diff --git a/kernel/abstract/filecontent.class.php b/kernel/abstract/filecontent.class.php index 0ef3b766..e19eea4a 100644 --- a/kernel/abstract/filecontent.class.php +++ b/kernel/abstract/filecontent.class.php @@ -55,7 +55,7 @@ class fileContent $parts = array_map('trim', explode(':', $line, 2)); // Lowercase variable - $parts[0] = helperText::lowercase($parts[0]); + $parts[0] = Text::lowercase($parts[0]); // If variables is content then break the foreach and process the content after. if($parts[0]==='content') @@ -89,4 +89,4 @@ class fileContent } -} \ No newline at end of file +} diff --git a/kernel/abstract/plugin.class.php b/kernel/abstract/plugin.class.php index 3f6adc8b..3aa1a97e 100644 --- a/kernel/abstract/plugin.class.php +++ b/kernel/abstract/plugin.class.php @@ -120,4 +120,4 @@ class Plugin { return false; } -} \ No newline at end of file +} diff --git a/kernel/ajax/slug.php b/kernel/ajax/slug.php index f6ecb583..8fff04c9 100644 --- a/kernel/ajax/slug.php +++ b/kernel/ajax/slug.php @@ -23,4 +23,4 @@ elseif( $_POST['type']==='post' ) { echo json_encode( array('slug'=>$slug) ); -?> \ No newline at end of file +?> diff --git a/kernel/boot/admin.php b/kernel/boot/admin.php index 38811c98..8009cff7 100644 --- a/kernel/boot/admin.php +++ b/kernel/boot/admin.php @@ -60,4 +60,4 @@ else // Load view and theme if( Sanitize::pathFile(PATH_ADMIN_THEMES, $Site->adminTheme().'/'.$layout['template']) ) include(PATH_ADMIN_THEMES.$Site->adminTheme().'/'.$layout['template']); -} \ No newline at end of file +} diff --git a/kernel/boot/rules/80.plugins.php b/kernel/boot/rules/80.plugins.php index 9b89a944..aa0349bf 100644 --- a/kernel/boot/rules/80.plugins.php +++ b/kernel/boot/rules/80.plugins.php @@ -11,7 +11,7 @@ function build_plugins() global $plugins; // List plugins directories - $list = helperFilesystem::listDirectories(PATH_PLUGINS); + $list = Filesystem::listDirectories(PATH_PLUGINS); // Get declared clasess before load plugins clasess $currentDeclaredClasess = get_declared_classes(); diff --git a/kernel/boot/rules/99.header.php b/kernel/boot/rules/99.header.php index a1ee6182..d67de305 100644 --- a/kernel/boot/rules/99.header.php +++ b/kernel/boot/rules/99.header.php @@ -6,4 +6,4 @@ if($Url->notFound()) header('HTTP/1.0 404 Not Found'); } -?> \ No newline at end of file +?> diff --git a/kernel/boot/site.php b/kernel/boot/site.php index 565be808..47548b14 100644 --- a/kernel/boot/site.php +++ b/kernel/boot/site.php @@ -18,4 +18,4 @@ if( Sanitize::pathFile(PATH_THEMES, $Site->theme().'/init.php') ) // Theme HTML if( Sanitize::pathFile(PATH_THEMES, $Site->theme().'/index.php') ) - include(PATH_THEMES.$Site->theme().'/index.php'); \ No newline at end of file + include(PATH_THEMES.$Site->theme().'/index.php'); diff --git a/kernel/db_pages.class.php b/kernel/db_pages.class.php deleted file mode 100644 index 2f28a8b1..00000000 --- a/kernel/db_pages.class.php +++ /dev/null @@ -1,92 +0,0 @@ -vars['pages'][$slug]; - } - - // Return TRUE if the page exists, FALSE otherwise. - public function validPage($slug) - { - return isset($this->vars['pages'][$slug]); - } - - // Return an array with all page's databases. - public function getAll() - { - return $this->vars['pages']; - } - - public function regenerate() - { - $db = $this->vars['pages']; - $paths = array(); - - $fields = array( - 'title'=>'', - 'content'=>'', - 'username'=>'', - 'status'=>'draft', - 'author'=>'', - 'unixstamp'=>Date::unixstamp(), - 'date'=>'', - 'timeago'=>'', - 'slug'=>'', - 'permalink'=>'', - 'parent'=>'' - ); - - if(HANDMADE_PUBLISHED) - $fields['status']='published'; - - // Recovery pages from the first level of directories - $tmpPaths = glob(PATH_PAGES.'*', GLOB_ONLYDIR); - foreach($tmpPaths as $directory) - { - $key = basename($directory); - - if(file_exists($directory.'/index.txt')) - // The key is the directory name - $paths[$key] = true; - - // Recovery pages from subdirectories - $subPaths = glob($directory.'/*', GLOB_ONLYDIR); - foreach($subPaths as $subDirectory) - { - $subKey = basename($subDirectory); - - if(file_exists($subDirectory.'/index.txt')) - // The key is composed by the directory/subdirectory - $paths[$key.'/'.$subKey] = true; - } - } - - // Remove old posts from db - foreach( array_diff_key($db, $paths) as $slug=>$data ) - unset($this->vars['pages'][$slug]); - - // Insert new posts to db - foreach( array_diff_key($paths, $db) as $slug=>$data ) - { - $this->vars['pages'][$slug] = $fields; - - // Get the parent if exists - $explode = explode('/', $slug); - if(!empty($explode[1])) - $this->vars['pages'][$slug]['parent'] = $explode[0]; - } - - $this->save(); - } - -} - -?> diff --git a/kernel/db_posts.class.php b/kernel/db_posts.class.php deleted file mode 100644 index da325356..00000000 --- a/kernel/db_posts.class.php +++ /dev/null @@ -1,121 +0,0 @@ -vars['posts'][$slug]; - } - - // Return TRUE if the post exists, FALSE otherwise. - public function validPost($slug) - { - return isset($this->vars['posts'][$slug]); - } - - public function regenerate() - { - $db = $this->vars['posts']; - $paths = array(); - - $fields = array( - 'title'=>'', - 'content'=>'', - 'username'=>'', - 'status'=>'draft', - 'author'=>'', - 'unixstamp'=>Date::unixstamp(), - 'date'=>'', - 'timeago'=>'', - 'slug'=>'', - 'permalink'=>'' - ); - - if(HANDMADE_PUBLISHED) - $fields['status']='published'; - - // Scan all directories from /content/post/ - $tmpPaths = glob(PATH_POSTS.'*', GLOB_ONLYDIR); - foreach($tmpPaths as $directory) - { - // Each directory is a post - if(file_exists($directory.'/index.txt')) { - $key = basename($directory); - $paths[$key] = true; - } - } - - // Remove old posts from db - foreach( array_diff_key($db, $paths) as $slug=>$data ) - unset($this->vars['posts'][$slug]); - - // Insert new posts to db - foreach( array_diff_key($paths, $db) as $slug=>$data ) - $this->vars['posts'][$slug] = $fields; - - $this->save(); - } - - public function getPage($pageNumber, $postPerPage) - { - $init = (int) $postPerPage * $pageNumber; - $end = (int) min( ($init + $postPerPage - 1), count($this->vars['posts']) - 1 ); - - $outrange = $init<0 ? true : $init > $end; - - // DEBUG: Ver una mejor manera de eliminar draft post antes de ordenarlos - $this->removeUnpublished(); - - $tmp = $this->sortByDate(); - - if(!$outrange) - return array_slice($tmp, $init, $end+1, true); - - return array(); - } - - // DEBUG: Ver una mejor manera de eliminar draft post antes de ordenarlos - private function removeUnpublished() - { - $tmp = array(); - - foreach($this->vars['posts'] as $key=>$value) - { - if($value['status']==='published') - $tmp[$key]=$value; - } - - $this->vars['posts'] = $tmp; - } - - private function sortByDate($low_to_high=false) - { - // high to low - function high_to_low($a, $b) { - return $a['unixstamp']<$b['unixstamp']; - } - - // low to high - function low_to_high($a, $b) { - return $a['unixstamp']>$b['unixstamp']; - } - - $tmp = $this->vars['posts']; - - if($low_to_high) - uasort($tmp, 'low_to_high'); - else - uasort($tmp, 'high_to_low'); - - return $tmp; - } - -} - -?> diff --git a/kernel/db_users.class.php b/kernel/db_users.class.php deleted file mode 100644 index 833c1a45..00000000 --- a/kernel/db_users.class.php +++ /dev/null @@ -1,26 +0,0 @@ -validUsername($username)) { - return $this->vars['users'][$username]; - } - - return false; - } - - // Return TRUE if the post exists, FALSE otherwise. - public function validUsername($username) - { - return isset($this->vars['users'][$username]); - } - -} diff --git a/kernel/dblanguage.class.php b/kernel/dblanguage.class.php index 8b408a14..9b92e53c 100644 --- a/kernel/dblanguage.class.php +++ b/kernel/dblanguage.class.php @@ -15,8 +15,8 @@ class dbLanguage extends dbJSON // Return the translation, if the translation does'n exist then return the English translation. public function get($text) { - $key = helperText::lowercase($text); - $key = helperText::replace(' ', '-', $key); + $key = Text::lowercase($text); + $key = Text::replace(' ', '-', $key); if(isset($this->db[$key])) return $this->db[$key]; @@ -31,4 +31,4 @@ class dbLanguage extends dbJSON echo $this->get($text); } -} \ No newline at end of file +} diff --git a/kernel/dbpages.class.php b/kernel/dbpages.class.php index f8c30c6b..c457feb2 100644 --- a/kernel/dbpages.class.php +++ b/kernel/dbpages.class.php @@ -33,7 +33,7 @@ class dbPages extends dbJSON // The user is always the one loggued. $args['username'] = Session::get('username'); - if( helperText::isEmpty($args['username']) ) { + if( Text::isEmpty($args['username']) ) { return false; } @@ -61,7 +61,7 @@ class dbPages extends dbJSON // Check where the field will be written, in file or database. if($options['inFile']) { - $dataForFile[$field] = $field.':'.$tmpValue; + $dataForFile[$field] = Text::firstCharUp($field).': '.$tmpValue; } else { @@ -74,7 +74,7 @@ class dbPages extends dbJSON } // Make the directory. Recursive. - if( helperFilesystem::mkdir(PATH_PAGES.$key, true) === false ) { + if( Filesystem::mkdir(PATH_PAGES.$key, true) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to create the directory '.PATH_PAGES.$key); return false; } @@ -105,7 +105,7 @@ class dbPages extends dbJSON // The user is always the one loggued. $args['username'] = Session::get('username'); - if( helperText::isEmpty($args['username']) ) { + if( Text::isEmpty($args['username']) ) { return false; } @@ -134,7 +134,7 @@ class dbPages extends dbJSON // Check where the field will be written, if in the file or in the database. if($options['inFile']) { - $dataForFile[$field] = $field.':'.$tmpValue; + $dataForFile[$field] = Text::firstCharUp($field).': '.$tmpValue; } else { @@ -149,7 +149,7 @@ class dbPages extends dbJSON // Make the directory. Recursive. if($newKey!==$args['key']) { - if( helperFilesystem::mv(PATH_PAGES.$args['key'], PATH_PAGES.$newKey) === false ) { + if( Filesystem::mv(PATH_PAGES.$args['key'], PATH_PAGES.$newKey) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to move the directory to '.PATH_PAGES.$newKey); return false; } @@ -183,12 +183,12 @@ class dbPages extends dbJSON } // Delete the index.txt file. - if( helperFilesystem::rmfile(PATH_PAGES.$key.'/index.txt') === false ) { + if( Filesystem::rmfile(PATH_PAGES.$key.'/index.txt') === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to delete the file index.txt'); } // Delete the directory. - if( helperFilesystem::rmdir(PATH_PAGES.$key) === false ) { + if( Filesystem::rmdir(PATH_PAGES.$key) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to delete the directory '.PATH_PAGES.$key); } @@ -237,15 +237,15 @@ class dbPages extends dbJSON // Generate a valid Key/Slug. public function generateKey($text, $parent=NO_PARENT_CHAR, $returnSlug=false, $oldKey='') { - if(helperText::isEmpty($text)) { + if(Text::isEmpty($text)) { $text = 'empty'; } - if( helperText::isEmpty($parent) || ($parent==NO_PARENT_CHAR) ) { - $newKey = helperText::cleanUrl($text); + if( Text::isEmpty($parent) || ($parent==NO_PARENT_CHAR) ) { + $newKey = Text::cleanUrl($text); } else { - $newKey = helperText::cleanUrl($parent).'/'.helperText::cleanUrl($text); + $newKey = Text::cleanUrl($parent).'/'.Text::cleanUrl($text); } if($newKey!==$oldKey) @@ -253,7 +253,7 @@ class dbPages extends dbJSON // Verify if the key is already been used. if( isset($this->db[$newKey]) ) { - if( !helperText::endsWithNumeric($newKey) ) { + if( !Text::endsWithNumeric($newKey) ) { $newKey = $newKey.'-0'; } @@ -350,4 +350,4 @@ class dbPages extends dbJSON return true; } -} \ No newline at end of file +} diff --git a/kernel/dbposts.class.php b/kernel/dbposts.class.php index 02ff56d5..bd2ce5e6 100644 --- a/kernel/dbposts.class.php +++ b/kernel/dbposts.class.php @@ -28,11 +28,11 @@ class dbPosts extends dbJSON // Generate a valid Key/Slug. public function generateKey($text, $oldKey='') { - if(helperText::isEmpty($text)) { + if(Text::isEmpty($text)) { $text = 'empty'; } - $newKey = helperText::cleanUrl($text); + $newKey = Text::cleanUrl($text); if($newKey===$oldKey) { return $newKey; @@ -41,7 +41,7 @@ class dbPosts extends dbJSON // Verify if the key is already been used. if( isset($this->db[$newKey]) ) { - if( !helperText::endsWithNumeric($newKey) ) { + if( !Text::endsWithNumeric($newKey) ) { $newKey = $newKey.'-0'; } @@ -63,7 +63,7 @@ class dbPosts extends dbJSON // The user is always the one loggued. $args['username'] = Session::get('username'); - if( helperText::isEmpty($args['username']) ) { + if( Text::isEmpty($args['username']) ) { return false; } @@ -93,7 +93,7 @@ class dbPosts extends dbJSON // Check where the field will be written, if in the file or in the database. if($options['inFile']) { - $dataForFile[$field] = $field.':'.$tmpValue; + $dataForFile[$field] = Text::firstCharUp($field).': '.$tmpValue; } else { @@ -106,7 +106,7 @@ class dbPosts extends dbJSON } // Make the directory. - if( helperFilesystem::mkdir(PATH_POSTS.$key) === false ) { + if( Filesystem::mkdir(PATH_POSTS.$key) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to create the directory '.PATH_POSTS.$key); return false; } @@ -150,12 +150,12 @@ class dbPosts extends dbJSON } // Delete the index.txt file. - if( helperFilesystem::rmfile(PATH_POSTS.$key.'/index.txt') === false ) { + if( Filesystem::rmfile(PATH_POSTS.$key.'/index.txt') === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to delete the file index.txt'); } // Delete the directory. - if( helperFilesystem::rmdir(PATH_POSTS.$key) === false ) { + if( Filesystem::rmdir(PATH_POSTS.$key) === false ) { Log::set(__METHOD__.LOG_SEP.'Error occurred when trying to delete the directory '.PATH_POSTS.$key); } diff --git a/kernel/dbsite.class.php b/kernel/dbsite.class.php index e6ac7d37..088d1edb 100644 --- a/kernel/dbsite.class.php +++ b/kernel/dbsite.class.php @@ -184,4 +184,4 @@ class dbSite extends dbJSON return date_default_timezone_set($timezone); } -} \ No newline at end of file +} diff --git a/kernel/dbusers.class.php b/kernel/dbusers.class.php index bc4eb56f..e052069b 100644 --- a/kernel/dbusers.class.php +++ b/kernel/dbusers.class.php @@ -119,7 +119,7 @@ class dbUsers extends dbJSON $dataForDb['registered'] = Date::unixTime(); // Password - $dataForDb['salt'] = helperText::randomText(SALT_LENGTH); + $dataForDb['salt'] = Text::randomText(SALT_LENGTH); $dataForDb['password'] = sha1($dataForDb['password'].$dataForDb['salt']); // Save the database diff --git a/kernel/helpers/category.class.php b/kernel/helpers/category.class.php deleted file mode 100644 index f1330c71..00000000 --- a/kernel/helpers/category.class.php +++ /dev/null @@ -1,30 +0,0 @@ - diff --git a/kernel/helpers/filesystem.class.php b/kernel/helpers/filesystem.class.php index ed5f2194..33de445f 100644 --- a/kernel/helpers/filesystem.class.php +++ b/kernel/helpers/filesystem.class.php @@ -1,6 +1,6 @@ diff --git a/kernel/helpers/language.class.php b/kernel/helpers/language.class.php deleted file mode 100644 index 757a7874..00000000 --- a/kernel/helpers/language.class.php +++ /dev/null @@ -1,45 +0,0 @@ -lang[$key])) - return $this->lang[$key]; - - return ''; - } - - public function set($array) - { - // Set an array with all keys from array uppercased - $this->lang = array_change_key_case($array, CASE_UPPER); - - return true; - } - - public function add($array) - { - $this->lang = array_merge($this->lang, $array); - - return true; - } - -} - -?> diff --git a/kernel/helpers/log.class.php b/kernel/helpers/log.class.php index 37ceb27c..16c980c1 100644 --- a/kernel/helpers/log.class.php +++ b/kernel/helpers/log.class.php @@ -7,4 +7,4 @@ class Log { error_log($text, $type); } -} \ No newline at end of file +} diff --git a/kernel/helpers/number.class.php b/kernel/helpers/number.class.php deleted file mode 100644 index 379823bd..00000000 --- a/kernel/helpers/number.class.php +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/kernel/helpers/page.class.php b/kernel/helpers/page.class.php deleted file mode 100644 index d6e84554..00000000 --- a/kernel/helpers/page.class.php +++ /dev/null @@ -1,57 +0,0 @@ - diff --git a/kernel/helpers/pager.class.php b/kernel/helpers/pager.class.php deleted file mode 100644 index 434d7903..00000000 --- a/kernel/helpers/pager.class.php +++ /dev/null @@ -1,107 +0,0 @@ -get('NEWER_POSTS').' →'; - - $html = ''.$text.''; - - return $html; - } - - public static function prev_link($text=NULL) - { - global $pager; - global $Language; - - if(!$pager['show_older']) - return false; - - $text = isset($text)?$text:'← '.$Language->get('OLDER_POSTS'); - - $html = ''.$text.''; - - return $html; - } - - public static function home_link($text=NULL) - { - global $pager; - global $Language; - - $text = isset($text)?$text:$Language->get('HOME'); - - $html = ''.$text.''; - - return $html; - } - -} - -?> diff --git a/kernel/helpers/plugin.class.php b/kernel/helpers/plugin.class.php deleted file mode 100644 index 3aa76160..00000000 --- a/kernel/helpers/plugin.class.php +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/kernel/helpers/post.class.php b/kernel/helpers/post.class.php deleted file mode 100644 index 47f3353e..00000000 --- a/kernel/helpers/post.class.php +++ /dev/null @@ -1,243 +0,0 @@ -get_list_by_post( array('id_post'=>$post['id']) ); - - return $comments; - } - - public static function num_comments() - { - global $post; - - return count($post['comments']); - } - - public static function category($field=false) - { - global $post; - global $_DB_CATEGORIES; - - $category = $_DB_CATEGORIES->get( array('id'=>$post['id_cat']) ); - - if($field=='id') - return $category['id']; - - if($field=='slug') - return $category['slug']; - - if($field=='permalink') - return helperUrl::category($category['slug']); - - return $category['name']; - } - - public static function read_more() - { - global $post; - - return $post['read_more']; - } - - public static function allow_comments() - { - global $post; - - return $post['allow_comments']; - } - - public static function permalink($absolute=false) - { - global $post; - - return helperUrl::post($post,$absolute); - } - - public static function tags($return2array=false) - { - global $post; - global $_DB_TAGS; - - $tags = $_DB_TAGS->get_by_idpost( array('id_post'=>$post['id']) ); - - if($return2array) - return $tags; - - $html = ''; - - return $html; - } - - public static function comment_count_link() - { - global $post; - global $theme; - global $Language; - global $Comment; - - if(!$post['allow_comments']) - return false; - - if( $Comment->disqus_enabled() ) - { - $url = helperUrl::post($post, true); - return ''.$Language->get('COMMENTS').''; - } - elseif( $Comment->facebook_enabled() ) - { - $url = helperUrl::post($post, true); - return ''.$Language->get('COMMENTS').' ()'; - } - else - { - return ''.$Language->get('COMMENTS').' ('.count($post['comments']).')'; - } - } - - // DEPRECATED - // Last version available 4.0.3 - public static function tweet_link() - { - global $post; - - $url = helperUrl::post($post, true); - return 'https://twitter.com/share?url='.urlencode($url); - } - - public static function twitter($text=false) - { - global $post; - - $text = $text===false?'':$text; - - $url = helperUrl::post($post, true); - return 'http://twitter.com/home?status='.urlencode($text.' '.$url); - } - - public static function facebook($text=false) - { - global $post; - - $text = $text===false?'':$text; - - $url = helperUrl::post($post, true); - return 'https://www.facebook.com/sharer/sharer.php?u='.urlencode($text.' '.$url); - } - - public static function linkedin($title=false, $text=false) - { - global $post; - - $title = $title===false?'':$title; - $text = $text===false?'':$text; - - $url = helperUrl::post($post, true); - return 'http://www.linkedin.com/shareArticle?mini=true&url='.urlencode($url).'&title='.urlencode($title).'&summary='.urlencode($text); - } - - public static function googleplus($text=false) - { - global $post; - - $text = $text===false?'':$text; - - $url = helperUrl::post($post, true); - return 'https://plus.google.com/share?url='.urlencode($text.' '.$url); - } - - public static function mailto($text=false) - { - global $post; - - $text = $text===false?'':$text; - - $url = helperUrl::post($post, true); - return 'mailto:?subject='.rawurlencode(Blog::name().' - '.$text).'&body='.urlencode($url); - } - - public static function published($format=false) - { - global $post; - global $settings; - - $format = $format===false?$settings['timestamp_format']:$format; - - return Date::format($post['pub_date_unix'], $format); - } - - public static function modified($format=false) - { - global $post; - global $settings; - - $format = $format===false?$settings['timestamp_format']:$format; - - return Date::format($post['mod_date_unix'], $format); - } - - public static function content($full=false) - { - global $post; - global $theme; - - if($post['type']=='quote') - { - $html = '
'.$post['quote'].'
'; - } - elseif($post['type']=='video') - { - $video_width = !isset($theme['video_width'])?640:$theme['video_width']; - $video_height = !isset($theme['video_height'])?320:$theme['video_height']; - - $video_info = Video::video_get_info($post['video'], $video_width, $video_height); - - $html = '
'; - $html .= $video_info['embed']; - $html .= '
'; - } - else - { - if($full) - $html = $post['content'][0]; - else - $html = $post['content'][1]; - } - - return $html; - } - -} - -?> diff --git a/kernel/helpers/redirect.class.php b/kernel/helpers/redirect.class.php index 7e9a8f48..a63b67b2 100644 --- a/kernel/helpers/redirect.class.php +++ b/kernel/helpers/redirect.class.php @@ -23,4 +23,4 @@ class Redirect { self::url(HTML_PATH_ROOT); } -} \ No newline at end of file +} diff --git a/kernel/helpers/resize.class.php b/kernel/helpers/resize.class.php deleted file mode 100644 index 91278c02..00000000 --- a/kernel/helpers/resize.class.php +++ /dev/null @@ -1,244 +0,0 @@ -image = $this->openImage($fileName); - - // *** Get width and height - $this->width = imagesx($this->image); - $this->height = imagesy($this->image); - - $this->resizeImage($newWidth, $newHeight, $option); - } - - public function saveImage($savePath, $imageQuality="100", $force_jpg=false) - { - $extension = strtolower(pathinfo($savePath, PATHINFO_EXTENSION)); - - // Remove the extension - $filename = substr($savePath, 0,strrpos($savePath,'.')); - - $path_complete = $filename.'.'.$extension; - - if($force_jpg) - { - imagejpeg($this->imageResized, $filename.'.jpg', $imageQuality); - } - else - { - switch($extension) - { - case 'jpg': - case 'jpeg': - if (imagetypes() & IMG_JPG) { - imagejpeg($this->imageResized, $path_complete, $imageQuality); - } - break; - - case 'gif': - if (imagetypes() & IMG_GIF) { - imagegif($this->imageResized, $path_complete); - } - break; - - case 'png': - // *** Scale quality from 0-100 to 0-9 - $scaleQuality = round(($imageQuality/100) * 9); - - // *** Invert quality setting as 0 is best, not 9 - $invertScaleQuality = 9 - $scaleQuality; - - if (imagetypes() & IMG_PNG) { - imagepng($this->imageResized, $path_complete, $invertScaleQuality); - } - break; - - default: - // *** No extension - No save. - break; - } - } - - imagedestroy($this->imageResized); - } - - private function openImage($file) - { - // *** Get extension - $extension = strtolower(strrchr($file, '.')); - - switch($extension) - { - case '.jpg': - case '.jpeg': - $img = imagecreatefromjpeg($file); - break; - case '.gif': - $img = imagecreatefromgif($file); - break; - case '.png': - $img = imagecreatefrompng($file); - break; - default: - $img = false; - break; - } - return $img; - } - - private function resizeImage($newWidth, $newHeight, $option) - { - // *** Get optimal width and height - based on $option - $optionArray = $this->getDimensions($newWidth, $newHeight, $option); - - $optimalWidth = $optionArray['optimalWidth']; - $optimalHeight = $optionArray['optimalHeight']; - - - // *** Resample - create image canvas of x, y size - $this->imageResized = imagecreatetruecolor($optimalWidth, $optimalHeight); - imagecopyresampled($this->imageResized, $this->image, 0, 0, 0, 0, $optimalWidth, $optimalHeight, $this->width, $this->height); - - - // *** if option is 'crop', then crop too - if ($option == 'crop') { - $this->crop($optimalWidth, $optimalHeight, $newWidth, $newHeight); - } - } - - private function getDimensions($newWidth, $newHeight, $option) - { - - if( ($this->width < $newWidth) and ($this->height < $newHeight) ) - { - return array('optimalWidth' => $this->width, 'optimalHeight' => $this->height); - } - - switch ($option) - { - case 'exact': - $optimalWidth = $newWidth; - $optimalHeight= $newHeight; - break; - case 'portrait': - $optimalWidth = $this->getSizeByFixedHeight($newHeight); - $optimalHeight= $newHeight; - break; - case 'landscape': - $optimalWidth = $newWidth; - $optimalHeight= $this->getSizeByFixedWidth($newWidth); - break; - case 'auto': - $optionArray = $this->getSizeByAuto($newWidth, $newHeight); - $optimalWidth = $optionArray['optimalWidth']; - $optimalHeight = $optionArray['optimalHeight']; - break; - case 'crop': - $optionArray = $this->getOptimalCrop($newWidth, $newHeight); - $optimalWidth = $optionArray['optimalWidth']; - $optimalHeight = $optionArray['optimalHeight']; - break; - } - - return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight); - } - - private function getSizeByFixedHeight($newHeight) - { - $ratio = $this->width / $this->height; - $newWidth = $newHeight * $ratio; - return $newWidth; - } - - private function getSizeByFixedWidth($newWidth) - { - $ratio = $this->height / $this->width; - $newHeight = $newWidth * $ratio; - return $newHeight; - } - - private function getSizeByAuto($newWidth, $newHeight) - { - if ($this->height < $this->width) - // *** Image to be resized is wider (landscape) - { - $optimalWidth = $newWidth; - $optimalHeight= $this->getSizeByFixedWidth($newWidth); - } - elseif ($this->height > $this->width) - // *** Image to be resized is taller (portrait) - { - $optimalWidth = $this->getSizeByFixedHeight($newHeight); - $optimalHeight= $newHeight; - } - else - // *** Image to be resizerd is a square - { - if ($newHeight < $newWidth) { - $optimalWidth = $newWidth; - $optimalHeight= $this->getSizeByFixedWidth($newWidth); - } else if ($newHeight > $newWidth) { - $optimalWidth = $this->getSizeByFixedHeight($newHeight); - $optimalHeight= $newHeight; - } else { - // *** Sqaure being resized to a square - $optimalWidth = $newWidth; - $optimalHeight= $newHeight; - } - } - - return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight); - } - - private function getOptimalCrop($newWidth, $newHeight) - { - - $heightRatio = $this->height / $newHeight; - $widthRatio = $this->width / $newWidth; - - if ($heightRatio < $widthRatio) { - $optimalRatio = $heightRatio; - } else { - $optimalRatio = $widthRatio; - } - - $optimalHeight = $this->height / $optimalRatio; - $optimalWidth = $this->width / $optimalRatio; - - return array('optimalWidth' => $optimalWidth, 'optimalHeight' => $optimalHeight); - } - - private function crop($optimalWidth, $optimalHeight, $newWidth, $newHeight) - { - // *** Find center - this will be used for the crop - $cropStartX = ( $optimalWidth / 2) - ( $newWidth /2 ); - $cropStartY = ( $optimalHeight/ 2) - ( $newHeight/2 ); - - $crop = $this->imageResized; - //imagedestroy($this->imageResized); - - // *** Now crop from center to exact requested size - $this->imageResized = imagecreatetruecolor($newWidth , $newHeight); - imagecopyresampled($this->imageResized, $crop , 0, 0, $cropStartX, $cropStartY, $newWidth, $newHeight , $newWidth, $newHeight); - } - -} -?> diff --git a/kernel/helpers/site.class.php b/kernel/helpers/site.class.php deleted file mode 100644 index c9e6be87..00000000 --- a/kernel/helpers/site.class.php +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/kernel/helpers/social.class.php b/kernel/helpers/social.class.php deleted file mode 100644 index 44d5e2fc..00000000 --- a/kernel/helpers/social.class.php +++ /dev/null @@ -1,42 +0,0 @@ -Tweet'; - $code .= ''; - - return $code; - } - - public static function facebook_share($args = array()) - { - // HTML Code - $code = ''; - $code .= ''; - - return $code; - } - - public static function facebook_like($args = array()) - { - // HTML Code - $code = ''; - - return $code; - } - -} - -?> diff --git a/kernel/helpers/text.class.php b/kernel/helpers/text.class.php index e6b5df2e..e8666a8d 100644 --- a/kernel/helpers/text.class.php +++ b/kernel/helpers/text.class.php @@ -1,6 +1,6 @@ '/publicacion/', 'tag'=>'/etiqueta/', ....) - // Ex (English): Array('post'=>'/post/', 'tag'=>'/tag/', ....) - public static function init($filters) - { - // Decodes any %## encoding in the given string. Plus symbols ('+') are decoded to a space character. - self::$uri = urldecode($_SERVER['REQUEST_URI']); - - // URI Lowercase - //self::$uri = helperText::lowercase(self::$uri); - - self::$uri_strlen = helperText::length(self::$uri); - - self::$whereAmI = 'home'; - - self::$notFound = false; - - self::$slug = false; - - self::$filters = $filters; - - // Check if filtering by post - // Primero verifico que no haya ningun slug filtrado, asi no lo piso. - if(self::$slug===false) - self::is_post($filters['post']); - - // Check if filtering by tag - // Primero verifico que no haya ningun slug filtrado, asi no lo piso. - if(self::$slug===false) - self::is_tag($filters['tag']); - - // Check if filtering by page - // Primero verifico que no haya ningun slug filtrado, asi no lo piso. - if(self::$slug===false) - self::is_page($filters['page']); - } - - public static function slug() - { - return self::$slug; - } - - public static function uri() - { - return self::$uri; - } - - // Return the filter used - public static function filters($type) - { - return self::$filters[$type]; - } - - // Return: home, tag, post - public static function whereAmI() - { - return self::$whereAmI; - } - - public static function setWhereAmI($where) - { - self::$whereAmI = $where; - } - - - public static function notFound() - { - return self::$notFound; - } - - public static function setNotFound($error = true) - { - self::$whereAmI = 'page'; - self::$notFound = $error; - } - - public static function is_tag($filter) - { - if(self::filter_slug($filter)===false) - return false; - - self::$whereAmI = 'tag'; - - return true; - } - - public static function is_post($filter) - { - if(self::filter_slug($filter)===false) - return false; - - self::$whereAmI = 'post'; - - return true; - } - - public static function is_page($filter) - { - if(self::filter_slug($filter)===false) - return false; - - self::$whereAmI = 'page'; - - return true; - } - - // Return the slug after the $filter - // ex: http://domain.com/cms/$filter/slug123 => slug123 - private static function filter_slug($filter) - { - $position = helperText::strpos(self::$uri, $filter); - - if($position===false) - return false; - - $start = $position + helperText::length($filter); - $end = self::$uri_strlen; - - self::$slug = helperText::cut(self::$uri, $start, $end); - - if(empty(self::$slug)) - return false; - - return self::$slug; - } - -} - -?> diff --git a/kernel/helpers/video.class.php b/kernel/helpers/video.class.php deleted file mode 100644 index e39b19eb..00000000 --- a/kernel/helpers/video.class.php +++ /dev/null @@ -1,89 +0,0 @@ -children('http://search.yahoo.com/mrss/'); - - $info = array(); - $info['id'] = $video_id; - $info['title'] = (string)$media->group->title; - $info['description'] = (string)$media->group->description; - - $info['thumb'][0] = (string)$media->group->thumbnail[0]->attributes()->url; - $info['thumb'][1] = (string)$media->group->thumbnail[1]->attributes()->url; - $info['thumb'][2] = (string)$media->group->thumbnail[2]->attributes()->url; - $info['thumb'][3] = (string)$media->group->thumbnail[3]->attributes()->url; - - $info['embed'] = ''; - - return($info); - } - - private static function video_get_vimeo($url, $width = 640, $height = 360) - { - preg_match('/vimeo\.com\/([0-9]{1,10})/', $url, $matches); - $video_id = $matches[1]; - - // Check if a valid url - if(!Net::check_http_code('http://vimeo.com/api/v2/video/'.$video_id.'.php',200)) - { - return(false); - } - - $hash = unserialize(file_get_contents('http://vimeo.com/api/v2/video/'.$video_id.'.php')); - - $info = array(); - $info['id'] = $video_id; - $info['title'] = $hash[0]['title']; - $info['description'] = $hash[0]['description']; - - $info['thumb'][0] = $hash[0]['thumbnail_medium']; - $info['thumb'][1] = $hash[0]['thumbnail_small']; - - $info['embed'] = ''; - - return($info); - } - -} - -?> diff --git a/kernel/js/functions.php b/kernel/js/functions.php index 04d7832f..3685286d 100644 --- a/kernel/js/functions.php +++ b/kernel/js/functions.php @@ -71,4 +71,4 @@ function checkSlug(type, text, parentPage, key, writeResponse) } - \ No newline at end of file + diff --git a/kernel/language.class.php b/kernel/language.class.php index 78a4f263..a750da8d 100644 --- a/kernel/language.class.php +++ b/kernel/language.class.php @@ -15,8 +15,8 @@ class Language extends DB_SERIALIZE // Return the translation, if the translation does'n exist then return the English translation. public function get($text) { - $key = helperText::lowercase($text); - $key = helperText::replace(' ', '-', $key); + $key = Text::lowercase($text); + $key = Text::replace(' ', '-', $key); if(isset($this->vars[$key])) return $this->vars[$key]; diff --git a/kernel/url.class.php b/kernel/url.class.php index ae937d92..38982cbd 100644 --- a/kernel/url.class.php +++ b/kernel/url.class.php @@ -22,7 +22,7 @@ class Url $this->parameters = $_GET; - $this->uriStrlen = helperText::length($this->uri); + $this->uriStrlen = Text::length($this->uri); $this->whereAmI = 'home'; @@ -147,15 +147,15 @@ class Url } // Check if the filter is in the uri. - $position = helperText::strpos($this->uri, $filter); + $position = Text::strpos($this->uri, $filter); if($position===false) { return false; } - $start = $position + helperText::length($filter); + $start = $position + Text::length($filter); $end = $this->uriStrlen; - $slug = helperText::cut($this->uri, $start, $end); + $slug = Text::cut($this->uri, $start, $end); $this->slug = trim($slug, '/'); return $slug; diff --git a/themes/pure/css/blog.css b/themes/pure/css/blog.css index c400a9bc..9d449864 100644 --- a/themes/pure/css/blog.css +++ b/themes/pure/css/blog.css @@ -49,6 +49,15 @@ th, td { padding: 0.5em 1em; } +pre, code { + white-space: pre-wrap !important; +} + +code { + font-size: 13px !important; + padding: 5px !important; +} + #layout { padding: 0; } @@ -78,13 +87,13 @@ th, td { .sidebar h2 { font-weight: lighter; - margin: -15px 0 20px; + margin: -15px 0 5px; padding: 0; font-size: 2.2em; } .sidebar div.links { - margin: 20px 0; + margin-bottom: 50px; } .sidebar p.about { diff --git a/themes/pure/index.php b/themes/pure/index.php index 84fc7e1e..1e36cbd7 100644 --- a/themes/pure/index.php +++ b/themes/pure/index.php @@ -51,4 +51,4 @@ echo "DEBUG: Load time: ".(microtime(true) - $loadTime).'
'; - \ No newline at end of file + diff --git a/themes/pure/php/footer.php b/themes/pure/php/footer.php index cdf4ae65..e129f1db 100644 --- a/themes/pure/php/footer.php +++ b/themes/pure/php/footer.php @@ -1,3 +1,3 @@

footer(); ?>

-
\ No newline at end of file + diff --git a/themes/pure/php/home.php b/themes/pure/php/home.php index b7820a16..06263eb7 100644 --- a/themes/pure/php/home.php +++ b/themes/pure/php/home.php @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/themes/pure/php/page.php b/themes/pure/php/page.php index 52302df8..368ce903 100644 --- a/themes/pure/php/page.php +++ b/themes/pure/php/page.php @@ -8,4 +8,4 @@
content() ?>
- \ No newline at end of file + diff --git a/themes/pure/php/post.php b/themes/pure/php/post.php index d2f90e24..a9689a06 100644 --- a/themes/pure/php/post.php +++ b/themes/pure/php/post.php @@ -15,4 +15,4 @@
content() ?>
- \ No newline at end of file + diff --git a/themes/pure/php/sidebar.php b/themes/pure/php/sidebar.php index af648f04..f64826ce 100644 --- a/themes/pure/php/sidebar.php +++ b/themes/pure/php/sidebar.php @@ -2,14 +2,13 @@

title() ?>

slogan() ?>

-

description() ?>

'; echo 'Home'; -echo ' | '; +echo ' - '; echo 'Twitter'; echo ''; @@ -30,7 +29,7 @@ foreach($parents as $parent) echo ''; } @@ -38,4 +37,4 @@ foreach($parents as $parent) ?> - \ No newline at end of file +