Skip to content

Commit 76ca1c6

Browse files
thorstenthorsten
committed
Changed paths from install/ to setup/
1 parent 8a49353 commit 76ca1c6

File tree

11 files changed

+31
-189
lines changed

11 files changed

+31
-189
lines changed

‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ phpMyFAQ Installation
22

33
Open your browser and type in the following URL:
44

5-
http://www.example.com/path/to/your/faq/install/setup.php
5+
http://www.example.com/path/to/your/faq/setup/index.php
66

77
Substitute www.example.com with your actual domain name. When the
88
site is loaded enter the address of your database server

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ requirements on [phpmyfaq.de](http://www.phpmyfaq.de/requirements.php) for more
2828
### Package for end-users
2929

3030
The best way to install phpMyFAQ is to download it on [phpmyfaq.de](http://www.phpmyfaq.de/download.php),
31-
unzip the package and open http://www.example.org/phpmyfaq/install/setup.php in your browser.
31+
unzip the package and open http://www.example.org/phpmyfaq/setup/index.php in your browser.
3232

3333
### Git for developers
3434

@@ -37,7 +37,7 @@ unzip the package and open http://www.example.org/phpmyfaq/install/setup.php in
3737
$ curl -s https://getcomposer.org/installer | php
3838
$ php composer.phar install
3939

40-
Then just open http://www.example.org/phpmyfaq/install/setup.php in your browser.
40+
Then just open http://www.example.org/phpmyfaq/setup/index.php in your browser.
4141

4242

4343
## Versioning

‎documentation/documentation.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
547547

548548
<p>Open your browser and type in the following URL:</p>
549549

550-
<p><code>http://www.example.com/faq/install/setup.php</code></p>
550+
<p><code>http://www.example.com/faq/setup/index.php</code></p>
551551

552552
<p>Substitute <strong>www.example.com</strong> with your actual domain name. When the site is loaded enter the address of your database server (e.g. db.provider.com), your database username and password as well as the database name. The database have to be created with UTF-8 chraracter set before running the installation script. You can leave the prefix-field empty. If you are planning on using multiple FAQs in one database you will have to use a table prefix, though (i.e. <em>sport</em> for a sports FAQ, <em>weather</em> for a weather FAQ, etc.). Please note that only letters and an underline: "_" can be used as the prefix.</p>
553553

@@ -816,7 +816,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
816816

817817
<p>Open the following URL in your browser:</p>
818818

819-
<p><code>http://www.example.com/faq/install/update.php</code></p>
819+
<p><code>http://www.example.com/faq/setup/update.php</code></p>
820820

821821
<p>Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated. You have to update a lot of your template files due to our change using the Bootstrap framework.</p>
822822

@@ -844,7 +844,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
844844

845845
<p>Open the following URL in your browser:</p>
846846

847-
<p><code>http://www.example.com/faq/install/update.php</code></p>
847+
<p><code>http://www.example.com/faq/setup/update.php</code></p>
848848

849849
<p>Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated. You have to update a lot of your template files due to our change using the Bootstrap framework.</p>
850850

@@ -870,7 +870,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
870870

871871
<p>Open the following URL in your browser:</p>
872872

873-
<p><code>http://www.example.com/faq/install/update.php</code></p>
873+
<p><code>http://www.example.com/faq/setup/update.php</code></p>
874874

875875
<p>Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated. You have to update a lot of your template files due to our change using the Bootstrap framework.</p>
876876

@@ -894,7 +894,7 @@ <h3>[ phpMyFAQ 2.8.x Documentation ]</h3>
894894

895895
<p>Open the following URL in your browser:</p>
896896

897-
<p><code>http://www.example.com/faq/install/update.php</code></p>
897+
<p><code>http://www.example.com/faq/setup/update.php</code></p>
898898

899899
<p>Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated.</p>
900900

‎documentation/documentation.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ The database user needs the permissions for CREATE, DROP, ALTER, INDEX, INSERT,
195195

196196
Open your browser and type in the following URL:
197197

198-
`http://www.example.com/faq/install/setup.php`
198+
`http://www.example.com/faq/setup/setup.php`
199199

200200
Substitute **www.example.com** with your actual domain name. When the site is loaded enter the address of your database server (e.g. db.provider.com), your database username and password as well as the database name. The database have to be created with UTF-8 chraracter set before running the installation script. You can leave the prefix-field empty. If you are planning on using multiple FAQs in one database you will have to use a table prefix, though (i.e. *sport* for a sports FAQ, *weather* for a weather FAQ, etc.). Please note that only letters and an underline: "_" can be used as the prefix.
201201

@@ -437,7 +437,7 @@ Upgrading from 2.5.x is a major upgrade. Please make a full backup before you ru
437437

438438
Open the following URL in your browser:
439439

440-
`http://www.example.com/faq/install/update.php`
440+
`http://www.example.com/faq/setup/update.php`
441441

442442
Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated. You have to update a lot of your template files due to our change using the Bootstrap framework.
443443

@@ -462,7 +462,7 @@ Upgrading from 2.6.x is a major upgrade. Please make a full backup before you ru
462462

463463
Open the following URL in your browser:
464464

465-
`http://www.example.com/faq/install/update.php`
465+
`http://www.example.com/faq/setup/update.php`
466466

467467
Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated. You have to update a lot of your template files due to our change using the Bootstrap framework.
468468

@@ -485,7 +485,7 @@ Upgrading from 2.7.x is a major upgrade. Please make a full backup before you ru
485485

486486
Open the following URL in your browser:
487487

488-
`http://www.example.com/faq/install/update.php`
488+
`http://www.example.com/faq/setup/update.php`
489489

490490
Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated. You have to update a lot of your template files due to our change using the Bootstrap framework.
491491

@@ -506,7 +506,7 @@ Updating an existing phpMyFAQ 2.8.x installation is fairly simple. Via FTP copy
506506

507507
Open the following URL in your browser:
508508

509-
`http://www.example.com/faq/install/update.php`
509+
`http://www.example.com/faq/setup/update.php`
510510

511511
Choose your installed phpMyFAQ version and click the button of the update script, your version will automatically be updated.
512512

‎phpmyfaq/admin/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// Check if config/database.php exist -> if not, redirect to installer
3030
//
3131
if (!file_exists(PMF_ROOT_DIR . '/config/database.php')) {
32-
RedirectResponse::create(str_replace('admin/index.php', '', $_SERVER['SCRIPT_NAME']).'install/setup.php')
32+
RedirectResponse::create(str_replace('admin/index.php', '', $_SERVER['SCRIPT_NAME']).'setup/index.php')
3333
->send();
3434
exit;
3535
}

‎phpmyfaq/inc/Bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
// Check if config/database.php exist -> if not, redirect to installer
113113
//
114114
if (!file_exists(PMF_CONFIG_DIR . '/database.php')) {
115-
RedirectResponse::create('install/setup.php')->send();
115+
RedirectResponse::create('setup/index.php')->send();
116116
exit;
117117
}
118118

‎phpmyfaq/inc/PMF/Installer.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ public function startInstall(Array $DB = null)
573573
$dbSetup['dbType'] = PMF_Filter::filterInput(INPUT_POST, 'sql_type', FILTER_SANITIZE_STRING);
574574
if (!is_null($dbSetup['dbType'])) {
575575
$dbSetup['dbType'] = trim($dbSetup['dbType']);
576-
if (! file_exists(PMF_ROOT_DIR . '/install/' . $dbSetup['dbType'] . '.sql.php')) {
576+
if (! file_exists(PMF_ROOT_DIR . '/setup/' . $dbSetup['dbType'] . '.sql.php')) {
577577
printf(
578578
'<p class="alert alert-error"><strong>Error:</strong> Invalid server type: %s</p>',
579579
$dbSetup['dbType']
@@ -744,8 +744,8 @@ public function startInstall(Array $DB = null)
744744
PMF_System::renderFooter(true);
745745
}
746746

747-
require PMF_ROOT_DIR . '/install/' . $dbSetup['dbType'] . '.sql.php'; // CREATE TABLES
748-
require PMF_ROOT_DIR . '/install/stopwords.sql.php'; // INSERTs for stopwords
747+
require PMF_ROOT_DIR . '/setup/' . $dbSetup['dbType'] . '.sql.php'; // CREATE TABLES
748+
require PMF_ROOT_DIR . '/setup/stopwords.sql.php'; // INSERTs for stopwords
749749

750750
$this->_system->setDatabase($db);
751751

@@ -788,7 +788,7 @@ public function startInstall(Array $DB = null)
788788
$configuration->add($name, $value);
789789
}
790790

791-
$configuration->update(array('main.referenceURL' => $link->getSystemUri('/install/setup.php')));
791+
$configuration->update(array('main.referenceURL' => $link->getSystemUri('/setup/index.php')));
792792
$configuration->add('security.salt', md5($configuration->get('main.referenceURL')));
793793

794794
// add admin account and rights
@@ -817,7 +817,7 @@ public function startInstall(Array $DB = null)
817817
// Add master instance
818818
$instanceData = array(
819819
'url' => $link->getSystemUri($_SERVER['SCRIPT_NAME']),
820-
'instance' => $link->getSystemRelativeUri('install/setup.php'),
820+
'instance' => $link->getSystemRelativeUri('setup/index.php'),
821821
'comment' => 'phpMyFAQ ' . PMF_System::getVersion()
822822
);
823823
$faqInstance = new PMF_Instance($configuration);
@@ -838,15 +838,15 @@ public function cleanUpFiles()
838838
{
839839
// Remove 'setup.php' file
840840
if (@unlink(basename($_SERVER['SCRIPT_NAME']))) {
841-
echo "<p class=\"alert alert-success\">The file <em>./install/setup.php</em> was deleted automatically.</p>\n";
841+
echo "<p class=\"alert alert-success\">The file <em>./setup/index.php</em> was deleted automatically.</p>\n";
842842
} else {
843-
echo "<p class=\"alert alert-error\">Please delete the file <em>./install/setup.php</em> manually.</p>\n";
843+
echo "<p class=\"alert alert-error\">Please delete the file <em>./setup/index.php</em> manually.</p>\n";
844844
}
845845
// Remove 'update.php' file
846846
if (@unlink(dirname($_SERVER['PATH_TRANSLATED']) . '/update.php')) {
847-
echo "<p class=\"alert alert-success\">The file <em>./install/update.php</em> was deleted automatically.</p>\n";
847+
echo "<p class=\"alert alert-success\">The file <em>./setup/update.php</em> was deleted automatically.</p>\n";
848848
} else {
849-
echo "<p class=\"alert alert-error\">Please delete the file <em>./install/update.php</em> manually.</p>\n";
849+
echo "<p class=\"alert alert-error\">Please delete the file <em>./setup/update.php</em> manually.</p>\n";
850850
}
851851
}
852852

‎phpmyfaq/inc/PMF/Instance/Setup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function checkDirs(Array $dirs)
9898
}
9999
} else {
100100
copy(
101-
$this->_rootDir . '/install/index.html',
101+
$this->_rootDir . '/setup/index.html',
102102
$this->_rootDir . $dir . '/index.html'
103103
);
104104
}

‎phpmyfaq/setup/attachment.php

-158
This file was deleted.

‎phpmyfaq/setup/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
session_start();
4545

4646
require PMF_ROOT_DIR . '/config/constants.php';
47-
require PMF_ROOT_DIR . '/install/questionnaire.php';
47+
require PMF_ROOT_DIR . '/setup/questionnaire.php';
4848

4949
//
5050
// Setting up PSR-0 autoloader for Symfony Components

‎phpmyfaq/setup/update.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@
573573

574574
$instanceData = array(
575575
'url' => $link->getSystemUri($_SERVER['SCRIPT_NAME']),
576-
'instance' => $link->getSystemRelativeUri('install/update.php'),
576+
'instance' => $link->getSystemRelativeUri('setup/update.php'),
577577
'comment' => $faqConfig->get('main.titleFAQ')
578578
);
579579
$faqInstance = new PMF_Instance($faqConfig);
@@ -680,15 +680,15 @@
680680
}
681681
// Remove 'setup.php' file
682682
if (is_writeable(__DIR__ . '/setup.php') && @unlink(__DIR__ . '/setup.php')) {
683-
echo "<p class=\"alert alert-success\">The file <em>./install/setup.php</em> was deleted automatically.</p>\n";
683+
echo "<p class=\"alert alert-success\">The file <em>./setup/index.php</em> was deleted automatically.</p>\n";
684684
} else {
685-
echo "<p class=\"alert alert-error\">Please delete the file <em>./install/setup.php</em> manually.</p>\n";
685+
echo "<p class=\"alert alert-error\">Please delete the file <em>./setup/index.php</em> manually.</p>\n";
686686
}
687687
// Remove 'update.php' file
688688
if (is_writeable(__DIR__ . '/update.php') && @unlink(__DIR__ . '/update.php')) {
689-
echo "<p class=\"alert alert-success\">The file <em>./install/update.php</em> was deleted automatically.</p>\n";
689+
echo "<p class=\"alert alert-success\">The file <em>./setup/update.php</em> was deleted automatically.</p>\n";
690690
} else {
691-
echo "<p class=\"alert alert-error\">Please delete the file <em>./install/update.php</em> manually.</p>\n";
691+
echo "<p class=\"alert alert-error\">Please delete the file <em>./setup/update.php</em> manually.</p>\n";
692692
}
693693

694694
PMF_System::renderFooter();

0 commit comments

Comments
 (0)