OSDN Git Service

ダブり行の削除
authorshizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Mon, 22 Jun 2009 12:48:13 +0000 (12:48 +0000)
committershizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Mon, 22 Jun 2009 12:48:13 +0000 (12:48 +0000)
ログインできない最高管理者修正

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1016 1ca29b6e-896d-4ea0-84a5-967f57386b96

utf8/nucleus/libs/ACTION.php
utf8/nucleus/libs/ADMIN.php
utf8/nucleus/libs/BaseActions.php
utf8/nucleus/libs/MEMBER.php

index 9e25916..e387275 100755 (executable)
@@ -310,13 +310,10 @@ class ACTION
                if ($blog->getNotifyAddress() && $blog->notifyOnVote()) {
 
                        $mailto_msg = _NOTIFY_KV_MSG . ' ' . $itemid . "\n";
-                       if ($CONF['URLMode'] == 'pathinfo') {
-                               $itemLink = createItemLink(intval($itemid));
-                       } else {
-                               $itemLink = createItemLink(intval($itemid));
-                               if (strpos($itemLink, 'http') === false) {
-                                       $itemLink = $CONF['IndexURL'] . $itemLink;
-                               }
+                       $itemLink = createItemLink(intval($itemid));
+                       $temp = parse_url($itemLink);
+                       if (!$temp['scheme']) {
+                               $itemLink = $CONF['IndexURL'] . $itemLink;
                        }
                        $mailto_msg .= $itemLink . "\n\n";
                        if ($member->isLoggedIn()) {
index 3e8e91c..bec886d 100755 (executable)
@@ -6502,7 +6502,6 @@ selector();
                        if ($iPrevPid != $aOption['pid']) {\r
                                $iPrevPid = $aOption['pid'];\r
 \r
-                               echo '<tr><th colspan="2">Options for ', htmlspecialchars($aOption['pfile']),'</th></tr>';\r
                                echo '<tr><th colspan="2">'.sprintf(_PLUGIN_OPTIONS_TITLE, htmlspecialchars($aOption['pfile']. ENT_QUOTES)).'</th></tr>';\r
                        }\r
 \r
index 7dcf150..2502cb3 100644 (file)
@@ -91,6 +91,7 @@ class BaseActions {
                        $contents = fread ($fd, $fsize);
                        fclose ($fd);
                }
+               $this->level = $this->level + 1;
 /*             $parts = explode('|', $filename, 2);
                if ($skin->getContent($parts[0])) {
                        $contents = $skin->getContent($parts[0]);
index 677a4fe..d380df3 100755 (executable)
@@ -637,6 +637,8 @@ class MEMBER {
                $canlogin = intval($canlogin);
                $notes = addslashes($notes);
 
+               if (($admin) && !($canlogin)) {return _ERROR;}
+
                $query = 'INSERT INTO '.sql_table('member')." (MNAME,MREALNAME,MPASSWORD,MEMAIL,MURL, MADMIN, MCANLOGIN, MNOTES) "
                           . "VALUES ('$name','$realname','$password','$email','$url',$admin, $canlogin, '$notes')";
                sql_query($query);