Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit f866778a5326b4e1c3db10f578ac48c43c66c653
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Sep 2 22:51:17 2017 +0300

    more changes

commit 4207db197419c8a098feb1d68ef07d2247301986
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Sep 2 19:03:35 2017 +0300

    fix the routing

commit ddb59ac
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Sep 1 16:12:38 2017 +0300

    fixes, remove webcomponets

commit 727401a
Merge: 1b1726d 6981a18
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Fri Sep 1 15:35:45 2017 +0300

    Merge pull request #64 from ciar4n/style-postinstall

    Post install markup and style

commit 6981a18
Author: ciar4n <ciaran@joomla51.com>
Date:   Fri Sep 1 13:32:31 2017 +0100

    Post install markup and style

commit 1b1726d
Merge: 0a43128 42e5517
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Tue Aug 29 14:28:33 2017 +0300

    Merge pull request #63 from ciar4n/style-preinstall

    New style to preinstall

commit 42e5517
Author: ciar4n <ciaran@joomla51.com>
Date:   Tue Aug 29 12:24:20 2017 +0100

    New style to preinstall check

commit 0a43128
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed Aug 23 16:37:18 2017 +0300

    js fixes

commit 9974ee5
Merge: 8fb5939 48857fc
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Tue Aug 22 19:53:31 2017 +0300

    Merge pull request #62 from ciar4n/install-style

    Install re design

commit 48857fc
Author: ciar4n <ciaran@joomla51.com>
Date:   Tue Aug 22 17:50:20 2017 +0100

    Redesign

commit 8fb5939
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Aug 19 18:24:35 2017 +0300

    remove duplicate line

commit 520b8d9
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sat Aug 19 18:06:42 2017 +0300

    unmute sessions

commit 8f18075
Merge: 7b04a78 020ad0e
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Fri Jul 21 14:04:08 2017 +0300

    Merge pull request #60 from ciar4n/install-style1

    Various bits

commit 7b04a78
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jul 21 13:42:13 2017 +0300

    clean up

commit 020ad0e
Author: ciar4n <ciaran@joomla51.com>
Date:   Fri Jul 21 11:24:58 2017 +0100

    Refactor alerts

commit 214db09
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jul 21 13:19:13 2017 +0300

    core needs patching

commit 2b5e924
Author: ciar4n <ciaran@joomla51.com>
Date:   Fri Jul 21 10:58:35 2017 +0100

    Compile SCSS

commit 3ffa406
Author: ciar4n <ciaran@joomla51.com>
Date:   Fri Jul 21 10:58:05 2017 +0100

    Add view/default.php

commit b0a580d
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jul 21 10:54:53 2017 +0300

    Use webcomponents for the alerts

commit 91272d2
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 20:53:07 2017 +0300

    easter egg, wow

commit a890a0b
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 19:45:12 2017 +0300

    do not fail

commit 00badb5
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 19:15:48 2017 +0300

    IIFE was a bad idea

commit 117426b
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 18:56:14 2017 +0300

    set focus to the rigth input between steps

commit 0df4e1b
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 18:44:59 2017 +0300

    smooth transitions in setup

commit 269d005
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 18:21:37 2017 +0300

    routing

commit 66b1cd7
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 15:28:20 2017 +0300

    better handling of the form

commit 8582cb6
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 14:39:05 2017 +0300

    recompile

commit e7135cf
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 14:24:36 2017 +0300

    session

commit 65bd548
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jul 20 14:08:10 2017 +0300

    styles

commit 2a41250
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed Jul 19 21:34:38 2017 +0300

    cleanup

commit 45a8af0
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Fri Jun 23 19:47:16 2017 +0300

    more

commit 405f799
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue Jun 6 11:36:50 2017 +0300

    morrere

commit 4eb2ef5
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon Jun 5 15:27:32 2017 +0300

    morerrererer

commit 6c3a285
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Sun Jun 4 13:55:25 2017 +0300

    morrrerer

commit faaca17
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jun 1 19:53:18 2017 +0300

    NOOOOOOOOOOOOOOOOOOOOOOOOO

commit 3eec79d
Merge: 4a91d2a d81f374
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Sun Jun 4 12:56:23 2017 +0200

    Merge pull request #58 from ciar4n/animate-form

    Animate that form - fix header

commit d81f374
Author: ciar4n <ciaran@joomla51.com>
Date:   Thu Jun 1 17:56:25 2017 +0100

    Animate that form

commit 4a91d2a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jun 1 17:26:00 2017 +0300

    more

commit 09d0ce8
Merge: 98eadea b058ea6
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Thu Jun 1 14:57:39 2017 +0200

    Merge pull request #57 from ciar4n/form-split

    Form split

