ADD/FIX/CHANGE/REMOVE: スキン・テンプレート表示処理の改良

[nucleus-jp/nucleus-next.git] / nucleus / convert / livejournal.php

diff --git a/nucleus/convert/livejournal.php b/nucleus/convert/livejournal.php
index f46788e..735c988 100644 (file)
--- a/nucleus/convert/livejournal.php
+++ b/nucleus/convert/livejournal.php
@@ -149,7 +149,7 @@ function bc_assignMembers() {
                <tr>
                        <td>
                                <b>default</b>
-                               <input name="default" value="default" type="hidden"
+                               <input name="default" value="default" type="hidden" />
                        </td>
                        <td>
                <?php
@@ -157,7 +157,7 @@ function bc_assignMembers() {
                                   . " FROM ".sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
-                       showlist($query,'select',$template);
+                       echo showlist($query,'select',$template);
                ?>
                        </td>
                        <td>
@@ -187,7 +187,7 @@ function bc_assignMembers() {
                                                   . " FROM ".sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                        ?>
                </div>
                <div>
@@ -200,7 +200,7 @@ function bc_assignMembers() {
                                                   . " FROM ".sql_table('member');
 
                                        $template['name'] = 'newowner';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                                </li>
                        </ul>
@@ -226,7 +226,7 @@ function bc_assignMembers() {
 
 
 function bc_doConversion() {
-       global $HTTP_POST_VARS;
+       global $HTTP_POST_VARS, $manager;
 
        // 1. get all data
        $authorcount = intval($HTTP_POST_VARS['authorcount']);
@@ -278,9 +278,9 @@ function bc_doConversion() {
        if ($createnew == 1) {
                // choose unique name
                $shortname = 'blogger';
-               if (BLOG::exists($shortname)) {
+               if (Blog::exists($shortname)) {
                        $idx = 1;
-                       while (BLOG::exists($shortname . $idx))
+                       while (Blog::exists($shortname . $idx))
                                $idx++;
                        $shortname = $shortname . $idx;
                }
@@ -290,7 +290,7 @@ function bc_doConversion() {
        }
 
        // add authors to blog team
-       $b = new BLOG($nucleus_blogid);
+       $b =& $manager->getBlog($nucleus_blogid);
        global $catid;
        $catid = $b->getDefaultCategory();
 
@@ -327,7 +327,7 @@ function bc_convertOneItem($row, $memberid, $nucleus_blogid) {
        $timestamp = date("Y-m-d H:i:s",bc_transformDate($row['eventtime']));
 
        echo "<pre>";
-       echo "<b>entry</b>:" .  ENTITY::hsc(substr($row['event'],0,20)) . "...(time: " . $timestamp . ") \n";
+       echo "<b>entry</b>:" .  Entity::hsc(substr($row['event'],0,20)) . "...(time: " . $timestamp . ") \n";
        echo "<b>author</b>: " . $row['author'] ;
        echo " (nucleus-id: " . $nucl_id . ")";
        echo "</pre>";