OSDN Git Service

Merge branch 'skinnable-master'
[nucleus-jp/nucleus-next.git] / nucleus / bookmarklet.php
index 61af96c..836b920 100644 (file)
@@ -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 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+       echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+       echo "<head>\n";
+       echo "<title>Nucleus CMS Bookmarklet</title>\n";
+       
+       bm_style();
+       
+       echo "</head>\n";
+       echo "<body>\n";
+       echo '<h1>' . _LOGIN_PLEASE . "</h1>\n";
+       echo "<form method=\"post\" action=\"bookmarklet.php\">\n";
+       echo "<p>\n";
+       echo _LOGINFORM_NAME . "<input type=\"text\" name=\"login\" value=\"\" /><br />\n";
+       echo _LOGINFORM_PWD . "<input type=\"password\" name=\"password\" value=\"\" /><br />\n";
+=======
+>>>>>>> skinnable-master
        echo '<input type="hidden" name="blogid" value="' . Entity::hsc($blogid). '" />' . "\n";
        echo '<input type="hidden" name="itemid" value="' . Entity::hsc($itemid). '" />' . "\n";
        echo '<input type="hidden" name="logtext" value="' . Entity::hsc($log_text) . '" />' . "\n";
        echo '<input type="hidden" name="loglink" value="' . Entity::hsc($log_link) . '" />' . "\n";
        echo '<input type="hidden" name="loglinktitle" value="' . Entity::hsc($log_linktitle) . '" />' . "\n";
        echo "<input type=\"hidden\" name=\"nextaction\" value=\"{$action}\" />\n";
+<<<<<<< HEAD
+       echo '<button type="submit" name="action" value="login">' . _LOGIN . "</button>\n";
+       echo "</p>\n";
+       echo "</form>\n";
+       echo '<p><a href="bookmarklet.php" onclick="window.close();">' . _POPUP_CLOSE . "</a></p>\n";
+       echo "</body>\n";
+       echo "</html>\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 .= '<a href="' . Entity::hsc($log_link) . '">' . Entity::hsc($log_linktitle) . '</a>';
        }
        
+<<<<<<< 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 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+       echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+       echo "<head>\n";
+       echo "<title>{$title}</title>\n";
+       
+       bm_style();
+       
+       echo $extrahead . "\n";
+       echo "</head>\n";
+       echo "<body>\n";
+       echo "<h1>{$head}</h1>\n";
+       echo "<p>{$msg}</p>\n";
+       echo '<p><a href="bookmarklet.php" onclick="window.close();window.opener.location.reload();">' . _POPUP_CLOSE . "</a></p>\n";
+       echo "</body>\n";
+       echo "</html>\n";
+=======
        Admin::$extrahead = $extrahead;
        Admin::$headMess = $msg;
        $skin->parse('adminerrorpage');
+>>>>>>> skinnable-master
        
        return;
 }
 
 function bm_doContextMenuCode($width=600, $height=500)
 {
+<<<<<<< HEAD
+       echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/bookmarklet.css\" />\n";
+       echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/addedit.css\" />\n";
+       return;
+}
+
+function bm_doContextMenuCode($width=600, $height=500)
+{
+       global $CONF;
+       
+=======
        global $CONF;   
+>>>>>>> skinnable-master
        $blogid = (integer) intGetVar('blogid');
        
        echo "<script type=\"text/javascript\" defer=\"defer\">\n";