commit b058ea6
Merge: 97c32b4 98eadea
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Thu Jun 1 14:57:28 2017 +0200

    Merge branch '################4.0-dev-installation' into form-split

commit 97c32b4
Author: ciar4n <ciaran@joomla51.com>
Date:   Thu Jun 1 13:53:20 2017 +0100

    Split form

commit 98eadea
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jun 1 12:28:16 2017 +0300

    more

commit 14aa21c
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Thu Jun 1 12:28:16 2017 +0300

    more

commit e70bd5e
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed May 31 15:18:42 2017 +0300

    morrrrre

commit d38061a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Wed May 31 11:34:24 2017 +0300

    more

commit b3730b7
Merge: e95fb4a 8d41267
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Wed May 31 10:34:59 2017 +0200

    Merge pull request #56 from ciar4n/post-install-ftp

    Post install ftp & lang select to header

commit 8d41267
Author: ciar4n <ciaran@joomla51.com>
Date:   Wed May 31 09:32:29 2017 +0100

    Move lang select to header

commit 6803dd0
Author: ciar4n <ciaran@joomla51.com>
Date:   Tue May 30 18:22:59 2017 +0100

    Post install FTP options

commit e95fb4a
Merge: e143c1a 7519981
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Tue May 30 17:00:42 2017 +0200

    Merge pull request #55 from ciar4n/password-icon

    Remove header margin - add password icon

commit 7519981
Author: ciar4n <ciaran@joomla51.com>
Date:   Tue May 30 15:57:15 2017 +0100

    Remove header margin - add password icon

commit e143c1a
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue May 30 17:24:48 2017 +0300

    preinstall

commit b8a55a7
Merge: a5213d6 1107db2
Author: Dimitri Grammatikogianni <mit505@upshift.gr>
Date:   Tue May 30 16:03:17 2017 +0200

    Merge pull request #54 from ciar4n/install-style

    Installation layout and style

commit 1107db2
Author: ciar4n <ciaran@joomla51.com>
Date:   Tue May 30 14:58:16 2017 +0100

    install-style

commit a5213d6
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue May 30 15:54:33 2017 +0300

    1 col

commit 9e85f1c
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Tue May 30 13:11:34 2017 +0300

    markup

commit 55eebdc
Author: dgt41 <d.grammatiko@gmail.com>
Date:   Mon May 29 12:18:39 2017 +0300

    init
  • Loading branch information
