37 files changed, 6 insertions, 6 deletions
diff --git a/http/.gitattributes b/.gitattributes
index 7daec9b..7daec9b 100644
--- a/http/.gitattributes
+++ b/.gitattributes
diff --git a/http/cache/.gitignore b/cache/.gitignore
index 72e8ffc..72e8ffc 100644
--- a/http/cache/.gitignore
+++ b/cache/.gitignore
diff --git a/http/cache/.htaccess b/cache/.htaccess
index 3a42882..3a42882 100644
--- a/http/cache/.htaccess
+++ b/cache/.htaccess
diff --git a/http/config.json b/config.json
index f293625..f293625 100644
--- a/http/config.json
+++ b/config.json
diff --git a/http/index.php b/http/index.php
index cf2f636..0a08aed 100644
--- a/http/index.php
+++ b/http/index.php
@@ -1,8 +1,8 @@
 <?php
 
-$config = json_decode(file_get_contents('config.json'), TRUE);
+$config = json_decode(file_get_contents('../config.json'), TRUE);
 
-require_once('codebird-php/src/codebird.php');
+require_once('../lib/codebird-php/src/codebird.php');
 
 \Codebird\Codebird::setConsumerKey($config['key'], $config['secret']);
 \Codebird\Codebird::setBearerToken($config['token']);
