--- a/web/common.php Fri Jun 15 08:40:12 2018 +0000
+++ b/web/common.php Mon Jun 18 23:15:34 2018 +0200
@@ -1,14 +1,9 @@
<?php
-/**
- * If you haven't edited php.ini to add the Zend Framework and the
- * Zend Framework Incubator to the PHP include_path, then do so here.
- * Don't use mine!
- */
-set_include_path(
- 'lib'
- . PATH_SEPARATOR . get_include_path()
-);
+// composer autoload files
+require __DIR__ . '/vendor/autoload.php';
+
+use Abraham\TwitterOAuth\TwitterOAuth;
/**
* Base configuration
@@ -83,17 +78,6 @@
/**
- * Make sure Zend_Oauth's Consumer is loaded
- */
-require_once dirname(__FILE__).'/lib/Zend/Oauth/Consumer.php';
-
-/** Zend_Locale */
-require_once dirname(__FILE__).'/lib/Zend/Locale.php';
-
-/** Zend_Translate_Adapter */
-require_once dirname(__FILE__).'/lib/Zend/Translate/Adapter.php';
-
-/**
* Start up the ol' session engine
*/
session_start();
@@ -104,13 +88,21 @@
include_once dirname(__FILE__).'/config.php';
-$configuration['callbackUrl'] = URL_ROOT."$req_rep/callback.php";
+$get_twitter_request_token = function () use ($req_rep) {
+ $twitterClient = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+ $token = $twitterClient->oauth('oauth/request_token', array('oauth_callback' => URL_ROOT."callback.php?rep=$req_rep"));
+
+ $_SESSION['TWITTER_REQUEST_TOKEN'] = serialize($token);
-/**
- * Setup an instance of the Consumer for use
- */
-$consumer = new Zend_Oauth_Consumer($configuration);
+ /**
+ * Now redirect user to Twitter site so they can log in and
+ * approve our access
+ */
+ $url = $twitterClient->url('oauth/authorize', array('oauth_token' => $token['oauth_token']));
+ header("Location: ".$url);
+ die();
+};
/**
* TRADUCTION
@@ -164,12 +156,9 @@
}
-Zend_Loader::loadClass('Zend_Translate');
-Zend_Loader::loadClass('Zend_Http_Cookie');
-
-
-$client = new Zend_Http_Client();
-$translate = new Zend_Translate('array', $init, 'fr');
+// use Translator;
+include './Translator.php';
+$translate = new Translator();
$translate->addTranslation($traduction_en, 'en');
@@ -177,20 +166,11 @@
$translate->addTranslation($traduction_fr, 'fr');
if(isset($config)) {
-
set_config_translations($config, $translate);
-// $config_translations = get_config_translations($config);
-
-
-// $translate->addTranslation($config_translations['en'], 'en');
-// $translate->addTranslation($config_translations['jp'], 'ja_JP');
-// $translate->addTranslation($config_translations['fr'], 'fr');
}
$actual = $translate->getLocale();
-//$translate->setLocale("en");
-// $acceptCookie = $this->_request->getCookie('acceptCookie',0);
if(isset($_GET['lang'])==false and isset($_SESSION['lang'])==false){
@@ -481,18 +461,7 @@
include("$basepath$rep/config.php");
set_config_translations($config, $translate);
-/* $config_translations = get_config_translations($config);
-// save the locale because it gets changed when adding translations
- $locale = $translate->getLocale();
-
- $translate->addTranslation($config_translations['en'], 'en');
- $translate->addTranslation($config_translations['jp'], 'ja_JP');
- $translate->addTranslation($config_translations['fr'], 'fr');
-
-// set the locale back
- $translate->setLocale($locale);
- */
$id = "abox_$rep".(($metadata!=null)?"_$metadata":"");
$hash = ($metadata!=null)?"#metadata=$metadata":"";
$tail_img = $translate->_('config__archive_img');