@dgrammatiko
dgrammatiko committed Sep 15, 2017
1 parent 69f39d3 commit 7a94090
Show file tree
Hide file tree
Showing 201 changed files with 12,593 additions and 28,357 deletions.
19 changes: 18 additions & 1 deletion Gruntfile.js
View file
Expand Up @@ -42,6 +42,7 @@ module.exports = function(grunt) {
puny : 'media/vendor/punycode/js',
codemirror : 'media/vendor/codemirror',
adminTemplate : 'administrator/templates/atum',
installTemplate : 'installation/template',
siteTemplate : 'templates/aurora',
node_module : 'build/assets_tmp/node_modules/',
},
Expand Down Expand Up @@ -240,6 +241,7 @@ module.exports = function(grunt) {
sourceMap: true // SHOULD BE FALSE FOR DIST
},
files: {
'<%= folder.adminTemplate %>/css/template.css': '<%= folder.adminTemplate %>/scss/template.scss',
'<%= folder.siteTemplate %>/css/template.css' : '<%= folder.siteTemplate %>/scss/template.scss',
}
},
Expand Down Expand Up @@ -447,7 +449,21 @@ module.exports = function(grunt) {
dest: '<%= folder.siteTemplate %>/css',
}]
},
admin: {
installTemplate: {
files: [{
expand: true,
matchBase: true,
ext: '.min.css',
cwd: '<%= folder.installTemplate %>/css',
src: [
'*.css',
'!*.min.css',
'!theme/*.css'
],
dest: '<%= folder.installTemplate %>/css',
}]
},
siteTemplate: {
files: [{
expand: true,
matchBase: true,
Expand All @@ -467,6 +483,7 @@ module.exports = function(grunt) {
watch: {
siteTemplate: {
files: [
'<%= folder.adminTemplate %>/**/*.scss',
'<%= folder.siteTemplate %>/**/*.scss',
'media/system/scss/**/*.scss',
],
Expand Down
1 change: 1 addition & 0 deletions administrator/templates/atum/scss/scss-lint-report.xml
View file
@@ -0,0 +1 @@
<?xml version="1.0"?><testsuites errors="0"><testsuite name="scss-lint" timestamp="2017-03-20T12:23:24"/></testsuites>
18 changes: 11 additions & 7 deletions installation/controller/database.php
View file
Expand Up @@ -30,24 +30,28 @@ public function execute()
$app = $this->getApplication();

// Check for request forgeries.
JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
// JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));

// Check the form
$vars = (new InstallationModelSetup)->checkForm('database');
(new InstallationModelSetup)->checkForm('setup');
// Get the options from the session
$options = (new InstallationModelSetup)->getOptions();

// Determine if the configuration file path is writable.
$path = JPATH_CONFIGURATION . '/configuration.php';
$useftp = file_exists($path) ? !is_writable($path) : !is_writable(JPATH_CONFIGURATION . '/');

$r = new stdClass;
$r->view = $useftp ? 'ftp' : 'summary';
$r->view = $useftp ? 'ftp' : 'install';

// Attempt to initialise the database.
if (!(new InstallationModelDatabase)->createDatabase($vars))
{
$r->view = 'database';
if (!(new InstallationModelDatabase)->initialise($options)){
if (!(new InstallationModelDatabase)->createDatabase($options))
{
$r->view = 'setup';
}
}

// $app->redirect('index.php?view=remove');
$app->sendJsonResponse($r);
}
}
61 changes: 25 additions & 36 deletions installation/controller/default.php
View file
Expand Up @@ -29,7 +29,7 @@ public function execute()
/** @var InstallationApplicationWeb $app */
$app = $this->getApplication();

$defaultView = 'site';
$defaultView = 'setup';

// If the app has already been installed, default to the remove view
if (file_exists(JPATH_CONFIGURATION . '/configuration.php') && (filesize(JPATH_CONFIGURATION . '/configuration.php') > 10)
Expand All @@ -38,6 +38,9 @@ public function execute()
$defaultView = 'remove';
}

// Are we allowed to proceed?
$model = new InstallationModelChecks;

$vName = $this->getInput()->getWord('view', $defaultView);
$vFormat = $app->getDocument()->getType();
$lName = $this->getInput()->getWord('layout', 'default');
Expand All @@ -47,44 +50,30 @@ public function execute()
$this->getInput()->set('view', $defaultView);
}

switch ($vName)
if (!$model->getPhpOptionsSufficient() && $defaultView !== 'remove')
{
case 'preinstall':
$model = new InstallationModelSetup;
$checkOptions = false;
$options = $model->getOptions();

if ($model->getPhpOptionsSufficient())
{
$app->redirect('index.php');
}

break;

case 'languages':
case 'defaultlanguage':
$model = new InstallationModelLanguages;
$checkOptions = false;
$options = [];
if ($vName !== 'preinstall')
{
$app->redirect('index.php?view=preinstall');
}

break;

default:
$model = new InstallationModelSetup;
$checkOptions = true;
$options = $model->getOptions();

if (!$model->getPhpOptionsSufficient())
{
$app->redirect('index.php?view=preinstall');
}

break;
$vName = 'preinstall';
}

if ($vName !== $defaultView && $checkOptions && empty($options))
else
{
$app->redirect('index.php');
if ($vName === 'preinstall')
{
$app->redirect('index.php?view=setup');
}

$options = (new InstallationModelChecks)->getOptions();
$model = new InstallationModelSetup;
$checkOptions = true;

if ($vName !== $defaultView && ($checkOptions && empty($options)) && $defaultView !== 'remove')
{
$app->redirect('index.php');
}
}

// Register the layout paths for the view
Expand All @@ -95,7 +84,7 @@ public function execute()

if (!class_exists($vClass))
{
$vClass = 'InstallationViewDefault';
$vClass = 'InstallationViewError';
}

/** @var JViewHtml $view */
Expand Down
4 changes: 2 additions & 2 deletions installation/controller/detectftproot.php
View file
Expand Up @@ -30,7 +30,7 @@ public function execute()
$app = $this->getApplication();

// Check for request forgeries.
JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
// JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));

// Get the data
$data = $app->input->post->get('jform', array(), 'array');
Expand All @@ -43,7 +43,7 @@ public function execute()

// Build the response object
$r = new stdClass;
$r->view = 'ftp';
$r->view = 'preinstall';

// If we got a FTP root, add it to the response object
if ($return)
Expand Down
2 changes: 1 addition & 1 deletion installation/controller/ftp.php
View file
Expand Up @@ -37,7 +37,7 @@ public function execute()

// Redirect to the page.
$r = new stdClass;
$r->view = 'summary';
$r->view = 'preinstall';
$app->sendJsonResponse($r);
}
}
4 changes: 2 additions & 2 deletions installation/controller/install/config.php
View file
Expand Up @@ -36,12 +36,12 @@ public function execute()
$options = (new InstallationModelSetup)->getOptions();

$r = new stdClass;
$r->view = 'complete';
$r->view = 'remove';

// Attempt to setup the configuration.
if (!(new InstallationModelConfiguration)->setup($options))
{
$r->view = 'database';
$r->view = 'setup';
}

$app->sendJsonResponse($r);
Expand Down
7 changes: 5 additions & 2 deletions installation/controller/install/database.php
View file
Expand Up @@ -32,14 +32,17 @@ public function execute()
// Check for request forgeries.
JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));

(new InstallationModelSetup)->checkForm('setup');
// Get the options from the session
$options = (new InstallationModelSetup)->getOptions();

$r = new stdClass;
$r->view = 'install';

// Attempt to create the database tables.
if (!(new InstallationModelDatabase)->installCmsData($options))
if (!(new InstallationModelDatabase)->initialise($options) || !(new InstallationModelDatabase)->installCmsData($options))
// ->initialise($options))

// ->installCmsData($options))
{
$r->view = 'database';
}
Expand Down
11 changes: 6 additions & 5 deletions installation/controller/site.php → installation/controller/install/dbcheck.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @since 3.1
*/
class InstallationControllerSite extends JControllerBase
class InstallationControllerInstallDbcheck extends JControllerBase
{
/**
* Execute the controller.
Expand All @@ -32,14 +32,15 @@ public function execute()
// Check for request forgeries.
JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));

// Set the page redirect.
// Redirect to the page.
$r = new stdClass;
$r->view = 'database';
$r->crap = 'setup';

// Check the form
if ((new InstallationModelSetup)->checkForm('site') === false)
if ((new InstallationModelSetup)->checkForm('setup') === false || (new InstallationModelSetup)->initialise('setup') === false)
{
$r->view = 'site';
$r->messages = 'Check your DB credentials, db type, db name or hostname';
$r->crap = 'setup';
}

$app->sendJsonResponse($r);
Expand Down
2 changes: 1 addition & 1 deletion installation/controller/removefolder.php
View file
Expand Up @@ -183,7 +183,7 @@ class InstallationResponseJson
public function __construct($data)
{
// The old token is invalid so send a new one.
$this->token = JSession::getFormToken(true);
// $this->token = JSession::getFormToken(true);

// Get the language and send it's tag along
$this->lang = JFactory::getLanguage()->getTag();
Expand Down
8 changes: 4 additions & 4 deletions installation/controller/setlanguage.php
View file
Expand Up @@ -30,7 +30,7 @@ public function execute()
$app = $this->getApplication();

// Check for request forgeries.
JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
// JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));

// Very crude workaround to give an error message when JSON is disabled
if (!function_exists('json_encode') || !function_exists('json_decode'))
Expand All @@ -56,7 +56,7 @@ public function execute()

// Get the posted values from the request and validate them.
$data = $this->getInput()->post->get('jform', [], 'array');
$return = $model->validate($data, 'preinstall');
$return = $data;//$model->validate($data, 'preinstall');

$r = new stdClass;

Expand All @@ -67,7 +67,7 @@ public function execute()
* The validate method enqueued all messages for us, so we just need to
* redirect back to the site setup screen.
*/
$r->view = $this->getInput()->getWord('view', 'site');
$r->view = $this->getInput()->getWord('view', 'setup');
$app->sendJsonResponse($r);
}

Expand All @@ -78,7 +78,7 @@ public function execute()
JFactory::$language = JLanguage::getInstance($return['language']);

// Redirect to the page.
$r->view = $this->getInput()->getWord('view', 'site');
$r->view = $this->getInput()->getWord('view', 'setup');
$app->sendJsonResponse($r);
}
}
47 changes: 47 additions & 0 deletions installation/controller/setup.php
View file
@@ -0,0 +1,47 @@
<?php
/**
* @package Joomla.Installation
* @subpackage Controller
*
* @copyright Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

defined('_JEXEC') or die;

/**
* Controller class to set the site data for the Joomla Installer.
*
* @since 3.1
*/
class InstallationControllerSetup extends JControllerBase
{
/**
* Execute the controller.
*
* @return void
*
* @since 3.1
*/
public function execute()
{
// Get the application
/* @var InstallationApplicationWeb $app */
$app = $this->getApplication();

// Check for request forgeries.
// JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));

// Redirect to the page.
$r = new stdClass;
$r->view = 'remove';

// Check the form
if ((new InstallationModelSetup)->checkForm('setup') === false || (new InstallationModelSetup)->initialise('setup') === false)
{
$r->view = 'setup';
}

$app->sendJsonResponse($r);
}
}

0 comments on commit 7a94090

Please sign in to comment.