Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/jappix/jappix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValérian Saliou <valerian@valeriansaliou.name>2014-01-20 11:48:22 +0400
committerValérian Saliou <valerian@valeriansaliou.name>2014-01-20 11:48:22 +0400
commit0a4fed17de1084622b2b2f606258b0dd000f3316 (patch)
treebe9a4bb29a868310a94a2768aa6a56e9cb6f7348
parentb8a38911a36835abf69909d00f1b2776e05730f6 (diff)
fixes #391
-rw-r--r--i18n/en/LC_MESSAGES/main.pot4
-rw-r--r--server/install.php4
-rw-r--r--server/store-tree.php6
3 files changed, 9 insertions, 5 deletions
diff --git a/i18n/en/LC_MESSAGES/main.pot b/i18n/en/LC_MESSAGES/main.pot
index 9fe48963..e31f4867 100644
--- a/i18n/en/LC_MESSAGES/main.pot
+++ b/i18n/en/LC_MESSAGES/main.pot
@@ -1212,10 +1212,10 @@ msgstr ""
msgid "It's time to build your own social cloud: just go to the next step!"
msgstr ""
-msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into multiple storage folders."
msgstr ""
-msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights of %1s to %2s or change the folder owner to %3s (depending of your configuration)."
msgstr ""
msgid "The folder is writable, you can continue!"
diff --git a/server/install.php b/server/install.php
index 0b356a20..e540dc14 100644
--- a/server/install.php
+++ b/server/install.php
@@ -141,9 +141,9 @@ if($step < 6) {
else if($step == 2) { ?>
<h3 class="storage install-images"><?php _e("Storage configuration"); ?></h3>
- <p><?php _e("Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."); ?></p>
+ <p><?php _e("Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into multiple storage folders."); ?></p>
- <p><?php printf(T_("Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."), '<em>777</em>', '<em>www-data</em>'); ?></p>
+ <p><?php printf(T_("Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights of %1s to %2s or change the folder owner to %3s (depending of your configuration)."), '<em>./store, ./log, ./tmp</em>', '<em>777</em>', '<em>www-data</em>'); ?></p>
<?php if(is_writable(JAPPIX_BASE.'/store') && is_writable(JAPPIX_BASE.'/tmp') && is_writable(JAPPIX_BASE.'/log')) {
// Create the store tree
diff --git a/server/store-tree.php b/server/store-tree.php
index 3e8d5838..ea013d36 100644
--- a/server/store-tree.php
+++ b/server/store-tree.php
@@ -31,7 +31,7 @@ $store_folders = array(
'updates'
);
-// Creates the sub-folders
+// Creates the store sub-folders
for($i = 0; $i < count($store_folders); $i++) {
$current = JAPPIX_BASE.'/store/'.$store_folders[$i];
@@ -48,4 +48,8 @@ for($i = 0; $i < count($store_folders); $i++) {
file_put_contents($current.'/index.html', $security_html, LOCK_EX);
}
+// Apply 777 rights on other writable folders
+chmod(JAPPIX_BASE.'/log', 0777);
+chmod(JAPPIX_BASE.'/tmp', 0777);
+
?>