git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/tags/release...

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 6666ecc..d785bb6 100755 (executable)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -1199,41 +1199,6 @@ class ADMIN {
                                $wasdraft: set to 1 when the item used to be a draft item\r
                                $publish: set to 1 when the edited item is not a draft\r
                */\r
-/*<del by shizuki>\r
-               switch ($actiontype) {\r
-                       case 'adddraft':\r
-                               $publish = 0;\r
-                               $wasdraft = 1;\r
-                               $timestamp = 0;\r
-                               break;\r
-                       case 'addfuture':\r
-                               $wasdraft = 1;\r
-                               $publish = 1;\r
-                               $timestamp = mktime(intPostVar('hour'), intPostVar('minutes'), 0, intPostVar('month'), intPostVar('day'), intPostVar('year'));\r
-                               break;\r
-                       case 'addnow':\r
-                               $wasdraft = 1;\r
-                               $publish = 1;\r
-                               $timestamp = 0;\r
-                               break;\r
-                       case 'changedate':\r
-                               $timestamp = mktime(intPostVar('hour'), intPostVar('minutes'), 0, intPostVar('month'), intPostVar('day'), intPostVar('year'));\r
-                               $publish = 1;\r
-                               $wasdraft = 0;\r
-                               break;\r
-                       case 'backtodrafts':\r
-                               $wasdraft = 0;\r
-                               $publish = 0;\r
-                               $timestamp = 0;\r
-                               break;\r
-                       case 'edit':\r
-                       default:\r
-                               $publish = 1;\r
-                               $wasdraft = 0;\r
-                               $timestamp = 0;\r
-               }\r
-</del by shizuki>*/\r
-// <add by shizuki>\r
                $blogid =  getBlogIDFromItemID($itemid);\r
                $blog   =& $manager->getBlog($blogid);\r
 \r
@@ -1246,21 +1211,10 @@ class ADMIN {
                        $timestamp =0;\r
                }\r
                $doping = ($publish && $timestamp < $blog->getCorrectTime() && postVar('dosendping')) ? 1 : 0;\r
-// </add by shizuki>\r
 \r
                // edit the item for real\r
                ITEM::update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp);\r
 \r