@@ -20,7 +20,7 @@ if (preg_match('/^(.*)\/spamfilter$/', $user, $filterMatch)) {
 
 if ($user) {
 
-  $cacheFile = 'cache/'.$user.'.json';
+  $cacheFile = '../cache/'.$user.'.json';
   $cacheTime = file_exists($cacheFile) ? filemtime($cacheFile) : 0;
 
   $content = '';
@@ -81,9 +81,9 @@ if ($user) {
   require_once('smarty3/Smarty.class.php');
 
   $smarty = new Smarty();
-  $smarty->setCacheDir('cache/smarty');
-  $smarty->setCompileDir('cache/smarty/compile');
-  $smarty->setTemplateDir('templates');
+  $smarty->setCacheDir('../cache/smarty');
+  $smarty->setCompileDir('../cache/smarty/compile');
+  $smarty->setTemplateDir('../templates');
 
   $smarty->assign('cacheTime', $cacheTime);
   $smarty->assign('user', $user);
diff --git a/http/codebird-php/.gitattributes b/lib/codebird-php/.gitattributes
index dfe0770..dfe0770 100644
--- a/http/codebird-php/.gitattributes
+++ b/lib/codebird-php/.gitattributes
diff --git a/http/codebird-php/.gitignore b/lib/codebird-php/.gitignore
index db64e73..db64e73 100644
--- a/http/codebird-php/.gitignore
+++ b/lib/codebird-php/.gitignore
diff --git a/http/codebird-php/.travis.yml b/lib/codebird-php/.travis.yml
index 6fe5235..6fe5235 100644
--- a/http/codebird-php/.travis.yml
+++ b/lib/codebird-php/.travis.yml
diff --git a/http/codebird-php/CHANGELOG b/lib/codebird-php/CHANGELOG
index 9eb31a7..9eb31a7 100644
--- a/http/codebird-php/CHANGELOG
+++ b/lib/codebird-php/CHANGELOG
diff --git a/http/codebird-php/CONTRIBUTING.md b/lib/codebird-php/CONTRIBUTING.md
index e6b5c88..e6b5c88 100644
--- a/http/codebird-php/CONTRIBUTING.md
+++ b/lib/codebird-php/CONTRIBUTING.md
diff --git a/http/codebird-php/LICENSE b/lib/codebird-php/LICENSE
index 94a9ed0..94a9ed0 100644
--- a/http/codebird-php/LICENSE
+++ b/lib/codebird-php/LICENSE
diff --git a/http/codebird-php/README.md b/lib/codebird-php/README.md
index ed1e871..ed1e871 100644
--- a/http/codebird-php/README.md
+++ b/lib/codebird-php/README.md
diff --git a/http/codebird-php/bower.json b/lib/codebird-php/bower.json
index 2250042..2250042 100644
--- a/http/codebird-php/bower.json
+++ b/lib/codebird-php/bower.json
diff --git a/http/codebird-php/build.xml b/lib/codebird-php/build.xml
index 7addea7..7addea7 100644
--- a/http/codebird-php/build.xml
+++ b/lib/codebird-php/build.xml
diff --git a/http/codebird-php/composer.json b/lib/codebird-php/composer.json
index cf43f02..cf43f02 100644
--- a/http/codebird-php/composer.json
+++ b/lib/codebird-php/composer.json
diff --git a/http/codebird-php/phpunit.xml b/lib/codebird-php/phpunit.xml
index cd28e1c..cd28e1c 100644
--- a/http/codebird-php/phpunit.xml
+++ b/lib/codebird-php/phpunit.xml
diff --git a/http/codebird-php/phpunit.xml.hhvm b/lib/codebird-php/phpunit.xml.hhvm
index 87e7409..87e7409 100644
--- a/http/codebird-php/phpunit.xml.hhvm
+++ b/lib/codebird-php/phpunit.xml.hhvm
diff --git a/http/codebird-php/src/cacert.pem b/lib/codebird-php/src/cacert.pem
index 5c41faf..5c41faf 100644
--- a/http/codebird-php/src/cacert.pem
+++ b/lib/codebird-php/src/cacert.pem
diff --git a/http/codebird-php/src/codebird.php b/lib/codebird-php/src/codebird.php
index c47996f..c47996f 100644
--- a/http/codebird-php/src/codebird.php
+++ b/lib/codebird-php/src/codebird.php
diff --git a/http/codebird-php/test/README b/lib/codebird-php/test/README
index fd344c4..fd344c4 100644
--- a/http/codebird-php/test/README
+++ b/lib/codebird-php/test/README
diff --git a/http/codebird-php/test/codebirdm.php b/lib/codebird-php/test/codebirdm.php
index 6cbae4a..6cbae4a 100644
--- a/http/codebird-php/test/codebirdm.php
+++ b/lib/codebird-php/test/codebirdm.php
diff --git a/http/codebird-php/test/codebirdt.php b/lib/codebird-php/test/codebirdt.php
index dd54dfc..dd54dfc 100644
--- a/http/codebird-php/test/codebirdt.php
+++ b/lib/codebird-php/test/codebirdt.php
diff --git a/http/codebird-php/test/constant_tests.php b/lib/codebird-php/test/constant_tests.php
index b5404a9..b5404a9 100644
--- a/http/codebird-php/test/constant_tests.php
+++ b/lib/codebird-php/test/constant_tests.php
diff --git a/http/codebird-php/test/curl_tests.php b/lib/codebird-php/test/curl_tests.php
index 71368a0..71368a0 100644
--- a/http/codebird-php/test/curl_tests.php
+++ b/lib/codebird-php/test/curl_tests.php
diff --git a/http/codebird-php/test/detection_tests.php b/lib/codebird-php/test/detection_tests.php
index 4ae6e4e..4ae6e4e 100644
--- a/http/codebird-php/test/detection_tests.php
+++ b/lib/codebird-php/test/detection_tests.php
diff --git a/http/codebird-php/test/environment_test.php b/lib/codebird-php/test/environment_test.php
index 096be65..096be65 100644
--- a/http/codebird-php/test/environment_test.php
+++ b/lib/codebird-php/test/environment_test.php
diff --git a/http/codebird-php/test/media_tests.php b/lib/codebird-php/test/media_tests.php
index 021f58a..021f58a 100644
--- a/http/codebird-php/test/media_tests.php
+++ b/lib/codebird-php/test/media_tests.php
diff --git a/http/codebird-php/test/oauth_tests.php b/lib/codebird-php/test/oauth_tests.php
index 34b10d1..34b10d1 100644
--- a/http/codebird-php/test/oauth_tests.php
+++ b/lib/codebird-php/test/oauth_tests.php
diff --git a/http/codebird-php/test/replyparse_tests.php b/lib/codebird-php/test/replyparse_tests.php
index f1436fd..f1436fd 100644
--- a/http/codebird-php/test/replyparse_tests.php
+++ b/lib/codebird-php/test/replyparse_tests.php
diff --git a/http/codebird-php/test/requestparse_tests.php b/lib/codebird-php/test/requestparse_tests.php
index 279fdda..279fdda 100644
--- a/http/codebird-php/test/requestparse_tests.php
+++ b/lib/codebird-php/test/requestparse_tests.php
diff --git a/http/codebird-php/test/returnformat_tests.php b/lib/codebird-php/test/returnformat_tests.php
index 3d5a3bd..3d5a3bd 100644
--- a/http/codebird-php/test/returnformat_tests.php
+++ b/lib/codebird-php/test/returnformat_tests.php
diff --git a/http/codebird-php/test/setter_tests.php b/lib/codebird-php/test/setter_tests.php
index 982a1b8..982a1b8 100644
--- a/http/codebird-php/test/setter_tests.php
+++ b/lib/codebird-php/test/setter_tests.php
diff --git a/http/codebird-php/test/signing_tests.php b/lib/codebird-php/test/signing_tests.php
index 882964c..882964c 100644
--- a/http/codebird-php/test/signing_tests.php
+++ b/lib/codebird-php/test/signing_tests.php
diff --git a/http/codebird-php/test/singleton_tests.php b/lib/codebird-php/test/singleton_tests.php
index e392c5f..e392c5f 100644
--- a/http/codebird-php/test/singleton_tests.php
+++ b/lib/codebird-php/test/singleton_tests.php
diff --git a/http/templates/.htaccess b/templates/.htaccess
index 3a42882..3a42882 100644
--- a/http/templates/.htaccess
+++ b/templates/.htaccess
diff --git a/http/templates/atom.tpl b/templates/atom.tpl
index e7e28f5..e7e28f5 100644
--- a/http/templates/atom.tpl
+++ b/templates/atom.tpl
diff --git a/http/templates/rss.tpl b/templates/rss.tpl
index f95a462..f95a462 100644
--- a/http/templates/rss.tpl
+++ b/templates/rss.tpl