-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathheroku-pancake.patch
77 lines (76 loc) · 2.89 KB
/
heroku-pancake.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
--- installer/controllers/wizard.php
+++ installer/controllers/wizard.php
@@ -72,42 +72,38 @@ class Wizard extends CI_Controller {
{
redirect('wizard/step1');
}
+ $DATABASE_URL = parse_url(getenv("DATABASE_URL"));
- $data['hostname'] = $this->input->post('hostname');
+ $data['hostname'] = $DATABASE_URL["host"];
- $data['database'] = $this->input->post('database');
+ $data['database'] = substr($DATABASE_URL["path"],1);
- $data['dbprefix'] = $this->input->post('dbprefix') ? $this->input->post('dbprefix') : 'pancake_';
+ $data['dbprefix'] = 'pancake_';
- $data['username'] = $this->input->post('username');
+ $data['username'] = $DATABASE_URL["user"];
- $data['password'] = $this->input->post('password');
+ $data['password'] = $DATABASE_URL["pass"];
- $data['port'] = $this->input->post('port');
+ $data['port'] = '3306';
- if ($_POST)
- {
- $data['port'] = ( ! $data['port']) ? '3306' : $data['port'];
-
- $link = @mysql_connect($data['hostname'].':'.$data['port'], $data['username'], $data['password'], TRUE);
-
- if ($link)
- {
- // If the database is not there create it
- mysql_query('CREATE DATABASE IF NOT EXISTS '.$data['database'], $link);
- }
-
- if ($link AND @mysql_select_db($data['database'], $link))
- {
- $this->session->set_userdata('hostname', $data['hostname']);
- $this->session->set_userdata('username', $data['username']);
- $this->session->set_userdata('database', $data['database']);
- $this->session->set_userdata('dbprefix', $data['dbprefix']);
- $this->session->set_userdata('username', $data['username']);
- $this->session->set_userdata('password', $data['password']);
- $this->session->set_userdata('port', $data['port']);
- $this->session->set_userdata('last_step', '2');
- redirect('wizard/step3');
- }
- else
- {
- $data['error'] = 'Database Error: '.mysql_error();
- }
- }
+
+ $link = @mysql_connect($data['hostname'].':'.$data['port'], $data['username'], $data['password'], TRUE);
+
+ if ($link)
+ {
+ // If the database is not there create it
+ mysql_query('CREATE DATABASE IF NOT EXISTS '.$data['database'], $link);
+ }
+
+ if ($link AND @mysql_select_db($data['database'], $link))
+ {
+ $this->session->set_userdata('hostname', $data['hostname']);
+ $this->session->set_userdata('username', $data['username']);
+ $this->session->set_userdata('database', $data['database']);
+ $this->session->set_userdata('dbprefix', $data['dbprefix']);
+ $this->session->set_userdata('username', $data['username']);
+ $this->session->set_userdata('password', $data['password']);
+ $this->session->set_userdata('port', $data['port']);
+ $this->session->set_userdata('last_step', '2');
+ redirect('wizard/step3');
+ }
+ else
+ {
+ $data['error'] = 'Database Error: '.mysql_error();
+ }
- $this->_output_step('steps/step2', $data);
}
public function step3()