Menu
▾
▴
sciret-svn — The subversion commit mailing list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(58) |
Sep
(44) |
Oct
(7) |
Nov
(4) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
(55) |
Sep
(48) |
Oct
(56) |
Nov
(14) |
Dec
|
|
From: <al...@us...> - 2008-07-08 03:37:23
|
Revision: 605
http://sciret.svn.sourceforge.net/sciret/?rev=605&view=rev
Author: alpeb
Date: 2008-07-07 20:37:22 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
slowly moving to zend framework
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/actions/Login.php
Modified: branches/release-candidates/sciret-1.2/actions/Login.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/Login.php 2008-07-08 03:37:05 UTC (rev 604)
+++ branches/release-candidates/sciret-1.2/actions/Login.php 2008-07-08 03:37:22 UTC (rev 605)
@@ -9,20 +9,23 @@
* @packager TheGang
*/
-require 'actions/Action.php';
-
class Login extends Action {
function dispatch() {
- require 'models/UserGateway.php';
- $userGateway = new UserGateway;
- if (!$user = $userGateway->getValidatedUser($_POST['username'], $_POST['password'], $this->configuration)) {
+ $auth = Zend_Auth::getInstance();
+ $db = Zend_Db::factory(Zend_Registry::get('config')->database);
+ $authAdapter = new Zend_Auth_Adapter_DbTable($db, 'users', 'username', 'password', 'MD5(?)');
+ $authAdapter->setIdentity($_POST['username'])
+ ->setCredential($_POST['password']);
+ $result = $auth->authenticate($authAdapter);
+ if ($result->isValid()) {
+ $user = UserGateway::getValidatedUser($_POST['username'], $_POST['password'], $this->configuration);
+ $auth->getStorage()->write($user);
+ } else {
$_SESSION['message'] = $this->user->lang('Wrong Username or Password');
Library::redirect(Library::getLink(array('view' => 'Login')));
}
- $_SESSION['userId'] = $user->getId();
-
if ($user->isPasswordExpired($this->configuration->getConfigValue('passwordExpirationDays'))) {
$_SESSION['message'] = $this->user->lang('Your password has expired. Please change it below.');
Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId())));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:37:07
|
Revision: 604
http://sciret.svn.sourceforge.net/sciret/?rev=604&view=rev
Author: alpeb
Date: 2008-07-07 20:37:05 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
use class constants instead of global constants
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/actions/DeleteArticle.php
branches/release-candidates/sciret-1.2/actions/SaveArticle.php
branches/release-candidates/sciret-1.2/actions/SavePreferences.php
Modified: branches/release-candidates/sciret-1.2/actions/DeleteArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/DeleteArticle.php 2008-07-08 03:36:20 UTC (rev 603)
+++ branches/release-candidates/sciret-1.2/actions/DeleteArticle.php 2008-07-08 03:37:05 UTC (rev 604)
@@ -20,7 +20,7 @@
if ($this->configuration->getConfigValue('restrictEditDelete')) {
$article = new Article($artId);
- if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & ROLE_ADMIN) != ROLE_ADMIN) {
+ if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & User::ROLE_ADMIN) != User::ROLE_ADMIN) {
$_SESSION['message'] = $this->user->lang('Sorry, only the author or an admin can delete this article.');
Library::redirect(Library::getLink(array('view' => 'ViewArticle', 'id' => $artId)));
}
Modified: branches/release-candidates/sciret-1.2/actions/SaveArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/SaveArticle.php 2008-07-08 03:36:20 UTC (rev 603)
+++ branches/release-candidates/sciret-1.2/actions/SaveArticle.php 2008-07-08 03:37:05 UTC (rev 604)
@@ -20,7 +20,7 @@
if ($articleId > 0 && $this->configuration->getConfigValue('restrictEditDelete')) {
$article = new Article($articleId);
- if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & ROLE_ADMIN) != ROLE_ADMIN) {
+ if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & User::ROLE_ADMIN) != User::ROLE_ADMIN) {
$_SESSION['message'] = $this->user->lang('Sorry, only the author or an admin can modify this article.');
Library::redirect(Library::getLink(array('view' => 'ViewArticle', 'id' => $articleId)));
}
Modified: branches/release-candidates/sciret-1.2/actions/SavePreferences.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/SavePreferences.php 2008-07-08 03:36:20 UTC (rev 603)
+++ branches/release-candidates/sciret-1.2/actions/SavePreferences.php 2008-07-08 03:37:05 UTC (rev 604)
@@ -32,7 +32,7 @@
$this->user->setPreference('navigationType', $_POST['navigationType']);
}
- if (($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+ if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
$this->configuration->setConfigValue('publishKB', $_POST['publishKB'] == '1'? '1' : '0');
$this->configuration->setConfigValue('publishArticlesAuto', $_POST['publishArticlesAuto'] == '1'? '1' : '0');
$this->configuration->setConfigValue('publishBookmarksAuto', $_POST['publishBookmarksAuto'] == '1'? '1' : '0');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:36:23
|
Revision: 603
http://sciret.svn.sourceforge.net/sciret/?rev=603&view=rev
Author: alpeb
Date: 2008-07-07 20:36:20 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
use automatic class loading
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/actions/Install.php
Modified: branches/release-candidates/sciret-1.2/actions/Install.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/Install.php 2008-07-08 03:35:38 UTC (rev 602)
+++ branches/release-candidates/sciret-1.2/actions/Install.php 2008-07-08 03:36:20 UTC (rev 603)
@@ -9,8 +9,6 @@
* @packager TheGang
*/
-require 'actions/Action.php';
-
class Install extends Action {
var $db;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:35:40
|
Revision: 602
http://sciret.svn.sourceforge.net/sciret/?rev=602&view=rev
Author: alpeb
Date: 2008-07-07 20:35:38 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
slowly moving to zend framework. This class will be discarded later
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/classes/DB.php
Modified: branches/release-candidates/sciret-1.2/classes/DB.php
===================================================================
--- branches/release-candidates/sciret-1.2/classes/DB.php 2008-07-08 03:35:04 UTC (rev 601)
+++ branches/release-candidates/sciret-1.2/classes/DB.php 2008-07-08 03:35:38 UTC (rev 602)
@@ -1,40 +1,20 @@
<?php
-/*
-* @copyright Copyright (C) 2005-2007 TheGang http://www.the-gang.net
-* @license http://www.fsf.org/copyleft/lgpl.html GNU Lesser General Public License
-* @author Alejandro Pedraza
-* @since Sciret 1.0
-* @package Sciret
-* @packager TheGang
-*/
-
class DB {
- // singleton PHP 4 hack
- function DB($calledFromConnect = false)
- {
- if (!$calledFromConnect) {
- trigger_error('Cannot instantiate class DB directly', E_USER_ERROR);
- }
- }
+ private static $instance;
+
+ private static $skipFatalError = false;
- // Database factory
- // @access static
- function &DBFactory($dbEngine, $dbHost, $dbUser, $dbPassword, $reconnect = false) {
- static $db;
+ private function __construct() {}
- $dbEngine = strtolower($dbEngine);
+ public static function setDBInstance($dbInstance) {
+ self::$instance =& $dbInstance;
+ }
- if (!is_object($db) || $reconnect) {
- switch ($dbEngine) {
- default:
- require_once 'classes/Mysql.php';
- $db = new MySQL($dbHost, $dbUser, $dbPassword);
- }
- }
-
- return $db;
+ public static function getInstance()
+ {
+ return self::$instance;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:35:06
|
Revision: 601
http://sciret.svn.sourceforge.net/sciret/?rev=601&view=rev
Author: alpeb
Date: 2008-07-07 20:35:04 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
slowly moving to zend framework. This class will be discarded later
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/classes/MysqlResult.php
Modified: branches/release-candidates/sciret-1.2/classes/MysqlResult.php
===================================================================
--- branches/release-candidates/sciret-1.2/classes/MysqlResult.php 2008-07-08 03:34:28 UTC (rev 600)
+++ branches/release-candidates/sciret-1.2/classes/MysqlResult.php 2008-07-08 03:35:04 UTC (rev 601)
@@ -37,17 +37,16 @@
return mysql_num_rows($this->query);
}
+ function rowCount() {
+ return $this->getNumRows();
+ }
+
// @access public
function getAffectedRows() {
return mysql_affected_rows($this->mysql->dbConn);
}
// @access public
- function getInsertId() {
- return mysql_insert_id($this->mysql->dbConn);
- }
-
- // @access public
function getNumFields() {
return mysql_num_fields($this->query);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:34:29
|
Revision: 600
http://sciret.svn.sourceforge.net/sciret/?rev=600&view=rev
Author: alpeb
Date: 2008-07-07 20:34:28 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
use class constants instead of global constants
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/classes/Controller.php
branches/release-candidates/sciret-1.2/views/EditArticle.php
branches/release-candidates/sciret-1.2/views/EditPreferences.php
branches/release-candidates/sciret-1.2/views/ManageUsers.php
branches/release-candidates/sciret-1.2/views/ViewArticle.php
Modified: branches/release-candidates/sciret-1.2/classes/Controller.php
===================================================================
--- branches/release-candidates/sciret-1.2/classes/Controller.php 2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/classes/Controller.php 2008-07-08 03:34:28 UTC (rev 600)
@@ -59,7 +59,7 @@
(($this->user->getRole() & $this->views[$view][MINIMUM_ROLE]) != $this->views[$view][MINIMUM_ROLE])
// or user is anonymous and KB is not public
- || ($this->user->getRole() == ROLE_ANONYMOUS && $this->views[$view][ALLOW_VIEW_ONLY_IF_PUBLIC_KB] && !$this->configuration->getConfigValue('publishKB'))
+ || ($this->user->getRole() == User::ROLE_ANONYMOUS && $this->views[$view][ALLOW_VIEW_ONLY_IF_PUBLIC_KB] && !$this->configuration->getConfigValue('publishKB'))
)
{
Library::redirect(Library::getLink(array('view' => 'Login')));
Modified: branches/release-candidates/sciret-1.2/views/EditArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/EditArticle.php 2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/EditArticle.php 2008-07-08 03:34:28 UTC (rev 600)
@@ -67,7 +67,7 @@
$this->tpl->parse('article_id', 'article_id_block');
- if (($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+ if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
$this->tpl->set_var(array(
));
$this->tpl->parse('usage_id','usage_block');
Modified: branches/release-candidates/sciret-1.2/views/EditPreferences.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/EditPreferences.php 2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/EditPreferences.php 2008-07-08 03:34:28 UTC (rev 600)
@@ -81,7 +81,7 @@
}
// *** ADMIN PREFERENCES ***
- if (($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+ if (($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
$this->tpl->set_var(array(
));
$this->tpl->parse('adminPreferences', 'adminPreferences_block');
Modified: branches/release-candidates/sciret-1.2/views/ManageUsers.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ManageUsers.php 2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/ManageUsers.php 2008-07-08 03:34:28 UTC (rev 600)
@@ -36,7 +36,7 @@
'userId' => $user->getId(),
'userName' => $user->getUserName(),
'email' => $user->getEmail(),
- 'adminRights' => $user->getRole() == ROLE_ADMIN? $this->user->lang('Yes') : $this->user->lang('No'),
+ 'adminRights' => $user->getRole() == User::ROLE_ADMIN? $this->user->lang('Yes') : $this->user->lang('No'),
));
if ($user->getId() != 1) {
$this->tpl->parse('delete', 'delete_block');
Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ViewArticle.php 2008-07-08 03:33:32 UTC (rev 599)
+++ branches/release-candidates/sciret-1.2/views/ViewArticle.php 2008-07-08 03:34:28 UTC (rev 600)
@@ -200,7 +200,7 @@
$showEditDelete = false;
if ($this->configuration->getConfigValue('restrictEditDelete')) {
- if ($this->article->getUserId() == $this->user->getId() || ($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+ if ($this->article->getUserId() == $this->user->getId() || ($this->user->getRole() & User::ROLE_ADMIN) == User::ROLE_ADMIN) {
$showEditDelete = true;
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:33:37
|
Revision: 599
http://sciret.svn.sourceforge.net/sciret/?rev=599&view=rev
Author: alpeb
Date: 2008-07-07 20:33:32 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
added some zend framework facilities, and play better with authenticated user objects coming from other apps
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/index.php
Modified: branches/release-candidates/sciret-1.2/index.php
===================================================================
--- branches/release-candidates/sciret-1.2/index.php 2008-07-08 03:31:59 UTC (rev 598)
+++ branches/release-candidates/sciret-1.2/index.php 2008-07-08 03:33:32 UTC (rev 599)
@@ -13,14 +13,25 @@
error_reporting(E_ALL);
ini_set('display_errors', 1);
+$pathList = array(
+ get_include_path(),
+ dirname(__FILE__),
+ dirname(__FILE__).'/libs',
+ dirname(__FILE__).'/classes',
+ dirname(__FILE__).'/models',
+ dirname(__FILE__).'/modules/default/models',
+ dirname(__FILE__).'/modules/blog/models',
+ dirname(__FILE__).'/actions',
+);
+set_include_path(implode(PATH_SEPARATOR, $pathList));
+require_once 'Zend/Loader.php';
+
$times = explode(' ', microtime());
$GLOBALS['startTime'] = $times[0] + $times[1];
-require 'classes/Library.php';
-require 'classes/DB.php';
-require 'models/User.php';
-require 'classes/Controller.php';
-require 'config.php';
+$config = new Zend_Config_Ini(dirname(__FILE__). '/config.ini', null, array('allowModifications' => true));
+Zend_Registry::set('config', $config);
+
require 'flowMap.php';
// MAGIC_QUOTES HANDLING
@@ -32,22 +43,45 @@
}
set_magic_quotes_runtime(0);
-$db =& DB::DBFactory(DB_ENGINE, DB_HOST, DB_USER, DB_PASSWORD);
+/**************************
+* DATABASE
+/**************************/
+$config->database->params->driver_options = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true);
+$db = Zend_Db::factory($config->database);
+$connectionFailed = false;
+try {
+ $db->getConnection();
+} catch (Zend_Db_Adapter_Exception $e) {
+ $connectionFailed = true;
+}
+DB::setDBInstance($db);
+
if ((!in_array(@$_GET['action'], array('Install')))
&& !in_array(@$_GET['view'], array('ConfigNotWritable', 'InstallEnterCredentials'))
- && (DB_NAME == '' || !$db->connect() || !$db->selectDb(DB_NAME) || !$db->hasTables()))
+ && ($config->database->params->dbname == '' || $connectionFailed))
{
$_GET['view'] = 'NotInstalled';
}
-session_start();
-if (isset($_SESSION['userId'])) {
- $user = new User($_SESSION['userId']);
+Zend_Session::start();
+$auth = Zend_Auth::getInstance();
+if ($auth->hasIdentity()) {
+ $user = $auth->getStorage()->read();
+ $user->init();
+ if ($user->app == 'monkeys') {
+ $publicId = $user->publicId;
+ $user = new User($publicId);
+ $user->app = 'sciret';
+ $auth->getStorage()->write($user);
+ }
} else {
- $user = new User;
+ // guest user
+ $user = new User();
}
+Zend_Registry::set('user', $user);
+
$controller = new Controller($views, $actions, $user);
if (isset($_GET['view'])) {
@@ -58,4 +92,13 @@
$controller->processView(VIEW_DEFAULT);
}
+
+/**************************
+* AUTOLOADING FUNCTION
+**************************/
+function __autoload($className) {
+ Zend_Loader::loadClass($className);
+}
+
+
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:32:02
|
Revision: 598
http://sciret.svn.sourceforge.net/sciret/?rev=598&view=rev
Author: alpeb
Date: 2008-07-07 20:31:59 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
replaced config.php with config.ini
Added Paths:
-----------
branches/release-candidates/sciret-1.2/config.ini
Removed Paths:
-------------
branches/release-candidates/sciret-1.2/config.php
Added: branches/release-candidates/sciret-1.2/config.ini
===================================================================
--- branches/release-candidates/sciret-1.2/config.ini (rev 0)
+++ branches/release-candidates/sciret-1.2/config.ini 2008-07-08 03:31:59 UTC (rev 598)
@@ -0,0 +1,10 @@
+[general]
+slowdown_secs = 0
+language_default = "English"
+
+[database]
+adapter = pdo_mysql
+params.host = localhost
+params.dbname = monkeys
+params.username = root
+params.password =
Property changes on: branches/release-candidates/sciret-1.2/config.ini
___________________________________________________________________
Name: svn:executable
+ *
Deleted: branches/release-candidates/sciret-1.2/config.php
===================================================================
--- branches/release-candidates/sciret-1.2/config.php 2008-07-08 03:30:14 UTC (rev 597)
+++ branches/release-candidates/sciret-1.2/config.php 2008-07-08 03:31:59 UTC (rev 598)
@@ -1,23 +0,0 @@
-<?php
-
-/*
-* @copyright Copyright (C) 2005-2007 TheGang http://www.the-gang.net
-* @license http://www.fsf.org/copyleft/lgpl.html GNU Lesser General Public License
-* @author Alejandro Pedraza
-* @since Sciret 1.0
-* @package Sciret
-* @packager TheGang
-*/
-
-define('DB_ENGINE', 'mysql');
-define('DB_HOST', 'localhost');
-define('DB_NAME', 'kb');
-define('DB_USER', 'root');
-define('DB_PASSWORD', '');
-
-define('LANGUAGE_DEFAULT', 'English');
-
-// set to > 0 to simulate latency
-define('SLOWDOWN_SECS', 0);
-
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:30:16
|
Revision: 597
http://sciret.svn.sourceforge.net/sciret/?rev=597&view=rev
Author: alpeb
Date: 2008-07-07 20:30:14 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
drop Model and instead grab db connection from DB singleton directly, and use Zend autoloader. First step before moving to the zend framework's Zend_Db_Tables_ classes
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/models/Article.php
branches/release-candidates/sciret-1.2/models/ArticleGateway.php
branches/release-candidates/sciret-1.2/models/ArticleIterator.php
branches/release-candidates/sciret-1.2/models/Category.php
branches/release-candidates/sciret-1.2/models/CategoryGateway.php
branches/release-candidates/sciret-1.2/models/Comment.php
branches/release-candidates/sciret-1.2/models/Configuration.php
branches/release-candidates/sciret-1.2/models/Favorite.php
branches/release-candidates/sciret-1.2/models/FavoriteGateway.php
branches/release-candidates/sciret-1.2/models/File.php
branches/release-candidates/sciret-1.2/models/History.php
branches/release-candidates/sciret-1.2/models/HistoryGateway.php
branches/release-candidates/sciret-1.2/models/Link.php
branches/release-candidates/sciret-1.2/models/Question.php
branches/release-candidates/sciret-1.2/models/QuestionGateway.php
branches/release-candidates/sciret-1.2/models/QuestionIterator.php
branches/release-candidates/sciret-1.2/models/Todo.php
branches/release-candidates/sciret-1.2/models/TodoGateway.php
branches/release-candidates/sciret-1.2/models/User.php
branches/release-candidates/sciret-1.2/models/UserGateway.php
Removed Paths:
-------------
branches/release-candidates/sciret-1.2/models/Model.php
Modified: branches/release-candidates/sciret-1.2/models/Article.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Article.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Article.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,23 +9,20 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class Article extends Model {
+class Article {
var $id;
var $isBookmark = 0;
var $questionId;
var $catId;
var $catLabel;
var $title;
- var $URL;
+ var $URL = '';
var $expDate;
- var $question;
+ var $question = '';
var $content;
var $excerpt;
var $published = 1;
var $draft = 0;
- var $user;
var $userId;
var $views = 0;
var $creationDate;
@@ -44,15 +41,15 @@
var $votes5 = 0;
var $internal = 0;
+ private $user;
+
function Article($id = false) {
- parent::Model();
-
if ($id) {
// left join because cat_id=0 doesn't exist in the db
$query = 'SELECT is_bookmark, title, url, expires, question, content, art.cat_id, cat.name AS catLabel, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, internal '
.'FROM articles art LEFT JOIN categories cat ON cat.cat_id=art.cat_id '
.'WHERE art_id = ?';
- $result = $this->db->query($query, $id);
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->isBookmark = $row['is_bookmark'];
@@ -81,13 +78,73 @@
}
function save() {
+ $db = DB::getInstance();
if (!isset($this->id)) {
$query = 'INSERT INTO articles (is_bookmark, title, url, expires, question, content, cat_id, published, draft, user_id, views, internal, created) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW())';
- $result = $this->db->query($query, $this->isBookmark, $this->title, $this->URL, $this->expDate, $this->question, $this->content, $this->catId, $this->published, $this->draft, $this->userId, $this->views, $this->internal);
- $this->id = $result->getInsertId();
+ $result = $db->query( $query, array(
+ $this->isBookmark,
+ $this->title,
+ $this->URL,
+ $this->expDate,
+ $this->question,
+ $this->content,
+ $this->catId,
+ $this->published,
+ $this->draft,
+ $this->userId,
+ $this->views,
+ $this->internal
+ )
+ );
+ $this->id = $db->lastInsertId();
} else {
- $query = 'UPDATE articles SET is_bookmark=?, title=?, url=?, expires=?, question=?, content=?, cat_id=?, published=?, draft=?, user_id=?, views=?, created=?, modified=?, modified_user_id=?, votes_1=?, votes_2=?, votes_3=?, votes_4=?, votes_5=?, internal=? WHERE art_id=?';
- $this->db->query($query, $this->isBookmark, $this->title, $this->URL, $this->expDate, $this->question, $this->content, $this->catId, $this->published, $this->draft, $this->userId, $this->views, $this->creationDate, $this->modificationDate, $this->modifiedByUserId, $this->votes1, $this->votes2, $this->votes3, $this->votes4, $this->votes5, $this->internal, $this->id);
+ $query = 'UPDATE articles SET '
+ .'is_bookmark=?, '
+ .'title=?, '
+ .'url=?, '
+ .'expires=?, '
+ .'question=?, '
+ .'content=?, '
+ .'cat_id=?, '
+ .'published=?, '
+ .'draft=?, '
+ .'user_id=?, '
+ .'views=?, '
+ .'created=?, '
+ .'modified=?, '
+ .'modified_user_id=?, '
+ .'votes_1=?, '
+ .'votes_2=?, '
+ .'votes_3=?, '
+ .'votes_4=?, '
+ .'votes_5=?, '
+ .'internal=? '
+ .'WHERE art_id=?';
+ DB::getInstance()->query( $query,
+ array(
+ $this->isBookmark,
+ $this->title,
+ $this->URL,
+ $this->expDate,
+ $this->question,
+ $this->content,
+ $this->catId,
+ $this->published,
+ $this->draft,
+ $this->userId,
+ $this->views,
+ $this->creationDate,
+ $this->modificationDate,
+ $this->modifiedByUserId,
+ $this->votes1,
+ $this->votes2,
+ $this->votes3,
+ $this->votes4,
+ $this->votes5,
+ $this->internal,
+ $this->id
+ )
+ );
}
}
@@ -213,6 +270,11 @@
$this->views = (int)$views;
}
+ public function getFormatedCreationDate() {
+ preg_match('/(\d\d\d\d)-(\d\d)-(\d\d)/', $this->getCreationDate(), $matches);
+ return $matches[2].'/'.$matches[3].'/'.$matches[1];
+ }
+
function getCreationDate() {
return $this->creationDate;
}
@@ -244,11 +306,15 @@
}
function getUser() {
+ if (!isset($this->user)) {
+ $this->user = new User($this->getUserId());
+ }
+
return $this->user;
}
- function setUser($userObj) {
- $this->user = $userObj;
+ function setUser(&$userObj) {
+ $this->user =& $userObj;
}
function getModificationDate() {
@@ -348,7 +414,7 @@
if (!isset($this->files)) {
$query = 'SELECT file_id, art_id, filename, comment, hash FROM files WHERE art_id=?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
$this->files = array();
while ($row = $result->fetch()) {
$file = new File;
@@ -377,7 +443,7 @@
if (!isset($this->links)) {
$query = 'SELECT link_id, art_id, title, url FROM links WHERE art_id=?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
$this->links = array();
while ($row = $result->fetch()) {
$link = new Link;
@@ -395,7 +461,7 @@
function getRelatedArticles() {
if (!isset($this->relatedArticles)) {
$query = 'SELECT art_id, related_art_id FROM articles_related WHERE art_id=?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
$this->relatedArticles = array();
while ($row = $result->fetch()) {
$this->relatedArticles[] = new Article($row['related_art_id']);
@@ -420,7 +486,7 @@
$this->getRelatedArticles();
$query = 'DELETE FROM articles_related WHERE art_id=?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
foreach ($arrRelatedArticles as $relatedArtId) {
$article = new Article;
@@ -430,13 +496,13 @@
foreach ($this->relatedArticles as $article) {
$query = 'INSERT INTO articles_related (art_id, related_art_id) VALUES (?, ?)';
- $this->db->query($query, $this->id, $article->getId());
+ DB::getInstance()->query($query, $this->id, $article->getId());
}
}
function deleteRelatedArticle($artId) {
$query = 'DELETE FROM articles_related WHERE art_id=? AND related_art_id=?';
- $this->db->query($query, $this->id, $artId);
+ DB::getInstance()->query($query, array($this->id, $artId));
}
function getComments() {
@@ -444,7 +510,7 @@
if (!isset($this->comments)) {
$query = 'SELECT comment_id, username, contents, entered, published FROM comments WHERE art_id = ?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
$this->comments = array();
while ($row = $result->fetch()) {
$comment = new Comment;
Modified: branches/release-candidates/sciret-1.2/models/ArticleGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/ArticleGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/ArticleGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,31 +9,25 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/Article.php';
-require_once 'models/ArticleIterator.php';
-
define('EXCERPT_LENGTH', 300);
-class ArticleGateway extends Model {
+class ArticleGateway {
- function getArticles( $catId,
- $includeSubCats,
- $specialList = false,
- $includeUnpublished = false,
- $onlyUnpublished = false,
- $offset = 0,
- $numRecords = -1,
- $set = 'all',
- $sort = false,
- $showExpired = false,
- $showDrafts = false)
+ public static function getArticles( $catId,
+ $includeSubCats,
+ $specialList = false,
+ $includeUnpublished = false,
+ $onlyUnpublished = false,
+ $offset = 0,
+ $numRecords = -1,
+ $set = 'all',
+ $sort = false,
+ $showExpired = false,
+ $showDrafts = false)
{
// uncomment for testing
//$numRecords = 3;
- require_once 'models/CategoryGateway.php';
-
$catId = (int)$catId;
$whereArr = array();
@@ -111,14 +105,15 @@
break;
}
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
if ($numRecords != -1) {
$query2 = 'SELECT FOUND_ROWS()';
- $result2 = $this->db->query($query2);
- list($totalNumItems) = $result2->fetch();
+ $result2 = DB::getInstance()->query($query2);
+ $rows = $result2->fetch();
+ $totalNumItems = $rows['FOUND_ROWS()'];
} else {
- $totalNumItems = $result->getNumRows();
+ $totalNumItems = $result->rowCount();
}
return new ArticleIterator($result, $totalNumItems);
@@ -144,7 +139,7 @@
.'FROM articles art LEFT JOIN files f on art.art_id = f.art_id LEFT JOIN users u ON art.user_id = u.user_id '
."WHERE $where "
.'GROUP BY art.art_id';
- $result = $this->db->query($query, $searchQuery);
+ $result = DB::getInstance()->query($query, $searchQuery);
} else {
switch ($set) {
case 'bookmarks':
@@ -164,15 +159,16 @@
if ($numRecords != -1) {
$query .= ' LIMIT ' . (int)$offset . ', ' . (int)$numRecords;
}
- $result = $this->db->query($query, $searchQuery, $searchQuery);
+ $result = DB::getInstance()->query($query, $searchQuery, $searchQuery);
}
if ($numRecords != -1) {
$query2 = 'SELECT FOUND_ROWS()';
- $result2 = $this->db->query($query2);
- list($totalNumItems) = $result2->fetch();
+ $result2 = DB::getInstance()->query($query2);
+ $rows = $result2->fetch();
+ $totalNumItems = $rows['FOUND_ROWS()'];
} else {
- $totalNumItems = $result->getNumRows();
+ $totalNumItems = $result->rowCount();
}
return new ArticleIterator($result, $totalNumItems);
@@ -209,7 +205,7 @@
if ($allWords != '') {
$wordList = explode(' ', $allWords);
for ($i = 0; $i < count($wordList); $i++) {
- $wordList[$i] = $this->db->escape_string($wordList[$i]);
+ $wordList[$i] = DB::escape_string($wordList[$i]);
if ($ocurrences == 'title') {
$wordList[$i] = "title LIKE '%{$wordList[$i]}%'";
} elseif ($ocurrences == 'content') {
@@ -222,7 +218,7 @@
}
if ($exactPhrase != '') {
- $exactPhrase = $this->db->escape_string($exactPhrase);
+ $exactPhrase = DB::escape_string($exactPhrase);
if ($ocurrences == 'title') {
$whereArr[] = "title LIKE '%$exactPhrase%'";
} elseif ($ocurrences == 'content') {
@@ -235,7 +231,7 @@
if ($oneWord != '') {
$wordList = explode(' ', $oneWord);
for ($i = 0; $i < count($wordList); $i++) {
- $wordList[$i] = $this->db->escape_string($wordList[$i]);
+ $wordList[$i] = DB::escape_string($wordList[$i]);
if ($ocurrences == 'title') {
$wordList[$i] = "title LIKE '%{$wordList[$i]}%'";
} elseif ($ocurrences == 'content') {
@@ -250,7 +246,7 @@
if ($excludeList != '') {
$wordList = explode(' ', $excludeList);
for ($i = 0; $i < count($wordList); $i++) {
- $wordList[$i] = $this->db->escape_string($wordList[$i]);
+ $wordList[$i] = DB::escape_string($wordList[$i]);
if ($ocurrences == 'title') {
$wordList[$i] = "title NOT LIKE '%{$wordList[$i]}%'";
} elseif ($ocurrences == 'content') {
@@ -317,14 +313,14 @@
if ($numRecords != -1) {
$query .= ' LIMIT ' . (int)$offset . ', ' . (int)$numRecords;
}
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
if ($numRecords != -1) {
$query2 = 'SELECT FOUND_ROWS()';
- $result2 = $this->db->query($query2);
+ $result2 = DB::getInstance()->query($query2);
list($totalNumItems) = $result2->fetch();
} else {
- $totalNumItems = $result->getNumRows();
+ $totalNumItems = $result->rowCount();
}
return new ArticleIterator($result, $totalNumItems);
@@ -337,26 +333,26 @@
}
$query = 'DELETE FROM articles WHERE art_id=?';
- $this->db->query($query, $id);
+ DB::getInstance()->query($query, $id);
$query = 'DELETE FROM articles_related WHERE art_id=? OR related_art_id=?';
- $this->db->query($query, $id, $id);
+ DB::getInstance()->query($query, array($id, $id));
$query = 'DELETE FROM comments WHERE art_id=?';
- $this->db->query($query, $id);
+ DB::getInstance()->query($query, $id);
$query = 'DELETE FROM links WHERE art_id=?';
- $this->db->query($query, $id);
+ DB::getInstance()->query($query, $id);
$query = 'DELETE FROM history WHERE art_id=?';
- $this->db->query($query, $id);
+ DB::getInstance()->query($query, $id);
}
function numUnpublishedArticles() {
$query = "SELECT art_id FROM articles WHERE published = 0";
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
- return $result->getNumRows();
+ return $result->rowCount();
}
}
Modified: branches/release-candidates/sciret-1.2/models/ArticleIterator.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/ArticleIterator.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/ArticleIterator.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,10 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/Article.php';
-
-class ArticleIterator extends Model {
+class ArticleIterator {
var $resultSet;
var $totalNumItems;
@@ -53,13 +50,6 @@
$article->setNumFiles($row['num_files']);
}
- if (isset($row['firstname'])) {
- $tUser = new User;
- $tUser->setFirstName($row['firstname']);
- $tUser->setLastName($row['lastname']);
- $article->setUser($tUser);
- }
-
return $article;
}
Modified: branches/release-candidates/sciret-1.2/models/Category.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Category.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Category.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,9 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class Category extends Model {
+class Category {
var $id;
var $label = '';
var $description = '';
@@ -20,11 +18,9 @@
var $iconFileName = '';
function Category($id = false) {
- parent::Model();
-
if ($id) {
$query = 'SELECT cat_id, name, description, parent_id, icon FROM categories WHERE cat_id = ?';
- $result = $this->db->query($query, $id);
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->label = $row['name'];
@@ -36,31 +32,32 @@
}
function save() {
+ $db = DB::getInstance();
if (!isset($this->id)) {
$query = 'INSERT INTO categories (name, description, parent_id, icon) VALUES(?, ?, ?, ?)';
- $result = $this->db->query($query, $this->label, $this->description, $this->parentId, $this->iconFileName);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->label, $this->description, $this->parentId, $this->iconFileName));
+ $this->id = $db->lastInsertId();
} else {
$query = 'UPDATE categories SET name=?, description=?, parent_id=?, icon=? WHERE cat_id=?';
- $result = $this->db->query($query, $this->label, $this->description, $this->parentId, $this->iconFileName, $this->id);
+ $result = $db->query($query, array($this->label, $this->description, $this->parentId, $this->iconFileName, $this->id));
}
}
function delete() {
$query = 'SELECT cat_id FROM categories WHERE parent_id=?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
if ($result->getNumRows() > 0) {
return false;
}
$query = 'DELETE FROM categories WHERE cat_id=?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
$query = 'UPDATE articles SET cat_id=0 WHERE cat_id=?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
$query = 'UPDATE questions SET cat_id=0 WHERE cat_id=?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
return true;
}
Modified: branches/release-candidates/sciret-1.2/models/CategoryGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/CategoryGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/CategoryGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,10 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/Category.php';
-
-class CategoryGateway extends Model {
+class CategoryGateway {
var $categories;
function getCategories() {
@@ -22,7 +19,7 @@
$this->categories[0] = new Category;
$query = 'SELECT cat_id, name, description, parent_id, icon FROM categories ORDER BY parent_id, name';
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
while ($row = $result->fetch()) {
$this->categories[$row['cat_id']] = new Category;
$this->categories[$row['cat_id']]->setId($row['cat_id']);
Modified: branches/release-candidates/sciret-1.2/models/Comment.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Comment.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Comment.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,9 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class Comment extends Model {
+class Comment {
var $id;
var $userName;
var $entered;
@@ -20,11 +18,9 @@
var $articleId;
function Comment($id = false) {
- parent::Model();
-
if ($id) {
$query = 'SELECT username, contents, entered, art_id, published FROM comments WHERE comment_id=?';
- $result = $this->db->query($query, $id);
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->userName = $row['username'];
$this->contents = $row['contents'];
@@ -37,19 +33,20 @@
}
function save() {
+ $db = DB::getInstance();
if (!isset($this->id)) {
$query = 'INSERT INTO comments (username, contents, entered, art_id, published) VALUES(?, ?, ?, ?, ?)';
- $result = $this->db->query($query, $this->userName, $this->contents, $this->entered, $this->articleId, $this->published);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->userName, $this->contents, $this->entered, $this->articleId, $this->published));
+ $this->id = $db->lastInsertId();
} else {
$query = 'UPDATE comments SET username=?, contents=?, entered=?, art_id=?, published=? WHERE comment_id=?';
- $this->db->query($query, $this->userName, $this->contents, $this->entered, $this->articleId, $this->published, $this->id);
+ $db->query($query, array($this->userName, $this->contents, $this->entered, $this->articleId, $this->published, $this->id));
}
}
function delete() {
$query = 'DELETE FROM comments WHERE comment_id = ?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
}
function getId() {
Modified: branches/release-candidates/sciret-1.2/models/Configuration.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Configuration.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Configuration.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,10 +9,8 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
+class Configuration {
-class Configuration extends Model {
-
var $configurationArray = array(
// var name => array(defaultValue, isHidden)
'publishKB' => 1,
@@ -25,10 +23,8 @@
);
function Configuration() {
- parent::Model();
-
$query = 'SELECT field, value FROM configuration';
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
while ($row = $result->fetch()) {
$this->configurationArray[$row['field']] = $row['value'];
}
@@ -36,11 +32,11 @@
function save() {
$query = 'DELETE FROM configuration';
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
foreach ($this->configurationArray as $field => $value) {
$query = 'INSERT INTO configuration (field, value) VALUES (?, ?)';
- $result = $this->db->query($query, $field, $value);
+ $result = DB::getInstance()->query($query, $field, $value);
}
}
Modified: branches/release-candidates/sciret-1.2/models/Favorite.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Favorite.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Favorite.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,13 +9,11 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
define('FAVORITE_TYPE_ARTICLE', 1);
define('FAVORITE_TYPE_LOCATION', 2);
define('FAVORITE_TYPE_SEARCHRESULT', 3);
-class Favorite extends Model {
+class Favorite {
var $id;
var $userId;
var $type;
@@ -24,11 +22,10 @@
var $searchStr = '';
function Favorite($id = false) {
- parent::Model();
if ($id) {
$query = 'SELECT favorite_id, user_id, favorite_type, art_id, cat_id, search_str FROM favorites WHERE favorite_id = ?';
- $result = $this->db->query($query, $id);
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->userId = $row['user_id'];
@@ -42,9 +39,10 @@
function save() {
if (!isset($this->id)) {
+ $db = DB::getInstance();
$query = 'INSERT INTO favorites (user_id, favorite_type, art_id, cat_id, search_str) VALUES (?, ?, ?, ?, ?)';
- $result = $this->db->query($query, $this->userId, $this->type, $this->artId, $this->catId, $this->searchStr);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->userId, $this->type, $this->artId, $this->catId, $this->searchStr));
+ $this->id = $db->lastInsertId();
}
}
Modified: branches/release-candidates/sciret-1.2/models/FavoriteGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/FavoriteGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/FavoriteGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,10 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/Favorite.php';
-
-class FavoriteGateway extends Model {
+class FavoriteGateway {
var $favorites;
function getFavorites($userId) {
@@ -20,7 +17,7 @@
$this->favorites = array();
$query = 'SELECT favorite_id, user_id, favorite_type, art_id, cat_id, search_str FROM favorites WHERE user_id = ?';
- $result = $this->db->query($query, $userId);
+ $result = DB::getInstance()->query($query, $userId);
while ($row = $result->fetch()) {
$favorite = new Favorite;
@@ -39,36 +36,36 @@
function isArticleFavorite($artId, $userId) {
$query = 'SELECT favorite_id FROM favorites WHERE art_id = ? AND user_id = ?';
- $result = $this->db->query($query, $artId, $userId);
+ $result = DB::getInstance()->query($query, array($artId, $userId));
- return ($result->getNumRows() > 0);
+ return ($result->rowCount() > 0);
}
function deleteArticleFavorite($artId, $userId) {
$query = 'DELETE FROM favorites WHERE art_id = ? AND user_id = ?';
- $result = $this->db->query($query, $artId, $userId);
+ $result = DB::getInstance()->query($query, $artId, $userId);
}
function deleteSearchResultFavorite($queryStr, $userId) {
$query = 'DELETE FROM favorites WHERE search_str = ? AND user_id = ?';
- $result = $this->db->query($query, $queryStr, $userId);
+ $result = DB::getInstance()->query($query, $queryStr, $userId);
}
function deleteLocationFavorite($catId, $userId) {
$query = 'DELETE FROM favorites WHERE cat_id = ? AND user_id = ?';
- $result = $this->db->query($query, $catId, $userId);
+ $result = DB::getInstance()->query($query, $catId, $userId);
}
function isSearchResultFavorite($queryStr, $userId) {
$query = 'SELECT favorite_id FROM favorites WHERE search_str = ? AND user_id = ?';
- $result = $this->db->query($query, $queryStr, $userId);
+ $result = DB::getInstance()->query($query, $queryStr, $userId);
return ($result->getNumRows() > 0);
}
function isLocationFavorite($catId, $userId) {
$query = 'SELECT favorite_id FROM favorites WHERE cat_id = ? AND user_id = ?';
- $result = $this->db->query($query, $catId, $userId);
+ $result = DB::getInstance()->query($query, $catId, $userId);
return ($result->getNumRows() > 0);
}
Modified: branches/release-candidates/sciret-1.2/models/File.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/File.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/File.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,9 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class File extends Model {
+class File {
var $id;
var $articleId;
var $fileName;
@@ -19,11 +17,10 @@
var $hash;
function File($id = false) {
- parent::Model();
if ($id) {
$query = 'SELECT art_id, filename, comment, hash FROM files WHERE file_id = ?';
- $result = $this->db->query($query, $id);
+ $result = DB::$instance->query($query, $id);
if (!$row = $result->fetch()) {
return;
}
@@ -38,15 +35,16 @@
function save() {
if (!isset($this->id)) {
+ $db = DB::getInstance();
$query = 'INSERT INTO files (art_id, filename, comment, hash) VALUES (?, ?, ?, ?)';
- $result = $this->db->query($query, $this->articleId, $this->fileName, $this->comment, $this->hash);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->articleId, $this->fileName, $this->comment, $this->hash));
+ $this->id = $db->lastInsertId();
}
}
function delete() {
$query = 'DELETE FROM files WHERE file_id=?';
- $this->db->query($query, $this->id);
+ DB::$instance->query($query, $this->id);
return @unlink('uploads/files/'.$this->hash);
}
Modified: branches/release-candidates/sciret-1.2/models/History.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/History.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/History.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,9 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class History extends Model {
+class History {
var $id;
var $articleId;
var $date;
@@ -19,15 +17,12 @@
var $action;
var $actionArgs = '';
- function History() {
- parent::Model();
- }
-
function save() {
if (!isset($this->id)) {
+ $db = DB::getInstance();
$query = 'INSERT INTO history (art_id, date, user, action, action_args) VALUES (?, ?, ?, ?, ?)';
- $result = $this->db->query($query, $this->articleId, $this->date, $this->userFullName, $this->action, $this->actionArgs);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->articleId, $this->date, $this->userFullName, $this->action, $this->actionArgs));
+ $this->id = $db->lastInsertId();
}
}
Modified: branches/release-candidates/sciret-1.2/models/HistoryGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/HistoryGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/HistoryGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,18 +9,11 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/History.php';
+class HistoryGateway {
-class HistoryGateway extends Model {
-
- function HistoryGateway() {
- parent::Model();
- }
-
function getEvents($articleId) {
$query = 'SELECT history_id, art_id, date, user, action, action_args FROM history WHERE art_id=? ORDER BY date DESC';
- $result = $this->db->query($query, $articleId);
+ $result = DB::getInstance()->query($query, $articleId);
$historyArr = array();
while ($row = $result->fetch()) {
$history = new History;
Modified: branches/release-candidates/sciret-1.2/models/Link.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Link.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Link.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,20 +9,16 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class Link extends Model {
+class Link {
var $id;
var $articleId;
var $title;
var $URL;
function Link($id = false) {
- parent::Model();
-
if ($id) {
$query = 'SELECT art_id, title, url FROM links WHERE link_id = ?';
- $result = $this->db->query($query, $id);
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->articleId = $row['art_id'];
@@ -34,15 +30,16 @@
function save() {
if (!isset($this->id)) {
+ $db = DB::getInstance();
$query = 'INSERT INTO links (art_id, title, url) VALUES (?, ?, ?)';
- $result = $this->db->query($query, $this->articleId, $this->title, $this->URL);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->articleId, $this->title, $this->URL));
+ $this->id = $db->lastInsertId();
}
}
function delete() {
$query = 'DELETE FROM links WHERE link_id=?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
}
function getId() {
Deleted: branches/release-candidates/sciret-1.2/models/Model.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Model.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Model.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -1,21 +0,0 @@
-<?php
-
-/*
-* @copyright Copyright (C) 2005-2007 TheGang http://www.the-gang.net
-* @license http://www.fsf.org/copyleft/lgpl.html GNU Lesser General Public License
-* @author Alejandro Pedraza
-* @since Sciret 1.0
-* @package Sciret
-* @packager TheGang
-*/
-
-class Model {
-
- var $db;
-
- function Model() {
- $this->db =& DB::DBFactory(DB_ENGINE, DB_HOST, DB_USER, DB_PASSWORD);
- }
-}
-
-?>
Modified: branches/release-candidates/sciret-1.2/models/Question.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Question.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Question.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,9 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
-class Question extends Model {
+class Question {
var $id;
var $userName;
var $contents;
@@ -20,11 +18,9 @@
var $published;
function Question($id = false) {
- parent::Model();
-
if ($id) {
$query = 'SELECT username, contents, cat_id, creation, published FROM questions WHERE question_id=?';
- $result = $this->db->query($query, $id);
+ $result = DB::$instance->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->userName = $row['username'];
@@ -38,15 +34,16 @@
function save() {
if (!isset($this->id)) {
+ $db = DB::getInstance();
$query = 'INSERT INTO questions (username, contents, cat_id, creation, published) VALUES (?, ?, ?, NOW(), ?)';
- $result = $this->db->query($query, $this->userName, $this->contents, $this->categoryId, $this->published);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->userName, $this->contents, $this->categoryId, $this->published));
+ $this->id = $db->lastInsertId();
}
}
function delete() {
$query = "DELETE FROM questions WHERE question_id=?";
- $this->db->query($query, $this->id);
+ DB::$instance->query($query, $this->id);
}
function getId() {
Modified: branches/release-candidates/sciret-1.2/models/QuestionGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/QuestionGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/QuestionGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,12 +9,8 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/Question.php';
-require_once 'models/QuestionIterator.php';
+class QuestionGateway {
-class QuestionGateway extends Model {
-
function getQuestions($catId, $onlyPublished = false, $onlyUnpublished = false) {
require_once 'models/CategoryGateway.php';
@@ -40,7 +36,7 @@
. $where
.'ORDER BY creation DESC';
- $result = $this->db->query($query);
+ $result = DB::getInstance()->query($query);
return new QuestionIterator($result);
}
@@ -48,12 +44,12 @@
function publish($id) {
$id = $id? 1 : 0;
$query = 'UPDATE questions SET published='.$id;
- $this->db->query($query);
+ DB::getInstance()->query($query);
}
function delete($id) {
$query = 'DELETE FROM questions WHERE question_id = ?';
- $this->db->query($query, $id);
+ DB::getInstance()->query($query, $id);
}
}
Modified: branches/release-candidates/sciret-1.2/models/QuestionIterator.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/QuestionIterator.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/QuestionIterator.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,10 +9,7 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-require_once 'models/Question.php';
-
-class QuestionIterator extends Model {
+class QuestionIterator {
var $resultSet;
function QuestionIterator($resultSet) {
Modified: branches/release-candidates/sciret-1.2/models/Todo.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/Todo.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/Todo.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,12 +9,10 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
-
define('TODO_STATUS_PENDING', 0);
define('TODO_STATUS_COMPLETED', 1);
-class Todo extends Model {
+class Todo {
var $id;
var $userId;
var $title;
@@ -28,11 +26,9 @@
var $hasRelatedArticles;
function Todo($id = false) {
- parent::Model();
-
if ($id) {
$query = 'SELECT user_id, title, content, status, private, creation_date, due_date FROM todos WHERE todo_id = ?';
- $result = $this->db->query($query, $id);
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->userId = $row['user_id'];
@@ -49,7 +45,7 @@
function getRelatedArticles() {
if (!isset($this->relatedArticles)) {
$query = 'SELECT todo_id, related_art_id FROM todos_related WHERE todo_id=?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
$this->relatedArticles = array();
while ($row = $result->fetch()) {
$this->relatedArticles[] = new Article($row['related_art_id']);
@@ -65,7 +61,7 @@
function hasRelatedArticles() {
if (!isset($this->hasRelatedArticles)) {
$query = 'SELECT a.draft FROM articles a, todos_related tr WHERE a.art_id=tr.related_art_id AND todo_id = ?';
- $result = $this->db->query($query, $this->id);
+ $result = DB::getInstance()->query($query, $this->id);
$this->hasRelatedArticles = false;
while ($row = $result->fetch()) {
if ($row['draft'] == 0) {
@@ -86,7 +82,7 @@
$this->getRelatedArticles();
$query = 'DELETE FROM todos_related WHERE todo_id=?';
- $this->db->query($query, $this->id);
+ DB::getInstance()->query($query, $this->id);
foreach ($arrRelatedArticles as $relatedArtId) {
$article = new Article;
@@ -96,23 +92,24 @@
foreach ($this->relatedArticles as $article) {
$query = 'INSERT INTO todos_related (todo_id, related_art_id) VALUES (?, ?)';
- $this->db->query($query, $this->id, $article->getId());
+ DB::getInstance()->query($query, $this->id, $article->getId());
}
}
function deleteRelatedArticle($artId) {
$query = 'DELETE FROM todos_related WHERE todo_id=? AND related_art_id=?';
- $this->db->query($query, $this->id, $artId);
+ DB::getInstance()->query($query, $this->id, $artId);
}
function save() {
+ $db = DB::getInstance();
if (!isset($this->id)) {
$query = 'INSERT INTO todos (user_id, title, content, status, private, creation_date, due_date) VALUES (?, ?, ?, ?, ?, ?, ?)';
- $result = $this->db->query($query, $this->userId, $this->title, $this->content, $this->status, $this->private, $this->creationDate, $this->dueDate);
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->userId, $this->title, $this->content, $this->status, $this->private, $this->creationDate, $this->dueDate));
+ $this->id = $db->lastInsertId();
} else {
$query = 'UPDATE todos SET user_id=?, title=?, content=?, status=?, private=?, creation_date=?, due_date=? WHERE todo_id=?';
- $result = $this->db->query($query, $this->userId, $this->title, $this->content, $this->status, $this->private, $this->creationDate, $this->dueDate, $this->id);
+ $result = $db->query($query, array($this->userId, $this->title, $this->content, $this->status, $this->private, $this->creationDate, $this->dueDate, $this->id));
}
}
Modified: branches/release-candidates/sciret-1.2/models/TodoGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/TodoGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/TodoGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,10 +9,9 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
require_once 'models/Todo.php';
-class TodoGateway extends Model {
+class TodoGateway {
var $todos;
function getTodos($userId) {
@@ -22,13 +21,13 @@
$query = "SELECT todo_id, user_id, title, content, status, private, creation_date, due_date "
."FROM todos "
."WHERE (user_id=? OR private=0) AND due_date != '0000-00-00' ORDER BY due_date ASC";
- $result = $this->db->query($query, $userId);
+ $result = DB::getInstance()->query($query, $userId);
$this->_fillData($result);
$query = "SELECT todo_id, user_id, title, content, status, private, creation_date, due_date "
."FROM todos "
."WHERE (user_id=? OR private=0) AND due_date = '0000-00-00'";
- $result = $this->db->query($query, $userId);
+ $result = DB::getInstance()->query($query, $userId);
$this->_fillData($result);
}
@@ -53,16 +52,16 @@
function deleteTodo($todoId, $userId) {
$query = 'SELECT todo_id FROM todos WHERE todo_id = ? AND user_id = ?';
- $result = $this->db->query($query, $todoId, $userId);
+ $result = DB::getInstance()->query($query, $todoId, $userId);
if (!$result->getNumRows()) {
return false;
}
$query = 'DELETE FROM todos_related WHERE todo_id = ?';
- $result = $this->db->query($query, $todoId);
+ $result = DB::getInstance()->query($query, $todoId);
$query = 'DELETE FROM todos WHERE todo_id = ?';
- $result = $this->db->query($query, $todoId);
+ $result = DB::getInstance()->query($query, $todoId);
return true;
}
Modified: branches/release-candidates/sciret-1.2/models/User.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/User.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/User.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,13 +9,17 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
+class User {
+ const ROLE_ANONYMOUS = 1;
+ const ROLE_REGISTERED = 3; // 2 | ROLE_ANONYMOUS;
+ const ROLE_ADMIN = 7; // 4 | ROLE_REGISTERED ;
-define('ROLE_ANONYMOUS', 1);
-define('ROLE_REGISTERED', 2 | ROLE_ANONYMOUS);
-define('ROLE_ADMIN', 4 | ROLE_REGISTERED);
+ /**
+ * I need these to distinguish this class with Monkeys' User class
+ */
+ public $app = 'sciret';
+ public $publicId;
-class User extends Model {
var $id;
var $firstName;
var $lastName;
@@ -24,14 +28,14 @@
var $password;
var $passwordChanged;
var $admin = 0;
- var $role = ROLE_ANONYMOUS;
+ var $role = User::ROLE_ANONYMOUS;
var $langArr;
var $skipTranslations = false;
var $preferences = array(
'startBrowsing' => 'all',
'articlesPerPage' => 10,
'dateFormat' => 'Month Day, Year',
- 'language' => LANGUAGE_DEFAULT,
+ 'language' => '', // set in the constructor
'navigationType' => 'catAndSubCats',
'hiddenCategories' => '',
);
@@ -40,11 +44,12 @@
var $disallowedPasswordChars = array('"', '@', '#', '%', '^', '&', '*', '(', ')', ',');
function User($id = false) {
- parent::Model();
+ $this->preferences['language'] = Zend_Registry::get('config')->general->language_default;
+
if ($id) {
- $query = 'SELECT firstname, lastname, username, email, password, password_changed, admin, preferences FROM users WHERE user_id = ?';
- $result = $this->db->query($query, $id);
+ $query = 'SELECT firstname, lastname, username, email, password, password_changed, admin, preferences FROM users WHERE id = ?';
+ $result = DB::getInstance()->query($query, $id);
if ($row = $result->fetch()) {
$this->id = $id;
$this->firstName = $row['firstname'];
@@ -62,19 +67,28 @@
}
}
- $this->role = ($this->admin == 1)? ROLE_ADMIN : ROLE_REGISTERED;
+ $this->setRole();
}
}
+
+ $this->init();
}
+ public function init() {
+ if ($this->id) {
+ $this->publicId = $this->id;
+ }
+ }
+
function save() {
+ $db = DB::getInstance();
if (!isset($this->id)) {
$query = 'INSERT INTO users SET firstname=?, lastname=?, username=?, email=?, admin=?, password=MD5(?), password_changed=?, preferences=?';
- $result = $this->db->query($query, $this->firstName, $this->lastName, $this->userName, $this->email, $this->admin, $this->password, $this->passwordChanged, serialize($this->preferences));
- $this->id = $result->getInsertId();
+ $result = $db->query($query, array($this->firstName, $this->lastName, $this->userName, $this->email, $this->admin, $this->password, $this->passwordChanged, serialize($this->preferences)));
+ $this->id = $db->lastInsertId();
} else {
- $query = 'UPDATE users SET firstname=?, lastname=?, username=?, email=?, password_changed=?, admin=?, preferences=? WHERE user_id=?';
- $result = $this->db->query($query, $this->firstName, $this->lastName, $this->userName, $this->email, $this->passwordChanged, $this->admin, serialize($this->preferences), $this->id);
+ $query = 'UPDATE users SET firstname=?, lastname=?, username=?, email=?, password_changed=?, admin=?, preferences=? WHERE id=?';
+ $result = $db->query($query, array($this->firstName, $this->lastName, $this->userName, $this->email, $this->passwordChanged, $this->admin, serialize($this->preferences), $this->id));
}
}
@@ -103,6 +117,7 @@
}
function setId($id) {
+ $this->publicId = $value;
$this->id = (int)$id;
}
@@ -125,7 +140,7 @@
function setAdmin($isAdmin) {
$this->admin = $isAdmin? 1 : 0;
if ($this->admin == 1) {
- $this->role = ROLE_ADMIN;
+ $this->role = User::ROLE_ADMIN;
}
}
@@ -149,6 +164,10 @@
return $this->password;
}
+ function setRole() {
+ $this->role = ($this->admin == 1)? User::ROLE_ADMIN : User::ROLE_REGISTERED;
+ }
+
function getRole() {
return $this->role;
}
@@ -187,8 +206,8 @@
return false;
}
- $query = 'UPDATE users SET password=MD5(?), password_changed = \''.date('Y-m-d').'\' WHERE `user_id` = ?';
- $this->db->query($query, $password, $this->id);
+ $query = 'UPDATE users SET password=MD5(?), password_changed = \''.date('Y-m-d').'\' WHERE `id` = ?';
+ DB::getInstance()->query($query, $password, $this->id);
$this->passwordChanged = date('Y-m-d');
return true;
@@ -199,7 +218,7 @@
}
function getPreference($field) {
- if ($this->role == ROLE_ANONYMOUS && isset($_COOKIE[$field])) {
+ if ($this->role == User::ROLE_ANONYMOUS && isset($_COOKIE[$field])) {
return $_COOKIE[$field];
}
@@ -207,7 +226,7 @@
}
function setPreference($field, $value) {
- if ($this->role == ROLE_ANONYMOUS) {
+ if ($this->role == User::ROLE_ANONYMOUS) {
setcookie($field, $value, time() + 60*60*24*90); // cookie expires in 90 days
}
@@ -284,7 +303,7 @@
$file = realpath(dirname(__FILE__)."/../languages/$language.txt");
$filemtime = date('Y-m-d H:i:s', filemtime($file));
$query = 'SELECT last_updated, content FROM language_cache WHERE language=? AND last_updated >= ?';
- $result = $this->db->query($query, $language, $filemtime);
+ $result = DB::getInstance()->query($query, array($language, $filemtime));
if ($row = $result->fetch()) {
$this->langArr = unserialize($row['content']);
}
@@ -306,9 +325,9 @@
}
$query = 'DELETE FROM language_cache WHERE language=?';
- $this->db->query($query, $language);
+ DB::getInstance()->query($query, $language);
$query = 'INSERT INTO language_cache (language, last_updated, content) VALUES(?, ?, ?)';
- $this->db->query($query, $language, date('Y-m-d H:i:s'), serialize($this->langArr));
+ DB::getInstance()->query($query, array($language, date('Y-m-d H:i:s'), serialize($this->langArr)));
}
if (isset($this->langArr[$phrase])) {
Modified: branches/release-candidates/sciret-1.2/models/UserGateway.php
===================================================================
--- branches/release-candidates/sciret-1.2/models/UserGateway.php 2008-07-08 03:02:12 UTC (rev 596)
+++ branches/release-candidates/sciret-1.2/models/UserGateway.php 2008-07-08 03:30:14 UTC (rev 597)
@@ -9,21 +9,20 @@
* @packager TheGang
*/
-require_once 'models/Model.php';
require_once 'models/User.php';
-class UserGateway extends Model {
+class UserGateway {
- function getValidatedUser($username, $password, $configuration) {
+ public static function getValidatedUser($username, $password, $configuration) {
if (in_array($configuration->getConfigValue('version'), array(0, '1.1.0'))) {
- $query = 'SELECT user_id, firstname, lastname, username, email, admin FROM users WHERE username=? AND password=MD5(?)';
+ $query = 'SELECT id, firstname, lastname, username, email, admin FROM users WHERE username=? AND password=MD5(?)';
} else {
- $query = 'SELECT user_id, firstname, lastname, username, email, password_changed, admin FROM users WHERE username=? AND password=MD5(?)';
+ $query = 'SELECT id, firstname, lastname, username, email, password_changed, admin FROM users WHERE username=? AND password=MD5(?)';
}
- $result = $this->db->query($query, $username, $password);
+ $result = DB::getInstance()->query($query, array($username, $password));
if ($row = $result->fetch()) {
$user = new User;
- $user->setId($row['user_id']);
+ $user->setId($row['id']);
$user->setFirstName($row['firstname']);
$user->setLastName($row['lastname']);
$user->setUserName($row['username']);
@@ -32,6 +31,7 @@
$user->setPasswordChanged($row['password_changed']);
}
$user->setAdmin($row['admin']);
+ $user->setRole();
return $user;
}
@@ -40,12 +40,12 @@
}
function getUsersList() {
- $query = 'SELECT user_id, firstname, lastname, username, email, admin FROM users';
+ $query = 'SELECT id, firstname, lastname, username, email, admin FROM users';
$result = $this->db->query($query);
$users = array();
while ($row = $result->fetch()) {
$user = new User;
- $user->setId($row['user_id']);
+ $user->setId($row['id']);
$user->setFirstName($row['firstname']);
$user->setLastName($row['lastname']);
$user->setUserName($row['username']);
@@ -58,7 +58,7 @@
}
function deleteUser($userId) {
- $query = 'DELETE FROM users WHERE user_id=?';
+ $query = 'DELETE FROM users WHERE id=?';
$this->db->query($query, $userId);
$query = 'UPDATE articles SET user_id = 1 WHERE user_id=?';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 03:02:14
|
Revision: 596
http://sciret.svn.sourceforge.net/sciret/?rev=596&view=rev
Author: alpeb
Date: 2008-07-07 20:02:12 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
use class constants instead of global constants
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/flowMap.php
Modified: branches/release-candidates/sciret-1.2/flowMap.php
===================================================================
--- branches/release-candidates/sciret-1.2/flowMap.php 2008-07-08 02:42:24 UTC (rev 595)
+++ branches/release-candidates/sciret-1.2/flowMap.php 2008-07-08 03:02:12 UTC (rev 596)
@@ -11,78 +11,78 @@
define('VIEW_DEFAULT', 'MainView');
-// ClassName => array(minimumRole, loadConfiguration, showHeader, allowOnlyIfPublicKB(for ROLE_ANONYMOUS)?)
+// ClassName => array(minimumRole, loadConfiguration, showHeader, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
$views = array(
- 'NotInstalled' => array(ROLE_ANONYMOUS, false, false, false),
- 'InstallEnterCredentials' => array(ROLE_ANONYMOUS, false, false, false),
- 'InstallOk' => array(ROLE_ANONYMOUS, true, false, false),
- 'Login' => array(ROLE_ANONYMOUS, true, true, false),
- 'MainView' => array(ROLE_ANONYMOUS, true, true, true),
- 'EditArticle' => array(ROLE_REGISTERED, true, true),
- 'EditBookmark' => array(ROLE_REGISTERED, true, true),
- 'ViewArticle' => array(ROLE_ANONYMOUS, true, true, true),
- 'ViewBookmark' => array(ROLE_ANONYMOUS, true, true, true),
- 'ManageUsers' => array(ROLE_ADMIN, true, true),
- 'EditUser' => array(ROLE_REGISTERED, true, true),
- 'AddQuestion' => array(ROLE_ANONYMOUS, true, true, true),
- 'EditCategories' => array(ROLE_ANONYMOUS, true, true, true),
- 'EditCategory' => array(ROLE_ADMIN, true, true),
- 'EditPreferences' => array(ROLE_ANONYMOUS, true, true, true),
- 'ManageArticles' => array(ROLE_REGISTERED, true, false),
- 'ManageQuestions' => array(ROLE_REGISTERED, true, true),
- 'SearchResults' => array(ROLE_ANONYMOUS, true, true, true),
- 'AdvancedSearch' => array(ROLE_ANONYMOUS, true, true, true),
- 'PrinterView' => array(ROLE_ANONYMOUS, true, false, true),
- 'MailArticle' => array(ROLE_ANONYMOUS, true, true, true),
- 'ViewComments' => array(ROLE_ANONYMOUS, true, false, true),
- 'ViewBookmarkDetails' => array(ROLE_ANONYMOUS, true, false, true),
- 'ViewRelatedArticles' => array(ROLE_ANONYMOUS, true, false, true),
- 'GetFavoritesDropdown' => array(ROLE_REGISTERED, true, false),
- 'GetTodosDropdown' => array(ROLE_REGISTERED, true, false),
- 'EditTodo' => array(ROLE_REGISTERED, true, false),
- 'Upgrade' => array(ROLE_ANONYMOUS, true, true, false),
- 'UpgradeOk' => array(ROLE_ANONYMOUS, true, true, false),
+ 'NotInstalled' => array(User::ROLE_ANONYMOUS, false, false, false),
+ 'InstallEnterCredentials' => array(User::ROLE_ANONYMOUS, false, false, false),
+ 'InstallOk' => array(User::ROLE_ANONYMOUS, true, false, false),
+ 'Login' => array(User::ROLE_ANONYMOUS, true, true, false),
+ 'MainView' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'EditArticle' => array(User::ROLE_REGISTERED, true, true),
+ 'EditBookmark' => array(User::ROLE_REGISTERED, true, true),
+ 'ViewArticle' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'ViewBookmark' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'ManageUsers' => array(User::ROLE_ADMIN, true, true),
+ 'EditUser' => array(User::ROLE_REGISTERED, true, true),
+ 'AddQuestion' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'EditCategories' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'EditCategory' => array(User::ROLE_ADMIN, true, true),
+ 'EditPreferences' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'ManageArticles' => array(User::ROLE_REGISTERED, true, false),
+ 'ManageQuestions' => array(User::ROLE_REGISTERED, true, true),
+ 'SearchResults' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'AdvancedSearch' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'PrinterView' => array(User::ROLE_ANONYMOUS, true, false, true),
+ 'MailArticle' => array(User::ROLE_ANONYMOUS, true, true, true),
+ 'ViewComments' => array(User::ROLE_ANONYMOUS, true, false, true),
+ 'ViewBookmarkDetails' => array(User::ROLE_ANONYMOUS, true, false, true),
+ 'ViewRelatedArticles' => array(User::ROLE_ANONYMOUS, true, false, true),
+ 'GetFavoritesDropdown' => array(User::ROLE_REGISTERED, true, false),
+ 'GetTodosDropdown' => array(User::ROLE_REGISTERED, true, false),
+ 'EditTodo' => array(User::ROLE_REGISTERED, true, false),
+ 'Upgrade' => array(User::ROLE_ANONYMOUS, true, true, false),
+ 'UpgradeOk' => array(User::ROLE_ANONYMOUS, true, true, false),
);
-// ClassName => array(minimumRole, loadConfiguration, allowOnlyIfPublicKB(for ROLE_ANONYMOUS)?)
+// ClassName => array(minimumRole, loadConfiguration, allowOnlyIfPublicKB(for User::ROLE_ANONYMOUS)?)
$actions = array(
- 'Install' => array(ROLE_ANONYMOUS, false, false),
- 'Login' => array(ROLE_ANONYMOUS, true, false),
- 'Logout' => array(ROLE_REGISTERED, true),
- 'SaveArticle' => array(ROLE_REGISTERED, true),
- 'SaveBookmark' => array(ROLE_REGISTERED, true),
- 'UploadFile' => array(ROLE_REGISTERED, true),
- 'GetFile' => array(ROLE_ANONYMOUS, true, true),
- 'DeleteFile' => array(ROLE_REGISTERED, true),
- 'AddLink' => array(ROLE_REGISTERED, true),
- 'DeleteLink' => array(ROLE_REGISTERED, true),
- 'AddCommentAndRating' => array(ROLE_ANONYMOUS, true, true),
- 'DeleteComment' => array(ROLE_REGISTERED, true),
- 'PublishComment' => array(ROLE_REGISTERED, true),
- 'EditUser' => array(ROLE_REGISTERED, true),
- 'DeleteUser' => array(ROLE_ADMIN, true),
- 'AddQuestion' => array(ROLE_ANONYMOUS, true, true),
- 'SaveCategory' => array(ROLE_ADMIN, true),
- 'DeleteCategory' => array(ROLE_ADMIN, true),
- 'SavePreferences' => array(ROLE_ANONYMOUS, true, true),
- 'DeleteArticle' => array(ROLE_REGISTERED, true),
- 'PublishArticle' => array(ROLE_REGISTERED, true),
- 'PublishQuestion' => array(ROLE_REGISTERED, true),
- 'AddRelatedArticles' => array(ROLE_REGISTERED, true),
- 'DeleteRelatedArticle' => array(ROLE_REGISTERED, true),
- 'MailArticle' => array(ROLE_ANONYMOUS, true, true),
- 'ArticleToPdf' => array(ROLE_ANONYMOUS, true, true),
- 'DeleteQuestion' => array(ROLE_REGISTERED, true),
- 'MarkArticle' => array(ROLE_REGISTERED, true),
- 'MarkSearchResults' => array(ROLE_REGISTERED, true),
- 'MarkLocation' => array(ROLE_REGISTERED, true),
- 'SaveTodo' => array(ROLE_REGISTERED, true),
- 'CompleteTodo' => array(ROLE_REGISTERED, true),
- 'DeleteTodo' => array(ROLE_REGISTERED, true),
- 'MarkArticleFinal' => array(ROLE_REGISTERED, true),
- 'Upgrade' => array(ROLE_ANONYMOUS, true, false),
- 'HideCategory' => array(ROLE_ANONYMOUS, true, true),
- 'ShowCategory' => array(ROLE_ANONYMOUS, true, true),
+ 'Install' => array(User::ROLE_ANONYMOUS, false, false),
+ 'Login' => array(User::ROLE_ANONYMOUS, true, false),
+ 'Logout' => array(User::ROLE_REGISTERED, true),
+ 'SaveArticle' => array(User::ROLE_REGISTERED, true),
+ 'SaveBookmark' => array(User::ROLE_REGISTERED, true),
+ 'UploadFile' => array(User::ROLE_REGISTERED, true),
+ 'GetFile' => array(User::ROLE_ANONYMOUS, true, true),
+ 'DeleteFile' => array(User::ROLE_REGISTERED, true),
+ 'AddLink' => array(User::ROLE_REGISTERED, true),
+ 'DeleteLink' => array(User::ROLE_REGISTERED, true),
+ 'AddCommentAndRating' => array(User::ROLE_ANONYMOUS, true, true),
+ 'DeleteComment' => array(User::ROLE_REGISTERED, true),
+ 'PublishComment' => array(User::ROLE_REGISTERED, true),
+ 'EditUser' => array(User::ROLE_REGISTERED, true),
+ 'DeleteUser' => array(User::ROLE_ADMIN, true),
+ 'AddQuestion' => array(User::ROLE_ANONYMOUS, true, true),
+ 'SaveCategory' => array(User::ROLE_ADMIN, true),
+ 'DeleteCategory' => array(User::ROLE_ADMIN, true),
+ 'SavePreferences' => array(User::ROLE_ANONYMOUS, true, true),
+ 'DeleteArticle' => array(User::ROLE_REGISTERED, true),
+ 'PublishArticle' => array(User::ROLE_REGISTERED, true),
+ 'PublishQuestion' => array(User::ROLE_REGISTERED, true),
+ 'AddRelatedArticles' => array(User::ROLE_REGISTERED, true),
+ 'DeleteRelatedArticle' => array(User::ROLE_REGISTERED, true),
+ 'MailArticle' => array(User::ROLE_ANONYMOUS, true, true),
+ 'ArticleToPdf' => array(User::ROLE_ANONYMOUS, true, true),
+ 'DeleteQuestion' => array(User::ROLE_REGISTERED, true),
+ 'MarkArticle' => array(User::ROLE_REGISTERED, true),
+ 'MarkSearchResults' => array(User::ROLE_REGISTERED, true),
+ 'MarkLocation' => array(User::ROLE_REGISTERED, true),
+ 'SaveTodo' => array(User::ROLE_REGISTERED, true),
+ 'CompleteTodo' => array(User::ROLE_REGISTERED, true),
+ 'DeleteTodo' => array(User::ROLE_REGISTERED, true),
+ 'MarkArticleFinal' => array(User::ROLE_REGISTERED, true),
+ 'Upgrade' => array(User::ROLE_ANONYMOUS, true, false),
+ 'HideCategory' => array(User::ROLE_ANONYMOUS, true, true),
+ 'ShowCategory' => array(User::ROLE_ANONYMOUS, true, true),
);
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-08 02:42:25
|
Revision: 595
http://sciret.svn.sourceforge.net/sciret/?rev=595&view=rev
Author: alpeb
Date: 2008-07-07 19:42:24 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
added libs dir to hold svn:externals reference to the zend framework
Added Paths:
-----------
branches/release-candidates/sciret-1.2/libs/
Property changes on: branches/release-candidates/sciret-1.2/libs
___________________________________________________________________
Name: svn:externals
+ Zend http://framework.zend.com/svn/framework/standard/tags/release-1.5.2/library/Zend
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-07-07 01:52:22
|
Revision: 594
http://sciret.svn.sourceforge.net/sciret/?rev=594&view=rev
Author: alpeb
Date: 2008-07-06 18:51:57 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
merged branches/release-candidates/sciret-1.2 -r 416:593 into the trunk
Modified Paths:
--------------
trunk/CHANGELOG
trunk/CONTRIBUTORS
trunk/classes/Controller.php
trunk/config.php
trunk/templates/EditCategories.tpl
trunk/templates/ManageArticles.tpl
trunk/views/EditCategories.php
trunk/views/ManageArticles.php
trunk/views/View.php
trunk/views/ViewArticle.php
Added Paths:
-----------
trunk/actions/ArticleToPdf.php
trunk/actions/HideCategory.php
trunk/actions/ShowCategory.php
trunk/docs/sciret-install-OpenBSD-EN-images.html
trunk/fckeditor/editor/
trunk/fckeditor/editor/_source/
trunk/fckeditor/editor/_source/classes/
trunk/fckeditor/editor/_source/classes/fckcontextmenu.js
trunk/fckeditor/editor/_source/classes/fckdataprocessor.js
trunk/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
trunk/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
trunk/fckeditor/editor/_source/classes/fckdomrange.js
trunk/fckeditor/editor/_source/classes/fckdomrange_gecko.js
trunk/fckeditor/editor/_source/classes/fckdomrange_ie.js
trunk/fckeditor/editor/_source/classes/fckeditingarea.js
trunk/fckeditor/editor/_source/classes/fckelementpath.js
trunk/fckeditor/editor/_source/classes/fckenterkey.js
trunk/fckeditor/editor/_source/classes/fckevents.js
trunk/fckeditor/editor/_source/classes/fckicon.js
trunk/fckeditor/editor/_source/classes/fckiecleanup.js
trunk/fckeditor/editor/_source/classes/fckimagepreloader.js
trunk/fckeditor/editor/_source/classes/fckkeystrokehandler.js
trunk/fckeditor/editor/_source/classes/fckmenublock.js
trunk/fckeditor/editor/_source/classes/fckmenublockpanel.js
trunk/fckeditor/editor/_source/classes/fckmenuitem.js
trunk/fckeditor/editor/_source/classes/fckpanel.js
trunk/fckeditor/editor/_source/classes/fckplugin.js
trunk/fckeditor/editor/_source/classes/fckspecialcombo.js
trunk/fckeditor/editor/_source/classes/fckstyledef.js
trunk/fckeditor/editor/_source/classes/fckstyledef_gecko.js
trunk/fckeditor/editor/_source/classes/fckstyledef_ie.js
trunk/fckeditor/editor/_source/classes/fckstylesloader.js
trunk/fckeditor/editor/_source/classes/fcktoolbar.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbutton.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
trunk/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
trunk/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
trunk/fckeditor/editor/_source/classes/fckw3crange.js
trunk/fckeditor/editor/_source/classes/fckxml_gecko.js
trunk/fckeditor/editor/_source/classes/fckxml_ie.js
trunk/fckeditor/editor/_source/commandclasses/
trunk/fckeditor/editor/_source/commandclasses/fck_othercommands.js
trunk/fckeditor/editor/_source/commandclasses/fckfitwindow.js
trunk/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
trunk/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
trunk/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
trunk/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
trunk/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
trunk/fckeditor/editor/_source/commandclasses/fckstylecommand.js
trunk/fckeditor/editor/_source/commandclasses/fcktablecommand.js
trunk/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
trunk/fckeditor/editor/_source/fckconstants.js
trunk/fckeditor/editor/_source/fckeditorapi.js
trunk/fckeditor/editor/_source/fckjscoreextensions.js
trunk/fckeditor/editor/_source/fckscriptloader.js
trunk/fckeditor/editor/_source/internals/
trunk/fckeditor/editor/_source/internals/fck.js
trunk/fckeditor/editor/_source/internals/fck_contextmenu.js
trunk/fckeditor/editor/_source/internals/fck_gecko.js
trunk/fckeditor/editor/_source/internals/fck_ie.js
trunk/fckeditor/editor/_source/internals/fckbrowserinfo.js
trunk/fckeditor/editor/_source/internals/fckcodeformatter.js
trunk/fckeditor/editor/_source/internals/fckcommands.js
trunk/fckeditor/editor/_source/internals/fckconfig.js
trunk/fckeditor/editor/_source/internals/fckdebug.js
trunk/fckeditor/editor/_source/internals/fckdialog.js
trunk/fckeditor/editor/_source/internals/fckdialog_gecko.js
trunk/fckeditor/editor/_source/internals/fckdialog_ie.js
trunk/fckeditor/editor/_source/internals/fckdocumentprocessor.js
trunk/fckeditor/editor/_source/internals/fckdomtools.js
trunk/fckeditor/editor/_source/internals/fcklanguagemanager.js
trunk/fckeditor/editor/_source/internals/fcklisthandler.js
trunk/fckeditor/editor/_source/internals/fcklistslib.js
trunk/fckeditor/editor/_source/internals/fckplugins.js
trunk/fckeditor/editor/_source/internals/fckregexlib.js
trunk/fckeditor/editor/_source/internals/fckselection.js
trunk/fckeditor/editor/_source/internals/fckselection_gecko.js
trunk/fckeditor/editor/_source/internals/fckselection_ie.js
trunk/fckeditor/editor/_source/internals/fcktablehandler.js
trunk/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
trunk/fckeditor/editor/_source/internals/fcktablehandler_ie.js
trunk/fckeditor/editor/_source/internals/fcktoolbaritems.js
trunk/fckeditor/editor/_source/internals/fcktoolbarset.js
trunk/fckeditor/editor/_source/internals/fcktools.js
trunk/fckeditor/editor/_source/internals/fcktools_gecko.js
trunk/fckeditor/editor/_source/internals/fcktools_ie.js
trunk/fckeditor/editor/_source/internals/fckundo.js
trunk/fckeditor/editor/_source/internals/fckundo_gecko.js
trunk/fckeditor/editor/_source/internals/fckundo_ie.js
trunk/fckeditor/editor/_source/internals/fckurlparams.js
trunk/fckeditor/editor/_source/internals/fckxhtml.js
trunk/fckeditor/editor/_source/internals/fckxhtml_gecko.js
trunk/fckeditor/editor/_source/internals/fckxhtml_ie.js
trunk/fckeditor/editor/_source/internals/fckxhtmlentities.js
trunk/fckeditor/editor/css/
trunk/fckeditor/editor/css/behaviors/
trunk/fckeditor/editor/css/behaviors/disablehandles.htc
trunk/fckeditor/editor/css/behaviors/showtableborders.htc
trunk/fckeditor/editor/css/fck_editorarea.css
trunk/fckeditor/editor/css/fck_internal.css
trunk/fckeditor/editor/css/fck_showtableborders_gecko.css
trunk/fckeditor/editor/css/images/
trunk/fckeditor/editor/css/images/fck_anchor.gif
trunk/fckeditor/editor/css/images/fck_flashlogo.gif
trunk/fckeditor/editor/css/images/fck_hiddenfield.gif
trunk/fckeditor/editor/css/images/fck_pagebreak.gif
trunk/fckeditor/editor/dialog/
trunk/fckeditor/editor/dialog/common/
trunk/fckeditor/editor/dialog/common/fck_dialog_common.css
trunk/fckeditor/editor/dialog/common/fck_dialog_common.js
trunk/fckeditor/editor/dialog/common/fcknumericfield.htc
trunk/fckeditor/editor/dialog/common/images/
trunk/fckeditor/editor/dialog/common/images/locked.gif
trunk/fckeditor/editor/dialog/common/images/reset.gif
trunk/fckeditor/editor/dialog/common/images/unlocked.gif
trunk/fckeditor/editor/dialog/common/moz-bindings.xml
trunk/fckeditor/editor/dialog/fck_about/
trunk/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif
trunk/fckeditor/editor/dialog/fck_about/logo_fredck.gif
trunk/fckeditor/editor/dialog/fck_about.html
trunk/fckeditor/editor/dialog/fck_anchor.html
trunk/fckeditor/editor/dialog/fck_button.html
trunk/fckeditor/editor/dialog/fck_checkbox.html
trunk/fckeditor/editor/dialog/fck_colorselector.html
trunk/fckeditor/editor/dialog/fck_docprops/
trunk/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
trunk/fckeditor/editor/dialog/fck_docprops.html
trunk/fckeditor/editor/dialog/fck_find.html
trunk/fckeditor/editor/dialog/fck_flash/
trunk/fckeditor/editor/dialog/fck_flash/fck_flash.js
trunk/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
trunk/fckeditor/editor/dialog/fck_flash.html
trunk/fckeditor/editor/dialog/fck_form.html
trunk/fckeditor/editor/dialog/fck_hiddenfield.html
trunk/fckeditor/editor/dialog/fck_image/
trunk/fckeditor/editor/dialog/fck_image/fck_image.js
trunk/fckeditor/editor/dialog/fck_image/fck_image_preview.html
trunk/fckeditor/editor/dialog/fck_image.html
trunk/fckeditor/editor/dialog/fck_link/
trunk/fckeditor/editor/dialog/fck_link/fck_link.js
trunk/fckeditor/editor/dialog/fck_link.html
trunk/fckeditor/editor/dialog/fck_listprop.html
trunk/fckeditor/editor/dialog/fck_paste.html
trunk/fckeditor/editor/dialog/fck_radiobutton.html
trunk/fckeditor/editor/dialog/fck_replace.html
trunk/fckeditor/editor/dialog/fck_select/
trunk/fckeditor/editor/dialog/fck_select/fck_select.js
trunk/fckeditor/editor/dialog/fck_select.html
trunk/fckeditor/editor/dialog/fck_smiley.html
trunk/fckeditor/editor/dialog/fck_source.html
trunk/fckeditor/editor/dialog/fck_specialchar.html
trunk/fckeditor/editor/dialog/fck_spellerpages/
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
trunk/fckeditor/editor/dialog/fck_spellerpages.html
trunk/fckeditor/editor/dialog/fck_table.html
trunk/fckeditor/editor/dialog/fck_tablecell.html
trunk/fckeditor/editor/dialog/fck_template/
trunk/fckeditor/editor/dialog/fck_template/images/
trunk/fckeditor/editor/dialog/fck_template/images/template1.gif
trunk/fckeditor/editor/dialog/fck_template/images/template2.gif
trunk/fckeditor/editor/dialog/fck_template/images/template3.gif
trunk/fckeditor/editor/dialog/fck_template.html
trunk/fckeditor/editor/dialog/fck_textarea.html
trunk/fckeditor/editor/dialog/fck_textfield.html
trunk/fckeditor/editor/fckdebug.html
trunk/fckeditor/editor/fckdialog.html
trunk/fckeditor/editor/fckeditor.html
trunk/fckeditor/editor/filemanager/
trunk/fckeditor/editor/filemanager/browser/
trunk/fckeditor/editor/filemanager/browser/default/
trunk/fckeditor/editor/filemanager/browser/default/browser.css
trunk/fckeditor/editor/filemanager/browser/default/browser.html
trunk/fckeditor/editor/filemanager/browser/default/connectors/
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/config.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/io.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/util.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/test.html
trunk/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
trunk/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
trunk/fckeditor/editor/filemanager/browser/default/frmfolders.html
trunk/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
trunk/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
trunk/fckeditor/editor/filemanager/browser/default/frmupload.html
trunk/fckeditor/editor/filemanager/browser/default/images/
trunk/fckeditor/editor/filemanager/browser/default/images/ButtonArrow.gif
trunk/fckeditor/editor/filemanager/browser/default/images/Folder.gif
trunk/fckeditor/editor/filemanager/browser/default/images/Folder32.gif
trunk/fckeditor/editor/filemanager/browser/default/images/FolderOpened.gif
trunk/fckeditor/editor/filemanager/browser/default/images/FolderOpened32.gif
trunk/fckeditor/editor/filemanager/browser/default/images/FolderUp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/ai.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/avi.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/cs.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/dll.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/doc.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/exe.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/fla.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/gif.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/htm.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/html.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/js.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/png.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/swf.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/swt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/txt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/xls.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/xml.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/zip.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/ai.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/avi.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/bmp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/cs.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/dll.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/doc.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/exe.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/fla.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/gif.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/htm.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/html.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/jpg.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/js.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/mdb.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/mp3.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/pdf.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/png.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/ppt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/rdp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/swf.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/swt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/txt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/vsd.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/xls.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/xml.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/zip.gif
trunk/fckeditor/editor/filemanager/browser/default/images/spacer.gif
trunk/fckeditor/editor/filemanager/browser/default/js/
trunk/fckeditor/editor/filemanager/browser/default/js/common.js
trunk/fckeditor/editor/filemanager/browser/default/js/fckxml.js
trunk/fckeditor/editor/filemanager/connectors/
trunk/fckeditor/editor/filemanager/connectors/php/
trunk/fckeditor/editor/filemanager/connectors/php/basexml.php
trunk/fckeditor/editor/filemanager/connectors/php/commands.php
trunk/fckeditor/editor/filemanager/connectors/php/config.php
trunk/fckeditor/editor/filemanager/connectors/php/connector.php
trunk/fckeditor/editor/filemanager/connectors/php/io.php
trunk/fckeditor/editor/filemanager/connectors/php/upload.php
trunk/fckeditor/editor/filemanager/connectors/php/util.php
trunk/fckeditor/editor/filemanager/connectors/test.html
trunk/fckeditor/editor/filemanager/connectors/uploadtest.html
trunk/fckeditor/editor/filemanager/upload/
trunk/fckeditor/editor/filemanager/upload/php/
trunk/fckeditor/editor/filemanager/upload/php/config.php
trunk/fckeditor/editor/filemanager/upload/php/upload.php
trunk/fckeditor/editor/filemanager/upload/php/util.php
trunk/fckeditor/editor/filemanager/upload/test.html
trunk/fckeditor/editor/images/
trunk/fckeditor/editor/images/anchor.gif
trunk/fckeditor/editor/images/arrow_ltr.gif
trunk/fckeditor/editor/images/arrow_rtl.gif
trunk/fckeditor/editor/images/smiley/
trunk/fckeditor/editor/images/smiley/msn/
trunk/fckeditor/editor/images/smiley/msn/angel_smile.gif
trunk/fckeditor/editor/images/smiley/msn/angry_smile.gif
trunk/fckeditor/editor/images/smiley/msn/broken_heart.gif
trunk/fckeditor/editor/images/smiley/msn/cake.gif
trunk/fckeditor/editor/images/smiley/msn/confused_smile.gif
trunk/fckeditor/editor/images/smiley/msn/cry_smile.gif
trunk/fckeditor/editor/images/smiley/msn/devil_smile.gif
trunk/fckeditor/editor/images/smiley/msn/embaressed_smile.gif
trunk/fckeditor/editor/images/smiley/msn/envelope.gif
trunk/fckeditor/editor/images/smiley/msn/heart.gif
trunk/fckeditor/editor/images/smiley/msn/kiss.gif
trunk/fckeditor/editor/images/smiley/msn/lightbulb.gif
trunk/fckeditor/editor/images/smiley/msn/omg_smile.gif
trunk/fckeditor/editor/images/smiley/msn/regular_smile.gif
trunk/fckeditor/editor/images/smiley/msn/sad_smile.gif
trunk/fckeditor/editor/images/smiley/msn/shades_smile.gif
trunk/fckeditor/editor/images/smiley/msn/teeth_smile.gif
trunk/fckeditor/editor/images/smiley/msn/thumbs_down.gif
trunk/fckeditor/editor/images/smiley/msn/thumbs_up.gif
trunk/fckeditor/editor/images/smiley/msn/tounge_smile.gif
trunk/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
trunk/fckeditor/editor/images/smiley/msn/wink_smile.gif
trunk/fckeditor/editor/images/spacer.gif
trunk/fckeditor/editor/lang/
trunk/fckeditor/editor/lang/_getfontformat.html
trunk/fckeditor/editor/lang/_translationstatus.txt
trunk/fckeditor/editor/lang/af.js
trunk/fckeditor/editor/lang/ar.js
trunk/fckeditor/editor/lang/bg.js
trunk/fckeditor/editor/lang/bn.js
trunk/fckeditor/editor/lang/bs.js
trunk/fckeditor/editor/lang/ca.js
trunk/fckeditor/editor/lang/cs.js
trunk/fckeditor/editor/lang/da.js
trunk/fckeditor/editor/lang/de.js
trunk/fckeditor/editor/lang/el.js
trunk/fckeditor/editor/lang/en-au.js
trunk/fckeditor/editor/lang/en-ca.js
trunk/fckeditor/editor/lang/en-uk.js
trunk/fckeditor/editor/lang/en.js
trunk/fckeditor/editor/lang/eo.js
trunk/fckeditor/editor/lang/es.js
trunk/fckeditor/editor/lang/et.js
trunk/fckeditor/editor/lang/eu.js
trunk/fckeditor/editor/lang/fa.js
trunk/fckeditor/editor/lang/fi.js
trunk/fckeditor/editor/lang/fo.js
trunk/fckeditor/editor/lang/fr.js
trunk/fckeditor/editor/lang/gl.js
trunk/fckeditor/editor/lang/he.js
trunk/fckeditor/editor/lang/hi.js
trunk/fckeditor/editor/lang/hr.js
trunk/fckeditor/editor/lang/hu.js
trunk/fckeditor/editor/lang/it.js
trunk/fckeditor/editor/lang/ja.js
trunk/fckeditor/editor/lang/km.js
trunk/fckeditor/editor/lang/ko.js
trunk/fckeditor/editor/lang/lt.js
trunk/fckeditor/editor/lang/lv.js
trunk/fckeditor/editor/lang/mn.js
trunk/fckeditor/editor/lang/ms.js
trunk/fckeditor/editor/lang/nb.js
trunk/fckeditor/editor/lang/nl.js
trunk/fckeditor/editor/lang/no.js
trunk/fckeditor/editor/lang/pl.js
trunk/fckeditor/editor/lang/pt-br.js
trunk/fckeditor/editor/lang/pt.js
trunk/fckeditor/editor/lang/ro.js
trunk/fckeditor/editor/lang/ru.js
trunk/fckeditor/editor/lang/sk.js
trunk/fckeditor/editor/lang/sl.js
trunk/fckeditor/editor/lang/sr-latn.js
trunk/fckeditor/editor/lang/sr.js
trunk/fckeditor/editor/lang/sv.js
trunk/fckeditor/editor/lang/th.js
trunk/fckeditor/editor/lang/tr.js
trunk/fckeditor/editor/lang/uk.js
trunk/fckeditor/editor/lang/vi.js
trunk/fckeditor/editor/lang/zh-cn.js
trunk/fckeditor/editor/lang/zh.js
trunk/fckeditor/editor/plugins/
trunk/fckeditor/editor/plugins/autogrow/
trunk/fckeditor/editor/plugins/autogrow/fckplugin.js
trunk/fckeditor/editor/plugins/bbcode/
trunk/fckeditor/editor/plugins/bbcode/_sample/
trunk/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
trunk/fckeditor/editor/plugins/bbcode/_sample/sample.html
trunk/fckeditor/editor/plugins/bbcode/fckplugin.js
trunk/fckeditor/editor/plugins/dragresizetable/
trunk/fckeditor/editor/plugins/dragresizetable/fckplugin.js
trunk/fckeditor/editor/plugins/placeholder/
trunk/fckeditor/editor/plugins/placeholder/fck_placeholder.html
trunk/fckeditor/editor/plugins/placeholder/fckplugin.js
trunk/fckeditor/editor/plugins/placeholder/lang/
trunk/fckeditor/editor/plugins/placeholder/lang/de.js
trunk/fckeditor/editor/plugins/placeholder/lang/en.js
trunk/fckeditor/editor/plugins/placeholder/lang/fr.js
trunk/fckeditor/editor/plugins/placeholder/lang/it.js
trunk/fckeditor/editor/plugins/placeholder/lang/pl.js
trunk/fckeditor/editor/plugins/placeholder/placeholder.gif
trunk/fckeditor/editor/plugins/simplecommands/
trunk/fckeditor/editor/plugins/simplecommands/fckplugin.js
trunk/fckeditor/editor/plugins/tablecommands/
trunk/fckeditor/editor/plugins/tablecommands/fckplugin.js
trunk/fckeditor/editor/skins/
trunk/fckeditor/editor/skins/_fckviewstrips.html
trunk/fckeditor/editor/skins/default/
trunk/fckeditor/editor/skins/default/fck_dialog.css
trunk/fckeditor/editor/skins/default/fck_editor.css
trunk/fckeditor/editor/skins/default/fck_strip.gif
trunk/fckeditor/editor/skins/default/images/
trunk/fckeditor/editor/skins/default/images/toolbar.arrowright.gif
trunk/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif
trunk/fckeditor/editor/skins/default/images/toolbar.collapse.gif
trunk/fckeditor/editor/skins/default/images/toolbar.end.gif
trunk/fckeditor/editor/skins/default/images/toolbar.expand.gif
trunk/fckeditor/editor/skins/default/images/toolbar.separator.gif
trunk/fckeditor/editor/skins/default/images/toolbar.start.gif
trunk/fckeditor/editor/skins/office2003/
trunk/fckeditor/editor/skins/office2003/fck_dialog.css
trunk/fckeditor/editor/skins/office2003/fck_editor.css
trunk/fckeditor/editor/skins/office2003/fck_strip.gif
trunk/fckeditor/editor/skins/office2003/images/
trunk/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.bg.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.end.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.expand.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.separator.gif
trunk/fckeditor/editor/skins/office2003/images/toolbar.start.gif
trunk/fckeditor/editor/skins/silver/
trunk/fckeditor/editor/skins/silver/fck_dialog.css
trunk/fckeditor/editor/skins/silver/fck_editor.css
trunk/fckeditor/editor/skins/silver/fck_strip.gif
trunk/fckeditor/editor/skins/silver/images/
trunk/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.collapse.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.end.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.expand.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.separator.gif
trunk/fckeditor/editor/skins/silver/images/toolbar.start.gif
trunk/fckeditor/fckconfig.js
trunk/fckeditor/fckeditor.js
trunk/fckeditor/fckeditor.php
trunk/fckeditor/fckeditor_php4.php
trunk/fckeditor/fckeditor_php5.php
trunk/fckeditor/fckpackager.xml
trunk/fckeditor/fckstyles.xml
trunk/fckeditor/fcktemplates.xml
trunk/fckeditor/license.txt
trunk/images/file_pdf.gif
trunk/images/question.png
trunk/languages/BrazilPortuguese.txt
trunk/languages/French.txt
trunk/languages/Italian.txt
trunk/languages/Norsk.txt
trunk/languages/Svenska.txt
trunk/setup/upgrade_1.1.0.sql
trunk/setup/upgrade_1.2.0.sql
trunk/tcpdf/
trunk/tcpdf/.eraseme.php.swp
trunk/tcpdf/.eraseme2.php.swp
trunk/tcpdf/.tcpdf.php.swp
trunk/tcpdf/CHANGELOG.TXT
trunk/tcpdf/LICENSE.TXT
trunk/tcpdf/README.TXT
trunk/tcpdf/barcode/
trunk/tcpdf/barcode/barcode.php
trunk/tcpdf/barcode/c128aobject.php
trunk/tcpdf/barcode/c128bobject.php
trunk/tcpdf/barcode/c128cobject.php
trunk/tcpdf/barcode/c39object.php
trunk/tcpdf/barcode/i25object.php
trunk/tcpdf/barcode/image.php
trunk/tcpdf/barcode/lesser.txt
trunk/tcpdf/cache/
trunk/tcpdf/config/
trunk/tcpdf/config/lang/
trunk/tcpdf/config/lang/eng.php
trunk/tcpdf/config/tcpdf_config.php
trunk/tcpdf/doc/
trunk/tcpdf/doc/blank.html
trunk/tcpdf/doc/classtrees_com.tecnick.tcpdf.html
trunk/tcpdf/doc/com.tecnick.tcpdf/
trunk/tcpdf/doc/com.tecnick.tcpdf/BarcodeObject.html
trunk/tcpdf/doc/com.tecnick.tcpdf/C128AObject.html
trunk/tcpdf/doc/com.tecnick.tcpdf/C128BObject.html
trunk/tcpdf/doc/com.tecnick.tcpdf/C128CObject.html
trunk/tcpdf/doc/com.tecnick.tcpdf/C39Object.html
trunk/tcpdf/doc/com.tecnick.tcpdf/I25Object.html
trunk/tcpdf/doc/com.tecnick.tcpdf/TCPDF.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_barcode_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c128aobject_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c128bobject_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c128cobject_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c39object_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_i25object_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_image_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_config_lang_eng_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_config_tcpdf_config_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_html_entity_decode_php4_php.html
trunk/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_tcpdf_php.html
trunk/tcpdf/doc/elementindex.html
trunk/tcpdf/doc/elementindex_com.tecnick.tcpdf.html
trunk/tcpdf/doc/errors.html
trunk/tcpdf/doc/index.html
trunk/tcpdf/doc/li_com.tecnick.tcpdf.html
trunk/tcpdf/doc/media/
trunk/tcpdf/doc/media/banner.css
trunk/tcpdf/doc/media/stylesheet.css
trunk/tcpdf/doc/packages.html
trunk/tcpdf/fonts/
trunk/tcpdf/fonts/.noencode
trunk/tcpdf/fonts/README.TXT
trunk/tcpdf/fonts/dejavu-ttf-2.15/
trunk/tcpdf/fonts/dejavu-ttf-2.15/AUTHORS
trunk/tcpdf/fonts/dejavu-ttf-2.15/BUGS
trunk/tcpdf/fonts/dejavu-ttf-2.15/LICENSE
trunk/tcpdf/fonts/dejavu-ttf-2.15/NEWS
trunk/tcpdf/fonts/dejavu-ttf-2.15/README
trunk/tcpdf/fonts/dejavu-ttf-2.15/langcover.txt
trunk/tcpdf/fonts/dejavu-ttf-2.15/status.txt
trunk/tcpdf/fonts/dejavu-ttf-2.15/unicover.txt
trunk/tcpdf/fonts/dejavusans-bold.ctg.z
trunk/tcpdf/fonts/dejavusans-bold.z
trunk/tcpdf/fonts/dejavusans-boldoblique.ctg.z
trunk/tcpdf/fonts/dejavusans-boldoblique.z
trunk/tcpdf/fonts/dejavusans-extralight.ctg.z
trunk/tcpdf/fonts/dejavusans-extralight.php
trunk/tcpdf/fonts/dejavusans-extralight.z
trunk/tcpdf/fonts/dejavusans-oblique.ctg.z
trunk/tcpdf/fonts/dejavusans-oblique.z
trunk/tcpdf/fonts/dejavusans.ctg.z
trunk/tcpdf/fonts/dejavusans.php
trunk/tcpdf/fonts/dejavusans.z
trunk/tcpdf/fonts/dejavusansb.php
trunk/tcpdf/fonts/dejavusansbi.php
trunk/tcpdf/fonts/dejavusanscondensed-bold.ctg.z
trunk/tcpdf/fonts/dejavusanscondensed-bold.z
trunk/tcpdf/fonts/dejavusanscondensed-boldoblique.ctg.z
trunk/tcpdf/fonts/dejavusanscondensed-boldoblique.z
trunk/tcpdf/fonts/dejavusanscondensed-oblique.ctg.z
trunk/tcpdf/fonts/dejavusanscondensed-oblique.z
trunk/tcpdf/fonts/dejavusanscondensed.ctg.z
trunk/tcpdf/fonts/dejavusanscondensed.php
trunk/tcpdf/fonts/dejavusanscondensed.z
trunk/tcpdf/fonts/dejavusanscondensedb.php
trunk/tcpdf/fonts/dejavusanscondensedbi.php
trunk/tcpdf/fonts/dejavusanscondensedi.php
trunk/tcpdf/fonts/dejavusansi.php
trunk/tcpdf/fonts/dejavusansmono-bold.ctg.z
trunk/tcpdf/fonts/dejavusansmono-bold.z
trunk/tcpdf/fonts/dejavusansmono-boldoblique.ctg.z
trunk/tcpdf/fonts/dejavusansmono-boldoblique.z
trunk/tcpdf/fonts/dejavusansmono-oblique.ctg.z
trunk/tcpdf/fonts/dejavusansmono-oblique.z
trunk/tcpdf/fonts/dejavusansmono.ctg.z
trunk/tcpdf/fonts/dejavusansmono.php
trunk/tcpdf/fonts/dejavusansmono.z
trunk/tcpdf/fonts/dejavusansmonob.php
trunk/tcpdf/fonts/dejavusansmonobi.php
trunk/tcpdf/fonts/dejavusansmonoi.php
trunk/tcpdf/fonts/dejavuserif-bold.ctg.z
trunk/tcpdf/fonts/dejavuserif-bold.z
trunk/tcpdf/fonts/dejavuserif-boldoblique.ctg.z
trunk/tcpdf/fonts/dejavuserif-boldoblique.z
trunk/tcpdf/fonts/dejavuserif-oblique.ctg.z
trunk/tcpdf/fonts/dejavuserif-oblique.z
trunk/tcpdf/fonts/dejavuserif.ctg.z
trunk/tcpdf/fonts/dejavuserif.php
trunk/tcpdf/fonts/dejavuserif.z
trunk/tcpdf/fonts/dejavuserifb.php
trunk/tcpdf/fonts/dejavuserifbi.php
trunk/tcpdf/fonts/dejavuserifcondensed-bold.ctg.z
trunk/tcpdf/fonts/dejavuserifcondensed-bold.z
trunk/tcpdf/fonts/dejavuserifcondensed-boldoblique.ctg.z
trunk/tcpdf/fonts/dejavuserifcondensed-boldoblique.z
trunk/tcpdf/fonts/dejavuserifcondensed-oblique.ctg.z
trunk/tcpdf/fonts/dejavuserifcondensed-oblique.z
trunk/tcpdf/fonts/dejavuserifcondensed.ctg.z
trunk/tcpdf/fonts/dejavuserifcondensed.php
trunk/tcpdf/fonts/dejavuserifcondensed.z
trunk/tcpdf/fonts/dejavuserifcondensedb.php
trunk/tcpdf/fonts/dejavuserifcondensedbi.php
trunk/tcpdf/fonts/dejavuserifcondensedi.php
trunk/tcpdf/fonts/dejavuserifi.php
trunk/tcpdf/fonts/freefont/
trunk/tcpdf/fonts/freefont/AUTHORS
trunk/tcpdf/fonts/freefont/CREDITS
trunk/tcpdf/fonts/freefont/ChangeLog
trunk/tcpdf/fonts/freefont/INSTALL
trunk/tcpdf/fonts/freefont/README
trunk/tcpdf/fonts/freemono.ctg.z
trunk/tcpdf/fonts/freemono.php
trunk/tcpdf/fonts/freemono.z
trunk/tcpdf/fonts/freemonob.php
trunk/tcpdf/fonts/freemonobi.php
trunk/tcpdf/fonts/freemonobold.ctg.z
trunk/tcpdf/fonts/freemonobold.z
trunk/tcpdf/fonts/freemonoboldoblique.ctg.z
trunk/tcpdf/fonts/freemonoboldoblique.z
trunk/tcpdf/fonts/freemonoi.php
trunk/tcpdf/fonts/freemonooblique.ctg.z
trunk/tcpdf/fonts/freemonooblique.z
trunk/tcpdf/fonts/freesans.ctg.z
trunk/tcpdf/fonts/freesans.php
trunk/tcpdf/fonts/freesans.z
trunk/tcpdf/fonts/freesansb.php
trunk/tcpdf/fonts/freesansbi.php
trunk/tcpdf/fonts/freesansbold.ctg.z
trunk/tcpdf/fonts/freesansbold.z
trunk/tcpdf/fonts/freesansboldoblique.ctg.z
trunk/tcpdf/fonts/freesansboldoblique.z
trunk/tcpdf/fonts/freesansi.php
trunk/tcpdf/fonts/freesansoblique.ctg.z
trunk/tcpdf/fonts/freesansoblique.z
trunk/tcpdf/fonts/freeserif.ctg.z
trunk/tcpdf/fonts/freeserif.php
trunk/tcpdf/fonts/freeserif.z
trunk/tcpdf/fonts/freeserifb.php
trunk/tcpdf/fonts/freeserifbi.php
trunk/tcpdf/fonts/freeserifbold.ctg.z
trunk/tcpdf/fonts/freeserifbold.z
trunk/tcpdf/fonts/freeserifbolditalic.ctg.z
trunk/tcpdf/fonts/freeserifbolditalic.z
trunk/tcpdf/fonts/freeserifi.php
trunk/tcpdf/fonts/freeserifitalic.ctg.z
trunk/tcpdf/fonts/freeserifitalic.z
trunk/tcpdf/fonts/old/
trunk/tcpdf/fonts/old/.noencode
trunk/tcpdf/fonts/old/courier.php
trunk/tcpdf/fonts/old/helvetica.php
trunk/tcpdf/fonts/old/helveticab.php
trunk/tcpdf/fonts/old/helveticabi.php
trunk/tcpdf/fonts/old/helveticai.php
trunk/tcpdf/fonts/old/makefont/
trunk/tcpdf/fonts/old/makefont/cp1250.map
trunk/tcpdf/fonts/old/makefont/cp1251.map
trunk/tcpdf/fonts/old/makefont/cp1252.map
trunk/tcpdf/fonts/old/makefont/cp1253.map
trunk/tcpdf/fonts/old/makefont/cp1254.map
trunk/tcpdf/fonts/old/makefont/cp1255.map
trunk/tcpdf/fonts/old/makefont/cp1257.map
trunk/tcpdf/fonts/old/makefont/cp1258.map
trunk/tcpdf/fonts/old/makefont/cp874.map
trunk/tcpdf/fonts/old/makefont/iso-8859-1.map
trunk/tcpdf/fonts/old/makefont/iso-8859-11.map
trunk/tcpdf/fonts/old/makefont/iso-8859-15.map
trunk/tcpdf/fonts/old/makefont/iso-8859-16.map
trunk/tcpdf/fonts/old/makefont/iso-8859-2.map
trunk/tcpdf/fonts/old/makefont/iso-8859-4.map
trunk/tcpdf/fonts/old/makefont/iso-8859-5.map
trunk/tcpdf/fonts/old/makefont/iso-8859-7.map
trunk/tcpdf/fonts/old/makefont/iso-8859-9.map
trunk/tcpdf/fonts/old/makefont/koi8-r.map
trunk/tcpdf/fonts/old/makefont/koi8-u.map
trunk/tcpdf/fonts/old/makefont/makefont.php
trunk/tcpdf/fonts/old/symbol.php
trunk/tcpdf/fonts/old/times.php
trunk/tcpdf/fonts/old/timesb.php
trunk/tcpdf/fonts/old/timesbi.php
trunk/tcpdf/fonts/old/timesi.php
trunk/tcpdf/fonts/old/zapfdingbats.php
trunk/tcpdf/fonts/ttf-bitstream-vera-1.10/
trunk/tcpdf/fonts/ttf-bitstream-vera-1.10/COPYRIGHT.TXT
trunk/tcpdf/fonts/ttf-bitstream-vera-1.10/README.TXT
trunk/tcpdf/fonts/ttf-bitstream-vera-1.10/RELEASENOTES.TXT
trunk/tcpdf/fonts/ttf-bitstream-vera-1.10/local.conf
trunk/tcpdf/fonts/ttf2ufm/
trunk/tcpdf/fonts/ttf2ufm/README.TXT
trunk/tcpdf/fonts/ttf2ufm/makefontuni.php
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/CHANGES
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/CHANGES.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/COPYRIGHT
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/FONTS.hpux.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/FONTS.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/Makefile
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/README.FIRST
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/README.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/RPM/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/RPM/ttf2pt1.spec.src
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/README.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/cjk-latex-config
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/cjk-latex-t1mapgen
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/sfd2map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/README.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/t1-xf86.334.patch
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/t1-xf86.39.patch
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/Makefile
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/README.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/fontsz.cf
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/notscape
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nsfilter
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nsfix.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nspr
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nsprint
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/psfonts.cf
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/bdf.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/bitmap.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/byteorder.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/cygbuild.sh
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/README.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/adobestd/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/adobestd/adobe-std.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/README
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/encodings.alias
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/ibm-1251.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/ibm-866.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/iso8859-5.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/koi8-r.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/encodings.alias
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/ibm-1251.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/ibm-866.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/iso8859-5.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/koi8-r.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin1/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin1/iso8859-1.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin2/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin2/iso8859-2.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin4/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin4/iso8859-4
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin4/iso8859-4.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin5/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin5/iso8859-9
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/README
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/encodings.alias
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/ibm-1251.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/ibm-866.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/iso8859-5.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/koi8-r.tbl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ft.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/global.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/CP1250.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/CP1251.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/T2A_compact.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/adobe-standard-encoding.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cubg5plus.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cubig5.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cugb.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cugbk.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ubig5.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ugb.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ugbk.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/unicode-sample.map
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/Makefile
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/README.html
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bmpfont.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bz.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bzscreen.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bzscreen.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/cmpf.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/cntstems.pl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/dmpf.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/lst.pl
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/showdf
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/showg
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/pt1.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/pt1.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/runt1asm.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/convert
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/convert.cfg.sample
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/forceiso
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/frommap
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/html2man
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/inst_dir
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/inst_file
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/mkrel
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/t1fdir
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/trans
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/unhtml
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/x2gs
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/t1asm
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/t1asm.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1.1
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1.c
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1_convert.1
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1_x2gs.1
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2ufm
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/version.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/winbuild.bat
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm-src/windows.h
trunk/tcpdf/fonts/ttf2ufm/ttf2ufm.exe
trunk/tcpdf/fonts/vera.ctg.z
trunk/tcpdf/fonts/vera.php
trunk/tcpdf/fonts/vera.z
trunk/tcpdf/fonts/verab.ctg.z
trunk/tcpdf/fonts/verab.php
trunk/tcpdf/fonts/verab.z
trunk/tcpdf/fonts/verabi.ctg.z
trunk/tcpdf/fonts/verabi.php
trunk/tcpdf/fonts/verabi.z
trunk/tcpdf/fonts/verai.ctg.z
trunk/tcpdf/fonts/verai.php
trunk/tcpdf/fonts/verai.z
trunk/tcpdf/fonts/veramo.ctg.z
trunk/tcpdf/fonts/veramo.php
trunk/tcpdf/fonts/veramo.z
trunk/tcpdf/fonts/veramob.ctg.z
trunk/tcpdf/fonts/veramob.php
trunk/tcpdf/fonts/veramob.z
trunk/tcpdf/fonts/veramobi.ctg.z
trunk/tcpdf/fonts/veramobi.php
trunk/tcpdf/fonts/veramobi.z
trunk/tcpdf/fonts/veramoi.ctg.z
trunk/tcpdf/fonts/veramoi.php
trunk/tcpdf/fonts/veramoi.z
trunk/tcpdf/fonts/verase.ctg.z
trunk/tcpdf/fonts/verase.php
trunk/tcpdf/fonts/verase.z
trunk/tcpdf/fonts/veraseb.ctg.z
trunk/tcpdf/fonts/veraseb.php
trunk/tcpdf/fonts/veraseb.z
trunk/tcpdf/html_entity_decode_php4.php
trunk/tcpdf/images/
trunk/tcpdf/images/_blank.png
trunk/tcpdf/images/logo_example.png
trunk/tcpdf/tcpdf.php
trunk/tcpdf/test_old.php
trunk/tcpdf/test_unicode.php
trunk/tcpdf/utf8test.txt
Removed Paths:
-------------
trunk/actions/ArticleToPdf.php
trunk/actions/HideCategory.php
trunk/actions/ShowCategory.php
trunk/docs/sciret-install-OpenBSD-EN-images.html
trunk/fckeditor/.htaccess
trunk/fckeditor/editor/
trunk/fckeditor/editor/_source/
trunk/fckeditor/editor/_source/classes/
trunk/fckeditor/editor/_source/classes/fckcontextmenu.js
trunk/fckeditor/editor/_source/classes/fckdataprocessor.js
trunk/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
trunk/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
trunk/fckeditor/editor/_source/classes/fckdomrange.js
trunk/fckeditor/editor/_source/classes/fckdomrange_gecko.js
trunk/fckeditor/editor/_source/classes/fckdomrange_ie.js
trunk/fckeditor/editor/_source/classes/fckeditingarea.js
trunk/fckeditor/editor/_source/classes/fckelementpath.js
trunk/fckeditor/editor/_source/classes/fckenterkey.js
trunk/fckeditor/editor/_source/classes/fckevents.js
trunk/fckeditor/editor/_source/classes/fckicon.js
trunk/fckeditor/editor/_source/classes/fckiecleanup.js
trunk/fckeditor/editor/_source/classes/fckimagepreloader.js
trunk/fckeditor/editor/_source/classes/fckkeystrokehandler.js
trunk/fckeditor/editor/_source/classes/fckmenublock.js
trunk/fckeditor/editor/_source/classes/fckmenublockpanel.js
trunk/fckeditor/editor/_source/classes/fckmenuitem.js
trunk/fckeditor/editor/_source/classes/fckpanel.js
trunk/fckeditor/editor/_source/classes/fckplugin.js
trunk/fckeditor/editor/_source/classes/fckspecialcombo.js
trunk/fckeditor/editor/_source/classes/fckstyledef.js
trunk/fckeditor/editor/_source/classes/fckstyledef_gecko.js
trunk/fckeditor/editor/_source/classes/fckstyledef_ie.js
trunk/fckeditor/editor/_source/classes/fckstylesloader.js
trunk/fckeditor/editor/_source/classes/fcktoolbar.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbutton.js
trunk/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
trunk/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
trunk/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
trunk/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
trunk/fckeditor/editor/_source/classes/fckw3crange.js
trunk/fckeditor/editor/_source/classes/fckxml_gecko.js
trunk/fckeditor/editor/_source/classes/fckxml_ie.js
trunk/fckeditor/editor/_source/commandclasses/
trunk/fckeditor/editor/_source/commandclasses/fck_othercommands.js
trunk/fckeditor/editor/_source/commandclasses/fckfitwindow.js
trunk/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
trunk/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
trunk/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
trunk/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
trunk/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
trunk/fckeditor/editor/_source/commandclasses/fckstylecommand.js
trunk/fckeditor/editor/_source/commandclasses/fcktablecommand.js
trunk/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
trunk/fckeditor/editor/_source/fckconstants.js
trunk/fckeditor/editor/_source/fckeditorapi.js
trunk/fckeditor/editor/_source/fckjscoreextensions.js
trunk/fckeditor/editor/_source/fckscriptloader.js
trunk/fckeditor/editor/_source/internals/
trunk/fckeditor/editor/_source/internals/fck.js
trunk/fckeditor/editor/_source/internals/fck_contextmenu.js
trunk/fckeditor/editor/_source/internals/fck_gecko.js
trunk/fckeditor/editor/_source/internals/fck_ie.js
trunk/fckeditor/editor/_source/internals/fckbrowserinfo.js
trunk/fckeditor/editor/_source/internals/fckcodeformatter.js
trunk/fckeditor/editor/_source/internals/fckcommands.js
trunk/fckeditor/editor/_source/internals/fckconfig.js
trunk/fckeditor/editor/_source/internals/fckdebug.js
trunk/fckeditor/editor/_source/internals/fckdialog.js
trunk/fckeditor/editor/_source/internals/fckdialog_gecko.js
trunk/fckeditor/editor/_source/internals/fckdialog_ie.js
trunk/fckeditor/editor/_source/internals/fckdocumentprocessor.js
trunk/fckeditor/editor/_source/internals/fckdomtools.js
trunk/fckeditor/editor/_source/internals/fcklanguagemanager.js
trunk/fckeditor/editor/_source/internals/fcklisthandler.js
trunk/fckeditor/editor/_source/internals/fcklistslib.js
trunk/fckeditor/editor/_source/internals/fckplugins.js
trunk/fckeditor/editor/_source/internals/fckregexlib.js
trunk/fckeditor/editor/_source/internals/fckselection.js
trunk/fckeditor/editor/_source/internals/fckselection_gecko.js
trunk/fckeditor/editor/_source/internals/fckselection_ie.js
trunk/fckeditor/editor/_source/internals/fcktablehandler.js
trunk/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
trunk/fckeditor/editor/_source/internals/fcktablehandler_ie.js
trunk/fckeditor/editor/_source/internals/fcktoolbaritems.js
trunk/fckeditor/editor/_source/internals/fcktoolbarset.js
trunk/fckeditor/editor/_source/internals/fcktools.js
trunk/fckeditor/editor/_source/internals/fcktools_gecko.js
trunk/fckeditor/editor/_source/internals/fcktools_ie.js
trunk/fckeditor/editor/_source/internals/fckundo.js
trunk/fckeditor/editor/_source/internals/fckundo_gecko.js
trunk/fckeditor/editor/_source/internals/fckundo_ie.js
trunk/fckeditor/editor/_source/internals/fckurlparams.js
trunk/fckeditor/editor/_source/internals/fckxhtml.js
trunk/fckeditor/editor/_source/internals/fckxhtml_gecko.js
trunk/fckeditor/editor/_source/internals/fckxhtml_ie.js
trunk/fckeditor/editor/_source/internals/fckxhtmlentities.js
trunk/fckeditor/editor/css/
trunk/fckeditor/editor/css/behaviors/
trunk/fckeditor/editor/css/behaviors/disablehandles.htc
trunk/fckeditor/editor/css/behaviors/showtableborders.htc
trunk/fckeditor/editor/css/fck_editorarea.css
trunk/fckeditor/editor/css/fck_internal.css
trunk/fckeditor/editor/css/fck_showtableborders_gecko.css
trunk/fckeditor/editor/css/images/
trunk/fckeditor/editor/css/images/fck_anchor.gif
trunk/fckeditor/editor/css/images/fck_flashlogo.gif
trunk/fckeditor/editor/css/images/fck_hiddenfield.gif
trunk/fckeditor/editor/css/images/fck_pagebreak.gif
trunk/fckeditor/editor/dialog/
trunk/fckeditor/editor/dialog/common/
trunk/fckeditor/editor/dialog/common/fck_dialog_common.css
trunk/fckeditor/editor/dialog/common/fck_dialog_common.js
trunk/fckeditor/editor/dialog/common/fcknumericfield.htc
trunk/fckeditor/editor/dialog/common/images/
trunk/fckeditor/editor/dialog/common/images/locked.gif
trunk/fckeditor/editor/dialog/common/images/reset.gif
trunk/fckeditor/editor/dialog/common/images/unlocked.gif
trunk/fckeditor/editor/dialog/common/moz-bindings.xml
trunk/fckeditor/editor/dialog/fck_about/
trunk/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif
trunk/fckeditor/editor/dialog/fck_about/logo_fredck.gif
trunk/fckeditor/editor/dialog/fck_about.html
trunk/fckeditor/editor/dialog/fck_anchor.html
trunk/fckeditor/editor/dialog/fck_button.html
trunk/fckeditor/editor/dialog/fck_checkbox.html
trunk/fckeditor/editor/dialog/fck_colorselector.html
trunk/fckeditor/editor/dialog/fck_docprops/
trunk/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
trunk/fckeditor/editor/dialog/fck_docprops.html
trunk/fckeditor/editor/dialog/fck_find.html
trunk/fckeditor/editor/dialog/fck_flash/
trunk/fckeditor/editor/dialog/fck_flash/fck_flash.js
trunk/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
trunk/fckeditor/editor/dialog/fck_flash.html
trunk/fckeditor/editor/dialog/fck_form.html
trunk/fckeditor/editor/dialog/fck_hiddenfield.html
trunk/fckeditor/editor/dialog/fck_image/
trunk/fckeditor/editor/dialog/fck_image/fck_image.js
trunk/fckeditor/editor/dialog/fck_image/fck_image_preview.html
trunk/fckeditor/editor/dialog/fck_image.html
trunk/fckeditor/editor/dialog/fck_link/
trunk/fckeditor/editor/dialog/fck_link/fck_link.js
trunk/fckeditor/editor/dialog/fck_link.html
trunk/fckeditor/editor/dialog/fck_listprop.html
trunk/fckeditor/editor/dialog/fck_paste.html
trunk/fckeditor/editor/dialog/fck_radiobutton.html
trunk/fckeditor/editor/dialog/fck_replace.html
trunk/fckeditor/editor/dialog/fck_select/
trunk/fckeditor/editor/dialog/fck_select/fck_select.js
trunk/fckeditor/editor/dialog/fck_select.html
trunk/fckeditor/editor/dialog/fck_smiley.html
trunk/fckeditor/editor/dialog/fck_source.html
trunk/fckeditor/editor/dialog/fck_specialchar.html
trunk/fckeditor/editor/dialog/fck_spellerpages/
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
trunk/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
trunk/fckeditor/editor/dialog/fck_spellerpages.html
trunk/fckeditor/editor/dialog/fck_table.html
trunk/fckeditor/editor/dialog/fck_tablecell.html
trunk/fckeditor/editor/dialog/fck_template/
trunk/fckeditor/editor/dialog/fck_template/images/
trunk/fckeditor/editor/dialog/fck_template/images/template1.gif
trunk/fckeditor/editor/dialog/fck_template/images/template2.gif
trunk/fckeditor/editor/dialog/fck_template/images/template3.gif
trunk/fckeditor/editor/dialog/fck_template.html
trunk/fckeditor/editor/dialog/fck_textarea.html
trunk/fckeditor/editor/dialog/fck_textfield.html
trunk/fckeditor/editor/fckdebug.html
trunk/fckeditor/editor/fckdialog.html
trunk/fckeditor/editor/fckeditor.html
trunk/fckeditor/editor/filemanager/
trunk/fckeditor/editor/filemanager/browser/
trunk/fckeditor/editor/filemanager/browser/default/
trunk/fckeditor/editor/filemanager/browser/default/browser.css
trunk/fckeditor/editor/filemanager/browser/default/browser.html
trunk/fckeditor/editor/filemanager/browser/default/connectors/
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/basexml.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/commands.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/config.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/connector.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/io.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/php/util.php
trunk/fckeditor/editor/filemanager/browser/default/connectors/test.html
trunk/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
trunk/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
trunk/fckeditor/editor/filemanager/browser/default/frmfolders.html
trunk/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
trunk/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
trunk/fckeditor/editor/filemanager/browser/default/frmupload.html
trunk/fckeditor/editor/filemanager/browser/default/images/
trunk/fckeditor/editor/filemanager/browser/default/images/ButtonArrow.gif
trunk/fckeditor/editor/filemanager/browser/default/images/Folder.gif
trunk/fckeditor/editor/filemanager/browser/default/images/Folder32.gif
trunk/fckeditor/editor/filemanager/browser/default/images/FolderOpened.gif
trunk/fckeditor/editor/filemanager/browser/default/images/FolderOpened32.gif
trunk/fckeditor/editor/filemanager/browser/default/images/FolderUp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/ai.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/avi.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/cs.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/dll.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/doc.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/exe.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/fla.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/gif.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/htm.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/html.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/js.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/png.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/swf.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/swt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/txt.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/xls.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/xml.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/32/zip.gif
trunk/fckeditor/editor/filemanager/browser/default/images/icons/ai.gif
trunk/fckeditor/editor/filemanager/browser/...
[truncated message content] |
|
From: <al...@us...> - 2008-01-15 14:52:44
|
Revision: 593
http://sciret.svn.sourceforge.net/sciret/?rev=593&view=rev
Author: alpeb
Date: 2008-01-15 06:52:43 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
if article doesn't exist, redirect to home and show error message
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/views/ViewArticle.php
Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ViewArticle.php 2008-01-15 14:51:50 UTC (rev 592)
+++ branches/release-candidates/sciret-1.2/views/ViewArticle.php 2008-01-15 14:52:43 UTC (rev 593)
@@ -18,8 +18,17 @@
class ViewArticle extends View {
+ var $article;
+
+ function preDispatch() {
+ $this->article = new Article($_GET['id']);
+ if (!$this->article->getId()) {
+ $_SESSION['message'] = $this->user->lang('Article does not exist');
+ Library::redirect(Library::getLink(array()));
+ }
+ }
+
function dispatch() {
- $article = new Article($_GET['id']);
$this->tpl->set_file('search', 'BasicSearch.tpl');
$this->tpl->set_block('search', 'searchInKB_block', 'searchInKB');
@@ -52,7 +61,7 @@
if ($this->configuration->getConfigValue('allowCommentsRatings')) {
$viewComments = new ViewComments($this->user, $this->configuration);
- $viewComments->setArticle($article);
+ $viewComments->setArticle($this->article);
$viewComments->setTemplate($this->tpl);
$this->tpl->set_var('commentsTable', $viewComments->dispatch(true));
} else {
@@ -60,12 +69,12 @@
}
// *** ATTACHED FILES ****
- $files = $article->getFiles();
+ $files = $this->article->getFiles();
$notFirstPass = false;
foreach ($files as $file) {
if (!$this->user->isAnonymous()) {
$this->tpl->set_var(array(
- 'href_del' => Library::getLink(array('action' => 'DeleteFile', 'artId' => $article->getId(), 'id' => $file->getId())),
+ 'href_del' => Library::getLink(array('action' => 'DeleteFile', 'artId' => $this->article->getId(), 'id' => $file->getId())),
));
$this->tpl->parse('img_delete', 'img_delete_block');
} else {
@@ -85,7 +94,7 @@
if (!$this->user->isAnonymous()) {
$this->tpl->set_var(array(
- 'uploadAction' => Library::getLink(array('action' => 'UploadFile', 'artId' => $article->getId())),
+ 'uploadAction' => Library::getLink(array('action' => 'UploadFile', 'artId' => $this->article->getId())),
'maxFileSize' => ini_get('upload_max_filesize'),
));
$this->tpl->parse('file_upload', 'file_upload_block');
@@ -95,7 +104,7 @@
// *** RELATED ARTICLES ****
$relatedArticles = new ViewRelatedArticles($this->user, $this->configuration);
- $relatedArticles->setParent($article);
+ $relatedArticles->setParent($this->article);
$relatedArticles->setTemplate($this->tpl);
$this->tpl->set_var('relatedArticlesTable', $relatedArticles->dispatch(true));
@@ -103,7 +112,7 @@
$historyGateway = new HistoryGateway;
$firstIteration = true;
$trClass = 'row_off';
- foreach ($historyGateway->getEvents($article->getId()) as $history) {
+ foreach ($historyGateway->getEvents($this->article->getId()) as $history) {
$this->tpl->set_var(array(
'historyTrClass' => $trClass,
'historyDate' => $this->user->formatDate($history->getDate()),
@@ -129,69 +138,69 @@
$categoryGateway = new CategoryGateway;
$this->categories = $categoryGateway->getCategories();
- if ($article->isDraft()) {
+ if ($this->article->isDraft()) {
$status = $this->user->lang('Article marked as draft') . ' '
. '(<a href="javascript:void(0)" class="headerLinks" onclick="markAsFinal(\'markFinalProgressImg\');" >'
. $this->user->lang('mark as final')
. '</a>)';
- } elseif (!$article->isPublished()) {
+ } elseif (!$this->article->isPublished()) {
$status = $this->user->lang("This article hasn't yet been published in the Knowledge Base");
} else {
$status = '';
}
$this->tpl->set_var(array(
- 'printerViewLink' => Library::getLink(array('view' => 'PrinterView', 'artId' => $article->getId())),
- 'pdfLink' => Library::getLink(array('action' => 'ArticleToPdf', 'artId' => $article->getId())),
- 'mailArticleLink' => Library::getLink(array('view' => 'MailArticle', 'artId' => $article->getId())),
- 'editArticleLink' => Library::getLink(array('view' => 'EditArticle', 'id' => $article->getId())),
- 'addCommentsAction' => Library::getLink(array('action' => 'AddCommentAndRating', 'artId' => $article->getId())),
- 'addRelatedAction' => Library::getLink(array('action' => 'AddRelatedArticles', 'artId' => $article->getId())),
- 'art_id' => $article->getId(),
- 'category' => $this->_getCategoryPath($article->getCategoryId(), 'MainView', true),
+ 'printerViewLink' => Library::getLink(array('view' => 'PrinterView', 'artId' => $this->article->getId())),
+ 'pdfLink' => Library::getLink(array('action' => 'ArticleToPdf', 'artId' => $this->article->getId())),
+ 'mailArticleLink' => Library::getLink(array('view' => 'MailArticle', 'artId' => $this->article->getId())),
+ 'editArticleLink' => Library::getLink(array('view' => 'EditArticle', 'id' => $this->article->getId())),
+ 'addCommentsAction' => Library::getLink(array('action' => 'AddCommentAndRating', 'artId' => $this->article->getId())),
+ 'addRelatedAction' => Library::getLink(array('action' => 'AddRelatedArticles', 'artId' => $this->article->getId())),
+ 'art_id' => $this->article->getId(),
+ 'category' => $this->_getCategoryPath($this->article->getCategoryId(), 'MainView', true),
'lang_status' => $status,
- 'title' => $article->getTitle(),
- 'deleteTitle' => addslashes($article->getTitle()),
- 'img_stars' => $article->getTotalVotes()? '<img src="images/'.round($article->getAverageRating()).'stars.png" width="50" height="10" />' : '',
- 'createdby' => $this->user->lang('Created by %s on %s', $article->getCreatedBy(), $this->user->formatDate($article->getCreationDate())),
- 'content' => $article->getContent(),
+ 'title' => $this->article->getTitle(),
+ 'deleteTitle' => addslashes($this->article->getTitle()),
+ 'img_stars' => $this->article->getTotalVotes()? '<img src="images/'.round($this->article->getAverageRating()).'stars.png" width="50" height="10" />' : '',
+ 'createdby' => $this->user->lang('Created by %s on %s', $this->article->getCreatedBy(), $this->user->formatDate($this->article->getCreationDate())),
+ 'content' => $this->article->getContent(),
'img_delete' => '',
- 'usage' => $article->isInternal() ? '<span style="color: red">'.$this->user->lang('Internal use only').'</span>' : $this->user->lang('Publicly available'),
+ 'usage' => $this->article->isInternal() ? '<span style="color: red">'.$this->user->lang('Internal use only').'</span>' : $this->user->lang('Publicly available'),
));
- if ($article->getQuestion()) {
- $this->tpl->set_var('question', $article->getQuestion());
+ if ($this->article->getQuestion()) {
+ $this->tpl->set_var('question', $this->article->getQuestion());
$this->tpl->parse('question', 'question_block');
} else {
$this->tpl->set_var('question', '');
}
- if (!$article->isInternal()) {
+ if (!$this->article->isInternal()) {
$this->tpl->parse('mailArticle', 'mailArticle_block');
} else {
$this->tpl->set_var('mailArticle', '');
}
- if ($article->getModifiedByUserId() != 0) {
+ if ($this->article->getModifiedByUserId() != 0) {
$this->tpl->set_var(array(
- 'modificationDate' => $this->user->formatDate($article->getModificationDate()),
- 'modifiedByUserName' => $article->getModifiedBy(),
+ 'modificationDate' => $this->user->formatDate($this->article->getModificationDate()),
+ 'modifiedByUserName' => $this->article->getModifiedBy(),
));
$this->tpl->parse('lastModif', 'lastModif_block');
} else {
$this->tpl->set_var('lastModif', '');
}
- if ($article->getExpDate() == '0000-00-00') {
+ if ($this->article->getExpDate() == '0000-00-00') {
$this->tpl->set_var('expDate', $this->user->lang('Never expires'));
} else {
- $this->tpl->set_var('expDate', $this->user->formatDate($article->getExpDate()));
+ $this->tpl->set_var('expDate', $this->user->formatDate($this->article->getExpDate()));
}
$showEditDelete = false;
if ($this->configuration->getConfigValue('restrictEditDelete')) {
- if ($article->getUserId() == $this->user->getId() || ($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
+ if ($this->article->getUserId() == $this->user->getId() || ($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) {
$showEditDelete = true;
}
} else {
@@ -203,14 +212,14 @@
if ($showEditDelete) {
$this->tpl->parse('edit_del', 'edit_del_block');
- if (!$article->isPublished()) {
- $this->tpl->set_var('publishBtnDisplay', $article->isDraft()? 'none' : '');
+ if (!$this->article->isPublished()) {
+ $this->tpl->set_var('publishBtnDisplay', $this->article->isDraft()? 'none' : '');
$this->tpl->parse('publish_btn', 'publish_btn_block');
} else {
$this->tpl->set_var('publish_btn', '');
}
- if ($article->isFavorite($this->user->getId())) {
+ if ($this->article->isFavorite($this->user->getId())) {
$this->tpl->set_var(array(
'favoriteArticleStarImgDisplay' => 'none',
'unFavoriteArticleStarImgDisplay' => 'inline',
@@ -234,10 +243,10 @@
$this->tpl->pparse('out', 'view_article');
// only record one view per session
- if (!isset($_SESSION['seen_article_'.$article->getId()])) {
- $article->setViews($article->getViews() + 1);
- $article->save();
- $_SESSION['seen_article_'.$article->getId()] = true;
+ if (!isset($_SESSION['seen_article_'.$this->article->getId()])) {
+ $this->article->setViews($this->article->getViews() + 1);
+ $this->article->save();
+ $_SESSION['seen_article_'.$this->article->getId()] = true;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-01-15 14:51:55
|
Revision: 592
http://sciret.svn.sourceforge.net/sciret/?rev=592&view=rev
Author: alpeb
Date: 2008-01-15 06:51:50 -0800 (Tue, 15 Jan 2008)
Log Message:
-----------
added preDispatch() method for Views, to allow doing things before the headers are sent
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/classes/Controller.php
branches/release-candidates/sciret-1.2/views/View.php
Modified: branches/release-candidates/sciret-1.2/classes/Controller.php
===================================================================
--- branches/release-candidates/sciret-1.2/classes/Controller.php 2008-01-11 13:58:15 UTC (rev 591)
+++ branches/release-candidates/sciret-1.2/classes/Controller.php 2008-01-15 14:51:50 UTC (rev 592)
@@ -67,6 +67,7 @@
require "views/$view.php";
$obj = new $view($this->user, $this->configuration);
$obj->setTemplate(new KB_Template('templates', $this->user));
+ $obj->preDispatch();
$obj->setHTMLHeader($this->views[$view][SHOW_HEADER]);
$obj->dispatch();
if ($this->views[$view][SHOW_HEADER]) {
Modified: branches/release-candidates/sciret-1.2/views/View.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/View.php 2008-01-11 13:58:15 UTC (rev 591)
+++ branches/release-candidates/sciret-1.2/views/View.php 2008-01-15 14:51:50 UTC (rev 592)
@@ -24,6 +24,18 @@
$this->configuration =& $configuration;
}
+ /**
+ * @abstract
+ */
+ function preDispatch() {
+ }
+
+ /**
+ * @abstract
+ */
+ function dispatch() {
+ }
+
function setTemplate(&$tpl) {
$this->tpl =& $tpl;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2008-01-11 13:58:22
|
Revision: 591
http://sciret.svn.sourceforge.net/sciret/?rev=591&view=rev
Author: alpeb
Date: 2008-01-11 05:58:15 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
Fixes problem for media files upload location
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php
Modified: branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php
===================================================================
--- branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php 2007-11-27 00:51:53 UTC (rev 590)
+++ branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php 2008-01-11 13:58:15 UTC (rev 591)
@@ -36,7 +36,7 @@
// Path to user files relative to the document root.
// ***** SCIRET MODIFICATION ******
-preg_match('#(.*)/fckeditor/editor/filemanager/connectors/php/connector\.php.*#', $_SERVER['REQUEST_URI'], $matches);
+preg_match('#(.*)/fckeditor/editor/filemanager/connectors/php.*#', $_SERVER['REQUEST_URI'], $matches);
$Config['UserFilesPath'] = $matches[1].'/uploads/editor/';
// ***** END OF SCIRET MODIFICATION ******
@@ -99,28 +99,36 @@
$Config['DeniedExtensions']['File'] = array('html','htm','php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','htaccess','asis','sh','shtml','shtm','phtm') ;
$Config['FileTypesPath']['File'] = $Config['UserFilesPath'] . 'file/' ;
$Config['FileTypesAbsolutePath']['File']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'file/' ;
-$Config['QuickUploadPath']['File'] = $Config['UserFilesPath'] ;
+// ***** SCIRET MODIFICATION ******
+$Config['QuickUploadPath']['File'] = $Config['FileTypesPath']['File'];
+// ***** END OF SCIRET MODIFICATION ******
$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ;
$Config['AllowedExtensions']['Image'] = array('jpg','gif','jpeg','png') ;
$Config['DeniedExtensions']['Image'] = array() ;
$Config['FileTypesPath']['Image'] = $Config['UserFilesPath'] . 'image/' ;
$Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/' ;
-$Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'] ;
+// ***** SCIRET MODIFICATION ******
+$Config['QuickUploadPath']['Image'] = $Config['FileTypesPath']['Image'];
+// ***** END OF SCIRET MODIFICATION ******
$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
$Config['AllowedExtensions']['Flash'] = array('swf','fla') ;
$Config['DeniedExtensions']['Flash'] = array() ;
$Config['FileTypesPath']['Flash'] = $Config['UserFilesPath'] . 'flash/' ;
$Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'flash/' ;
-$Config['QuickUploadPath']['Flash'] = $Config['UserFilesPath'] ;
+// ***** SCIRET MODIFICATION ******
+$Config['QuickUploadPath']['Flash'] = $Config['FileTypesPath']['Flash'];
+// ***** END OF SCIRET MODIFICATION ******
$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
$Config['AllowedExtensions']['Media'] = array('swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg') ;
$Config['DeniedExtensions']['Media'] = array() ;
$Config['FileTypesPath']['Media'] = $Config['UserFilesPath'] . 'media/' ;
$Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'media/' ;
-$Config['QuickUploadPath']['Media'] = $Config['UserFilesPath'] ;
+// ***** SCIRET MODIFICATION ******
+$Config['QuickUploadPath']['Media'] = $Config['FileTypesPath']['Media'];
+// ***** END OF SCIRET MODIFICATION ******
$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2007-11-27 00:51:54
|
Revision: 590
http://sciret.svn.sourceforge.net/sciret/?rev=590&view=rev
Author: alpeb
Date: 2007-11-26 16:51:53 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
escape slashes in js argument
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/views/ManageArticles.php
Modified: branches/release-candidates/sciret-1.2/views/ManageArticles.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ManageArticles.php 2007-11-27 00:51:12 UTC (rev 589)
+++ branches/release-candidates/sciret-1.2/views/ManageArticles.php 2007-11-27 00:51:53 UTC (rev 590)
@@ -124,6 +124,7 @@
'articleId' => $article->getId(),
'articleImage' => $article->isBookmark()? 'bookmark.png' : 'article.png',
'articleTitle' => $article->getTitle(),
+ 'articleTitleSlashed' => addslashes($article->getTitle()),
'articleAuthor' => $articleUser->getFullName(),
'articleCreationDate' => $this->user->formatDate($article->getCreationDate()),
'articleExpirationDate' => $expDateLang,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2007-11-27 00:51:13
|
Revision: 589
http://sciret.svn.sourceforge.net/sciret/?rev=589&view=rev
Author: alpeb
Date: 2007-11-26 16:51:12 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
escape slashes in js argument
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/views/EditCategories.php
Modified: branches/release-candidates/sciret-1.2/views/EditCategories.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/EditCategories.php 2007-11-27 00:50:26 UTC (rev 588)
+++ branches/release-candidates/sciret-1.2/views/EditCategories.php 2007-11-27 00:51:12 UTC (rev 589)
@@ -62,6 +62,7 @@
'catId' => $category->getId(),
'indent' => $indent,
'catLabel' => $category->getLabel(),
+ 'catLabelSlashed' => addslashes($category->getLabel()),
'catDescription' => $category->getDescription(),
'catIcon' => ($category->getIconFileName() != '')? '<img src="uploads/icons/'.$category->getIconFileName().'" />' : '',
));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2007-11-27 00:50:27
|
Revision: 588
http://sciret.svn.sourceforge.net/sciret/?rev=588&view=rev
Author: alpeb
Date: 2007-11-26 16:50:26 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
escape slashes in js argument
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/templates/ManageArticles.tpl
Modified: branches/release-candidates/sciret-1.2/templates/ManageArticles.tpl
===================================================================
--- branches/release-candidates/sciret-1.2/templates/ManageArticles.tpl 2007-11-27 00:49:47 UTC (rev 587)
+++ branches/release-candidates/sciret-1.2/templates/ManageArticles.tpl 2007-11-27 00:50:26 UTC (rev 588)
@@ -74,7 +74,7 @@
<a href="#" id="publishButton_{articleId}" onclick="publishArticle('articleManageLoading_{articleId}', 'ManageArticles', {articleId})" style="display:{publishLinkDisplay}">[l]publish[/l]</a>
<!-- END publish_block -->
<!-- BEGIN delete_block -->
- <a href="#" onclick="deleteArticle({articleId}, '{articleTitle}', '[l]Are you sure you wish to delete the article titled[/l]', 'ManageArticles')">[l]delete[/l]</a>
+ <a href="#" onclick="deleteArticle({articleId}, '{articleTitleSlashed}', '[l]Are you sure you wish to delete the article titled[/l]', 'ManageArticles')">[l]delete[/l]</a>
<!-- END delete_block -->
<!-- BEGIN select_block -->
<a href="#" onclick="transferId({articleId})">[l]select[/l]</a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <al...@us...> - 2007-11-27 00:49:48
|
Revision: 587
http://sciret.svn.sourceforge.net/sciret/?rev=587&view=rev
Author: alpeb
Date: 2007-11-26 16:49:47 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
escape slashes in js argument
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/templates/EditCategories.tpl
Modified: branches/release-candidates/sciret-1.2/templates/EditCategories.tpl
===================================================================
--- branches/release-candidates/sciret-1.2/templates/EditCategories.tpl 2007-10-07 08:41:23 UTC (rev 586)
+++ branches/release-candidates/sciret-1.2/templates/EditCategories.tpl 2007-11-27 00:49:47 UTC (rev 587)
@@ -47,7 +47,7 @@
<a href="{addSubCatLink}">[l]Add subcategory[/l]</a>
<a href="{editCatLink}">[l]Edit[/l]</a>
<!-- BEGIN deleteCategory_block -->
- <a href="#" onclick="deleteCategory({catId}, '{catLabel}')">[l]Delete[/l]</a>
+ <a href="#" onclick="deleteCategory({catId}, '{catLabelSlashed}')">[l]Delete[/l]</a>
<!-- END deleteCategory_block -->
<!-- END categoryAdminOps_block -->
</td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2007-10-07 08:41:24
|
Revision: 586
http://sciret.svn.sourceforge.net/sciret/?rev=586&view=rev
Author: lugo04
Date: 2007-10-07 01:41:23 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
readme update
Modified Paths:
--------------
branches/sub-projects/translations/translators/README
Modified: branches/sub-projects/translations/translators/README
===================================================================
--- branches/sub-projects/translations/translators/README 2007-10-07 08:02:30 UTC (rev 585)
+++ branches/sub-projects/translations/translators/README 2007-10-07 08:41:23 UTC (rev 586)
@@ -1,7 +1,10 @@
Langpatch update.
-Since the version 1.2.0 (SVN revision 559) all files are sorted and extended. For a new translation use the "english.txt",please.
+Since the version 1.2.0 (SVN revision 554) all files are sorted and extended. For a new translation use the "english.txt",please.
-The files langpatch .txt show the differenzes from SVN release 273 to SVN release 449. When you want add the missing translations, please rename or add them to your langfile.
+The version of the language file is identical to the Sciret release (for example: sciret-1.2.0; language-update 1.2.0)
+
+The files langpatch.txt show the differenzes from SVN release 273 to SVN release 449. When you want add the missing translations, please rename or add them to your langfile.
+
For futher questions about the translation, please contact one of the project admins.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2007-10-07 08:02:35
|
Revision: 585
http://sciret.svn.sourceforge.net/sciret/?rev=585&view=rev
Author: lugo04
Date: 2007-10-07 01:02:30 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
branches/sub-projects/translations/translators/CHANGELOG
branches/sub-projects/translations/translators/README
Modified: branches/sub-projects/translations/translators/CHANGELOG
===================================================================
--- branches/sub-projects/translations/translators/CHANGELOG 2007-10-07 06:15:34 UTC (rev 584)
+++ branches/sub-projects/translations/translators/CHANGELOG 2007-10-07 08:02:30 UTC (rev 585)
@@ -1,3 +1,42 @@
+2007-10-07 Lucie Goga <lg...@th...>
+ * update Brazil Portuguese translation from Rodrigo Lozada
+
+2007-09-25 Lucie Goga <lg...@th...>
+ * Add French translation from delaplagnejd
+ * Add Brazil Portuguese translation from Rodrigo Lozada
+
+2007-09-21 Lucie Goga <lg...@th...>
+ * Sciret 1.2.0 release
+
+2007-09-03 Lucie Goga <lg...@th...>
+ * update language file Russian, Spanish, Svenska
+
+2007-09-02 Lucie Goga <lg...@th...>
+ * update language file Hebrew, Japanese, Italian, Norsk, Russian, Spanish.
+ The file are sorted and extended.
+
+2007-08-24 Lucie Goga <lg...@th...>
+ * Add Italian translation from two students
+ * update language file Chinesetraditional, Czech, Dutch.
+ The file are sorted and extended.
+
+2007-08-22 Lucie Goga <lg...@th...>
+ * update German lang file
+
+2007-08-20 Lucie Goga <lg...@th...>
+ * Update the English and German lang file.
+
+2007-08-19 Lucie Goga <lg...@th...>
+ * Update the English and German lang file.
+
+2007-08-16 Reiner Jung <rj...@th...>
+ * Update the English and German lang file. Files are sorted now and
+ duplicates are removed
+
+2007-07-28 Reiner Jung <rj...@th...>
+ * Update language files for SMTP settings
+ * Update Norsk translation
+
2007-07-12 Lucie Goga <lg...@th...>
* Add Norwegian translation from Rune Hammersland
Modified: branches/sub-projects/translations/translators/README
===================================================================
--- branches/sub-projects/translations/translators/README 2007-10-07 06:15:34 UTC (rev 584)
+++ branches/sub-projects/translations/translators/README 2007-10-07 08:02:30 UTC (rev 585)
@@ -1,5 +1,7 @@
Langpatch update.
+Since the version 1.2.0 (SVN revision 559) all files are sorted and extended. For a new translation use the "english.txt",please.
+
The files langpatch .txt show the differenzes from SVN release 273 to SVN release 449. When you want add the missing translations, please rename or add them to your langfile.
For futher questions about the translation, please contact one of the project admins.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2007-10-07 06:15:39
|
Revision: 584
http://sciret.svn.sourceforge.net/sciret/?rev=584&view=rev
Author: lugo04
Date: 2007-10-06 23:15:34 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/CONTRIBUTORS
branches/release-candidates/sciret-1.2/VERSION
Modified: branches/release-candidates/sciret-1.2/CONTRIBUTORS
===================================================================
--- branches/release-candidates/sciret-1.2/CONTRIBUTORS 2007-10-07 05:49:35 UTC (rev 583)
+++ branches/release-candidates/sciret-1.2/CONTRIBUTORS 2007-10-07 06:15:34 UTC (rev 584)
@@ -14,6 +14,10 @@
* Japanese translation from SF user tm800720
* Norway translation from Rune Hammersland
* Swedish translation from Henrik Christensson
+ * Czech translation from Peter Dvorak
+ * Italian traslation from "two students"
+ * French translation from delaplagnejd
+ * BrazilPortuguese translation from Rodrigo
Testing
Modified: branches/release-candidates/sciret-1.2/VERSION
===================================================================
--- branches/release-candidates/sciret-1.2/VERSION 2007-10-07 05:49:35 UTC (rev 583)
+++ branches/release-candidates/sciret-1.2/VERSION 2007-10-07 06:15:34 UTC (rev 584)
@@ -1 +1 @@
-1.2.0-SVN-Release-554
+1.2.0-SVN-Release-559
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2007-10-07 05:49:36
|
Revision: 583
http://sciret.svn.sourceforge.net/sciret/?rev=583&view=rev
Author: lugo04
Date: 2007-10-06 22:49:35 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/CHANGELOG
Modified: branches/release-candidates/sciret-1.2/CHANGELOG
===================================================================
--- branches/release-candidates/sciret-1.2/CHANGELOG 2007-10-07 05:45:21 UTC (rev 582)
+++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-10-07 05:49:35 UTC (rev 583)
@@ -1,3 +1,6 @@
+2007-10-07 Lucie Goga <lg...@th...>
+ * update Brazil Portuguese translation from Rodrigo Lozada
+
2007-09-25 Lucie Goga <lg...@th...>
* Add French translation from delaplagnejd
* Add Brazil Portuguese translation from Rodrigo Lozada
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2007-10-07 05:45:24
|
Revision: 582
http://sciret.svn.sourceforge.net/sciret/?rev=582&view=rev
Author: lugo04
Date: 2007-10-06 22:45:21 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
BrazilPortuguese update
Modified Paths:
--------------
trunk/languages/BrazilPortuguese.txt
Modified: trunk/languages/BrazilPortuguese.txt
===================================================================
--- trunk/languages/BrazilPortuguese.txt 2007-10-07 05:44:27 UTC (rev 581)
+++ trunk/languages/BrazilPortuguese.txt 2007-10-07 05:45:21 UTC (rev 582)
@@ -176,7 +176,7 @@
Favoritos salvos com sucesso
Browse unpublished articles/bookmarks
-Ver artigos/favoritos não publicados
+Ver Artigos/Favoritos não publicados
by
por
@@ -329,7 +329,7 @@
Enviar artigo por e-mail
Enter one or two words describing the issue, or type the article number if you know it
-Digite uma ou mais palavras descrevendo o problema, ou digite o numero do artigo se você souber
+Digite uma ou mais palavras descrevendo o problema, ou digite o número do artigo se você souber
Enter the Knowledge Base!!
Entrar no Banco de Conhecimento
@@ -386,7 +386,7 @@
Nome
Give Admin access?
-Direitos de Administrador?
+Direitos de Administrador?
Hide
Esconder
@@ -491,7 +491,7 @@
Link '%s' adicionado
Link saved successfully
-Vínculo salvo com sucesso
+Link salvo com sucesso
Links & Files
Links e Arquivos
@@ -662,7 +662,7 @@
Anterior
Printer view
-Visualizar Impressão
+Versão para Impressão
Private
Privada
@@ -932,16 +932,16 @@
Nome de Usuário
View All
-Ver Todos
+Ver todos
Viewing All Articles
-Vendo Todos os artigos
+Vendo todos os Artigos
Viewing All Articles and Bookmarks
-Vendo Todos os artigos e Favoritos
+Vendo todos os Artigos e Favoritos
Viewing All Bookmarks
-Vendo Todos os Favoritos
+Vendo todos os Favoritos
views
visualizações
@@ -1022,7 +1022,7 @@
Seu favorito não estará disponível publicamente até que seja explicitamente marcado como "Publicado"
your name
-seu Nome
+Seu nome
Your question was added successfully
Sua pergunta foi adicionada com sucesso
@@ -1031,10 +1031,10 @@
Sua pergunta esta vazia
Your question will be published immediately
-Sua pergunta será publicada publicada imediatamente
+Sua pergunta será publicada imediatamente
Your question will need to get approved before being published
Sua pergunta precisa ser aprovada antes de ser publicada
Your search
-Sua Pesquisa
\ No newline at end of file
+Sua Pesquisa
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lu...@us...> - 2007-10-07 05:44:28
|
Revision: 581
http://sciret.svn.sourceforge.net/sciret/?rev=581&view=rev
Author: lugo04
Date: 2007-10-06 22:44:27 -0700 (Sat, 06 Oct 2007)
Log Message:
-----------
BrazilPortuguese update
Modified Paths:
--------------
branches/release-candidates/sciret-1.2/languages/BrazilPortuguese.txt
Modified: branches/release-candidates/sciret-1.2/languages/BrazilPortuguese.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/BrazilPortuguese.txt 2007-10-07 05:40:55 UTC (rev 580)
+++ branches/release-candidates/sciret-1.2/languages/BrazilPortuguese.txt 2007-10-07 05:44:27 UTC (rev 581)
@@ -176,7 +176,7 @@
Favoritos salvos com sucesso
Browse unpublished articles/bookmarks
-Ver artigos/favoritos não publicados
+Ver Artigos/Favoritos não publicados
by
por
@@ -329,7 +329,7 @@
Enviar artigo por e-mail
Enter one or two words describing the issue, or type the article number if you know it
-Digite uma ou mais palavras descrevendo o problema, ou digite o numero do artigo se você souber
+Digite uma ou mais palavras descrevendo o problema, ou digite o número do artigo se você souber
Enter the Knowledge Base!!
Entrar no Banco de Conhecimento
@@ -386,7 +386,7 @@
Nome
Give Admin access?
-Direitos de Administrador?
+Direitos de Administrador?
Hide
Esconder
@@ -491,7 +491,7 @@
Link '%s' adicionado
Link saved successfully
-Vínculo salvo com sucesso
+Link salvo com sucesso
Links & Files
Links e Arquivos
@@ -662,7 +662,7 @@
Anterior
Printer view
-Visualizar Impressão
+Versão para Impressão
Private
Privada
@@ -932,16 +932,16 @@
Nome de Usuário
View All
-Ver Todos
+Ver todos
Viewing All Articles
-Vendo Todos os artigos
+Vendo todos os Artigos
Viewing All Articles and Bookmarks
-Vendo Todos os artigos e Favoritos
+Vendo todos os Artigos e Favoritos
Viewing All Bookmarks
-Vendo Todos os Favoritos
+Vendo todos os Favoritos
views
visualizações
@@ -1022,7 +1022,7 @@
Seu favorito não estará disponível publicamente até que seja explicitamente marcado como "Publicado"
your name
-seu Nome
+Seu nome
Your question was added successfully
Sua pergunta foi adicionada com sucesso
@@ -1031,10 +1031,10 @@
Sua pergunta esta vazia
Your question will be published immediately
-Sua pergunta será publicada publicada imediatamente
+Sua pergunta será publicada imediatamente
Your question will need to get approved before being published
Sua pergunta precisa ser aprovada antes de ser publicada
Your search
-Sua Pesquisa
\ No newline at end of file
+Sua Pesquisa
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
