From d235aea9ec04fd0e0c8b68719d655f2ba7fc9ffc Mon Sep 17 00:00:00 2001 From: habarnam Date: Tue, 19 Aug 2008 14:10:16 +0300 Subject: [PATCH] * making the css and rss controllers work for real :D --- _res/_libs/tscontrollercss.class.php | 23 ++++++++++++----------- _res/_libs/tscontrollerrss.class.php | 22 +++++++++++----------- _res/_templates_c/.keep | 0 3 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 _res/_templates_c/.keep diff --git a/_res/_libs/tscontrollercss.class.php b/_res/_libs/tscontrollercss.class.php index 20528f2..f8a3bc4 100644 --- a/_res/_libs/tscontrollercss.class.php +++ b/_res/_libs/tscontrollercss.class.php @@ -6,9 +6,9 @@ class tsControllerCss extends tsController { public $themePath; - + private $media = 'screen'; - + /** * the constructor that does it all. * starts output buffering, and initializes different things @@ -16,26 +16,27 @@ class tsControllerCss extends tsController { */ public function __construct(){ ob_start(); - + $this->theme = (!empty($_COOKIE['theme']) ? $_COOKIE['theme'] : DEFAULT_THEME); - if (!empty($_GET)) { - list($this->media) = array_keys($_GET); - } else { - $this->media = 'screen'; - } + + $this->media = tsController::getRequest('do'); + + if (empty($this->media)) + $this->media = 'screen'; + if (!is_file(THEME_PATH. $this->theme . DIRECTORY_SEPARATOR .'_css'. DIRECTORY_SEPARATOR .$this->media.'.css')) { $this->theme = DEFAULT_THEME; $this->media = 'screen'; } - + } - + public function dispatch (){ header('Content-type: text/css'); $out = file_get_contents ( THEME_PATH. $this->theme . DIRECTORY_SEPARATOR .'_css'. DIRECTORY_SEPARATOR .$this->media.'.css'); $this->postDispatch ( $out ); } - + private function postDispatch ($incString){ if (stristr ($_SERVER['HTTP_USER_AGENT'], 'MSIE')) { diff --git a/_res/_libs/tscontrollerrss.class.php b/_res/_libs/tscontrollerrss.class.php index f545c27..b121268 100644 --- a/_res/_libs/tscontrollerrss.class.php +++ b/_res/_libs/tscontrollerrss.class.php @@ -11,36 +11,36 @@ class tsControllerRss extends tsControllerHtml { $this->setTheme(); session_start(); - + $this->connectDb(); } - + protected function connectDb () { $this->db = sqlFactory::connect (DB_TYPE); - + if (defined ('DB_NAME') && DB_NAME && !empty($this->db->link)) { $this->db->selectDatabase(DB_NAME); return true; } return false; } - + public function dispatch (){ $this->db->close(); $this->setTheme(); - + $this->smarty = new Smarty(); - + $this->smarty->compile_check = false; // $this->smarty->debugging = C_SYSTEM_DEBUG; $this->smarty->compile_dir = S_C_TEMPL_DIR; - + if (is_file (PAGE_PATH . $className . DIRECTORY_SEPARATOR . $className . '.tpl')) { $this->smarty->assign('contentFile', PAGE_PATH . $className . DIRECTORY_SEPARATOR . $className . '.tpl'); } else { $this->smarty->assign('contentFile', $this->themePath . DIRECTORY_SEPARATOR . S_TEMPL_DIR . 'tpl404.tpl'); } - + if (is_array($this->varArray)) { $this->smarty->assign ($this->varArray); } @@ -48,14 +48,14 @@ class tsControllerRss extends tsControllerHtml { ob_end_clean(); $this->postDispatch ($this->content); } - + protected function postDispatch ($incString) { header ('Content-Type: application/rss+xml'); echo str_replace( - array ('%TIME%','%QUERIES%', '%MEMUSED%'), + array ('%TIME%','%QUERIES%', '%MEMUSED%'), array ( number_format(microtime (true) - $GLOBALS['st'] , 5, ',', '.'), - $GLOBALS['qCnt'], + $GLOBALS['qCnt'], number_format(memory_get_usage()/1024, 3, ',', '.') ), $incString diff --git a/_res/_templates_c/.keep b/_res/_templates_c/.keep deleted file mode 100644 index e69de29..0000000 -- 2.11.4.GIT