From: shizuki
Date: Fri, 13 Feb 2009 05:22:07 +0000 (+0000)
Subject: instructions for manually adding .htaccess files to media and skins folder after...
X-Git-Tag: release-3-41@1002~50
X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-jp-ancient.git;a=commitdiff_plain;h=091f1a8bf196ba05f0fa432c9c95936d221bfe63
instructions for manually adding .htaccess files to media and skins folder after upgrade.
Comment count at items list display via 'sprintf()'.
git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk/utf8@938 1ca29b6e-896d-4ea0-84a5-967f57386b96
---
diff --git a/extra/htaccess/media/readme.ja.txt b/extra/htaccess/media/readme.ja.txt
index 73b4d8a..45be204 100644
--- a/extra/htaccess/media/readme.ja.txt
+++ b/extra/htaccess/media/readme.ja.txt
@@ -1,17 +1,12 @@
-Nucleus Media ãã£ã¬ã¯ããª
------------------------
+ãã®ãã£ã¬ã¯ããªã®media.htaccessãã¡ã¤ã«ã¯ãmediaãã£ã¬ã¯ããªã§ã®ã¹ã¯ãªããã®å®è¡ãé»æ¢ãããµã¼ãã®ã»ãã¥ãªãã£ãå¼·åãããã¨ãæå³ãã¦ãã¾ãã
+ããã¯æªæãæã£ããã®ããmediaãã£ã¬ã¯ããªã«ã¢ãããã¼ããããã¡ã¤ã«ãå®è¡ããããã¨ãé²ãã¾ãã
+ãã ãã.htaccessã§ã®å¶éã®è¨±å¯ã»ä¸è¨±å¯ã¯ãµã¼ãã®è¨å®ã«ä¾åãã¦ããã®ã§ãã³ã¼ããæå³ãããã¨ããã«åãã¨ã¯éãã¾ããã
-ã¢ãããã¼ããããç»åçã®ãã¡ã¤ã«ã¯ãæçµçã«ãã®ãã£ã¬ã¯ããªã«ç§»åããã¾ãã
+ä¸è¨ã®æé ã«å¾ã£ã¦ã.htaccessãé©ç¨ãã¦ãã ãã
+1. mediaãã£ã¬ã¯ããªã«ä»ã®.htaccessãã¡ã¤ã«ããªããã¨ã確èªãã¾ãã
+2. ãmrdia.htaccessããã¡ã¤ã«ããNucleusã®mediaãã£ã¬ã¯ããªã«ã³ãã¼ãã¾ãã
+3. ãã¡ã¤ã«ããmrdia.htaccessãããã.htaccessãã«ãªãã¼ã ãã¾ãã
+4. ããããã§ã«.htaccessãã¡ã¤ã«ãmediaãã£ã¬ã¯ããªã«åå¨ããå ´åã¯ããã§ã«ãã.htaccessãã¡ã¤ã«ã«ãmrdia.htaccessãã®å
容ã追è¨ãã¾ãã
-ãµããã£ã¬ã¯ããªã«ã¤ãã¦ï¼
-
-* æ°å (ä¾ /media/1/)
-
-ã¢ãããã¼ãããã¡ã³ãã¼ã ãããã¡ã¤ã«ã使ç¨ã§ãã¾ãã(ãã£ã¬ã¯ããªåã¯ã¡ã³ãã¼IDã«ãªãã¾ã)
-
-* æ°åä»¥å¤ (ä¾ /media/common/)
-
-誰ã使ã£ã¦ããããã¡ã¤ã«ãä¿åãã¦ããçºã®ãã£ã¬ã¯ããªã
-ãã£ã¬ã¯ããªãä½ã£ã¦ãã¼ããã·ã§ã³ã777çã«ãã¦ããã ãã§ãæ°ããã³ã¬ã¯ã·ã§ã³ã¨ãã¦è¿½å ããã¾ãã
-
+ããã§mediaãã£ã¬ã¯ããªããæå³ããªãã¹ã¯ãªããã®å®è¡ããä¿è·ãããã¨ãåºæ¥ã¾ãã
diff --git a/extra/htaccess/media/readme.txt b/extra/htaccess/media/readme.txt
index 308d3a1..b302899 100644
--- a/extra/htaccess/media/readme.txt
+++ b/extra/htaccess/media/readme.txt
@@ -1,15 +1,10 @@
-Nucleus Media Directory
------------------------
+PLEASE NOTE: The media.htaccess file in this directory is intended to enhance security of your server by disallowing the running of scripts from the media folder. This will protect against rogue members, or external exploits, that rely on uploading script files to this folder for execution at a later time. Depending on the configuration of your web server, this code may not run as intended.
-Uploaded images will end up in the media directory.
+To apply it, follow these instructions:
-Subdirectories work as follows:
-
-* numeric (e.g. /media/1/)
-
-Media files for a certain member (directory name is the memberid)
-
-* other directories (e.g. /media/common/)
-
-Global media collections that can be used by any member that is on a team. In order to create a new collection, simply create a new directory and assure write access is enabled for it.
+1. Be sure that another .htaccess file does not exist in the /media folder
+2. Copy the media.htaccess file into the media folder of your Nucleus CMS installation
+3. Rename the file to .htaccess
+4. If you have an existing .htaccess file in your media folder, copy the contents from the media.htaccess file into the existing .htacces file.
+You can disable after installing it by renaming the file to something else, or by removing the file from that folder.
\ No newline at end of file
diff --git a/extra/htaccess/skins/readme.ja.txt b/extra/htaccess/skins/readme.ja.txt
index 073d092..728c356 100644
--- a/extra/htaccess/skins/readme.ja.txt
+++ b/extra/htaccess/skins/readme.ja.txt
@@ -1,12 +1,13 @@
-Nucleus skins ãã£ã¬ã¯ããª
------------------------
+ãã®ãã£ã¬ã¯ããªã®skins.htaccessãã¡ã¤ã«ã¯ãåã¹ãã³ã§ä½¿ç¨ããã.incããã¡ã¤ã«ãã.phpããã¡ã¤ã«ã«å¯¾ããå¤é¨ããã®ç´æ¥ã¢ã¯ã»ã¹ãç¦æ¢ãããµã¼ãã®ã»ãã¥ãªãã£ãå¼·åãããã¨ãæå³ãã¦ãã¾ãã
+ãã ã.htaccessã§ã®å¶éã®è¨±å¯ã»ä¸è¨±å¯ã¯ãµã¼ãã®è¨å®ã«ä¾åãã¦ããã®ã§ãã³ã¼ããæå³ãããã¨ããã«åãã¨ã¯éãã¾ããã
+ä¾ãã°ãæå³ããã«ä¸é¨ã®ãã¡ã¤ã«ã¸ã®ãµã¼ãå
ã§ã®ã¢ã¯ã»ã¹ã¾ã§ç¦æ¢ããã¦ãã¾ã£ã¦ãããªãã®ãµã¤ãã«CSSãé©ç¨ãããã«è¡¨ç¤ºããããããªãã¨ãããããããã¾ããã
+ãã®æã¯.htaccessãã¡ã¤ã«ããªãã¼ã ãã¦åé¡ã解決ãã¦ãã ããã
-注æï¼ãã®ãã£ã¬ã¯ããªå
(ãµããã£ã¬ã¯ããªãå«ã)ã«ãããskinbackup.xml ã skindata.xml çã®ãã¡ã¤ã«ãç´æ¥ç·¨éãããã¨ã¯é¿ãã¦ãã ããã
- ãããã®ãã¡ã¤ã«ã¯ã¦ã¼ã¶ã¼ã«é
å¸ããçºã«ãNucleusã®æ©è½ã使ç¨ãã¦ä½æããã¦ãã¾ãã
+ä¸è¨ã®æé ã«å¾ã£ã¦ã.htaccessãé©ç¨ãã¦ãã ãã
- ã¹ãã³ãç·¨éããæã¯ãNucleusã®ç®¡çã¨ãªã¢ã§å·¦ã®ã¡ãã¥ã¼ããï½¢ã¹ãã³ç·¨éï½£ãé¸æããã¹ãã³ç·¨éç»é¢ã¸ã¨é²ãã§ãã ããã
+1. skinsãã£ã¬ã¯ããªã«ä»ã®.htaccessãã¡ã¤ã«ããªããã¨ã確èªãã¾ãã
+2. ãmrdia.htaccessããã¡ã¤ã«ããNucleusã®skinsãã£ã¬ã¯ããªã«ã³ãã¼ãã¾ãã
+3. ãã¡ã¤ã«ããskins.htaccessãããã.htaccessãã«ãªãã¼ã ãã¾ãã
+4. ããããã§ã«.htaccessãã¡ã¤ã«ãskinsãã£ã¬ã¯ããªã«åå¨ããå ´åã¯ããã§ã«ãã.htaccessãã¡ã¤ã«ã«ãskins.htaccessãã®å
容ã追è¨ãã¾ãã
-注æï¼ãã®ãã£ã¬ã¯ããªã®.htaccessãã¡ã¤ã«ã¯ããã£ã¬ã¯ããªå
(ãµããã£ã¬ã¯ããªãå«ã)ã® .inc ãã¡ã¤ã«ã .php ãã¡ã¤ã«ã«å¤é¨ããç´æ¥ã¢ã¯ã»ã¹
- ãããã¨ãç¦æ¢ããçºã®ãã®ã§ãã
- ãµã¼ãã®è¨å®ã«ãã£ã¦ã¯ã.htaccessã«è¨è¿°ãããå
容ããæå³ããã¨ããã«åä½ããªããã¨ãããã¾ãã
- ã¹ãã³ã®è¡¨ç¤ºãå£ãã¦ããæã¯ã.htaccess ãã¡ã¤ã«ãä¿®æ£ãããã¨ã§ç´ããã¨ãããã¾ãã
\ No newline at end of file
+ããã§skinsãã£ã¬ã¯ããªããä¸è¦ãªã¢ã¯ã»ã¹ããä¿è·ãããã¨ãåºæ¥ã¾ãã
diff --git a/extra/htaccess/skins/readme.txt b/extra/htaccess/skins/readme.txt
index 3844617..6d61376 100644
--- a/extra/htaccess/skins/readme.txt
+++ b/extra/htaccess/skins/readme.txt
@@ -1,8 +1,10 @@
-Nucleus skins directory
------------------------
+PLEASE NOTE: the skins.htaccess file in this directory is intended to prohibit, for enhanced security, direct access .inc and .php files in the skin folders. Depending on the web server configuration, the code in this .htaccess file may not work as intended. In this case, your site will be displayed incorrectly, with missing content or style. Renaming the .htaccess file should fix the problem.
-PLEASE NOTE: the skinbackup.xml or skindata.xml files in these directories are not where you should edit the skins. These files get generated by the Nucleus skin export function and are meant to distribute skins between Nucleus users.
+To apply it, follow these instructions:
-To edit skins, open the Nucleus Admin Area, and select 'skins' in the left menu.
+1. Be sure that another .htaccess file does not exist in the /skins folder
+2. Copy the skins.htaccess file into the skins folder of your Nucleus CMS installation
+3. Rename the file to .htaccess
+4. If you have an existing .htaccess file in your skins folder, copy the contents from the skins.htaccess file into the existing .htacces file.
-PLEASE NOTE: the .htaccess file in this directory is intended to prohibit, for enhanced security, direct access .inc and .php files in the skin folders. Depending on the web server configuration, the code in this .htaccess file may not work as intended. In this case, your site will be displayed incorrectly, with missing content or style. Renaming the .htaccess file should fix the problem.
\ No newline at end of file
+You can disable after installing it by renaming the file to something else, or by removing the file from that folder.
\ No newline at end of file
diff --git a/nucleus/documentation/history.html b/nucleus/documentation/history.html
index 07521a7..b6ad1a1 100755
--- a/nucleus/documentation/history.html
+++ b/nucleus/documentation/history.html
@@ -165,6 +165,7 @@
Nucleus v3.3 (May 1, 2007)
+ - ADDED: check cmail column to separate to URL and cemail when Nucleus upgrade to 3.3 or later. (kimitake/katsumi)
-
ADDED: Serveral changes and fixes from Nucleus Japan (details in the log files of the Nucleus repository at sourceforge.net)
diff --git a/nucleus/upgrades/index.php b/nucleus/upgrades/index.php
index 9772f60..f176b10 100755
--- a/nucleus/upgrades/index.php
+++ b/nucleus/upgrades/index.php
@@ -55,9 +55,10 @@ upgrade_head();
else if (!upgrade_checkinstall(32)) $current = 31;
else if (!upgrade_checkinstall(33)) $current = 32;
else if (!upgrade_checkinstall(331)) $current = 33;
- else $current = 331;
+ else if (!upgrade_checkinstall(34)) $current = 33;
+ else $current = 34;
- if ($current == 331) {
+ if ($current == 34) {
?>
èªåã§ã§ããã¢ããã°ã¬ã¼ãã¯ããã¾ããããã¼ã¿ãã¼ã¹ã¯æ¢ã«ææ°ã® Nucleus ç¨ã«ã¢ãããã¼ãããã¦ãã¾ãã
ããã¤ãã®å¤æ´ã¯æåã§è¡ãå¿
è¦ãããã¾ããä¸è¨ã«ãã®æé ã示ãã¾ãã
æåå¤æ´ã¯å¿
è¦ããã¾ãããä»æ¥ã¯ã©ããã¼ãªæ¥ã§ãã!";
@@ -150,6 +162,26 @@ function upgrade_manual_20() {
+ Nucleus 3.4 ç¨ã«å¿
è¦ãªå¤æ´
+
+ skinsãã£ã¬ã¯ããªã¨mediaãã£ã¬ã¯ããªã«ã.haccessããè¨ç½®ãã¦ãã¢ã¯ã»ã¹å¶éãããããã¨ãæ¨å¥¨ããã¾ãããã®å¤æ´ã¯ãNucleusã®æ©è½ãã»ãã¥ãªãã£ã«ç´æ¥é¢ä¿ãããããã§ã¯ããã¾ããããä¸æ£ã¢ã¯ã»ã¹ãé²ãçºã®éè¦ãªå©ãã«ãªãã§ãããã
+
+
+
+ Instructions for applying the restrictions are found in the following two files on your server:
+
+
+
+
+
PHP ã®ãã¼ã¸ã§ã³ã 4.0.3, 4.0.4 ã¾ã㯠4.0.5 ã®å ´åã«å¿
è¦ã¨ãªãå¤æ´
diff --git a/nucleus/upgrades/upgrade.functions.php b/nucleus/upgrades/upgrade.functions.php
index 4d4e952..af907c3 100755
--- a/nucleus/upgrades/upgrade.functions.php
+++ b/nucleus/upgrades/upgrade.functions.php
@@ -103,6 +103,10 @@
$query = 'SELECT * FROM '.sql_table('config').' WHERE name=\'DatabaseVersion\' and value >= 331 LIMIT 1';
$minrows = 1;
break;
+ case '34':
+ $query = 'SELECT * FROM '.sql_table('config').' WHERE name=\'DatabaseVersion\' and value >= 340 LIMIT 1';
+ $minrows = 1;
+ break;
}
$res = mysql_query($query);
@@ -203,6 +207,7 @@
function upgrade_end($msg = "") {
global $upgrade_failures;
+ $from = intGetVar('from');
if ($upgrade_failures > 0)
$msg = "ããã¤ãã®ãã¼ã¿ãã¼ã¹æä½ã«å¤±æãã¾ããããã以åã«ãã®ã¢ããã°ã¬ã¼ãã¹ã¯ãªãããå®è¡ãã¦ããã®ã§ããã°ãåé¡ãªãã¨æããã¾ãã";
@@ -213,7 +218,7 @@
- ã¢ããã°ã¬ã¼ãæåã®ãã¼ã¸ã«ãã©ã
+ ã¢ããã°ã¬ã¼ãæåã®ãã¼ã¸ã«ãã©ã
isLoggedIn()) {
}
if (!$member->isAdmin()) {
- upgrade_error('Only Super-Admins are allowed to perform upgrades');
+ upgrade_error('Super-adminï¼æé«ç®¡çè
ï¼ã®ã¿ãã¢ããã°ã¬ã¼ããå®è¡ã§ãã¾ãã');
}
include('upgrade0.95.php');
@@ -39,6 +39,7 @@ include('upgrade3.1.php');
include('upgrade3.2.php');
include('upgrade3.3.php');
include('upgrade3.31.php');
+include('upgrade3.4.php');
$from = intGetVar('from');
@@ -64,12 +65,15 @@ switch($from) {
upgrade_do31();
case 31:
upgrade_do32();
- break;
+// break;
case 32:
upgrade_do33();
- break;
+// break;
case 33:
upgrade_do331();
+// break;
+ case 331:
+ upgrade_do34();
break;
default:
echo "ã¨ã©ã¼! å®è¡ãã¹ãã¢ãããã¼ãã¯ããã¾ãã";
diff --git a/nucleus/upgrades/upgrade3.4.php b/nucleus/upgrades/upgrade3.4.php
new file mode 100644
index 0000000..37d609c
--- /dev/null
+++ b/nucleus/upgrades/upgrade3.4.php
@@ -0,0 +1,63 @@
+ 3.4
+ // update database version
+ update_version('340');
+
+}
+
+?>