From 116f919590277a62a09156429618a59be1c95c93 Mon Sep 17 00:00:00 2001 From: shizuki Date: Tue, 1 May 2012 19:44:03 +0900 Subject: [PATCH] =?utf8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E8=BF=BD?= =?utf8?q?=E5=8A=A0/=E7=B7=A8=E9=9B=86=E5=9F=BA=E6=9C=AC=E7=94=BB=E9=9D=A2?= =?utf8?q?=E3=81=AE=E3=83=91=E3=83=BC=E3=82=B9=E6=99=82=E3=81=AE=E3=82=A8?= =?utf8?q?=E3=83=A9=E3=83=BC=E5=AF=BE=E5=BF=9C=20=E6=97=A7PAGEFACTORY?= =?utf8?q?=E7=94=B1=E6=9D=A5=E3=81=AEparse=5F*=E3=83=A1=E3=82=BD=E3=83=83?= =?utf8?q?=E3=83=89=E3=82=92AdminActions=E3=81=AB=E7=A7=BB=E8=A1=8C?= =?utf8?q?=E3=80=81=E5=8F=8A=E3=81=B3<%jsinput%>=E3=81=A8<%jsbuttonbar%>?= =?utf8?q?=E9=83=A8=E5=88=86=E3=82=92=E3=82=B9=E3=82=AD=E3=83=B3=E3=81=AB?= =?utf8?q?=E7=9B=B4=E6=8E=A5=E8=A8=98=E8=BF=B0=20=E3=81=93=E3=82=8C?= =?utf8?q?=E3=81=AB=E4=BC=B4=E3=81=84=E3=83=9C=E3=82=BF=E3=83=B3=E7=94=A8?= =?utf8?q?=E7=94=BB=E5=83=8F=E3=82=82=E3=82=B9=E3=82=AD=E3=83=B3=E3=83=87?= =?utf8?q?=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA=E3=81=AB=E7=A7=BB?= =?utf8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nucleus/libs/ADMIN.php | 21 +- nucleus/libs/AdminActions.php | 247 ++++++++++++++++++- .../defaultadmin}/images/button-aligncenter.gif | Bin .../defaultadmin}/images/button-alignleft.gif | Bin .../defaultadmin}/images/button-alignright.gif | Bin .../admin/defaultadmin}/images/button-bold.gif | Bin .../admin/defaultadmin}/images/button-copy.gif | Bin .../admin/defaultadmin}/images/button-cut.gif | Bin .../admin/defaultadmin}/images/button-italic.gif | Bin .../admin/defaultadmin}/images/button-left.gif | Bin .../admin/defaultadmin}/images/button-link.gif | Bin .../admin/defaultadmin}/images/button-media.gif | Bin .../admin/defaultadmin}/images/button-paste.gif | Bin .../admin/defaultadmin}/images/button-preview.gif | Bin .../admin/defaultadmin}/images/button-right.gif | Bin .../admin/defaultadmin}/images/globe.gif | Bin skins/admin/defaultadmin/skinbackup.xml | 262 +++++++++++++++++++-- 17 files changed, 504 insertions(+), 26 deletions(-) rename {nucleus => skins/admin/defaultadmin}/images/button-aligncenter.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-alignleft.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-alignright.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-bold.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-copy.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-cut.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-italic.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-left.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-link.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-media.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-paste.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-preview.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/button-right.gif (100%) rename {nucleus => skins/admin/defaultadmin}/images/globe.gif (100%) diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php index e249ebf..0e35fcf 100644 --- a/nucleus/libs/ADMIN.php +++ b/nucleus/libs/ADMIN.php @@ -657,7 +657,7 @@ class Admin * * NOTE: callback from AdminAction */ - static private function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) + static public function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) { Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude); return; @@ -863,8 +863,15 @@ class Admin // only allow if user is allowed to alter item $member->canAlterItem($itemid) or self::disallow(); - $item =& $manager->getItem($itemid, 1, 1); - $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + $itemid = intRequestVar('itemid'); + $blogid = getBlogIDFromItemID($itemid); + $item =& $manager->getItem($itemid, 1, 1); + $manager->notify( + 'PrepareItemForEdit', + array( + 'item' => &$item + ) + ); self::pagehead(); self::$skin->parse('itemedit'); @@ -5969,6 +5976,14 @@ class Admin } /** + * Admin::getAdminpassvar() + */ + static function getAdminpassvar() + { + return self::$passvar; + } + + /** * Admin::getAdminAction() */ static function getAdminAction() diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php index d736d9e..01ed6ba 100644 --- a/nucleus/libs/AdminActions.php +++ b/nucleus/libs/AdminActions.php @@ -481,8 +481,6 @@ class AdminActions extends BaseActions $extra_actions = array( 'adminbloglink', 'blogid', - 'jsinput', - 'jsbuttonbar', 'contents', 'categories', 'currenttime', @@ -532,8 +530,6 @@ class AdminActions extends BaseActions $extra_actions = array( 'init', 'contents', - 'jsinput', - 'jsbuttonbar', 'checkedonval', 'categories', 'currenttime', @@ -1654,6 +1650,19 @@ class AdminActions extends BaseActions } /** + * AdminActions::parse_blogid() + * Parse skinvar blogid + * + * @param void + * @return void + */ + function parse_blogid() + { + echo intRequestVar('blogid'); + return; + } + + /** * AdminActions::parse_blognotifysetting() * Parse skinvar blognotifysetting * @@ -1742,9 +1751,9 @@ class AdminActions extends BaseActions } // 2. for each category in that blog - $catQueriy = "SELECT cname, catid FROM %s WHERE cblog=%d ORDER BY cname ASC;"; + $catQuery = "SELECT cname, catid FROM %s WHERE cblog=%d ORDER BY cname ASC;"; $catQuery = sprintf($catQuery, sql_table('category'), (integer) $oBlog->bnumber); - $categories = sql_query(sprintf($catQueriy)); + $categories = sql_query($catQuery); while ( $oCat = sql_fetch_object($categories) ) { if ( $oCat->catid == $selected ) @@ -1934,6 +1943,42 @@ class AdminActions extends BaseActions echo Entity::hsc('javascript:' . getBookmarklet($blogid)); return; } + + /** + * AdminActions::parse_categories() + * Parse skinvar categories + * + * create category dropdown box + * + * @param string $type name of setting for category + * @return void + */ + function parse_categories($startidx = 0) + { + global $manager; + $item = false; + $itemid = intRequestVar('itemid'); + $item =& $manager->getItem($itemid, 1, 1); + $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + if ($item && $blog->convertBreaks() && requestVar('action') == 'itemedit') { + $item['body'] = removeBreaks($item['body']); + $item['more'] = removeBreaks($item['more']); + } + $contents = array(); + if ( requestVar('action') == 'itemedit' ) + { + $contents = $item; + } + if ( isset($contents['catid']) && $contents['catid'] ) + { + $catid = $contents['catid']; // on edit item + } + else + { + $catid = $blog->getDefaultCategory(); // on add item + } + Admin::selectBlogCategory('catid', $catid, $startidx, 1, $blog->getID()); + } /** * AdminActions::parse_category() @@ -1985,6 +2030,39 @@ class AdminActions extends BaseActions * AdminActions::parse_codename() * Parse templatevar codename * + * @param $value + * @param $name + * + */ + function parse_checkedonval($value, $name) { + global $manager; + $item = false; + $itemid = intRequestVar('itemid'); + $item =& $manager->getItem($itemid, 1, 1); + $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + if ($item && $blog->convertBreaks() && requestVar('action') == 'itemedit') { + $item['body'] = removeBreaks($item['body']); + $item['more'] = removeBreaks($item['more']); + } + $contents = array(); + if ( requestVar('action') == 'itemedit' ) + { + $contents = $item; + } + if ( !isset($contents[$name]) ) + { + $contents[$name] = ''; + } + if ($contents[$name] == $value) + { + echo 'checked="checked"'; + } + } + + /** + * AdminActions::parse_codename() + * Parse templatevar codename + * * @param void * @return void * @@ -2144,6 +2222,71 @@ class AdminActions extends BaseActions } /** + * AdminActions::parse_contents() + * Parse skinvar contents + * + * @param string $which part for item + * @return void + */ + function parse_contents($which) + { + global $manager; + $item = false; + $contents = array(); + if ( requestVar('action') == 'itemedit' ) + { + $itemid = intRequestVar('itemid'); + $item =& $manager->getItem($itemid, 1, 1); + $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + if ( $item && $blog->convertBreaks() ) + { + $item['body'] = removeBreaks($item['body']); + $item['more'] = removeBreaks($item['more']); + } + $contents = $item; + } + elseif ( requestVar('action') == 'createitem' ) + { + $blog =& $manager->getBlog(intRequestVar($blogid)); + $manager->notify( + 'PreAddItemForm', + array( + 'contents' => &$contents, + 'blog' => &$blog + ) + ); + } + if ( !isset($contents[$which]) ) + { + $contents[$which] = ''; + } + echo Entity::hsc($contents[$which],ENT_QUOTES); + } + + /** + * AdminActions::parse_currenttime() + * Parse skinvar currenttime + * + * @param string $what + */ + // for future items + function parse_currenttime($what) + { + global $manager; + if ( requestVar('action') == 'itemedit' ) + { + $itemid = intRequestVar('itemid'); + $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + } + elseif ( requestVar('action') == 'createitem' ) + { + $blog =& $manager->getBlog(intRequestVar('blogid')); + } + $nu = getdate($blog->getCorrectTime()); + echo $nu[$what]; + } + + /** * AdminActions::parse_customhelplink() * Parse skinvar customhelplink * @@ -3410,6 +3553,39 @@ class AdminActions extends BaseActions * AdminActions::parse_inputyesno() * Parse skinvar inputyesno * + * some init stuff for all forms + * + * @param void + */ + function parse_init() + { + global $manager; + $item = false; + if ( requestVar('action') == 'itemedit' ) + { + $itemid = intRequestVar('itemid'); + $item =& $manager->getItem($itemid, 1, 1); + $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + if ( $item && $blog->convertBreaks() ) + { + $item['body'] = removeBreaks($item['body']); + $item['more'] = removeBreaks($item['more']); + } + $contents = $item; + $authorid = $contents['authorid']; + } + elseif ( requestVar('action') == 'createitem' ) + { + $blog =& $manager->getBlog(intRequestVar($blogid)); + $authorid = ''; + } + $blog->insertJavaScriptInfo($authorid); + } + + /** + * AdminActions::parse_inputyesno() + * Parse skinvar inputyesno + * * @param string $name * @param string $checkedval * @param string $tabindex @@ -3629,6 +3805,59 @@ class AdminActions extends BaseActions } /** + * AdminActions::parse_itemoptions() + * Parse skinvar itemoptions + * Adds the itemOptions of a plugin to a page + * @author TeRanEX + */ + function parse_itemoptions() + { + $this->parse_pluginoptions($type = 'item'); +// global $itemid; +// Admin::insertPluginOptions('item', $itemid); + } + + /** + * AdminActions::parse_itemoptions() + * + * date change on edit item + * + * Parse skinvar itemoptions + * Adds the itemOptions of a plugin to a page + * @author TeRanEX + */ + function parse_itemtime($what) + { + global $manager; + $item = false; + $itemid = intRequestVar('itemid'); + $item =& $manager->getItem($itemid, 1, 1); + $blog =& $manager->getBlog(getBlogIDFromItemID($itemid)); + if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' ) + { + $item['body'] = removeBreaks($item['body']); + $item['more'] = removeBreaks($item['more']); + } + $contents = array(); + if ( requestVar('action') == 'itemedit' ) + { + $contents = $item; + } + elseif ( requestVar('action') == 'createitem' ) + { + $manager->notify( + 'PreAddItemForm', + array( + 'contents' => &$contents, + 'blog' => &$this->blog + ) + ); + } + $itemtime = getdate($contents['timestamp']); + echo $itemtime[$what]; + } + + /** * AdminActions::parse_jstoolbaroptions() * Parse skinvar jstoolbaroptions * @@ -3943,10 +4172,11 @@ class AdminActions extends BaseActions */ public function parse_passrequestvars() { + $passvar = Admin::getAdminpassvar(); $oldaction = postVar('oldaction'); if ( ($oldaction != 'logout') && ($oldaction != 'login') - && Admin::passvar + && $passvar && !postVar('customaction') ) { passRequestVars(); @@ -4067,6 +4297,9 @@ class AdminActions extends BaseActions case 'category': $id = intRequestVar('catid'); break; + case 'item': + global $itemid; + $id = $itemid; } Admin::insertPluginOptions($type, $id); return; diff --git a/nucleus/images/button-aligncenter.gif b/skins/admin/defaultadmin/images/button-aligncenter.gif similarity index 100% rename from nucleus/images/button-aligncenter.gif rename to skins/admin/defaultadmin/images/button-aligncenter.gif diff --git a/nucleus/images/button-alignleft.gif b/skins/admin/defaultadmin/images/button-alignleft.gif similarity index 100% rename from nucleus/images/button-alignleft.gif rename to skins/admin/defaultadmin/images/button-alignleft.gif diff --git a/nucleus/images/button-alignright.gif b/skins/admin/defaultadmin/images/button-alignright.gif similarity index 100% rename from nucleus/images/button-alignright.gif rename to skins/admin/defaultadmin/images/button-alignright.gif diff --git a/nucleus/images/button-bold.gif b/skins/admin/defaultadmin/images/button-bold.gif similarity index 100% rename from nucleus/images/button-bold.gif rename to skins/admin/defaultadmin/images/button-bold.gif diff --git a/nucleus/images/button-copy.gif b/skins/admin/defaultadmin/images/button-copy.gif similarity index 100% rename from nucleus/images/button-copy.gif rename to skins/admin/defaultadmin/images/button-copy.gif diff --git a/nucleus/images/button-cut.gif b/skins/admin/defaultadmin/images/button-cut.gif similarity index 100% rename from nucleus/images/button-cut.gif rename to skins/admin/defaultadmin/images/button-cut.gif diff --git a/nucleus/images/button-italic.gif b/skins/admin/defaultadmin/images/button-italic.gif similarity index 100% rename from nucleus/images/button-italic.gif rename to skins/admin/defaultadmin/images/button-italic.gif diff --git a/nucleus/images/button-left.gif b/skins/admin/defaultadmin/images/button-left.gif similarity index 100% rename from nucleus/images/button-left.gif rename to skins/admin/defaultadmin/images/button-left.gif diff --git a/nucleus/images/button-link.gif b/skins/admin/defaultadmin/images/button-link.gif similarity index 100% rename from nucleus/images/button-link.gif rename to skins/admin/defaultadmin/images/button-link.gif diff --git a/nucleus/images/button-media.gif b/skins/admin/defaultadmin/images/button-media.gif similarity index 100% rename from nucleus/images/button-media.gif rename to skins/admin/defaultadmin/images/button-media.gif diff --git a/nucleus/images/button-paste.gif b/skins/admin/defaultadmin/images/button-paste.gif similarity index 100% rename from nucleus/images/button-paste.gif rename to skins/admin/defaultadmin/images/button-paste.gif diff --git a/nucleus/images/button-preview.gif b/skins/admin/defaultadmin/images/button-preview.gif similarity index 100% rename from nucleus/images/button-preview.gif rename to skins/admin/defaultadmin/images/button-preview.gif diff --git a/nucleus/images/button-right.gif b/skins/admin/defaultadmin/images/button-right.gif similarity index 100% rename from nucleus/images/button-right.gif rename to skins/admin/defaultadmin/images/button-right.gif diff --git a/nucleus/images/globe.gif b/skins/admin/defaultadmin/images/globe.gif similarity index 100% rename from nucleus/images/globe.gif rename to skins/admin/defaultadmin/images/globe.gif diff --git a/skins/admin/defaultadmin/skinbackup.xml b/skins/admin/defaultadmin/skinbackup.xml index 9a2582e..c3e0966 100644 --- a/skins/admin/defaultadmin/skinbackup.xml +++ b/skins/admin/defaultadmin/skinbackup.xml @@ -910,8 +910,7 @@ selector(); <%endif%> <%text(_ADD_TITLE)%> - + <%helplink(additem)%> - <%jsbuttonbar(media+preview)%> - @@ -991,9 +1048,67 @@ selector();
<%helplink(extended)%> - <%jsbuttonbar(media+preview)%> - @@ -1317,9 +1489,67 @@ selector();
<%helplink(extended)%> - <%jsbuttonbar(media+preview)%> - -- 2.11.0