);\r
/*\r
// the rest of the actions needs to be checked\r
- $aActionsToCheck = array('additem', 'itemupdate', 'itemmoveto', 'categoryupdate', 'categorydeleteconfirm', 'itemdeleteconfirm', 'commentdeleteconfirm', 'teamdeleteconfirm', 'memberdeleteconfirm', 'templatedeleteconfirm', 'skindeleteconfirm', 'banlistdeleteconfirm', 'plugindeleteconfirm', 'batchitem', 'batchcomment', 'batchmember', 'batchcategory', 'batchteam', 'regfile', 'commentupdate', 'banlistadd', 'changemembersettings', 'clearactionlog', 'settingsupdate', 'blogsettingsupdate', 'categorynew', 'teamchangeadmin', 'teamaddmember', 'memberadd', 'addnewlog', 'addnewlog2', 'backupcreate', 'backuprestore', 'pluginup', 'plugindown', 'pluginupdate', 'pluginadd', 'pluginoptionsupdate', 'skinupdate', 'skinclone', 'skineditgeneral', 'templateclone', 'templatenew', 'templateupdate', 'skinieimport', 'skinieexport', 'skiniedoimport', 'skinnew', 'deleteblogconfirm', 'sendping', 'rawping', 'activatesetpwd');\r
+ $aActionsToCheck = array('additem', 'itemupdate', 'itemmoveto', 'categoryupdate', 'categorydeleteconfirm', 'itemdeleteconfirm', 'commentdeleteconfirm', 'teamdeleteconfirm', 'memberdeleteconfirm', 'templatedeleteconfirm', 'skindeleteconfirm', 'banlistdeleteconfirm', 'plugindeleteconfirm', 'batchitem', 'batchcomment', 'batchmember', 'batchcategory', 'batchteam', 'regfile', 'commentupdate', 'banlistadd', 'changemembersettings', 'clearactionlog', 'settingsupdate', 'blogsettingsupdate', 'categorynew', 'teamchangeadmin', 'teamaddmember', 'memberadd', 'addnewlog', 'addnewlog2', 'backupcreate', 'backuprestore', 'pluginup', 'plugindown', 'pluginupdate', 'pluginadd', 'pluginoptionsupdate', 'skinupdate', 'skinclone', 'skineditgeneral', 'templateclone', 'templatenew', 'templateupdate', 'skinieimport', 'skinieexport', 'skiniedoimport', 'skinnew', 'deleteblogconfirm', 'activatesetpwd');\r
*/\r
if (!in_array($this->action, $aActionsNotToCheck))\r
{\r
} else {\r
$timestamp =0;\r
}\r
- $doping = ($publish && $timestamp < $blog->getCorrectTime()) ? 1 : 0;\r
\r
// edit the item for real\r
ITEM::update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp);\r
ITEM::delete($draftid);\r
}\r
\r
- if (!$closed && $doping && numberOfEventSubscriber('SendPing') > 0) {\r
- $this->action_sendping($blogid);\r
- return;\r
- }\r
-\r
// show category edit window when we created a new category\r
// ($catid will then be a new category ID, while postVar('catid') will be 'newcat-x')\r
if ($catid != intPostVar('catid')) {\r
* Adds a item to the chosen blog\r
*/\r
function action_additem() {\r
- global $member, $manager, $CONF;\r
+ global $manager, $CONF;\r
\r
$manager->loadClass('ITEM');\r
\r
$btimestamp = $blog->getCorrectTime();\r
$item = $manager->getItem(intval($result['itemid']), 1, 1);\r
\r
- // TODO: ED$ should be skipping to itemlist always eventually\r
- if (!$item['draft'] && $item['timestamp'] <= $btimestamp) {\r
- $nextAction = 'sendping';\r
- } else {\r
- $nextAction = 'itemlist';\r
- }\r
-\r
if ($result['status'] == 'newcategory') {\r
- $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=' . $nextAction . '&blogid=' . intval($blogid));\r
+ $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . intval($blogid));\r
$this->action_categoryedit($result['catid'], $blogid, $distURI);\r
} else {\r
- $methodName = 'action_' . $nextAction;\r
+ $methodName = 'action_itemList';\r
call_user_func(array(&$this, $methodName), $blogid);\r
}\r
}\r
\r
/**\r
- * Shows a window that says we're about to ping.\r
- * immediately refresh to the real pinging page, which will\r
- * show an error, or redirect to the blog.\r
- *\r
- * @param int $blogid ID of blog for which ping needs to be sent out\r
- */\r
- function action_sendping($blogid = -1) {\r
- global $member, $manager;\r
-\r
- if ($blogid == -1)\r
- $blogid = intRequestVar('blogid');\r
-\r
- $member->isLoggedIn() or $this->disallow();\r
-\r
- $rawPingUrl = $manager->addTicketToUrl('index.php?action=rawping&blogid=' . intval($blogid));\r
-\r
- $this->pagehead('<meta http-equiv="refresh" content="1; url='.htmlspecialchars($rawPingUrl).'" />');\r
- echo _UPDATEDPING_MESSAGE;\r
- ?>\r
- <a href="index.php?action=rawping&blogid=<?php echo $blogid?>"><?php echo _UPDATEDPING_GOPINGPAGE ?></a>\r
- </p>\r
- <?php\r
- $this->pagefoot();\r
- }\r
-\r
- /**\r
- * Sends the real ping (can take up to 10 seconds!)\r
- */\r
- function action_rawping() {\r
- global $manager;\r
- // TODO: checks?\r
-\r
- $blogid = intRequestVar('blogid');\r
- $blog =& $manager->getBlog($blogid);\r
-\r
- $this->pagehead();\r
-\r
- ?>\r
-\r
- <h2><?php echo _UPDATEDPING_PINGING ?></h2>\r
- <div class='note'>\r
- <?php\r
-\r
- // send sendPing event\r
- $manager->notify('SendPing', array('blogid' => $blogid));\r
-\r
- ?>\r
- </div>\r
-\r
- <ul>\r
- <li><a href="index.php?action=itemlist&blogid=<?php echo $blog->getID()?>"><?php echo _UPDATEDPING_VIEWITEM . htmlspecialchars($blog->getName())?></a></li>\r
- <li><a href="<?php echo $blog->getURL()?>"><?php echo _UPDATEDPING_VISITOWNSITE ?></a></li>\r
- </ul>\r
-\r
- <?php $this->pagefoot();\r
- }\r
-\r
- /**\r
* Allows to edit previously made comments\r
*/\r
function action_commentedit() {\r
$pwdvalid = true;\r
$pwderror = '';\r
$manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));\r
- if (!pwdvalid) {\r
+ if (!$pwdvalid) {\r
$this->error($pwderror);\r
}\r
}\r
$pwdvalid = true;\r
$pwderror = '';\r
$manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));\r
- if (!pwdvalid) {\r
+ if (!$pwdvalid) {\r
return $this->_showActivationPage($key,$pwderror);\r
}\r
\r
\r
$catid = intval($catid);\r
\r
- $manager->notify('PreDeleteCategory', array('catid' => $catid));\r
-\r
$blogid = getBlogIDFromCatID($catid);\r
\r
if (!$member->blogAdminRights($blogid))\r
if (sql_num_rows($res) == 1)\r
return _ERROR_DELETELASTCATEGORY;\r
\r
+ $manager->notify('PreDeleteCategory', array('catid' => $catid));\r
+\r
// change category for all items to the default category\r
$query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";\r
sql_query($query);\r
$blog =& $manager->getBlog($blogid);\r
\r
// create new category\r
+\r
+\r
$sql = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, "%s", "%s")';\r
sql_query(sprintf($sql, sql_table('category'), $blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC));\r
+\r
// sql_query('INSERT INTO '.sql_table('category')." (cblog, cname, cdesc) VALUES ($blogid, _EBLOGDEFAULTCATEGORY_NAME, _EBLOGDEFAULTCATEGORY_DESC)");\r
$catid = sql_insert_id();\r
\r
sql_query($query);\r
\r
\r
+\r
+\r
+\r
+\r
$blog->additem($blog->getDefaultCategory(),_EBLOG_FIRSTITEM_TITLE,_EBLOG_FIRSTITEM_BODY,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);\r
\r
+\r
$manager->notify(\r
'PostAddBlog',\r
array(\r
?>\r
\r
\r
- <div style="width:100%;">\r
<form method="post" action="index.php">\r
<div>\r
\r
echo '<br />' . _SKINEDIT_ALLOWEDTEMPLATESS;\r
$query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');\r
showlist($query,'table',array('content'=>'shortnames'));\r
- echo '</div></form></div>';\r
+ echo '</div></form>';\r
$this->pagefoot();\r
}\r
\r
if ($iPrevPid != $aOption['pid']) {\r
$iPrevPid = $aOption['pid'];\r
\r
+\r
+\r
echo '<tr><th colspan="2">'.sprintf(_PLUGIN_OPTIONS_TITLE, htmlspecialchars($aOption['pfile']. ENT_QUOTES)).'</th></tr>';\r
}\r
\r
OSDN Git Service
