Browse Source

News admin panel

git-svn-id: svn+ssh://code.netmonsters.ru/svn/majestic/trunk@39 4cb57b5f-5bbd-dd11-951b-001d605cbbc5
master
akulikov 16 years ago
parent
commit
9345b8d27e
  1. 5
      classes/Model.class.php
  2. 14
      classes/Router.class.php
  3. 8
      init/init.inc.php

5
classes/Model.class.php

@ -113,7 +113,10 @@ abstract class Model
function getList($limit = false, $sort = 'ASC') function getList($limit = false, $sort = 'ASC')
{ {
return $this->query('SELECT * FROM '.$this->table.' ORDER BY '.$this->primary_key.' '.($sort == 'ASC' ? 'ASC' : 'DESC').($limit === false ? ' LIMIT '.(int) $limit : ''));
return $this->query('SELECT *
FROM '.$this->table.'
ORDER BY '.$this->primary_key.' '.($sort == 'ASC' ? 'ASC' : 'DESC')
.($limit !== false ? ' LIMIT '.(int) $limit : ''))->fetchAll();
} }
} }

14
classes/Router.class.php

@ -56,10 +56,6 @@ final class Router
*/ */
function proccess($path) function proccess($path)
{ {
if(self::getRewriteBase()){
$path = trim(ltrim($path, self::getRewriteBase()), '/');
}
$path = explode('/', $path); $path = explode('/', $path);
foreach($this->routes as $name => $route) { foreach($this->routes as $name => $route) {
@ -73,16 +69,6 @@ final class Router
throw new StaticPageException(E_404); throw new StaticPageException(E_404);
} }
static public function setRewriteBase($value = '')
{
self::$rewrite_base = $value;
}
static public function getRewriteBase()
{
return self::$rewrite_base;
}
static public function setDefaultDecorator($decorator) static public function setDefaultDecorator($decorator)
{ {
self::$decorator = $decorator.DECORATOR_POSTFIX; self::$decorator = $decorator.DECORATOR_POSTFIX;

8
init/init.inc.php

@ -13,8 +13,12 @@
require('sys.inc.php'); require('sys.inc.php');
$path = explode('?', Env::Server('REQUEST_URI')); $path = explode('?', Env::Server('REQUEST_URI'));
define('MJ_PATH', trim($path[0], '/'));
define('MJ_URL', "/".MJ_PATH."/");
$path = trim($path[0], '/');
define('MJ_URL', '/'.$path.'/');
if (defined('PATH_TRIM') && PATH_TRIM != '' && strpos($path, PATH_TRIM) === 0) {
$path = substr($path, strlen(PATH_TRIM) + 1);
}
define('MJ_PATH', $path);
unset($path); unset($path);
require(CONFIG_PATH.'/routers.inc.php'); require(CONFIG_PATH.'/routers.inc.php');

Loading…
Cancel
Save