diff -r 15a1a28f609a -r 8b3d57a519eb web/common.php --- 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 @@ 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');