r31k
/
bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Installer minor changes

This commit is contained in:
dignajar 2015-08-04 00:10:12 -03:00
parent 6c9fb2a0c1
commit 951cb8f613
7 changed files with 359 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/themes/default/css/installer.css
View File

@ -26,3 +26,20 @@ h1.title {
td { td {
text-align: center; text-align: center;
} }
.tools-message {
display: block;
position: relative;
top: 0;
right: 0;
left: 0;
bottom: 0;
max-width: none;
margin-bottom: 30px;
}
#jscompleteEmail {
border-bottom: 1px solid #fff;
display: inline-block;
cursor: pointer;
}

2
content/README
View File

@ -1,2 +0,0 @@
Set the correct permissions on this directory.
Check the documentation: http://docs.bludit.com/en/troubleshooting/writing-test-failure-err205

11
index.php
View File

@ -14,7 +14,7 @@ if( !file_exists('content/databases/site.php') )
exit('<a href="./install.php">First, install Bludit</a>'); exit('<a href="./install.php">First, install Bludit</a>');
} }
// DEBUG: // Load time init
$loadTime = microtime(true); $loadTime = microtime(true);
// Security constant // Security constant
@ -24,7 +24,7 @@ define('BLUDIT', true);
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);
// PHP paths // PHP paths
define('PATH_ROOT', __DIR__.DS); define('PATH_ROOT', __DIR__.DS);
define('PATH_BOOT', PATH_ROOT.'kernel'.DS.'boot'.DS); define('PATH_BOOT', PATH_ROOT.'kernel'.DS.'boot'.DS);
// Init // Init
@ -40,10 +40,3 @@ else
{ {
require(PATH_BOOT.'site.php'); require(PATH_BOOT.'site.php');
} }
// DEBUG:
// Print all variables/objects
//print_r(get_defined_vars());
//var_dump($_SESSION);
//var_dump($Login->fingerPrint());

527
install.php
View File

