Changes in [1495:cf4e36db13a6:1536:31b45740bf86]

Files:

• admin/index.php (modified) (1 diff)
• admin/install/index.php (modified) (1 diff)
• inc/config.php.in (modified) (1 diff)

admin/index.php

@@ -223 +223 @@
      ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
      '</p>';
+}
+
+$err = array();
+
+# Check cache directory
+if (!is_dir(DC_TPL_CACHE)) {
+     $err[] = '<p>'.sprintf(__('Cache directory %s does not exist.'),DC_TPL_CACHE).'</p>';
+} else if (!is_writable(DC_TPL_CACHE)) {
+     $err[] = '<p>'.sprintf(__('Cache directory %s is not writable.'),DC_TPL_CACHE).'</p>';
+}
+
+# Check public directory
+if (!is_dir($core->blog->public_path)) {
+     $err[] = '<p>'.sprintf(__('Directory %s does not exist.'),$core->blog->public_path).'</p>';
+} else if (!is_writable($core->blog->public_path)) {
+     $err[] = '<p>'.sprintf(__('Directory %s is not writable.'),$core->blog->public_path).'</p>';
+}
+
+# Error list
+if (count($err) > 0) {
+     echo '<div class="error"><p><strong>Erreur&nbsp;:</strong></p>'.
+     '<ul><li>'.implode("</li><li>",$err).'</li></ul></div>';
 }
 

admin/install/index.php

@@ -299 +299 @@
 '<div id="main">';
 
-if (!is_writable(DC_TPL_CACHE)) {
-     echo '<div class="error"><p>'.sprintf(__('Cache directory %s is not writable.'),DC_TPL_CACHE).'</p></div>';
-}
-
 if ($can_install && !empty($err)) {
      echo '<div class="error"><p><strong>'.__('Errors:').'</strong></p>'.$err.'</div>';

inc/config.php.in

@@ -50 +50 @@
 
 // Template cache directory
-define('DC_TPL_CACHE',dirname(__FILE__).'/../cache');
+define('DC_TPL_CACHE',path::real(dirname(__FILE__).'/..').'/cache');