aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rw-r--r--index.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/index.php b/index.php
index 6dcec9b2..29d67f62 100644
--- a/index.php
+++ b/index.php
@@ -48,7 +48,7 @@ if (! file_exists(__DIR__ . '/vendor/autoload.php')) {
48 ."If you installed Shaarli through Git or using the development branch,\n" 48 ."If you installed Shaarli through Git or using the development branch,\n"
49 ."please refer to the installation documentation to install PHP" 49 ."please refer to the installation documentation to install PHP"
50 ." dependencies using Composer:\n" 50 ." dependencies using Composer:\n"
51 ."- https://shaarli.readthedocs.io/en/master/Server-requirements/\n" 51 ."- https://shaarli.readthedocs.io/en/master/Server-configuration/\n"
52 ."- https://shaarli.readthedocs.io/en/master/Download-and-Installation/"; 52 ."- https://shaarli.readthedocs.io/en/master/Download-and-Installation/";
53 exit; 53 exit;
54} 54}
@@ -174,7 +174,7 @@ if (! is_file($conf->getConfigFileExt())) {
174 } 174 }
175 175
176 // Display the installation form if no existing config is found 176 // Display the installation form if no existing config is found
177 install($conf, $sessionManager); 177 install($conf, $sessionManager, $loginManager);
178} 178}
179 179
180$loginManager->checkLoginState($_COOKIE, $clientIpId); 180$loginManager->checkLoginState($_COOKIE, $clientIpId);
@@ -1823,8 +1823,9 @@ function lazyThumbnail($conf, $url,$href=false)
1823 * 1823 *
1824 * @param ConfigManager $conf Configuration Manager instance. 1824 * @param ConfigManager $conf Configuration Manager instance.
1825 * @param SessionManager $sessionManager SessionManager instance 1825 * @param SessionManager $sessionManager SessionManager instance
1826 * @param LoginManager $loginManager LoginManager instance
1826 */ 1827 */
1827function install($conf, $sessionManager) { 1828function install($conf, $sessionManager, $loginManager) {
1828 // On free.fr host, make sure the /sessions directory exists, otherwise login will not work. 1829 // On free.fr host, make sure the /sessions directory exists, otherwise login will not work.
1829 if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705); 1830 if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705);
1830 1831