Changeset 1127

Timestamp:

02/28/2008 12:44:14 AM (18 years ago)

Author:

sambauers

Message:

Merge exporter improvements into 0.8 branch, small nomenclature change in install log output.

Location:

branches/0.8/bb-admin

Files:

• class-install.php (modified) (1 diff)
• export.php (modified) (4 diffs)

branches/0.8/bb-admin/class-install.php

@@ -1363 +1363 @@
         $installation_log[] = '>>> ' . __('Site address (URL):') . ' ' . $data3['uri']['value'];
         bb_update_option('from_email', $data3['keymaster_user_email']['value']);
-        $installation_log[] = '>>> ' . __('Admin email address:') . ' ' . $data3['keymaster_user_email']['value'];
+        $installation_log[] = '>>> ' . __('From email address:') . ' ' . $data3['keymaster_user_email']['value'];
         
         // Create the key master

branches/0.8/bb-admin/export.php

@@ -1 +1 @@
 <?php
-die('No thieving allowed.');
 
 require_once('../bb-load.php');
 require_once('admin-functions.php');
 
-if ( !bb_current_user_can( 'use_keys' ) )
+define('BB_EXPORT_USERS', 1);
+define('BB_EXPORT_FORUMS', 2);
+define('BB_EXPORT_TOPICS', 4);
+
+// Some example usage of the bitwise export levels (can be defined in bb-config.php)
+//define('BB_EXPORT_LEVEL', BB_EXPORT_USERS);
+//define('BB_EXPORT_LEVEL', BB_EXPORT_USERS + BB_EXPORT_FORUMS);
+//define('BB_EXPORT_LEVEL', BB_EXPORT_USERS + BB_EXPORT_FORUMS + BB_EXPORT_TOPICS);
+
+if ( !defined('BB_EXPORT_LEVEL') )
+    define('BB_EXPORT_LEVEL', 0);
+
+if ( !BB_EXPORT_LEVEL || !bb_current_user_can( 'use_keys' ) )
     bb_die( __('No thieving allowed.') );
 
@@ -55 +66 @@
     $r = array();
     foreach ( $translate as $prop => $export ) {
-        if ( '?' == $export{0} && !$data[$prop] || false === $export ) {
+        if ( '?' == $export{0} ) {
+            $export = substr($export, 1);
+            if ( !$data[$prop] ) {
+                unset($data[$prop]);
+                continue;
+            }
+        }
+        if ( false === $export ) {
             unset($data[$prop]);
-            $export = substr($export, 1);
             continue;
         }
@@ -116 +133 @@
 
     $translate = array(
-        'forum_name' => '!title',
-        'forum_desc' => '?!content'
+        'forum_name'   => '!title',
+        'forum_desc'   => '?!content',
+        'forum_parent' => '?parent'
     );
 
@@ -247 +265 @@
     echo "<forums-data version='0.75'>\n";
 
-    $page = 1;
-    while ( ( $users = bb_user_search( array('page' => $page++) ) ) && !is_wp_error( $users ) ) {
-        foreach ( $users as $user )
-            echo bb_export_user( $user->ID );
-        $bb_user_cache = array(); // For the sake of memory
-    }
-    unset($users, $user_ids, $user_id);
-
-    $forums = get_forums();
-    foreach ( $forums as $forum )
-        echo bb_export_forum( $forum->forum_id );
-    unset($forums, $forum);
-
-    $page = 1;
-    while ( false && $topics = get_latest_topics( 0, $page++ ) ) {
-        foreach ( $topics as $topic )
-            echo bb_export_topic( $topic->topic_id );
-        $bb_topic_cache = array();
-    }
-    unset($topics, $topic, $page);
+    if (BB_EXPORT_LEVEL & BB_EXPORT_USERS) {
+        $page = 1;
+        while ( ( $users = bb_user_search( array('page' => $page++) ) ) && !is_wp_error( $users ) ) {
+            foreach ( $users as $user )
+                echo bb_export_user( $user->ID );
+            $bb_user_cache = array(); // For the sake of memory
+        }
+        unset($users, $user_ids, $user_id, $page);
+    }
+
+    if (BB_EXPORT_LEVEL & BB_EXPORT_FORUMS) {
+        $forums = get_forums();
+        foreach ( $forums as $forum )
+            echo bb_export_forum( $forum->forum_id );
+        unset($forums, $forum);
+    }
+
+    if (BB_EXPORT_LEVEL & BB_EXPORT_TOPICS) {
+        $page = 1;
+        while ( $topics = get_latest_topics( 0, $page++ ) ) {
+            foreach ( $topics as $topic )
+                echo bb_export_topic( $topic->topic_id );
+            $bb_topic_cache = array();
+        }
+        unset($topics, $topic, $page);
+    }
 
     do_action( 'bb_export' );