Skip to content

Patches to installation scripts to allow calling from cli #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivandiazwm merged 1 commit into from
Jan 2, 2016
Merged

Patches to installation scripts to allow calling from cli #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion install/install1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function close() {
echo "</form>";
"</body>";
"</html>";
exit;
exit(1);
}

function exit_error($string){
Expand Down Expand Up @@ -87,6 +87,10 @@ function hashPassword($input, $rounds = 7) {
return crypt($input, sprintf('$2a$%02d$', $rounds) . $salt);
}

/* if started from commandline, wrap parameters to $_POST*/
if (!isset($_SERVER["HTTP_HOST"]))
parse_str($argv[1], $_POST);

if($_POST['adminpass'] != $_POST['adminrpass'])
exit_error('Admin passwords do not match');

Expand Down
18 changes: 13 additions & 5 deletions install/install2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,28 @@
See LICENSE.TXT for details.
**********************************************************************/

/* if started from commandline, wrap parameters to $_POST */
if (!isset($_SERVER["HTTP_HOST"]))
parse_str($argv[1], $_POST);


include "../application/config/database.php";

$mysql = new mysqli($db['default']['hostname'], $db['default']['username'], $db['default']['password'], $db['default']['database']);

if ($server->connect_error) echo('Connection Error (' . $server->connect_errno . ') ' . $server->connect_error . '<br>');
if ($mysql->connect_error) {
echo('Connection Error (' . $mysql->connect_errno . ') ' . $mysql->connect_error . '<br>');
exit(2);
}

$mysql->multi_query("INSERT INTO `settings` (`id`, `name`, `value`) VALUES
('', 'recaptchapublic', '". $_POST['rpublic'] ."'),
('', 'recaptchaprivate', '". $_POST['rprivate'] ."'),
('', 'maxvotes', '20'),
('', 'maxvotes', '". ((isset($_POST['maxvotes']) && $_POST['maxvotes'] != '')? $_POST['maxvotes'] : 20)."'),
('', 'mainmail', '". $_POST['mainmail'] ."'),
('', 'title', '". $_POST['title'] ."'),
('', 'max_results', '10'),
('', 'language', 'english'),
('', 'max_results', '".((isset($_POST['max_results']) && $_POST['max_results'] != '')? $_POST['max_results'] : 10)."'),
('', 'language', '".(isset($_POST['language'])? $_POST['language'] : 'english')."'),
('', 'smtp-host', '". $_POST['smtp-host'] ."'),
('', 'smtp-port', '". $_POST['smtp-port'] ."'),
('', 'smtp-user', '". $_POST['smtp-user'] ."'),
Expand All @@ -32,4 +40,4 @@
header('Location: ../admin');
} else {
echo "PLEASE DELETE install/ FOLDER MANUALLY. THEN GO TO yourwebsite.com/feedback/admin/ TO LOG IN";
}
}