# FIXED: atom.phpとxml-rss2.phpで_CHARSETをチェックして文字コード変換(Nicleus3.41 へアップグレード後 xml-rss2...

[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / ACTION.php

diff --git a/utf8/nucleus/libs/ACTION.php b/utf8/nucleus/libs/ACTION.php
index 7ea7069..9e25916 100755 (executable)
--- a/utf8/nucleus/libs/ACTION.php
+++ b/utf8/nucleus/libs/ACTION.php
@@ -249,8 +249,10 @@ class ACTION
                        doError(_ERROR_NOSUCHMEMBER);
                $mem = MEMBER::createFromName($membername);
 
-               if (!$mem->canLogin())
-                       doError(_ERROR_NOLOGON_NOACTIVATE);
+               /* below keeps regular users from resetting passwords using forgot password feature
+                    Removing for now until clear why it is required.*/
+               /*if (!$mem->canLogin())
+                       doError(_ERROR_NOLOGON_NOACTIVATE);*/
 
                // check if e-mail address is correct
                if (!($mem->getEmail() == postVar('email')))
@@ -301,7 +303,7 @@ class ACTION
                                break;
                }
 
-               $blogid = getBlogIDFromItemID($itemid);
+//             $blogid = getBlogIDFromItemID($itemid);
                $blog =& $manager->getBlog($blogid);
 
                // send email to notification address, if any
@@ -311,10 +313,12 @@ class ACTION
                        if ($CONF['URLMode'] == 'pathinfo') {
                                $itemLink = createItemLink(intval($itemid));
                        } else {
-                               $itemLink = $CONF['IndexURL'] . createItemLink(intval($itemid));
+                               $itemLink = createItemLink(intval($itemid));
+                               if (strpos($itemLink, 'http') === false) {
+                                       $itemLink = $CONF['IndexURL'] . $itemLink;
+                               }
                        }
-//                     $mailto_msg .= $CONF['IndexURL'] . 'index.php?itemid=' . $itemid . "\n\n";
-                       $mailto_msg .= $itemLink;
+                       $mailto_msg .= $itemLink . "\n\n";
                        if ($member->isLoggedIn()) {
                                $mailto_msg .= _NOTIFY_MEMBER . ' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";
                        }
@@ -395,7 +399,7 @@ class ACTION
                        echo $manager->getNewTicket();
                }
                else {
-                       echo 'err:' . _ERROR_BADTICKET;
+                       echo _ERROR . ':' . _ERROR_BADTICKET;
                }
                return false;
        }
@@ -416,7 +420,7 @@ class ACTION
                        }
                }
                else {
-                       echo 'err:' . _ERROR_BADTICKET;
+                       echo _ERROR . ':' . _ERROR_BADTICKET;
                }
                return false;
        }