From 12ec7efe901d5667e26c86e11543010105656d84 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 22 Sep 2010 12:52:34 -0700 Subject: [PATCH] Split Yammer importer files into subdirs before I get too lost adding UI --- plugins/YammerImport/YammerImportPlugin.php | 4 +--- plugins/YammerImport/{ => lib}/sn_yammerclient.php | 0 plugins/YammerImport/{ => lib}/yammerimporter.php | 0 plugins/YammerImport/{ => scripts}/yamdump.php | 2 +- plugins/YammerImport/{ => scripts}/yammer-import.php | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) rename plugins/YammerImport/{ => lib}/sn_yammerclient.php (100%) rename plugins/YammerImport/{ => lib}/yammerimporter.php (100%) rename plugins/YammerImport/{ => scripts}/yamdump.php (90%) rename plugins/YammerImport/{ => scripts}/yammer-import.php (94%) diff --git a/plugins/YammerImport/YammerImportPlugin.php b/plugins/YammerImport/YammerImportPlugin.php index a3520d8a86..79b8260b69 100644 --- a/plugins/YammerImport/YammerImportPlugin.php +++ b/plugins/YammerImport/YammerImportPlugin.php @@ -68,9 +68,7 @@ class YammerImportPlugin extends Plugin switch ($lower) { case 'sn_yammerclient': case 'yammerimporter': - case 'yammerimqueuehandler': - case 'importyammeraction': - require_once "$base/$lower.php"; + require_once "$base/lib/$lower.php"; return false; default: return true; diff --git a/plugins/YammerImport/sn_yammerclient.php b/plugins/YammerImport/lib/sn_yammerclient.php similarity index 100% rename from plugins/YammerImport/sn_yammerclient.php rename to plugins/YammerImport/lib/sn_yammerclient.php diff --git a/plugins/YammerImport/yammerimporter.php b/plugins/YammerImport/lib/yammerimporter.php similarity index 100% rename from plugins/YammerImport/yammerimporter.php rename to plugins/YammerImport/lib/yammerimporter.php diff --git a/plugins/YammerImport/yamdump.php b/plugins/YammerImport/scripts/yamdump.php similarity index 90% rename from plugins/YammerImport/yamdump.php rename to plugins/YammerImport/scripts/yamdump.php index 809baa1223..a358777ad1 100644 --- a/plugins/YammerImport/yamdump.php +++ b/plugins/YammerImport/scripts/yamdump.php @@ -4,7 +4,7 @@ if (php_sapi_name() != 'cli') { die('no'); } -define('INSTALLDIR', dirname(dirname(dirname(__FILE__)))); +define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__))))); require INSTALLDIR . "/scripts/commandline.inc"; diff --git a/plugins/YammerImport/yammer-import.php b/plugins/YammerImport/scripts/yammer-import.php similarity index 94% rename from plugins/YammerImport/yammer-import.php rename to plugins/YammerImport/scripts/yammer-import.php index 4931d1bc52..ac258e1c7d 100644 --- a/plugins/YammerImport/yammer-import.php +++ b/plugins/YammerImport/scripts/yammer-import.php @@ -4,7 +4,7 @@ if (php_sapi_name() != 'cli') { die('no'); } -define('INSTALLDIR', dirname(dirname(dirname(__FILE__)))); +define('INSTALLDIR', dirname(dirname(dirname(dirname(__FILE__))))); require INSTALLDIR . "/scripts/commandline.inc";