@ -14,218 +14,246 @@ define('BLUDIT', true);
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);
// PATHs // PATHs
define('PATH_ROOT', __DIR__.DS); define('PATH_ROOT', __DIR__.DS);
define('PATH_CONTENT', PATH_ROOT.'content'.DS); define('PATH_CONTENT', PATH_ROOT.'content'.DS);
define('PATH_POSTS', PATH_CONTENT.'posts'.DS); define('PATH_POSTS', PATH_CONTENT.'posts'.DS);
define('PATH_UPLOADS', PATH_CONTENT.'uploads'.DS); define('PATH_UPLOADS', PATH_CONTENT.'uploads'.DS);
define('PATH_PAGES', PATH_CONTENT.'pages'.DS); define('PATH_PAGES', PATH_CONTENT.'pages'.DS);
define('PATH_DATABASES', PATH_CONTENT.'databases'.DS); define('PATH_DATABASES', PATH_CONTENT.'databases'.DS);
define('PATH_PLUGINS_DATABASES', PATH_CONTENT.'databases'.DS.'plugins'.DS); define('PATH_PLUGINS_DATABASES',PATH_CONTENT.'databases'.DS.'plugins'.DS);
define('DOMAIN', getenv('HTTP_HOST')); define('PATH_KERNEL', PATH_ROOT.'kernel'.DS);
define('PATH_HELPERS', PATH_KERNEL.'helpers'.DS);
define('PATH_LANGUAGES', PATH_ROOT.'languages'.DS);
define('PATH_ABSTRACT', PATH_KERNEL.'abstract'.DS);
define('DOMAIN', getenv('HTTP_HOST'));
// HTML PATHs // HTML PATHs
$base = (dirname(getenv('SCRIPT_NAME'))==DS)?'/':dirname(getenv('SCRIPT_NAME')).'/'; $base = (dirname(getenv('SCRIPT_NAME'))==DS)?'/':dirname(getenv('SCRIPT_NAME')).'/';
define('HTML_PATH_ROOT', $base); define('HTML_PATH_ROOT', $base);
// JSON
if(!defined('JSON_PRETTY_PRINT')) { if(!defined('JSON_PRETTY_PRINT')) {
define('JSON_PRETTY_PRINT', 128); define('JSON_PRETTY_PRINT', 128);
} }
// Helpers class
include(PATH_HELPERS.'sanitize.class.php');
include(PATH_HELPERS.'valid.class.php');
include(PATH_ABSTRACT.'dbjson.class.php');
// ============================================================================ // ============================================================================
// FUNCTIONS // FUNCTIONS
// ============================================================================ // ============================================================================
// Generate a random string function getLanguageList()
{
$files = glob(PATH_LANGUAGES.'*.json');
$tmp = array();
foreach($files as $file)
{
$t = new dbJSON($file, false);
$native = $t->db['language-data']['native'];
$locale = basename($file, '.json');
$tmp[$locale] = $native;
}
return $tmp;
}
// Generate a random string.
// Thanks, http://stackoverflow.com/questions/4356289/php-random-string-generator // Thanks, http://stackoverflow.com/questions/4356289/php-random-string-generator
function getRandomString($length = 10) { function getRandomString($length = 10) {
return substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, $length); return substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, $length);
} }
function alreadyInstalled() // Check if Bludit is installed.
{ function alreadyInstalled() {
return file_exists(PATH_DATABASES.'site.php'); return file_exists(PATH_DATABASES.'site.php');
} }
// Check the system, permissions, php version, modules, etc.
// Returns an array with the problems otherwise empty array.
function checkSystem() function checkSystem()
{ {
$stdOut = array(); $stdOut = array();
$dirpermissions = 0755; $dirpermissions = 0755;
$phpModules = array(); $phpModules = array();
if(function_exists('get_loaded_extensions')) if(function_exists('get_loaded_extensions')) {
{ $phpModules = get_loaded_extensions();
$phpModules = get_loaded_extensions(); }
}
if(!version_compare(phpversion(), '5.3', '>=')) if(!version_compare(phpversion(), '5.3', '>='))
{ {
$errorText = 'Current PHP version '.phpversion().', you need > 5.3. (ERR_202)'; $errorText = 'Current PHP version '.phpversion().', you need > 5.3. (ERR_202)';
error_log($errorText, 0); error_log($errorText, 0);
array_push($stdOut, $errorText); array_push($stdOut, $errorText);
return $stdOut; return $stdOut;
} }
if(!file_exists(PATH_ROOT.'.htaccess')) if(!file_exists(PATH_ROOT.'.htaccess'))
{ {
$errorText = 'Missing file, upload the file .htaccess (ERR_201)'; $errorText = 'Missing file, upload the file .htaccess (ERR_201)';
error_log($errorText, 0); error_log($errorText, 0);
array_push($stdOut, $errorText); array_push($stdOut, $errorText);
} }
if(!in_array('dom', $phpModules)) if(!in_array('dom', $phpModules))
{ {
$errorText = 'PHP module DOM does not exist. (ERR_203)'; $errorText = 'PHP module DOM is not installed. (ERR_203)';
error_log($errorText, 0); error_log($errorText, 0);
array_push($stdOut, $errorText); array_push($stdOut, $errorText);
} }
if(!in_array('json', $phpModules)) if(!in_array('json', $phpModules))
{ {
$errorText = 'PHP module JSON does not exist. (ERR_204)'; $errorText = 'PHP module JSON is not installed. (ERR_204)';
error_log($errorText, 0); error_log($errorText, 0);
array_push($stdOut, $errorText); array_push($stdOut, $errorText);
} }
if(!is_writable(PATH_CONTENT)) if(!is_writable(PATH_CONTENT))
{ {
$errorText = 'Writing test failure, check directory content permissions. (ERR_205)'; $errorText = 'Writing test failure, check directory content permissions. (ERR_205)';
error_log($errorText, 0); error_log($errorText, 0);
array_push($stdOut, $errorText); array_push($stdOut, $errorText);
} }
return $stdOut; return $stdOut;
} }
function install($adminPassword, $email) function install($adminPassword, $email, $language)
{ {
$stdOut = array(); $stdOut = array();
// ============================================================================ // ============================================================================
// Create directories // Create directories
// ============================================================================ // ============================================================================
// 7=read,write,execute | 5=read,execute // 7=read,write,execute | 5=read,execute
$dirpermissions = 0755; $dirpermissions = 0755;
$firstPostSlug = 'first-post'; $firstPostSlug = 'first-post';
if(!mkdir(PATH_POSTS.$firstPostSlug, $dirpermissions, true)) if(!mkdir(PATH_POSTS.$firstPostSlug, $dirpermissions, true))
{ {
$errorText = 'Error when trying to created the directory=>'.PATH_POSTS.$firstPostSlug; $errorText = 'Error when trying to created the directory=>'.PATH_POSTS.$firstPostSlug;
error_log($errorText, 0); error_log($errorText, 0);
} }
if(!mkdir(PATH_PAGES.'error', $dirpermissions, true)) if(!mkdir(PATH_PAGES.'error', $dirpermissions, true))
{ {
$errorText = 'Error when trying to created the directory=>'.PATH_PAGES.'error'; $errorText = 'Error when trying to created the directory=>'.PATH_PAGES.'error';
error_log($errorText, 0); error_log($errorText, 0);
} }
if(!mkdir(PATH_PLUGINS_DATABASES.'pages', $dirpermissions, true)) if(!mkdir(PATH_PLUGINS_DATABASES.'pages', $dirpermissions, true))
{ {
$errorText = 'Error when trying to created the directory=>'.PATH_PLUGINS_DATABASES; $errorText = 'Error when trying to created the directory=>'.PATH_PLUGINS_DATABASES;
error_log($errorText, 0); error_log($errorText, 0);
} }
if(!mkdir(PATH_UPLOADS, $dirpermissions, true)) if(!mkdir(PATH_UPLOADS, $dirpermissions, true))
{ {
$errorText = 'Error when trying to created the directory=>'.PATH_UPLOADS; $errorText = 'Error when trying to created the directory=>'.PATH_UPLOADS;
error_log($errorText, 0); error_log($errorText, 0);
} }
// ============================================================================ // ============================================================================
// Create files // Create files
// ============================================================================ // ============================================================================
$dataHead = "<?php defined('BLUDIT') or die('Bludit CMS.'); ?>".PHP_EOL; $dataHead = "<?php defined('BLUDIT') or die('Bludit CMS.'); ?>".PHP_EOL;
// File pages.php // File pages.php
$data = array( $data = array(
'error'=>array( 'error'=>array(
'description'=>'Error page', 'description'=>'Error page',
'username'=>'admin', 'username'=>'admin',
'tags'=>'', 'tags'=>'',
'status'=>'published', 'status'=>'published',
'unixTimeCreated'=>1430686755, 'unixTimeCreated'=>1430686755,
'unixTimeModified'=>0, 'unixTimeModified'=>0,
'position'=>0 'position'=>0
) )
); );
file_put_contents(PATH_DATABASES.'pages.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX); file_put_contents(PATH_DATABASES.'pages.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);
// File posts.php // File posts.php
$data = array( $data = array(
$firstPostSlug=>array( $firstPostSlug=>array(
'description'=>'Welcome to Bludit', 'description'=>'Welcome to Bludit',
'username'=>'admin', 'username'=>'admin',
'status'=>'published', 'status'=>'published',
'tags'=>'welcome, bludit, cms', 'tags'=>'welcome, bludit, cms',
'allowComments'=>false, 'allowComments'=>false,
'unixTimeCreated'=>1430875199, 'unixTimeCreated'=>1430875199,
'unixTimeModified'=>0 'unixTimeModified'=>0
) )
); );
file_put_contents(PATH_DATABASES.'posts.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX); file_put_contents(PATH_DATABASES.'posts.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);
// File site.php // File site.php
$data = array( $data = array(
'title'=>'Bludit', 'title'=>'Bludit',
'slogan'=>'cms', 'slogan'=>'cms',
'description'=>'', 'description'=>'',
'footer'=>'Footer text - ©2015', 'footer'=>'Footer text - ©2015',
'language'=>'english', 'language'=>$language,
'locale'=>'en_US', 'locale'=>$language,
'timezone'=>'UTC', 'timezone'=>'UTC',
'theme'=>'pure', 'theme'=>'pure',
'adminTheme'=>'default', 'adminTheme'=>'default',
'homepage'=>'', 'homepage'=>'',
'postsperpage'=>'6', 'postsperpage'=>'6',
'uriPost'=>'/post/', 'uriPost'=>'/post/',
'uriPage'=>'/', 'uriPage'=>'/',
'uriTag'=>'/tag/', 'uriTag'=>'/tag/',
'advancedOptions'=>'false', 'advancedOptions'=>'false',
'url'=>'http://'.DOMAIN.HTML_PATH_ROOT 'url'=>'http://'.DOMAIN.HTML_PATH_ROOT
); );
file_put_contents(PATH_DATABASES.'site.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX); file_put_contents(PATH_DATABASES.'site.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);
$salt = getRandomString(); $salt = getRandomString();
$passwordHash = sha1($adminPassword.$salt); $passwordHash = sha1($adminPassword.$salt);
$registered = time(); $registered = time();
// File users.php // File users.php
$data = array( $data = array(
'admin'=>array( 'admin'=>array(
'firstName'=>'', 'firstName'=>'',
'lastName'=>'', 'lastName'=>'',
'twitter'=>'', 'twitter'=>'',
'role'=>'admin', 'role'=>'admin',
'password'=>$passwordHash, 'password'=>$passwordHash,
'salt'=>$salt, 'salt'=>$salt,
'email'=>$email, 'email'=>$email,
'registered'=>$registered 'registered'=>$registered
) )
); );
file_put_contents(PATH_DATABASES.'users.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX); file_put_contents(PATH_DATABASES.'users.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);
// File plugins/pages/db.php // File plugins/pages/db.php
$data = array( $data = array(
'homeLink'=>true, 'homeLink'=>true,
'label'=>'Pages' 'label'=>'Pages'
); );
file_put_contents(PATH_PLUGINS_DATABASES.'pages'.DS.'db.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX); file_put_contents(PATH_PLUGINS_DATABASES.'pages'.DS.'db.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);
// File index.txt for error page // File index.txt for error page
$data = 'Title: Error $data = 'Title: Error
Content: The page has not been found.'; Content: The page has not been found.';
file_put_contents(PATH_PAGES.'error'.DS.'index.txt', $data, LOCK_EX); file_put_contents(PATH_PAGES.'error'.DS.'index.txt', $data, LOCK_EX);
// File index.txt for welcome post // File index.txt for welcome post
$data = 'title: First post $data = 'Title: First post
Content: Content:
Congratulations, you have installed **Bludit** successfully! Congratulations, you have installed **Bludit** successfully!
@ -239,32 +267,58 @@ What\'s next:
- Read the [documentation](http://docs.bludit.com) for more information - Read the [documentation](http://docs.bludit.com) for more information
- Share with your friend :D'; - Share with your friend :D';
file_put_contents(PATH_POSTS.$firstPostSlug.DS.'index.txt', $data, LOCK_EX); file_put_contents(PATH_POSTS.$firstPostSlug.DS.'index.txt', $data, LOCK_EX);
return true; return true;
}
function checkPOST($_POST)
{
// Check empty password
if(empty($_POST['password']))
{
return '<div>The password field is empty</div>';
}
// Check invalid email
if(!Valid::email($_POST['email']))
{
return '<div>Your email address is invalid.</div><div id="jscompleteEmail">Proceed anyway!</div>';
}
// Sanitize email
$email = sanitize::email($_POST['email']);
// Install Bludit
install($_POST['password'], $email, $_POST['language']);
return true;
} }
// ============================================================================ // ============================================================================
// MAIN // MAIN
// ============================================================================ // ============================================================================
if( alreadyInstalled() ) $error = '';
{
exit('Bludit already installed'); if( alreadyInstalled() ) {
exit('Bludit already installed');
} }
if( $_SERVER['REQUEST_METHOD'] == 'POST' ) if( $_SERVER['REQUEST_METHOD'] == 'POST' )
{ {
if(install($_POST['password'],$_POST['email'])) $error = checkPOST($_POST);
{
if(!headers_sent())
{
header("Location:".HTML_PATH_ROOT, TRUE, 302);
exit;
}
exit('<meta http-equiv="refresh" content="0; url="'.HTML_PATH_ROOT.'" />'); if($error===true)
} {
if(!headers_sent())
{
header("Location:".HTML_PATH_ROOT, TRUE, 302);
exit;
}
exit('<meta http-equiv="refresh" content="0; url="'.HTML_PATH_ROOT.'">');
}
} }
?> ?>
@ -272,73 +326,104 @@ if( $_SERVER['REQUEST_METHOD'] == 'POST' )
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<base href="admin/themes/default/"> <base href="admin/themes/default/">
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Bludit Installer</title> <title>Bludit Installer</title>
<link rel="stylesheet" href="./css/kube.min.css"> <link rel="stylesheet" href="./css/kube.min.css">
<link rel="stylesheet" href="./css/installer.css"> <link rel="stylesheet" href="./css/installer.css">
<script src="./js/jquery.min.js"></script> <script src="./js/jquery.min.js"></script>
<script src="./js/kube.min.js"></script> <script src="./js/kube.min.js"></script>
</head> </head>
<body> <body>
<div class="units-row"> <div class="units-row">
<div class="unit-centered unit-60"> <div class="unit-centered unit-60">
<div class="main"> <div class="main">
<h1 class="title">Bludit Installer</h1> <h1 class="title">Bludit Installer</h1>
<p>Welcome to the Bludit installer</p> <p>Welcome to the Bludit installer</p>
<?php <?php
$system = checkSystem(); $system = checkSystem();
if(empty($system)) if(empty($system))
{ {
?> ?>
<p>Complete the form, choose a password for the username <strong>admin</strong></p> <p>Complete the form, choose a password for the username <strong>admin</strong></p>
<div class="unit-centered unit-40">
<form method="post" action="" class="forms" autocomplete="off">
<label> <div class="unit-centered unit-40">
<input type="text" value="admin" disabled="disabled" class="width-100">
</label>
<label> <?php
<input type="password" name="password" placeholder="Password" class="width-100" autocomplete="off"> if(!empty($error)) {
</label> echo '<div class="tools-message tools-message-red">'.$error.'</div>';
}
?>
<label> <form id="jsformInstaller" method="post" action="" class="forms" autocomplete="off">
<input type="text" name="email" placeholder="Email" class="width-100" autocomplete="off">
</label>
<p> <label>
<button class="btn btn-blue width-100">Install</button> <input type="text" value="admin" disabled="disabled" class="width-100">
</p> </label>
</form>
</div>
<?php <label>
} <input type="text" name="password" id="jspassword" placeholder="Password, visible field!" class="width-100" autocomplete="off" maxlength="100" value="<?php echo isset($_POST['password'])?$_POST['password']:'' ?>">
else </label>
{
echo '<div class="unit-centered unit-40">';
echo '<table class="table-stripped">';
foreach ($system as $value) <label>
{ <input type="text" name="email" id="jsemail" placeholder="Email" class="width-100" autocomplete="off" maxlength="100">
echo '<tr><td>'.$value.'</td></tr>'; </label>
}
echo '</table>'; <label for="jslanguage">
echo '</div'; <select id="jslanguage" name="language" class="width-100">
} <?php
?> $htmlOptions = getLanguageList();
foreach($htmlOptions as $locale=>$nativeName) {
echo '<option value="'.$locale.'">'.$nativeName.'</option>';
}
?>
</select>
</label>
<p>
<button class="btn btn-blue width-100">Install</button>
</p>
</form>
</div>
<?php
}
else
{
echo '<div class="unit-centered unit-50">';
echo '<table class="table-stripped">';
foreach ($system as $value)
{
echo '<tr><td>'.$value.'</td></tr>';
}
echo '</table>';
echo '</div';
}
?>
</div>
</div>
<script>
$(document).ready(function()
{
$("#jscompleteEmail").on("click", function() {
$("#jsemail").val('noreply@localhost.com');
if(!$("jspassword").val()) {
$("#jsformInstaller").submit();
}
});
});
</script>
</div>
</div>
</div> </div>
</body> </body>
</html> </html>

1
kernel/boot/init.php
View File

@ -113,6 +113,7 @@ include(PATH_HELPERS.'theme.class.php');
include(PATH_HELPERS.'session.class.php'); include(PATH_HELPERS.'session.class.php');
include(PATH_HELPERS.'redirect.class.php'); include(PATH_HELPERS.'redirect.class.php');
include(PATH_HELPERS.'sanitize.class.php'); include(PATH_HELPERS.'sanitize.class.php');
include(PATH_HELPERS.'valid.class.php');
include(PATH_HELPERS.'filesystem.class.php'); include(PATH_HELPERS.'filesystem.class.php');
include(PATH_HELPERS.'alert.class.php'); include(PATH_HELPERS.'alert.class.php');
include(PATH_HELPERS.'paginator.class.php'); include(PATH_HELPERS.'paginator.class.php');

41
kernel/helpers/sanitize.class.php
View File

@ -55,35 +55,17 @@ class Sanitize {
return true; return true;
} }
// old public static function email($email)
public static function ip($ip)
{ {
return filter_var($ip, FILTER_VALIDATE_IP); return( filter_var($email, FILTER_SANITIZE_EMAIL) );
} }
public static function mail($mail) public static function url($url)
{ {
return filter_var($mail, FILTER_VALIDATE_EMAIL); return( filter_var($url, FILTER_SANITIZE_URL) );
} }
public static function int($int) public static function int($value)
{
if($int === 0)
return( true );
elseif (filter_var($int, FILTER_VALIDATE_INT) === false )
return( false );
else
return( true );
}
// Remove all characters except digits
public static function sanitize_float($value)
{
return( filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_THOUSAND) );
}
// Valid an integer positive
public static function sanitize_int($value)
{ {
$value = (int)$value; $value = (int)$value;
@ -93,17 +75,4 @@ class Sanitize {
return 0; return 0;
} }
public static function sanitize_email($value)
{
return( filter_var($value, FILTER_SANITIZE_EMAIL) );
}
public static function sanitize_url($value)
{
return( filter_var($value, FILTER_SANITIZE_URL) );
}
// Convert all applicable characters to HTML entities incluye acentos
} }

27
kernel/helpers/valid.class.php Normal file
View File

@ -0,0 +1,27 @@
<?php defined('BLUDIT') or die('Bludit CMS.');
class Valid {
public static function ip($ip)
{
return filter_var($ip, FILTER_VALIDATE_IP);
}
public static function email($email)
{
return filter_var($email, FILTER_VALIDATE_EMAIL);
}
public static function int($int)
{
if($int === 0) {
return true;
}
elseif(filter_var($int, FILTER_VALIDATE_INT) === false ) {
return false;
}
return true;
}
}