X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Fbookmarklet.php;h=836b920f29558ed854fb5b41d31873b663d0bb57;hp=61af96cddfffcb7a326574a548ea698f230f444c;hb=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hpb=6575e866f3fd1938601432841d80f82e9d259265;ds=sidebyside
diff --git a/nucleus/bookmarklet.php b/nucleus/bookmarklet.php
index 61af96c..836b920 100644
--- a/nucleus/bookmarklet.php
+++ b/nucleus/bookmarklet.php
@@ -25,6 +25,8 @@ $CONF['UsingAdminArea'] = 1;
// include all classes and config data
include('../config.php');
+<<<<<<< HEAD
+=======
// get skin object
$skinid = $member->bookmarklet;
if ( !Skin::existsID($skinid) )
@@ -39,11 +41,16 @@ if ( !Skin::existsID($skinid) )
}
$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');
+>>>>>>> skinnable-master
// check logged-in or pass through
$action = requestVar('action');
if ( !$member->isLoggedIn() )
{
+<<<<<<< HEAD
+ bm_loginAndPassThrough($action);
+=======
bm_loginAndPassThrough($skin, $action);
+>>>>>>> skinnable-master
exit;
}
else if ( $action == 'login')
@@ -63,6 +70,12 @@ else if ( $action == '' )
$action = 'add';
}
+<<<<<<< HEAD
+// send HTTP 1.1 message header for Content-Type
+sendContentType('text/html', 'bookmarklet-' . $action);
+
+=======
+>>>>>>> skinnable-master
// check ticket
$aActionsNotToCheck = array('login', 'add', 'edit');
if ( !in_array($action, $aActionsNotToCheck) )
@@ -129,7 +142,11 @@ function bm_doAddItem($skin)
$extrahead = '';
}
+<<<<<<< HEAD
+ bm_message(_ITEM_ADDED, _ITEM_ADDED, $message,$extrahead);
+=======
bm_message($skin, _ITEM_ADDED, $message,$extrahead);
+>>>>>>> skinnable-master
return;
}
@@ -221,12 +238,19 @@ function bm_doEditItem($skin)
$message = _ITEM_ADDED;
}
+<<<<<<< HEAD
+ return;
+}
+
+function bm_loginAndPassThrough($action='add')
+=======
// show success message
bm_message($skin, _ITEM_ADDED, $message, '');
return;
}
function bm_loginAndPassThrough($skin, $action='add')
+>>>>>>> skinnable-master
{
/*
* TODO: ãããåºåããã
@@ -236,15 +260,41 @@ function bm_loginAndPassThrough($skin, $action='add')
$log_link = requestVar('loglink');
$log_linktitle = requestVar('loglinktitle');
+<<<<<<< HEAD
+ echo "\n";
+ echo "\n";
+ echo "\n";
+ echo "Nucleus CMS Bookmarklet\n";
+
+ bm_style();
+
+ echo "\n";
+ echo "\n";
+ echo '' . _LOGIN_PLEASE . "
\n";
+ echo "\n";
+ echo '' . _POPUP_CLOSE . "
\n";
+ echo "\n";
+ echo "\n";
+=======
*/
$skin->parse('showlogin');
+>>>>>>> skinnable-master
return;
}
@@ -262,7 +312,16 @@ function bm_doShowForm($skin)
{
bm_doError($skin, _ERROR_NOSUCHBLOG);
}
+<<<<<<< HEAD
+ else
+ {
+ $blog =& $manager->getBlog($blogid);
+ }
+
+ if ( !$member->isTeamMember($blogid) )
+=======
else if ( !$member->isTeamMember($blogid) )
+>>>>>>> skinnable-master
{
bm_doError($skin, _ERROR_NOTONTEAM);
}
@@ -286,6 +345,21 @@ function bm_doShowForm($skin)
$logje .= '' . Entity::hsc($log_linktitle) . '';
}
+<<<<<<< HEAD
+ $variables = array();
+ $variables['body'] = $logje;
+ $variables['title'] = Entity::hsc($log_linktitle);
+
+ $handler = new PageFactory($blog);
+ $handler->setVariables($variables);
+
+ $contents = $handler->getTemplateFor('bookmarklet', 'add');
+ $manager->notify('PreAddItemForm', array('contents' => &$contents, 'blog' => &$blog));
+
+ $parser = new Parser($handler);
+ $parser->parse($contents);
+
+=======
$item = array();
$item['body'] = $logje;
$item['title'] = Entity::hsc($log_linktitle);
@@ -308,6 +382,7 @@ function bm_doShowForm($skin)
Admin::$action = 'createitem';
$skin->parse('createitem');
+>>>>>>> skinnable-master
return;
}
@@ -326,21 +401,41 @@ function bm_doEditForm($skin)
bm_doError($skin, _ERROR_DISALLOWED);
}
+<<<<<<< HEAD
+ $variables =& $manager->getItem($itemid, 1, 1);
+=======
+>>>>>>> skinnable-master
$blog =& $manager->getBlog(getBlogIDFromItemID($itemid) );
$item =& $manager->getItem($itemid, 1, 1);
+<<<<<<< HEAD
+ $manager->notify('PrepareItemForEdit', array('item' => &$variables) );
+=======
$data = array(
'blog' => &$blog,
'item' => &$item
);
$manager->notify('PrepareItemForEdit', $data);
+>>>>>>> skinnable-master
if ( $blog->convertBreaks() )
{
- $item['body'] = removeBreaks($item['body']);
- $item['more'] = removeBreaks($item['more']);
+ $variables['body'] = removeBreaks($variables['body']);
+ $variables['more'] = removeBreaks($variables['more']);
}
+<<<<<<< HEAD
+ $handler = new PageFactory($blog);
+ $handler->setVariables($variables);
+
+ $contents = $handler->getTemplateFor('bookmarklet', 'edit');
+
+ $parser = new Parser($handler);
+ $parser->parse($contents);
+
+ return;
+}
+=======
Admin::$blog = &$blog;
Admin::$contents = &$item;
@@ -348,6 +443,7 @@ function bm_doEditForm($skin)
$skin->parse('itemedit');
return;}
+>>>>>>> skinnable-master
function bm_doError($skin, $msg)
{
@@ -357,16 +453,46 @@ function bm_doError($skin, $msg)
function bm_message($skin, $title, $msg, $extrahead = '')
{
+<<<<<<< HEAD
+ echo "\n";
+ echo "\n";
+ echo "\n";
+ echo "{$title}\n";
+
+ bm_style();
+
+ echo $extrahead . "\n";
+ echo "\n";
+ echo "\n";
+ echo "{$head}
\n";
+ echo "{$msg}
\n";
+ echo '' . _POPUP_CLOSE . "
\n";
+ echo "\n";
+ echo "\n";
+=======
Admin::$extrahead = $extrahead;
Admin::$headMess = $msg;
$skin->parse('adminerrorpage');
+>>>>>>> skinnable-master
return;
}
function bm_doContextMenuCode($width=600, $height=500)
{
+<<<<<<< HEAD
+ echo "\n";
+ echo "\n";
+ return;
+}
+
+function bm_doContextMenuCode($width=600, $height=500)
+{
+ global $CONF;
+
+=======
global $CONF;
+>>>>>>> skinnable-master
$blogid = (integer) intGetVar('blogid');
echo "