Changeset 5427

Timestamp:

02/28/08 11:31:45 (10 months ago)

Author:

inureyes

Message:

#843

• token으로 로그인 하였을 때는 강제 비번 변경이 가능하도록 수정
  #841
  
• 플러그인 저작자 수정
  

Location:

trunk

Files:

• interface/owner/plugin/index.php (modified) (1 diff)
• interface/owner/setting/account/password/index.php (modified) (1 diff)
• lib/model/blog.blogSetting.php (modified) (2 diffs)
• plugins/TattertoolsBirthday/index.xml (modified) (1 diff)
• plugins/URLkeeper/index.xml (modified) (1 diff)

trunk/interface/owner/plugin/index.php

@@ -461 +461 @@
                                             <ul class="plugin-description">
                                                 <li class="author"><span class="label"><?php echo _t('제작자');?> : </span><a href="<?php echo htmlspecialchars($authorLink);?>" title="<?php echo htmlspecialchars($author);?>"><?php echo htmlspecialchars($author);?></a></li>
-                                                <li class="version"><span class="label"><?php echo _t('버젼');?> : </span><?php echo $version;?></li>
+                                                <li class="version"><span class="label"><?php echo _t('판번호');?> : </span><?php echo $version;?></li>
                                                 <li class="description"><span class="label"><?php echo _t('설명');?> : </span><?php echo htmlspecialchars($description);?></li>
                                             </ul>

trunk/interface/owner/setting/account/password/index.php

@@ -12 +12 @@
 requireStrictRoute();
 $result = false;
-if($_POST['pwd'] != '' && $_POST['prevPwd'] != '') {
-    $result = changePassword(getUserId(), $_POST['pwd'], $_POST['prevPwd']);
+$isAuthToken = getUserSetting('AuthToken',false);
+if($_POST['pwd'] != '' && ($_POST['prevPwd'] != '' || $isAuthToken)) {
+    $result = changePassword(getUserId(), $_POST['pwd'], $_POST['prevPwd'], $isAuthToken);
 }
 if($result) respond::ResultPage(0);

trunk/lib/model/blog.blogSetting.php

@@ -415 +415 @@
 }
 
-function changePassword($userid, $pwd, $prevPwd) {
+function changePassword($userid, $pwd, $prevPwd, $forceChange = false) {
     global $database;
-    if (!strlen($pwd) || !strlen($prevPwd))
-        return false;
+    if (!strlen($pwd) || (!strlen($prevPwd) || !$forceChange))
+        return false;
+    if($forceChange === true) {
+        $pwd = md5($pwd);
+        return POD::execute("UPDATE `{$database['prefix']}Users` SET password = '$pwd' WHERE `userid` = $userid");
+    }
     if ((strlen($prevPwd) == 32) && preg_match('/[0-9a-f]/i', $prevPwd))
         $secret = '(`password` = \'' . md5($prevPwd) . "' OR `password` = '$prevPwd')";
@@ -427 +431 @@
         return false;
     $pwd = md5($pwd);
-    $sql = "UPDATE `{$database['prefix']}Users` SET password = '$pwd' WHERE `userid` = $userid";
-    return POD::execute($sql);
+    return POD::execute("UPDATE `{$database['prefix']}Users` SET password = '$pwd' WHERE `userid` = $userid");
 }
 

trunk/plugins/TattertoolsBirthday/index.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin version="1.0">
-  <title xml:lang="ko">텍스트큐브 생일 표시</title>
-  <title xml:lang="en">Textcube birthday</title>
+  <title xml:lang="ko">태터툴즈/텍스트큐브 생일 표시</title>
+  <title xml:lang="en">Tattertools/Textcube birthday</title>
   <title xml:lang="ja">タッターツールズの誕生日表示</title>
   <title xml:lang="zh-CN">表示TT生日</title>
   <link>http://needlworks.org/</link>
-  <version>1.0</version>
+  <version>1.6</version>
   <description xml:lang="en">This plugin displays Textcube birthday and D-day. To enable this, skin's HTML should contain [##_TextcubeBirthday_##] tag.</description>
-  <description xml:lang="ko">텍스트큐브의 생일과 D-day를 블로그 페이지에 출력합니다. [##_TextcubeBirthday_##] 태그가 스킨에 있어야 합니다.</description>
+  <description xml:lang="ko"><![CDATA[텍스트큐브의 생일과 D-day를 블로그 페이지에 출력합니다. [##_TextcubeBirthday_##] 태그가 스킨에 있어야 합니다.]]></description>
   <description xml:lang="ja">タッターツールズの誕生日と D-day をブログのページに出力します。このプラグインを使用中にして [##_TextcubeBirthday_##] タグをスキンに含むと動作が出来ます。</description>
   <description xml:lang="zh-CN">在网页中显示TT生日和D-day. 模板中要包含 [##_TextcubeBirthday_##] 标签.</description>
   <license>GPL</license>
-  <author xml:lang="en" link="http://needlworks.org">Needlworks</author>
-  <author xml:lang="ko" link="http://needlworks.org">Needlworks</author>
+  <author xml:lang="ko" link="http://papacha.net"><![CDATA[장선주 (papacha / TNC)]]></author>
+  <author xml:lang="en" link="http://papacha.net">Sunju Jahng</author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="no" />
   <requirements>

trunk/plugins/URLkeeper/index.xml

@@ -6 +6 @@
   <title xml:lang="zh-CN">URLkeeper</title>
   <link>http://www.needlworks.org</link>
-  <version>1.1</version>
+  <version>1.6</version>
   <description xml:lang="ko">퍼머링크를 보존하기 위하여 자신의 블로그를 프레임에 넣어 호출하는 외부사이트에 원래 주소로 접속해달라는 경고창을 띄우거나, 자신의 블로그로 이동하게 합니다.</description>
   <description xml:lang="en">Breaks frame or iframe to prevent permalink.</description>
   <license>GPL</license>
-  <author link="http://forum.tattersite.com"><![CDATA[Tatter Network Foundation]]></author>
-  <author xml:lang="ko" link="http://forum.tattersite.com"><![CDATA[태터 네트워크 재단]]></author>
+  <author link="http://forum.tattersite.com/ko"><![CDATA[Needlworks / Tatter Network Foundation]]></author>
+  <author xml:lang="ko" link="http://forum.tattersite.com/ko"><![CDATA[Needlworks / TNF]]></author>
   <safety changeData="no" exposeData="no" accessLocal="no" accessRemote="no" accessRaw="no" />
   <requirements>