Changeset 1535:5878d21ef9b9

Timestamp:

08/12/13 17:42:04 (10 years ago)

Author:

Lepeltier kévin

Branch:

ticket #1406-2

Message:

ticket #1406
Déplacement du message d'erreur du dossier cache pendant la phase d'installation
Vers le Dashboard.
Ajout d'un message d'erreur concernant le dossier public, sur le Dashboard.
Deux phrases ajouté pour la traduction.
"Cache directory %s does not exist."
"Directory %s is not writable."

Files:

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

admin/index.php

@@ -225 +225 @@
 }
 
+$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>';
+}
+
 # Plugins install messages
 if (!empty($plugins_install['success']))

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');