不要となったPAGEFACTORYクラスを削除

diff --git a/install/index.php b/install/index.php
index e7097dd..5e6e87c 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -16,7 +16,7 @@
 /**\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: index.php 1745 2012-04-12 23:45:47Z sakamocchi $
+ * @version $Id: index.php 1745 2012-04-12 23:45:47Z sakamocchi $\r
  */\r
 \r
 /* global values initialize */\r
@@ -1320,7 +1320,6 @@ function do_check_files()
                '../nucleus/libs/MEMBER.php',\r
                '../nucleus/libs/mysql.php',\r
                '../nucleus/libs/NOTIFICATION.php',\r
-               '../nucleus/libs/PAGEFACTORY.php',\r
                '../nucleus/libs/PARSER.php',\r
                '../nucleus/libs/PLUGIN.php',\r
                '../nucleus/libs/PLUGINADMIN.php',\r

diff --git a/nucleus/libs/PAGEFACTORY.php b/nucleus/libs/PAGEFACTORY.php
deleted file mode 100644 (file)
index 768c16e..0000000
--- a/nucleus/libs/PAGEFACTORY.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php\r
-/*\r
- * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
- * Copyright (C) 2002-2012 The Nucleus Group\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- * (see nucleus/documentation/index.html#license for more info)\r
- */\r
-/**\r
- * @license http://nucleuscms.org/license.txt GNU General Public License\r
- * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: PAGEFACTORY.php 1626 2012-01-09 15:46:54Z sakamocchi $\r
- */\r
-\r
-/**\r
- * The formfactory class can be used to insert add/edit item forms into\r
- * admin area, bookmarklet, skins or any other places where such a form\r
- * might be needed\r
- */\r
-class PageFactory extends BaseActions\r
-{\r
-       /**\r
-        * PageFactory::$blog\r
-        * Reference to the blog object for which an add:edit form is created\r
-        */\r
-       private $blog;\r
-       \r
-       /**\r
-        * PageFactory::$allowed_types\r
-        * Allowed types of forms (bookmarklet/admin)\r
-        */\r
-       private $allowed_types;\r
-       \r
-       /**\r
-        * PageFactory::$type\r
-        * One of the types in $allowed_types\r
-        */\r
-       private $type;\r
-       \r
-       /**\r
-        * PageFactory::$method\r
-        * 'add' or 'edit'\r
-        */\r
-       private $method;\r
-       \r
-       /**\r
-        * PageFactory::$variables\r
-        * Info to fill out in the form (e.g. catid, itemid, ...)\r
-        */\r
-       private $variables;\r
-       \r
-       /**\r
-        * PageFactory::$actions\r
-        * Allowed actions (for parser)\r
-        */\r
-       // TODO: move the definition of actions to the createXForm methods\r
-       static private $defined_actions = array(\r
-               'actionurl',\r
-               'title',\r
-               'body',\r
-               'more',\r
-               'blogid',\r
-               'bloglink',\r
-               'blogname',\r
-               'authorname',\r
-               'checkedonval',\r
-               'helplink',\r
-               'currenttime',\r
-               'itemtime',\r
-               'init',\r
-               'text',\r
-               'jsinput',\r
-               'jsbuttonbar',\r
-               'categories',\r
-               'contents',\r
-               'ifblogsetting',\r
-               'ifitemproperty',\r
-               'else',\r
-               'endif',\r
-               'pluginextras',\r
-               'itemoptions',\r
-               'extrahead',\r
-               'ticket',\r
-               'autosave',\r
-               'autosaveinfo',\r
-               'ifautosave'\r
-       );\r
-       \r
-       /**\r
-        * Creates a new PAGEFACTORY object\r
-        * @param int $blog_id\r
-        */\r
-       public function __construct($type = '', $blogid, $skin = '')\r
-       {\r
-               global $manager;\r
-               # Call constructor of superclass first\r
-               parent::__construct();\r
-               \r
-               if ( !$blogid && $type == 'itemedit' )\r
-               {\r
-                       $itemid = intRequestVar('itemid');\r
-                       $blogid =  getBlogIDFromItemID($itemid);\r
-                       $item   = &$manager->getItem($itemid, 1, 1);\r
-                       $manager->notify('PrepareItemForEdit', array('item' => &$item));\r
-               }\r
-               \r
-               $this->blog =& $manager->getBlog($blogid);\r
-               \r
-               if ( $item && $this->blog->convertBreaks() && $type == 'itemedit' )\r
-               {\r
-                       $item['body'] = removeBreaks($item['body']);\r
-                       $item['more'] = removeBreaks($item['more']);\r
-               }\r
-               \r
-               $contents = array();\r
-               if ( $type == 'itemedit' )\r
-               {\r
-                       $contents = $item;\r
-               }\r
-               elseif ( $type == 'createitem' )\r
-               {\r
-                       $data = array(\r
-                               'contents' => &$contents,\r
-                               'blog'     => &$this->blog\r
-                       );\r
-                       $manager->notify('PreAddItemForm', $data);\r
-               }\r
-               $this->variables = $contents;\r
-               \r
-               $skin = new Skin($skin_id, 'AdminActions', 'AdminSkin');\r
-               $allowed_action_types = $skin->getAllowedActionsForType($type);\r
-               $this->actions = array_merge($skinActions, $formActions);\r
-               return;\r
-       }\r
-}\r

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 3e0ee80..f9f91f4 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -344,10 +344,8 @@ include($DIR_LIBS . 'BLOG.php');
 include($DIR_LIBS . 'BODYACTIONS.php');\r
 include($DIR_LIBS . 'COMMENTS.php');\r
 include($DIR_LIBS . 'COMMENT.php');\r
-/* include($DIR_LIBS . 'ITEM.php'); */\r
 include($DIR_LIBS . 'NOTIFICATION.php');\r
 include($DIR_LIBS . 'BAN.php');\r
-include($DIR_LIBS . 'PAGEFACTORY.php');\r
 include($DIR_LIBS . 'SEARCH.php');\r
 include($DIR_LIBS . 'LINK.php');\r
 \r