From a0b2d09125d7911656fe4cb286f20643c4432281 Mon Sep 17 00:00:00 2001 From: Marek Laane Date: Sun, 12 Oct 2014 10:54:11 +0300 Subject: Updated Estonian translation --- lib/pinq/App.php | 31 ----- lib/pinq/Cache.php | 55 -------- lib/pinq/Controller.php | 270 --------------------------------------- lib/pinq/templates/analytics.tpl | 13 -- lib/pinq/templates/layout.tpl | 22 ---- 5 files changed, 391 deletions(-) delete mode 100644 lib/pinq/App.php delete mode 100644 lib/pinq/Cache.php delete mode 100644 lib/pinq/Controller.php delete mode 100644 lib/pinq/templates/analytics.tpl delete mode 100644 lib/pinq/templates/layout.tpl (limited to 'lib/pinq') diff --git a/lib/pinq/App.php b/lib/pinq/App.php deleted file mode 100644 index 587b47a86..000000000 --- a/lib/pinq/App.php +++ /dev/null @@ -1,31 +0,0 @@ - - * @link http://www.mageia.org/ - * - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU GPL v2+ - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License aspublished by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. -*/ - - -/** -*/ -abstract class Pinq_App -{ - function __construct($controller, $options) - { - $this->_control = $controller; - $this->_options = $options; - } - - abstract function run(); -} \ No newline at end of file diff --git a/lib/pinq/Cache.php b/lib/pinq/Cache.php deleted file mode 100644 index 8a5a3d4d1..000000000 --- a/lib/pinq/Cache.php +++ /dev/null @@ -1,55 +0,0 @@ - - * @link http://www.mageia.org/ - * - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU GPL v2+ - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License aspublished by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. -*/ - -abstract class Pinq_Cache -{ - abstract public function __construct(); - - /** - * @param string $key - * - * @return mixed - */ - abstract public function get($key); - - /** - * @param mixed $value - * @param string $key - * @param integer $timeout - */ - abstract public function set($value, $key, $timeout = 0); -} - -class Pinq_Memcache_Cache extends Pinq_Cache -{ - - public function __construct($timeout = 0) - { - $this->timeout = $timeout; - } - - public function get($key) - { - - } - - public function set($value, $key, $timeout = 0) - { - $timeout = $timeout > 0 ? $timeout : $this->timeout; - } -} \ No newline at end of file diff --git a/lib/pinq/Controller.php b/lib/pinq/Controller.php deleted file mode 100644 index af82c3b0d..000000000 --- a/lib/pinq/Controller.php +++ /dev/null @@ -1,270 +0,0 @@ - - * @link http://www.mageia.org/ - * - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU GPL v2+ - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License aspublished by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. -*/ - -/** -*/ -class Pinq_Controller -{ - /** - * @param string $dir root application directory - * @param array $server $_SERVER array - * - */ - public function __construct($dir, $server) - { - $this->_app_root = $dir; - $this->_server = $server; - } - - /** - */ - public static function run($app_root, $routes, $_server, $cache) - { - $pc = new self($app_root, $_server); - $pc->init(); - - if (isset($cache) - && $res = $cache->get($pc->get_cache_key())) { - - } else { - $res = $pc->_run($routes); - - if (isset($cache) - && isset($res['cache']) - && $res['cache'] > 0) { - - $cache->set($res, $pc->cache_key()); - } - } - - $pc->publish($res); - unset($pc); - } - - /** - */ - public function init() - { - $this->method = $this->_server['REQUEST_METHOD']; - $this->uri = $this->_server['REQUEST_URI']; - - if (strpos('?', $this->uri) !== false) { - $uri = explode('?', $this->uri); - $this->query = $uri[1]; - $this->uri = $uri[0]; - } - } - - /** - */ - public function get_cache_key() - { - return sha1(implode('#', array($this->method, $this->uri))); - } - - /** - * Prints document headers and contents. - * It _expects_ $res to be correctly formatted. - * - * @param array $res as returned by self::_run() - * - * @return void - */ - public function publish($res) - { - //$res['statuts'] - // Content-Length must match buffer + body - foreach ($res['headers'] as $h => $v) { - header($h); - } - echo $res['buffer']; - echo $res['body']; - } - - /** - * @param array $routes - * - * @return boolean - */ - private function _run($routes = null) - { - // static, image files are expected to be served directly by the server. - $ret = array( - 'body' => '', - 'buffer' => '', - 'cache' => 0, - 'headers' => array() - ); - - // detect path language; if not set, redirect to best fallback language (English for now), end - $this->lang = $this->get_request_language($this->uri); - - if (!$this->lang_is_managed($this->lang)) { - // TODO - ignore, with a special code or redirect? - $this->lang = 'en'; - } - - // TODO ob_start, etc.? - - if ($app = $this->matches_route($this->uri, $routes)) { - // 1. - $ret = $this->delegate_to($app); - } elseif (false) { // TODO - // 2. - // delegate to local script - // TODO look at local code at $uri, and decide if we can/should load it and decorate it. How? - } elseif ($this->fallback_to_previous_mode($this->uri, $this->lang)) { - // 3. - // finally, act as we used to before - } else { - // 4. - // if nothing matched, well... - $ret = $this->delegate_to('error', array('code' => '404')); - } - - return $ret; - } - - /** - * @param string $uri - * @param array $routes - * - * @return string - */ - private function matches_route($uri, $routes) - { - $re = ' - / - \/(([a-zA-Z\-\_]{2,5})\/)? - (.*) - /x'; - - if (preg_match_all($re, $uri, $matches)) { - $this->_lang = $matches[2][0]; - $this->_path = $matches[3][0]; - } - - if (is_array($routes) && count($routes) > 0) { - foreach ($routes as $r => $app) { - $re = '/' . $r . '/'; - if (preg_match_all($re, $uri, $m)) { - return $app; - } - } - } - - return null; - } - - /** - * @param string $uri - * - * @return string - */ - function get_request_language($uri) - { - $tu = explode('/', $uri); - $lang = $tu[1]; - $sl = strlen($lang); - if ($this->lang_exists($lang)) { - return $lang; - } - - return null; - } - - /** - */ - function lang_exists($lang) - { - // is it a valid language code? ll[-cc] or ll[_CC]? - return true; - } - - /** - */ - function lang_is_managed($lang) - { - // in managed languages array? - return true; - } - - /** - * @param string $app_name - * - * @return boolean - */ - private function delegate_to($app_name, $options = null) - { - $app_cont = realpath(sprintf('%s/apps/%s/%s_app.php', $this->_app_root, $app_name, $app_name)); - if (!file_exists($app_cont)) { - throw new Exception(sprintf('Expected "%s" app, found no definition file.', $app_name)); - } - - include $app_cont; - $a = new $app_name($this, $options); - - return $a->run(); - } - - /** - * @return boolean true if fallback happened - */ - function fallback_to_previous_mode($uri, $lang) - { - $uri = explode('?', $uri); - $qs = count($uri) > 1 ? $uri[1] : null; - $uri = $uri[0]; - - $alt_uri = sprintf( - '/%s/%s', - 'en', - substr($uri, strlen($lang) + 2) - ); - - $test_uris = array( - $uri, - $uri . 'index.php', - $uri . 'index.html', - $alt_uri, - $alt_uri . 'index.php', - $alt_uri . 'index.html' - ); - - $found = false; - - foreach ($test_uris as $inc_uri) { - - $real_file = realpath($this->_app_root . $inc_uri); - if (file_exists($real_file) && !is_dir($real_file)) { - - $found = true; - break; - } - } - - if ($found) { - chdir(dirname($real_file)); - require $real_file; - return true; - } - - return false; - } - -} diff --git a/lib/pinq/templates/analytics.tpl b/lib/pinq/templates/analytics.tpl deleted file mode 100644 index 81ee4ce38..000000000 --- a/lib/pinq/templates/analytics.tpl +++ /dev/null @@ -1,13 +0,0 @@ - - \ No newline at end of file diff --git a/lib/pinq/templates/layout.tpl b/lib/pinq/templates/layout.tpl deleted file mode 100644 index 9e0c2abc5..000000000 --- a/lib/pinq/templates/layout.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {block name=page_title}{/block} - - - - - - - {block name=more_meta}{/block} - - - - {include file="nav.tpl"} - - {block name=body}{/block} - - {include file='analytics.tpl'} - - \ No newline at end of file -- cgit v1.2.1