-/* <del by shizuki>\r
-               $blogid = getBlogIDFromItemID($itemid);\r
-               $blog =& $manager->getBlog($blogid);\r
-\r
-               $isFuture = 0;\r
-               if ($timestamp > $blog->getCorrectTime(time())) {\r
-                       $isFuture = 1;\r
-               }\r
-\r
-</del by shizuki>*/\r
                $this->updateFuturePosted($blogid);\r
 \r
                if ($draftid > 0) {\r
@@ -1494,23 +1448,7 @@ class ADMIN {
 \r
                $blogid = getBlogIDFromItemID($result['itemid']);\r
                $blog =& $manager->getBlog($blogid);\r
-/* <del by shizuki>\r
-               $pingUrl = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=sendping&blogid=' . intval($blogid));\r
-\r
-               if ($result['status'] == 'newcategory')\r
-                       $this->action_categoryedit(\r
-                               $result['catid'],\r
-                               $blogid,\r
-                               $blog->sendPing() && numberOfEventSubscriber('SendPing') > 0 ? $pingUrl : ''\r
-                       );\r
-               elseif ((postVar('actiontype') == 'addnow') && $blog->sendPing() && numberOfEventSubscriber('SendPing') > 0)\r
-                       $this->action_sendping($blogid);\r
-               else\r
-                       $this->action_itemlist($blogid);\r
-</del by shizuki>*/\r
-// <add by shizuki>\r
                $btimestamp = $blog->getCorrectTime();\r
-               $bPingInfo  = ($blog->sendPing() && numberOfEventSubscriber('SendPing') > 0);\r
                $item       = $manager->getItem(intval($result['itemid']), 1, 1);\r
                $iPingInfo  = (!$item['draft'] && postVar('dosendping') && $item['timestamp'] <= $btimestamp);\r
                if ($iPingInfo && $bPingInfo) {\r
@@ -1519,16 +1457,12 @@ class ADMIN {
                        $nextAction = 'itemlist';\r
                }\r
                if ($result['status'] == 'newcategory') {\r
-//                     $distURI = ($nextAction == 'sendping') ? $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action='\r
-//                                      . $nextAction . '&blogid=' . intval($blogid)) :\r
-//                                        '';\r
                        $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=' . $nextAction . '&blogid=' . intval($blogid));\r
                        $this->action_categoryedit($result['catid'], $blogid, $distURI);\r
                } else {\r
                        $methodName = 'action_' . $nextAction;\r
                        call_user_func(array(&$this, $methodName), $blogid);\r
                }\r
-//</add by shizuki>\r
        }\r
 \r
        /**\r

diff --git a/nucleus/plugins/NP_Ping.php b/nucleus/plugins/NP_Ping.php
index 9341bec..3fc4b6d 100644 (file)
--- a/nucleus/plugins/NP_Ping.php
+++ b/nucleus/plugins/NP_Ping.php
@@ -9,6 +9,7 @@
     v1.3 - pinged variable support
     v1.4 - language file support
     v1.5 - remove arg1 in exec() call
+    v1.6 - move send update ping override option to plugin
  */
 
 class NP_Ping extends NucleusPlugin {
@@ -17,7 +18,7 @@ class NP_Ping extends NucleusPlugin {
 
        function getAuthor() { return 'admun (Edmond Hui)'; }
        function getURL()    { return 'http://edmondhui.homeip.net/nudn'; }
-       function getVersion() { return '1.5'; }
+       function getVersion() { return '1.6'; }
 
        function getMinNucleusVersion() { return '330'; }
 
@@ -56,7 +57,11 @@ class NP_Ping extends NucleusPlugin {
        }
 
        function getEventList() {
-               return array('SendPing', 'JustPosted');
+               return array(
+                       'SendPing',
+                       'JustPosted'
+                       'AddItemFormExtras',
+                       'EditItemFormExtras');
        }
 
        function event_JustPosted($data) {
@@ -83,6 +88,26 @@ class NP_Ping extends NucleusPlugin {
                 $this->sendPings($data);
        }
 
+       function DisplayFormOptions($sendping) {
+               if ($sendping) {
+                       $check = 'checked="checked"';
+               } else {
+                       $check = '';
+               }
+                $output = '<h3>' . _PING_EXTRA_PLUGIN_OPTION . '</h3>
+                <p><input id="dosendping" name="dosendping" value="1" type="checkbox" ' . $check . '><label for="dosendping">' . _UPDATEDPING_GOSENDPING . '</label> </p>';
+                echo $output;
+       }
+
+        function event_AddItemFormExtras($data){
+               $this->DisplayFormOptions($data['blog']->sendPing());
+       }
+
+        function event_EditItemFormExtras($data){
+               // we are not sending ping by default after edit an item
+               $this->DisplayFormOptions(0);
+       }
+
         function sendPings($data) {
                if (!class_exists('xmlrpcmsg')) {
                        global $DIR_LIBS;

diff --git a/nucleus/plugins/ping/english.php b/nucleus/plugins/ping/english.php
index c81e8b3..627aa50 100644 (file)
--- a/nucleus/plugins/ping/english.php
+++ b/nucleus/plugins/ping/english.php
@@ -13,4 +13,6 @@
        define('_PING_PHP_ERROR', 'PHP Error: ');
        define('_PING_PHP_PING_ERROR', 'Error while trying to send ping. Sorry about that.');
        define('_PING_SUCCESS', 'Success');
+       define('_UPDATEDPING_GOSENDPING', 'Send Update ping'); 
+       define('_PING_EXTRA_PLUGIN_OPTION', 'Blog Tracking Ping Service');
 ?>

diff --git a/nucleus/plugins/ping/japanese-euc.php b/nucleus/plugins/ping/japanese-euc.php
index 0a46131..c2ec03a 100644 (file)
--- a/nucleus/plugins/ping/japanese-euc.php
+++ b/nucleus/plugins/ping/japanese-euc.php
@@ -13,4 +13,6 @@
        define('_PING_PHP_ERROR', 'PHP ¥¨¥é¡¼: ');
        define('_PING_PHP_PING_ERROR', '¿½¤·Ìõ¤¢¤ê¤Þ¤»¤ó¡£ping ¤òÁ÷¿®Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£');
        define('_PING_SUCCESS', 'À®¸ù');
+       define('_UPDATEDPING_GOSENDPING', 'ping¤òÁ÷¿®¤¹¤ë'); 
+       define('_PING_EXTRA_PLUGIN_OPTION', '¹¹¿·ping');
 ?>

diff --git a/nucleus/plugins/ping/japanese-utf8.php b/nucleus/plugins/ping/japanese-utf8.php
index 3bcd670..5d7e029 100644 (file)
--- a/nucleus/plugins/ping/japanese-utf8.php
+++ b/nucleus/plugins/ping/japanese-utf8.php
@@ -13,4 +13,6 @@
        define('_PING_PHP_ERROR', 'PHP エラー: ');
        define('_PING_PHP_PING_ERROR', '申し訳ありません。ping を送信中にエラーが発生しました。');
        define('_PING_SUCCESS', '成功');
+       define('_UPDATEDPING_GOSENDPING', 'pingを送信する'); 
+       define('_PING_EXTRA_PLUGIN_OPTION', '更新ping');
 ?>