summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharly Root <root@muse-sequencer.org>2013-10-07 23:59:55 +0200
committerCharly Root <root@muse-sequencer.org>2013-10-07 23:59:55 +0200
commitd4e28b7d94d7eed6edae05729e14e51b30f87e18 (patch)
tree9dec855d566ec0328906ac2976437351c343f12f
parent7437f8756d445ed8d5aa298d269dbd4950ac3e3c (diff)
mark config with CONFIG_TODO
-rw-r--r--INSTALL4
-rw-r--r--src/BridgeConf.php.example6
-rw-r--r--src/PhpBB3Conf.php2
-rw-r--r--src/PhpBB3Impl.php4
-rw-r--r--src/PhpBB3ToMailman.php2
-rw-r--r--src/attachment_writer.php4
-rw-r--r--src/forum_post_send.php2
-rw-r--r--src/list_post_receive.php2
8 files changed, 14 insertions, 12 deletions
diff --git a/INSTALL b/INSTALL
index c802254..a504a89 100644
--- a/INSTALL
+++ b/INSTALL
@@ -71,7 +71,7 @@ Then, subscribe your bridge address to your mailing list.
direct posts in different forums to different lists; I just happen not
to in my current setup.)
-6. Other adjustments:
+6. Configuration
* Set $php_root_path in PhpBB3Conf.php.
@@ -83,6 +83,8 @@ Then, subscribe your bridge address to your mailing list.
* $attach_dir in attachment_writer.php should match the storage directory
for post attachments for your forum.
+* grep for CONFIG_TODO, change the things
+
* Possibly some that I'm missing? Let me know.
7. TODO:
diff --git a/src/BridgeConf.php.example b/src/BridgeConf.php.example
index e9f3bc4..5b9a27a 100644
--- a/src/BridgeConf.php.example
+++ b/src/BridgeConf.php.example
@@ -1,8 +1,8 @@
<?php
define('DB_HOST', 'localhost');
-define('DB', 'bridge');
-define('DB_USER', 'bridge');
-define('DB_PASS', 'password');
+define('DB', 'phpbb_bridge');
+define('DB_USER', 'phpbb_bridge');
+define('DB_PASS', 'CONFIG_TODO');
?>
diff --git a/src/PhpBB3Conf.php b/src/PhpBB3Conf.php
index 7f023d9..e33c5c9 100644
--- a/src/PhpBB3Conf.php
+++ b/src/PhpBB3Conf.php
@@ -1,5 +1,5 @@
<?php
-$phpbb_root_path = '/var/www/forum/';
+$phpbb_root_path = '/var/www/CONFIG_TODO/';
?>
diff --git a/src/PhpBB3Impl.php b/src/PhpBB3Impl.php
index 06b0427..d2c908b 100644
--- a/src/PhpBB3Impl.php
+++ b/src/PhpBB3Impl.php
@@ -329,9 +329,9 @@ class PhpBB3Impl implements PhpBB3 {
# post the attachment data to our attachment writer shim
require_once(__DIR__ . '/HTTP_POST_multipart.php');
- $url = 'http://www.vassalengine.org/forum/attachment_writer.php';
+ $url = 'http://CONFIG_TODO/attachment_writer.php';
$poster = new HTTP_POST_multipart();
- $poster->addData('password', '5rnudbp7dLkijcwrT@sz');
+ $poster->addData('password', 'CONFIG_TODO: use the same random password here as in attachment_writer.php');
$poster->addFile(1, $physicalFilename, $mimetype, null, 'binary', $data);
$result = $poster->post($url);
diff --git a/src/PhpBB3ToMailman.php b/src/PhpBB3ToMailman.php
index 2ef3c73..2d72af2 100644
--- a/src/PhpBB3ToMailman.php
+++ b/src/PhpBB3ToMailman.php
@@ -63,7 +63,7 @@ class PhpBB3ToMailman {
$userName = $user->data['username'];
$userEmail = $user->data['user_email'];
- $sender = 'forum-bridge@vassalengine.org';
+ $sender = 'forum-bridge@CONFIG_TODO.org';
# determine if we are a reply
$is_reply = $mode == 'reply' || $mode == 'quote';
diff --git a/src/attachment_writer.php b/src/attachment_writer.php
index 5b290d6..eccf641 100644
--- a/src/attachment_writer.php
+++ b/src/attachment_writer.php
@@ -18,8 +18,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-$password = '';
-$attach_dir = '/var/www/forum/files';
+$password = 'CONFIG_TODO use the same random password as in PhpBB3Impl.php';
+$attach_dir = '/var/www/CONFIG_TODO/files';
# All requests should be local, since they come from the list post script.
if ($_SERVER['SERVER_ADDR'] != $_SERVER['REMOTE_ADDR']) {
diff --git a/src/forum_post_send.php b/src/forum_post_send.php
index 894d411..cf76ef5 100644
--- a/src/forum_post_send.php
+++ b/src/forum_post_send.php
@@ -33,7 +33,7 @@ catch (Exception $e) {
function send_post_to_lists($config, $user, $mode, $data, $post_data) {
require_once('Log.php');
- $logger = &Log::singleton('file', '/var/log/listbridge', 'one');
+ $logger = &Log::singleton('file', '/var/log/CONFIG_TODO/log', 'one');
/*
print '<p>';
diff --git a/src/list_post_receive.php b/src/list_post_receive.php
index ba8e2c3..9b0a3cc 100644
--- a/src/list_post_receive.php
+++ b/src/list_post_receive.php
@@ -19,7 +19,7 @@
#
require_once('Log.php');
-$logger = &Log::singleton('file', '/var/log/listbridge', 'one');
+$logger = &Log::singleton('file', '/var/log/CONFIG_TODO/log', 'one');
try {
if (!isset($_POST['message'])) {