From: <al...@us...> - 2007-08-13 01:53:08
|
Revision: 480 http://sciret.svn.sourceforge.net/sciret/?rev=480&view=rev Author: alpeb Date: 2007-08-12 18:53:06 -0700 (Sun, 12 Aug 2007) Log Message: ----------- Show original question for articles that answer a question Modified Paths: -------------- branches/release-candidates/sciret-1.2/actions/SaveArticle.php 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/Question.php branches/release-candidates/sciret-1.2/setup/final.sql branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql branches/release-candidates/sciret-1.2/templates/MainView.tpl branches/release-candidates/sciret-1.2/views/MainView.php branches/release-candidates/sciret-1.2/views/ViewArticle.php Modified: branches/release-candidates/sciret-1.2/actions/SaveArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/SaveArticle.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/actions/SaveArticle.php 2007-08-13 01:53:06 UTC (rev 480) @@ -50,9 +50,10 @@ $historyMessage = $this->user->lang('Article created'); if (isset($_POST['questionID'])) { - require 'models/QuestionGateway.php'; - $questionGateway = new QuestionGateway; - $questionGateway->delete($_POST['questionID']); + require 'models/Question.php'; + $question = new Question($_POST['questionID']); + $art->setQuestion($question->getContents()); + $question->delete(); } } $art->setDraft($_POST['draft']); Modified: branches/release-candidates/sciret-1.2/models/Article.php =================================================================== --- branches/release-candidates/sciret-1.2/models/Article.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/models/Article.php 2007-08-13 01:53:06 UTC (rev 480) @@ -20,6 +20,7 @@ var $title; var $URL; var $expDate; + var $question; var $content; var $excerpt; var $published = 1; @@ -48,7 +49,7 @@ if ($id) { // left join because cat_id=0 doesn't exist in the db - $query = 'SELECT is_bookmark, title, url, expires, 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 ' + $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); @@ -58,6 +59,7 @@ $this->title = $row['title']; $this->URL = $row['url']; $this->expDate = $row['expires']; + $this->question = $row['question']; $this->content = $row['content']; $this->catId = $row['cat_id']; $this->catLabel = $row['catLabel']; @@ -80,12 +82,12 @@ function save() { if (!isset($this->id)) { - $query = 'INSERT INTO articles (is_bookmark, title, url, expires, 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->content, $this->catId, $this->published, $this->draft, $this->userId, $this->views, $this->internal); + $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(); } else { - $query = 'UPDATE articles SET is_bookmark=?, title=?, url=?, expires=?, 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->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=?'; + $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); } } @@ -163,6 +165,14 @@ $this->expDate = $expDate; } + function getQuestion() { + return $this->question; + } + + function setQuestion($question) { + $this->question = $question; + } + function getContent() { return $this->content; } Modified: branches/release-candidates/sciret-1.2/models/ArticleGateway.php =================================================================== --- branches/release-candidates/sciret-1.2/models/ArticleGateway.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/models/ArticleGateway.php 2007-08-13 01:53:06 UTC (rev 480) @@ -78,21 +78,21 @@ switch ($specialList) { case 'mostViewed': - $query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT( f.file_id ) AS num_files ' + $query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT( f.file_id ) AS num_files ' .'FROM articles art LEFT JOIN files f ON art.art_id = f.art_id ' . $where .'GROUP BY art.art_id ' .'ORDER BY views DESC LIMIT 0, 5'; break; case 'latest': - $query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT( f.file_id ) AS num_files ' + $query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT( f.file_id ) AS num_files ' .'FROM articles art LEFT JOIN files f ON art.art_id = f.art_id ' . $where .'GROUP BY art.art_id ' .'ORDER BY created DESC LIMIT 0, 5'; break; case 'withFullName': - $query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, firstname, lastname ' + $query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, firstname, lastname ' .'FROM articles art LEFT JOIN users u ON art.user_id = u.user_id ' . $where . " ORDER BY $order $direction"; if ($numRecords != -1) { @@ -100,7 +100,7 @@ } break; default: - $query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT( f.file_id ) AS num_files ' + $query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT( f.file_id ) AS num_files ' .'FROM articles art LEFT JOIN files f ON art.art_id = f.art_id ' . $where .'GROUP BY art.art_id' @@ -140,7 +140,7 @@ if (is_numeric($searchQuery)) { $whereArr[] = 'art.art_id=?'; $where = implode(' AND ', $whereArr); - $query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files, firstname, lastname ' + $query = 'SELECT art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files, firstname, lastname ' .'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'; @@ -157,7 +157,7 @@ $whereArr[] = 'MATCH (title, content, url) AGAINST(?)'; $where = implode(' AND ', $whereArr); - $query = 'SELECT SQL_CALC_FOUND_ROWS MATCH(title, content, url) AGAINST(?) AS score, art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files, firstname, lastname ' + $query = 'SELECT SQL_CALC_FOUND_ROWS MATCH(title, content, url) AGAINST(?) AS score, art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, art.user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files, firstname, lastname ' .'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'; @@ -309,7 +309,7 @@ if ($where != '') { $where = 'AND '.$where; } - $query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files ' + $query = 'SELECT SQL_CALC_FOUND_ROWS art.art_id, is_bookmark, q_id, title, url, expires, question, SUBSTRING(content, 1, '.EXCERPT_LENGTH.') AS excerpt, cat_id, published, draft, user_id, views, created, modified, modified_user_id, votes_1, votes_2, votes_3, votes_4, votes_5, COUNT(f.file_id) AS num_files ' .'FROM articles art LEFT JOIN files f on art.art_id = f.art_id ' ."WHERE published=1 $where " .'GROUP BY art.art_id ' Modified: branches/release-candidates/sciret-1.2/models/ArticleIterator.php =================================================================== --- branches/release-candidates/sciret-1.2/models/ArticleIterator.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/models/ArticleIterator.php 2007-08-13 01:53:06 UTC (rev 480) @@ -33,6 +33,7 @@ $article->setTitle($row['title']); $article->setExpDate($row['expires']); $article->setURL($row['url']); + $article->setQuestion($row['question']); $article->setExcerpt($row['excerpt']); $article->setCategoryId($row['cat_id']); $article->setPublished($row['published']); Modified: branches/release-candidates/sciret-1.2/models/Question.php =================================================================== --- branches/release-candidates/sciret-1.2/models/Question.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/models/Question.php 2007-08-13 01:53:06 UTC (rev 480) @@ -44,6 +44,11 @@ } } + function delete() { + $query = "DELETE FROM questions WHERE question_id=?"; + $this->db->query($query, $this->id); + } + function getId() { return $this->id; } Modified: branches/release-candidates/sciret-1.2/setup/final.sql =================================================================== --- branches/release-candidates/sciret-1.2/setup/final.sql 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/setup/final.sql 2007-08-13 01:53:06 UTC (rev 480) @@ -5,6 +5,7 @@ `title` text collate utf8_unicode_ci NOT NULL, `url` varchar(255) collate utf8_unicode_ci NOT NULL default '', `expires` date NOT NULL, + `question` text collate utf8_unicode_ci NOT NULL, `content` text collate utf8_unicode_ci NOT NULL, `cat_id` int(11) NOT NULL default '0', `published` tinyint(4) NOT NULL default '0', Modified: branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql =================================================================== --- branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql 2007-08-13 01:53:06 UTC (rev 480) @@ -5,3 +5,5 @@ UPDATE configuration SET value = '1.2.0' WHERE field = 'version'; ALTER TABLE `users` ADD `password_changed` DATE NOT NULL AFTER `password` ; + +ALTER TABLE `articles` ADD `question` TEXT NOT NULL AFTER `expires` ; Modified: branches/release-candidates/sciret-1.2/templates/MainView.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/MainView.tpl 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/templates/MainView.tpl 2007-08-13 01:53:06 UTC (rev 480) @@ -87,6 +87,11 @@ <i>({art_num}) </i> <img src="images/{articleImage}" /> <a href="{art_link}" {target} style="font-weight:bold; font-size:17px">{art_title}</a> {bookmark_edit}<br /> + <!-- BEGIN question_block --> + <div> + ({questionStr}) + </div> + <!-- END question_block --> <div> {modifOrCreated} {art_date} - {img_stars} {attachment} </div> Modified: branches/release-candidates/sciret-1.2/views/MainView.php =================================================================== --- branches/release-candidates/sciret-1.2/views/MainView.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/views/MainView.php 2007-08-13 01:53:06 UTC (rev 480) @@ -63,6 +63,7 @@ $this->tpl->set_block('main', 'viewAllLink_block', 'viewAllLink'); $this->tpl->set_block('main', 'viewArticlesLink_block', 'viewArticlesLink'); $this->tpl->set_block('main', 'viewBookmarksLink_block', 'viewBookmarksLink'); + $this->tpl->set_block('articles_block', 'question_block', 'question'); $this->tpl->set_block('unanswered_questions_block', 'answerLink_block', 'answerLink'); @@ -169,7 +170,6 @@ 'target' => $article->isBookmark()? 'target="_blank"' : '', 'bookmark_edit' => $article->isBookmark()? '<a href="'.Library::getLink(array('view' => 'ViewBookmark', 'id' => $article->getId())).'" style="font-size:10px">'.$this->user->lang('details').'</a>' : '', 'art_num' => $article->getId(), - 'articleImage' => $article->isBookmark()? 'bookmark.png' : 'article.png', 'art_title' => $article->getTitle(), 'modifOrCreated'=> $article->getModifiedByUserId() > 0? $this->user->lang('Last Modified') : $this->user->lang('Created on'), 'art_date' => $this->user->formatDate($article->getModifiedByUserId() > 0? $article->getModificationDate() : $article->getCreationDate()), @@ -177,6 +177,18 @@ 'attachment' => $article->getNumFiles()? '<img src="images/attach.gif" />' : '', 'art_excerpt' => strip_tags($article->getExcerpt()).($article->isBookmark()? '' : '...'), )); + + if ($article->isBookmark()) { + $this->tpl->set_var('articleImage', 'bookmark.png'); + } elseif ($article->getQuestion()) { + $this->tpl->set_var('articleImage', 'question.png'); + $this->tpl->set_var('questionStr', $article->getQuestion()); + $this->tpl->parse('question', 'question_block'); + } else { + $this->tpl->set_var('articleImage', 'article.png'); + $this->tpl->set_var('question', ''); + } + if ($article->getCategoryId() == 0) { $this->tpl->set_var('art_category', ''); } else { Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-13 01:48:54 UTC (rev 479) +++ branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-13 01:53:06 UTC (rev 480) @@ -45,6 +45,7 @@ $this->tpl->set_block('view_article', 'edit_del_block', 'edit_del'); $this->tpl->set_block('view_article', 'publish_btn_block', 'publish_btn'); $this->tpl->set_block('view_article', 'history_line_block', 'history_line'); + $this->tpl->set_block('view_article', 'question_block', 'question'); $this->tpl->set_block('view_article', 'mailArticle_block', 'mailArticle'); // *** COMMENTS **** @@ -152,6 +153,13 @@ 'usage' => $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()); + $this->tpl->parse('question', 'question_block'); + } else { + $this->tpl->set_var('question', ''); + } + if (!$article->isInternal()) { $this->tpl->parse('mailArticle', 'mailArticle_block'); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2007-08-13 18:12:49
|
Revision: 483 http://sciret.svn.sourceforge.net/sciret/?rev=483&view=rev Author: reinerj Date: 2007-08-13 11:12:45 -0700 (Mon, 13 Aug 2007) Log Message: ----------- add the Changes to the roadmap and update the TODO Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/TODO branches/release-candidates/sciret-1.2/VERSION Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-13 13:41:40 UTC (rev 482) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-13 18:12:45 UTC (rev 483) @@ -1,3 +1,11 @@ +2007-08-12 Alejandro Pedraza <ale...@gm...> + * When an article was made to answer a question, show the + question text between the title and the article excerpt in + the list view, and between the title and the category in + the article detail view. Also, when an article that answers + a question is shown on the list view, use a question mark + as an icon, instead of the sheet icon currently used. + 2007-08-10 Reiner Jung <rj...@th...> * Add SF patch 1765899 from Trond Viggo Håpnes. This patch removes the mail-link from ViewArticle if the article is marked Modified: branches/release-candidates/sciret-1.2/TODO =================================================================== --- branches/release-candidates/sciret-1.2/TODO 2007-08-13 13:41:40 UTC (rev 482) +++ branches/release-candidates/sciret-1.2/TODO 2007-08-13 18:12:45 UTC (rev 483) @@ -1,15 +1,15 @@ 1.2 Release -- When edit a category and select a icon, the icon should be visible as a preview and not after it is selected -- A Question should be visible also in the categories where the question is assigned so long as it is answered. It must be marked - that it is clear visible this is a question - Automatic password reset for users (SF request 1704597) - Preferences for a user based view of the screen - Pre Installation check for Sciret (Check the right file system rights ...) - When a new user will be created, the password must be entered 2 times (at the moment it is only once) DONE - * Password protected access to Sciret that only signed in users have access. + * Password protected access to Sciret that only signed in users have access. Should be a configuration option (SF request 1704597) + * A Question should be visible also in the categories where the question is + assigned so long as it is answered. It must be marked that it is clear + visible this is a question 1.3 Release - New User Interface for Sciret based on the work from Nuno Pinheiro Modified: branches/release-candidates/sciret-1.2/VERSION =================================================================== --- branches/release-candidates/sciret-1.2/VERSION 2007-08-13 13:41:40 UTC (rev 482) +++ branches/release-candidates/sciret-1.2/VERSION 2007-08-13 18:12:45 UTC (rev 483) @@ -1 +1 @@ -1.1.0-SVN-Release-454 +1.2.0-SVN-Release-483 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-08-15 19:31:42
|
Revision: 484 http://sciret.svn.sourceforge.net/sciret/?rev=484&view=rev Author: lugo04 Date: 2007-08-15 12:31:40 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Add SF patch 1772600 from Trond Viggo H?\195?\165pnes Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/actions/SaveCategory.php branches/release-candidates/sciret-1.2/templates/EditCategory.tpl Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-13 18:12:45 UTC (rev 483) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-15 19:31:40 UTC (rev 484) @@ -1,3 +1,7 @@ +2007-08-15 Lucie Goga <lg...@th...> + * Add SF patch 1772600 from Trond Viggo Håpnes. This patch + allows the admin to remove the icon from a (sub)category. + 2007-08-12 Alejandro Pedraza <ale...@gm...> * When an article was made to answer a question, show the question text between the title and the article excerpt in @@ -40,7 +44,7 @@ missing with xcache 2007-07-18 Lucie Goga <lg...@th...> - * Scirt 1.1.0 release + * Sciret 1.1.0 release 2007-07-15 Alejandro Pedraza <ale...@gm...> * [BUG] Fix problem to send mail from Sciret Modified: branches/release-candidates/sciret-1.2/actions/SaveCategory.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/SaveCategory.php 2007-08-13 18:12:45 UTC (rev 483) +++ branches/release-candidates/sciret-1.2/actions/SaveCategory.php 2007-08-15 19:31:40 UTC (rev 484) @@ -26,9 +26,7 @@ $category->setParentId($_POST['parentCategory']); $category->setLabel($_POST['name']); $category->setDescription($_POST['description']); - if ($_POST['icon'] != 'blank.gif') { - $category->setIconFileName($_POST['icon']); - } + $category->setIconFileName($_POST['icon']); $category->save(); $_SESSION['message'] = $this->user->lang('Category saved successfully'); Modified: branches/release-candidates/sciret-1.2/templates/EditCategory.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/EditCategory.tpl 2007-08-13 18:12:45 UTC (rev 483) +++ branches/release-candidates/sciret-1.2/templates/EditCategory.tpl 2007-08-15 19:31:40 UTC (rev 484) @@ -45,7 +45,7 @@ <td>[l]Icon[/l]:</td> <td> <select name="icon" onchange="changeIcon(this.value)"> - <option value="blank.gif" >[l]None[/l]</option> + <option value="" >[l]None[/l]</option> <!-- BEGIN icons_block --> <option value="{iconName}" {iconSelected}>{iconName}</option> <!-- END icons_block --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2007-08-16 00:20:47
|
Revision: 485 http://sciret.svn.sourceforge.net/sciret/?rev=485&view=rev Author: alpeb Date: 2007-08-15 17:20:45 -0700 (Wed, 15 Aug 2007) Log Message: ----------- allow users to hide categories in the main screen Modified Paths: -------------- branches/release-candidates/sciret-1.2/flowMap.php branches/release-candidates/sciret-1.2/models/User.php branches/release-candidates/sciret-1.2/templates/EditCategories.tpl branches/release-candidates/sciret-1.2/templates/header.tpl branches/release-candidates/sciret-1.2/views/EditCategories.php branches/release-candidates/sciret-1.2/views/View.php Modified: branches/release-candidates/sciret-1.2/flowMap.php =================================================================== --- branches/release-candidates/sciret-1.2/flowMap.php 2007-08-15 19:31:40 UTC (rev 484) +++ branches/release-candidates/sciret-1.2/flowMap.php 2007-08-16 00:20:45 UTC (rev 485) @@ -26,7 +26,7 @@ 'ManageUsers' => array(ROLE_ADMIN, true, true), 'EditUser' => array(ROLE_REGISTERED, true, true), 'AddQuestion' => array(ROLE_ANONYMOUS, true, true, true), - 'EditCategories' => array(ROLE_ADMIN, 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), @@ -81,6 +81,8 @@ '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), ); ?> Modified: branches/release-candidates/sciret-1.2/models/User.php =================================================================== --- branches/release-candidates/sciret-1.2/models/User.php 2007-08-15 19:31:40 UTC (rev 484) +++ branches/release-candidates/sciret-1.2/models/User.php 2007-08-16 00:20:45 UTC (rev 485) @@ -33,6 +33,7 @@ 'dateFormat' => 'Month Day, Year', 'language' => LANGUAGE_DEFAULT, 'navigationType' => 'catAndSubCats', + 'hiddenCategories' => '', ); var $rtlLanguages = array('Hebrew'); Modified: branches/release-candidates/sciret-1.2/templates/EditCategories.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/EditCategories.tpl 2007-08-15 19:31:40 UTC (rev 484) +++ branches/release-candidates/sciret-1.2/templates/EditCategories.tpl 2007-08-16 00:20:45 UTC (rev 485) @@ -37,11 +37,19 @@ <td>{catDescription}</td> <td>{catIcon}</td> <td> - <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> - <!-- END deleteCategory_block --> + <!-- BEGIN hideCategory_block --> + <a href="{hideCatLink}">[l]Hide[/l]</a> + <!-- END hideCategory_block --> + <!-- BEGIN showCategory_block --> + <a href="{showCatLink}">[l]Show[/l]</a> + <!-- END showCategory_block --> + <!-- BEGIN categoryAdminOps_block --> + <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> + <!-- END deleteCategory_block --> + <!-- END categoryAdminOps_block --> </td> </tr> <!-- END categories_block --> Modified: branches/release-candidates/sciret-1.2/templates/header.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/header.tpl 2007-08-15 19:31:40 UTC (rev 484) +++ branches/release-candidates/sciret-1.2/templates/header.tpl 2007-08-16 00:20:45 UTC (rev 485) @@ -88,7 +88,7 @@ <a href="{addBookmarkHref}">[l]Add Bookmark[/l]</a> | <!-- END addBookmarkLink_block --> <!-- BEGIN editCategoriesLink_block --> - <a href="{editCategoriesHref}">[l]Edit Categories[/l]</a> | + <a href="{editCategoriesHref}">[l]Manage Categories[/l]</a> | <!-- END editCategoriesLink_block --> <!-- BEGIN manageArticlesLink_block --> <a href="{manageArticlesHref}">[l]Manage Items[/l]</a> | Modified: branches/release-candidates/sciret-1.2/views/EditCategories.php =================================================================== --- branches/release-candidates/sciret-1.2/views/EditCategories.php 2007-08-15 19:31:40 UTC (rev 484) +++ branches/release-candidates/sciret-1.2/views/EditCategories.php 2007-08-16 00:20:45 UTC (rev 485) @@ -14,12 +14,17 @@ class EditCategories extends View { + var $hiddenCategories; + function dispatch() { $this->tpl->set_file('edit_categories', 'EditCategories.tpl'); $this->tpl->set_block('edit_categories', 'categories_block', 'categories'); $this->tpl->set_block('categories_block', 'boldCategory_block', 'boldCategory'); $this->tpl->set_block('categories_block', 'nonBoldCategory_block', 'nonBoldCategory'); - $this->tpl->set_block('categories_block', 'deleteCategory_block', 'deleteCategory'); + $this->tpl->set_block('categories_block', 'categoryAdminOps_block', 'categoryAdminOps'); + $this->tpl->set_block('categoryAdminOps_block', 'deleteCategory_block', 'deleteCategory'); + $this->tpl->set_block('categories_block', 'hideCategory_block', 'hideCategory'); + $this->tpl->set_block('categories_block', 'showCategory_block', 'showCategory'); $this->tpl->set_var(array( 'deleteCatRedirect' => Library::getLink(array('action' => 'DeleteCategory')), 'addCatRedirect' => Library::getLink(array('view' => 'EditCategory', 'subAction' => 'add')), @@ -27,6 +32,11 @@ $categoryGateway = new CategoryGateway; $categories = $categoryGateway->getCategories(); + if (!$this->user->getPreference('hiddenCategories')) { + $this->hiddenCategories = array(); + } else { + $this->hiddenCategories = explode(',', $this->user->getPreference('hiddenCategories')); + } foreach ($categories[0]->getChildren() as $category) { $this->_showCategories($category); } @@ -44,6 +54,8 @@ $indent = str_repeat(' ', $depth); $this->tpl->set_var(array( + 'hideCatLink' => Library::getLink(array('action' => 'HideCategory', 'catId' => $category->getId())), + 'showCatLink' => Library::getLink(array('action' => 'ShowCategory', 'catId' => $category->getId())), 'addSubCatLink' => Library::getLink(array('view' => 'EditCategory', 'subAction' => 'addSubCategory', 'catId' => $category->getId())), 'editCatLink' => Library::getLink(array('view' => 'EditCategory', 'catId' => $category->getId())), 'rowClass' => $rowClass, @@ -54,6 +66,17 @@ 'catIcon' => ($category->getIconFileName() != '')? '<img src="uploads/icons/'.$category->getIconFileName().'" />' : '', )); + if (in_array($category->getParentId(), $this->hiddenCategories)) { + $this->tpl->set_var('hideCategory', ''); + $this->tpl->set_var('showCategory', ''); + } elseif (in_array($category->getId(), $this->hiddenCategories)) { + $this->tpl->parse('showCategory', 'showCategory_block'); + $this->tpl->set_var('hideCategory', ''); + } else { + $this->tpl->parse('hideCategory', 'hideCategory_block'); + $this->tpl->set_var('showCategory', ''); + } + if ($depth == 0) { $this->tpl->parse('boldCategory', 'boldCategory_block'); $this->tpl->set_var('nonBoldCategory', ''); @@ -68,6 +91,12 @@ $this->tpl->parse('deleteCategory', 'deleteCategory_block'); } + if ($this->user->isAdmin()) { + $this->tpl->parse('categoryAdminOps', 'categoryAdminOps_block'); + } else { + $this->tpl->set_var('categoryAdminOps', ''); + } + $this->tpl->parse('categories', 'categories_block', !$firstIteration); $firstIteration = false; $rowClass = $rowClass == 'row_off'? 'row_on' : 'row_off'; Modified: branches/release-candidates/sciret-1.2/views/View.php =================================================================== --- branches/release-candidates/sciret-1.2/views/View.php 2007-08-15 19:31:40 UTC (rev 484) +++ branches/release-candidates/sciret-1.2/views/View.php 2007-08-16 00:20:45 UTC (rev 485) @@ -98,12 +98,8 @@ } $this->tpl->set_block('header', 'editCategoriesLink_block', 'editCategoriesLink'); - if ($this->user->isAdmin()) { - $this->tpl->set_var('editCategoriesHref', Library::getLink(array('view' => 'EditCategories'))); - $this->tpl->parse('editCategoriesLink', 'editCategoriesLink_block'); - } else { - $this->tpl->set_var('editCategoriesLink', ''); - } + $this->tpl->set_var('editCategoriesHref', Library::getLink(array('view' => 'EditCategories'))); + $this->tpl->parse('editCategoriesLink', 'editCategoriesLink_block'); $this->tpl->set_block('header', 'manageArticlesLink_block', 'manageArticlesLink'); if (!$this->user->isAnonymous()) { @@ -154,8 +150,17 @@ function _getCategoriesHTML($categories, $view) { $categories_str = ''; $num_main_cat = 0; + if (!$this->user->getPreference('hiddenCategories')) { + $hiddenCategories = array(); + } else { + $hiddenCategories = explode(',', $this->user->getPreference('hiddenCategories')); + } foreach ($categories as $cat) { + if (in_array($cat->getId(), $hiddenCategories)) { + continue; + } + $num_main_cat ++; $categories_str .= "<tr><td valign=top>"; if ($icon = $cat->getIconFileName()) { @@ -163,6 +168,9 @@ } $categories_str .= "</td><td><a href='".Library::getLink(array('view' => $view, 'catId' => $cat->getId()))."'><b>".$cat->getLabel()."</b></a><br><div style='padding-left:10px'>"; foreach ($cat->getChildren() as $subcat) { + if (in_array($subcat->getId(), $hiddenCategories)) { + continue; + } $categories_str .= "<a href='".Library::getLink(array('view' => $view, 'catId' => $subcat->getId()))."'>".$subcat->getLabel()."</a>, "; } if ($cat->hasChildren()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <re...@us...> - 2007-08-16 07:08:48
|
Revision: 487 http://sciret.svn.sourceforge.net/sciret/?rev=487&view=rev Author: reinerj Date: 2007-08-16 00:08:46 -0700 (Thu, 16 Aug 2007) Log Message: ----------- update the Changelog Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/TODO branches/release-candidates/sciret-1.2/VERSION Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-16 00:21:19 UTC (rev 486) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-16 07:08:46 UTC (rev 487) @@ -1,5 +1,9 @@ +2007-08-16 Alejandro Pedraza <ale...@gm...> + * User can manage the categories and hide them with the + Manage categories + 2007-08-15 Lucie Goga <lg...@th...> - * Add SF patch 1772600 from Trond Viggo Håpnes. This patch + * [BUG] Add SF patch 1772600 from Trond Viggo Håpnes. This patch allows the admin to remove the icon from a (sub)category. 2007-08-12 Alejandro Pedraza <ale...@gm...> @@ -20,7 +24,7 @@ * Let registered users edit their own profile. * Added functionality to expire passwords and oblige users to change them when that happens - * New Feature: Be able to decide whether the KB is public or not + * Be able to decide whether the KB is public or not (set by the admin, in the preferences section) 2007-08-02 Reiner Jung <rj...@th...> Modified: branches/release-candidates/sciret-1.2/TODO =================================================================== --- branches/release-candidates/sciret-1.2/TODO 2007-08-16 00:21:19 UTC (rev 486) +++ branches/release-candidates/sciret-1.2/TODO 2007-08-16 07:08:46 UTC (rev 487) @@ -1,6 +1,5 @@ 1.2 Release - Automatic password reset for users (SF request 1704597) -- Preferences for a user based view of the screen - Pre Installation check for Sciret (Check the right file system rights ...) - When a new user will be created, the password must be entered 2 times (at the moment it is only once) @@ -10,6 +9,7 @@ * A Question should be visible also in the categories where the question is assigned so long as it is answered. It must be marked that it is clear visible this is a question + * Preferences for a user based view of the screen 1.3 Release - New User Interface for Sciret based on the work from Nuno Pinheiro Modified: branches/release-candidates/sciret-1.2/VERSION =================================================================== --- branches/release-candidates/sciret-1.2/VERSION 2007-08-16 00:21:19 UTC (rev 486) +++ branches/release-candidates/sciret-1.2/VERSION 2007-08-16 07:08:46 UTC (rev 487) @@ -1 +1 @@ -1.2.0-SVN-Release-483 +1.2.0-SVN-Release-487 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-08-16 18:18:34
|
Revision: 492 http://sciret.svn.sourceforge.net/sciret/?rev=492&view=rev Author: lugo04 Date: 2007-08-16 11:10:19 -0700 (Thu, 16 Aug 2007) Log Message: ----------- Add SF patch 1775353 Allow / disallow comments and ratings Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/actions/SavePreferences.php branches/release-candidates/sciret-1.2/languages/English.txt branches/release-candidates/sciret-1.2/setup/final.sql branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl branches/release-candidates/sciret-1.2/views/EditPreferences.php branches/release-candidates/sciret-1.2/views/ViewArticle.php branches/release-candidates/sciret-1.2/views/ViewBookmark.php Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-16 18:10:19 UTC (rev 492) @@ -1,3 +1,7 @@ +2007-08-15 Lucie Goga <lg...@th...> + * Add SF patch 1775353 from Trond Viggo Håpnes. This patch + allows / disallow coments and ratings. + 2007-08-16 Alejandro Pedraza <ale...@gm...> * User can manage the categories and hide them with the Manage categories Modified: branches/release-candidates/sciret-1.2/actions/SavePreferences.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/SavePreferences.php 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/actions/SavePreferences.php 2007-08-16 18:10:19 UTC (rev 492) @@ -39,6 +39,7 @@ $this->configuration->setConfigValue('publishCommentsAuto', $_POST['publishCommentsAuto'] == '1'? '1' : '0'); $this->configuration->setConfigValue('publishQuestionsAuto', $_POST['publishQuestionsAuto'] == '1'? '1' : '0'); $this->configuration->setConfigValue('internalByDefault', $_POST['internalByDefault'] == '1'? '1' : '0'); + $this->configuration->setConfigValue('allowCommentsRatings', $_POST['allowCommentsRatings'] == '1'? '1' : '0'); $this->configuration->setConfigValue('passwordExpirationDays', $_POST['passwordExpirationDays']); $this->configuration->setConfigValue('mailTransport', $_POST['mailTransport'] == 'smtp' ? 'smtp' : 'sendmail'); $this->configuration->setConfigValue('mailFromName', $_POST['mailFromName']); Modified: branches/release-candidates/sciret-1.2/languages/English.txt =================================================================== --- branches/release-candidates/sciret-1.2/languages/English.txt 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/languages/English.txt 2007-08-16 18:10:19 UTC (rev 492) @@ -661,3 +661,5 @@ Usage Sorry, this article is for internal use only. + +Allow comments and ratings Modified: branches/release-candidates/sciret-1.2/setup/final.sql =================================================================== --- branches/release-candidates/sciret-1.2/setup/final.sql 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/setup/final.sql 2007-08-16 18:10:19 UTC (rev 492) @@ -21,6 +21,7 @@ `votes_4` int(11) NOT NULL default '0', `votes_5` int(11) NOT NULL default '0', `internal` tinyint(4) NOT NULL default '0', + `allowCommentsRatings` tinyint(4) NOT NULL default '1', PRIMARY KEY (`art_id`), FULLTEXT KEY `title` (`title`,`content`, `url`) ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ; Modified: branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql =================================================================== --- branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql 2007-08-16 18:10:19 UTC (rev 492) @@ -1,4 +1,4 @@ -INSERT INTO `configuration` (`field`, `value`) VALUES ('publishKB', '1'), ('internalByDefault', '0'), ('passwordExpirationDays', '60'), ('mailTransport', 'sendmail'), ('mailFromName', 'Sciret Knowledgebase'), ('mailFromMail', 'root@localhost'), ('smtpServer', ''), ('smtpUser', ''), ('smtpPassword', ''), ('smtpPort', '25'); +INSERT INTO `configuration` (`field`, `value`) VALUES ('publishKB', '1'), ('internalByDefault', '0'), ('passwordExpirationDays', '60'), ('mailTransport', 'sendmail'), ('mailFromName', 'Sciret Knowledgebase'), ('mailFromMail', 'root@localhost'), ('smtpServer', ''), ('smtpUser', ''), ('smtpPassword', ''), ('smtpPort', '25'), ('allowCommentsRatings', '1'); ALTER TABLE `articles` ADD `internal` tinyint(4) NOT NULL default '0'; Modified: branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl 2007-08-16 18:10:19 UTC (rev 492) @@ -120,12 +120,21 @@ </td> </tr> <tr class="row_off"> + <td style="text-align:right; font-weight:bold">[l]Allow comments and ratings[/l]:</td> + <td> + <select name="allowCommentsRatings"> + <option value="1" {allowCommentsRatings_yes_selected}>[l]Yes[/l]</option> + <option value="0" {allowCommentsRatings_no_selected}>[l]No[/l]</option> + </select> + </td> + </tr> + + <tr class="row_on"> <td style="text-align:right; font-weight:bold">[l]Days before password expires[/l]:</td> <td> <input type="text" name="passwordExpirationDays" value="{passwordExpirationDays}" size="2" /> </td> </tr> - <tr class="row_off"> <td style="text-align:right; font-weight:bold">[l]Send mail from (name)[/l]:</td> <td> Modified: branches/release-candidates/sciret-1.2/views/EditPreferences.php =================================================================== --- branches/release-candidates/sciret-1.2/views/EditPreferences.php 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/views/EditPreferences.php 2007-08-16 18:10:19 UTC (rev 492) @@ -47,6 +47,8 @@ 'publishQuestionsAuto_no_selected' => $this->configuration->getConfigValue('publishQuestionsAuto') == '0'? 'selected="true" ': '', 'internalByDefault_yes_selected' => $this->configuration->getConfigValue('internalByDefault') == '1'? 'selected="true" ': '', 'internalByDefault_no_selected' => $this->configuration->getConfigValue('internalByDefault') == '0'? 'selected="true" ': '', + 'allowCommentsRatings_yes_selected' => $this->configuration->getConfigValue('allowCommentsRatings') == '1'? 'selected="true" ': '', + 'allowCommentsRatings_no_selected' => $this->configuration->getConfigValue('allowCommentsRatings') == '0'? 'selected="true" ': '', 'passwordExpirationDays' => $this->configuration->getConfigValue('passwordExpirationDays'), 'mailFromName' => $this->configuration->getConfigValue('mailFromName'), 'mailFromMail' => $this->configuration->getConfigValue('mailFromMail'), @@ -58,7 +60,7 @@ 'smtpPassword' => $this->configuration->getConfigValue('smtpPassword'), 'smtpPort' => $this->configuration->getConfigValue('smtpPort'), )); - + // *** LANGUAGES *** $dirname = 'languages'; $dir = dir($dirname); Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-16 18:10:19 UTC (rev 492) @@ -49,11 +49,18 @@ $this->tpl->set_block('view_article', 'mailArticle_block', 'mailArticle'); // *** COMMENTS **** - $viewComments = new ViewComments($this->user, $this->configuration); - $viewComments->setArticle($article); - $viewComments->setTemplate($this->tpl); - $this->tpl->set_var('commentsTable', $viewComments->dispatch(true)); + $config = $this->configuration; + $allowCommentsRatings = $config->getConfigValue('allowCommentsRatings'); + if ($allowCommentsRatings) { + $viewComments = new ViewComments($this->user, $this->configuration); + $viewComments->setArticle($article); + $viewComments->setTemplate($this->tpl); + $this->tpl->set_var('commentsTable', $viewComments->dispatch(true)); + } else { + $this->tpl->set_var('commentsTable', ''); + } + // *** ATTACHED FILES **** $files = $article->getFiles(); $notFirstPass = false; Modified: branches/release-candidates/sciret-1.2/views/ViewBookmark.php =================================================================== --- branches/release-candidates/sciret-1.2/views/ViewBookmark.php 2007-08-16 10:02:39 UTC (rev 491) +++ branches/release-candidates/sciret-1.2/views/ViewBookmark.php 2007-08-16 18:10:19 UTC (rev 492) @@ -43,11 +43,18 @@ $this->tpl->set_var('mailBookmarkLink', Library::getLink(array('view' => 'MailArticle', 'artId' => $article->getId()))); // *** COMMENTS **** - $viewComments = new ViewComments($this->user, $this->configuration); - $viewComments->setArticle($article); - $viewComments->setTemplate($this->tpl); - $this->tpl->set_var('commentsTable', $viewComments->dispatch(true)); + $config = $this->configuration; + $allowCommentsRatings = $config->getConfigValue('allowCommentsRatings'); + if ($allowCommentsRatings) { + $viewComments = new ViewComments($this->user, $this->configuration); + $viewComments->setArticle($article); + $viewComments->setTemplate($this->tpl); + $this->tpl->set_var('commentsTable', $viewComments->dispatch(true)); + } else { + $this->tpl->set_var('commentsTable', ''); + } + // *** GENERAL *** $this->tpl->set_var(array( 'bookmark_id' => $article->getId(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2007-08-19 12:30:57
|
Revision: 506 http://sciret.svn.sourceforge.net/sciret/?rev=506&view=rev Author: alpeb Date: 2007-08-19 05:30:40 -0700 (Sun, 19 Aug 2007) Log Message: ----------- New feature download pdf for article Modified Paths: -------------- branches/release-candidates/sciret-1.2/flowMap.php branches/release-candidates/sciret-1.2/templates/ViewArticle.tpl branches/release-candidates/sciret-1.2/views/ViewArticle.php Modified: branches/release-candidates/sciret-1.2/flowMap.php =================================================================== --- branches/release-candidates/sciret-1.2/flowMap.php 2007-08-19 09:51:54 UTC (rev 505) +++ branches/release-candidates/sciret-1.2/flowMap.php 2007-08-19 12:30:40 UTC (rev 506) @@ -71,6 +71,7 @@ '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), Modified: branches/release-candidates/sciret-1.2/templates/ViewArticle.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/ViewArticle.tpl 2007-08-19 09:51:54 UTC (rev 505) +++ branches/release-candidates/sciret-1.2/templates/ViewArticle.tpl 2007-08-19 12:30:40 UTC (rev 506) @@ -27,6 +27,8 @@ <img id="markFinalProgressImg" src="images/progress.gif" style="visibility:hidden" /> <span style='width:200px; position: absolute;right:0; text-align:right;'> <a href="{printerViewLink}" target="_blank"><img src="images/articleprint.gif" alt="[l]Printer view[/l]" title="[l]Printer view[/l]"></a> + + <a href="{pdfLink}"><img src="images/file_pdf.gif" alt="[l]PDF[/l]" title="[l]PDF[/l]"></a> <!-- BEGIN mailArticle_block --> <a href="{mailArticleLink}"><img src="images/mail.gif" alt="[l]Mail article[/l]" title="[l]Mail article[/l]"></a> Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-19 09:51:54 UTC (rev 505) +++ branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-19 12:30:40 UTC (rev 506) @@ -144,6 +144,7 @@ $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())), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2007-08-19 13:13:17
|
Revision: 511 http://sciret.svn.sourceforge.net/sciret/?rev=511&view=rev Author: alpeb Date: 2007-08-19 06:13:15 -0700 (Sun, 19 Aug 2007) Log Message: ----------- new repeat password field to avoid typos Modified Paths: -------------- branches/release-candidates/sciret-1.2/actions/EditUser.php branches/release-candidates/sciret-1.2/templates/EditUser.tpl branches/release-candidates/sciret-1.2/views/EditUser.php Modified: branches/release-candidates/sciret-1.2/actions/EditUser.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/EditUser.php 2007-08-19 13:12:37 UTC (rev 510) +++ branches/release-candidates/sciret-1.2/actions/EditUser.php 2007-08-19 13:13:15 UTC (rev 511) @@ -43,11 +43,14 @@ $missingFieldsArr[] = $this->user->lang('password'); } - if (!$user->setPassword($_POST['password'])) { + $invalidPassword = false; + if ($_POST['password'] != $_POST['password2']) { + $_SESSION['message'] = $this->user->lang('Password and Repeat Password fields don\'t match'); + $invalidPassword = true; + } + elseif (!$user->setPassword($_POST['password'])) { $_SESSION['message'] = $this->user->lang('Invalid password. Please don\'t use any of these characters: %s', implode($user->getDisallowedPasswordChars())); $invalidPassword = true; - } else { - $invalidPassword = false; } if ($missingFieldsArr) { @@ -77,11 +80,12 @@ Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId()))); } - if ($_POST['password'] != '') { - if (!$user->changePassword($_POST['password'])) { - $_SESSION['message'] = $this->user->lang('Invalid password. Please don\'t use any of these characters: %s', implode(', ', $user->getDisallowedPasswordChars())); - Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId()))); - } + if ($_POST['password'] != $_POST['password2']) { + $_SESSION['message'] = $this->user->lang('Password and Repeat Password fields don\'t match'); + Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId()))); + } elseif (!$user->changePassword($_POST['password'])) { + $_SESSION['message'] = $this->user->lang('Invalid password. Please don\'t use any of these characters: %s', implode(', ', $user->getDisallowedPasswordChars())); + Library::redirect(Library::getLink(array('view' => 'EditUser', 'userId' => $user->getId()))); } } Modified: branches/release-candidates/sciret-1.2/templates/EditUser.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/EditUser.tpl 2007-08-19 13:12:37 UTC (rev 510) +++ branches/release-candidates/sciret-1.2/templates/EditUser.tpl 2007-08-19 13:13:15 UTC (rev 511) @@ -35,8 +35,12 @@ <td style="text-align:right">[l]Password[/l]: </td> <td><input type="password" name="password" value="{password}" /></td> </tr> + <tr class="row_on"> + <td style="text-align:right">[l]Repeat password[/l]: </td> + <td><input type="password" name="password2" value="{password2}" /></td> + </tr> <!-- BEGIN adminAccess_block --> - <tr class="row_on"> + <tr class="row_off"> <td style="text-align:right">[l]Give Admin access?[/l]: </td> <td><input type="checkbox" name="adminAccess" {checkedAdminAccess} /></td> </tr> Modified: branches/release-candidates/sciret-1.2/views/EditUser.php =================================================================== --- branches/release-candidates/sciret-1.2/views/EditUser.php 2007-08-19 13:12:37 UTC (rev 510) +++ branches/release-candidates/sciret-1.2/views/EditUser.php 2007-08-19 13:13:15 UTC (rev 511) @@ -34,6 +34,8 @@ 'lastName' => $user->getLastName(), 'userName' => $user->getUserName(), 'email' => $user->getEmail(), + 'password' => '', + 'password2' => '', 'checkedAdminAccess' => $user->isAdmin()? 'checked="true" ' : '', )); } else { @@ -44,6 +46,7 @@ 'userName' => isset($_SESSION['formFields']['userName'])? $_SESSION['formFields']['userName'] : '', 'email' => isset($_SESSION['formFields']['email'])? $_SESSION['formFields']['email'] : '', 'password' => isset($_SESSION['formFields']['password'])? $_SESSION['formFields']['password'] : '', + 'password2' => isset($_SESSION['formFields']['password'])? $_SESSION['formFields']['password'] : '', 'checkedAdminAccess' => (isset($_SESSION['formFields']['checkedAdminAccess']) && $_SESSION['formFields']['checkedAdminAccess'])? 'checked="true"' : '', )); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2007-08-19 12:44:08
|
Revision: 507 http://sciret.svn.sourceforge.net/sciret/?rev=507&view=rev Author: alpeb Date: 2007-08-19 05:44:03 -0700 (Sun, 19 Aug 2007) Log Message: ----------- New feature download pdf for article Added Paths: ----------- branches/release-candidates/sciret-1.2/tcpdf/ branches/release-candidates/sciret-1.2/tcpdf/.eraseme.php.swp branches/release-candidates/sciret-1.2/tcpdf/.eraseme2.php.swp branches/release-candidates/sciret-1.2/tcpdf/.tcpdf.php.swp branches/release-candidates/sciret-1.2/tcpdf/CHANGELOG.TXT branches/release-candidates/sciret-1.2/tcpdf/LICENSE.TXT branches/release-candidates/sciret-1.2/tcpdf/README.TXT branches/release-candidates/sciret-1.2/tcpdf/barcode/ branches/release-candidates/sciret-1.2/tcpdf/barcode/barcode.php branches/release-candidates/sciret-1.2/tcpdf/barcode/c128aobject.php branches/release-candidates/sciret-1.2/tcpdf/barcode/c128bobject.php branches/release-candidates/sciret-1.2/tcpdf/barcode/c128cobject.php branches/release-candidates/sciret-1.2/tcpdf/barcode/c39object.php branches/release-candidates/sciret-1.2/tcpdf/barcode/i25object.php branches/release-candidates/sciret-1.2/tcpdf/barcode/image.php branches/release-candidates/sciret-1.2/tcpdf/barcode/lesser.txt branches/release-candidates/sciret-1.2/tcpdf/cache/ branches/release-candidates/sciret-1.2/tcpdf/config/ branches/release-candidates/sciret-1.2/tcpdf/config/lang/ branches/release-candidates/sciret-1.2/tcpdf/config/lang/eng.php branches/release-candidates/sciret-1.2/tcpdf/config/tcpdf_config.php branches/release-candidates/sciret-1.2/tcpdf/doc/ branches/release-candidates/sciret-1.2/tcpdf/doc/blank.html branches/release-candidates/sciret-1.2/tcpdf/doc/classtrees_com.tecnick.tcpdf.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/ branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/BarcodeObject.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/C128AObject.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/C128BObject.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/C128CObject.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/C39Object.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/I25Object.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/TCPDF.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_barcode_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c128aobject_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c128bobject_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c128cobject_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_c39object_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_i25object_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_barcode_image_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_config_lang_eng_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_config_tcpdf_config_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_html_entity_decode_php4_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/com.tecnick.tcpdf/_tcpdf_php4_tcpdf_php.html branches/release-candidates/sciret-1.2/tcpdf/doc/elementindex.html branches/release-candidates/sciret-1.2/tcpdf/doc/elementindex_com.tecnick.tcpdf.html branches/release-candidates/sciret-1.2/tcpdf/doc/errors.html branches/release-candidates/sciret-1.2/tcpdf/doc/index.html branches/release-candidates/sciret-1.2/tcpdf/doc/li_com.tecnick.tcpdf.html branches/release-candidates/sciret-1.2/tcpdf/doc/media/ branches/release-candidates/sciret-1.2/tcpdf/doc/media/banner.css branches/release-candidates/sciret-1.2/tcpdf/doc/media/stylesheet.css branches/release-candidates/sciret-1.2/tcpdf/doc/packages.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ branches/release-candidates/sciret-1.2/tcpdf/fonts/.noencode branches/release-candidates/sciret-1.2/tcpdf/fonts/README.TXT branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/ branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/AUTHORS branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/BUGS branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/LICENSE branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/NEWS branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/README branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/langcover.txt branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/status.txt branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavu-ttf-2.15/unicover.txt branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-bold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-bold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-boldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-boldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-extralight.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-extralight.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-extralight.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-oblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans-oblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusans.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed-bold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed-bold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed-boldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed-boldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed-oblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed-oblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensed.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensedb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensedbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusanscondensedi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono-bold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono-bold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono-boldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono-boldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono-oblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono-oblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmono.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmonob.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmonobi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavusansmonoi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif-bold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif-bold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif-boldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif-boldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif-oblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif-oblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserif.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed-bold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed-bold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed-boldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed-boldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed-oblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed-oblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensed.z branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensedb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensedbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifcondensedi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/dejavuserifi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freefont/ branches/release-candidates/sciret-1.2/tcpdf/fonts/freefont/AUTHORS branches/release-candidates/sciret-1.2/tcpdf/fonts/freefont/CREDITS branches/release-candidates/sciret-1.2/tcpdf/fonts/freefont/ChangeLog branches/release-candidates/sciret-1.2/tcpdf/fonts/freefont/INSTALL branches/release-candidates/sciret-1.2/tcpdf/fonts/freefont/README branches/release-candidates/sciret-1.2/tcpdf/fonts/freemono.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemono.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freemono.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonob.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonobi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonobold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonobold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonoboldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonoboldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonoi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonooblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freemonooblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesans.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesans.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freesans.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansbold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansbold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansboldoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansboldoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansoblique.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freesansoblique.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserif.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserif.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserif.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifbold.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifbold.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifbolditalic.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifbolditalic.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifitalic.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/freeserifitalic.z branches/release-candidates/sciret-1.2/tcpdf/fonts/old/ branches/release-candidates/sciret-1.2/tcpdf/fonts/old/.noencode branches/release-candidates/sciret-1.2/tcpdf/fonts/old/courier.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/helvetica.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/helveticab.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/helveticabi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/helveticai.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/ branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1250.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1251.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1252.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1253.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1254.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1255.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1257.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp1258.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/cp874.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-1.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-11.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-15.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-16.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-2.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-4.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-5.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-7.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/iso-8859-9.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/koi8-r.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/koi8-u.map branches/release-candidates/sciret-1.2/tcpdf/fonts/old/makefont/makefont.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/symbol.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/times.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/timesb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/timesbi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/timesi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/old/zapfdingbats.php branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf-bitstream-vera-1.10/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf-bitstream-vera-1.10/COPYRIGHT.TXT branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf-bitstream-vera-1.10/README.TXT branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf-bitstream-vera-1.10/RELEASENOTES.TXT branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf-bitstream-vera-1.10/local.conf branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/README.TXT branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/makefontuni.php branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/CHANGES branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/CHANGES.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/COPYRIGHT branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/FONTS.hpux.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/FONTS.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/Makefile branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/README.FIRST branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/README.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/RPM/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/RPM/ttf2pt1.spec.src branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/README.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/cjk-latex-config branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/cjk-latex-t1mapgen branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/TeX/sfd2map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/README.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/t1-xf86.334.patch branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/X11/t1-xf86.39.patch branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/Makefile branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/README.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/fontsz.cf branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/notscape branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nsfilter branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nsfix.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nspr branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/nsprint branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/app/netscape/psfonts.cf branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/bdf.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/bitmap.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/byteorder.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/cygbuild.sh branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/README.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/adobestd/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/adobestd/adobe-std.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/README branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/encodings.alias branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/ibm-1251.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/ibm-866.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/iso8859-5.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/bulgarian/koi8-r.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/encodings.alias branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/ibm-1251.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/ibm-866.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/iso8859-5.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/cyrillic/koi8-r.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin1/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin1/iso8859-1.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin2/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin2/iso8859-2.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin4/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin4/iso8859-4 branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin4/iso8859-4.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin5/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/latin5/iso8859-9 branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/README branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/encodings.alias branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/ibm-1251.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/ibm-866.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/iso8859-5.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/encodings/russian/koi8-r.tbl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ft.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/global.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/CP1250.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/CP1251.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/T2A_compact.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/adobe-standard-encoding.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cubg5plus.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cubig5.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cugb.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/cugbk.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ubig5.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ugb.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/ugbk.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/maps/unicode-sample.map branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/Makefile branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/README.html branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bmpfont.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bz.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bzscreen.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/bzscreen.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/cmpf.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/cntstems.pl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/dmpf.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/lst.pl branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/showdf branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/other/showg branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/pt1.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/pt1.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/runt1asm.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/ branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/convert branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/convert.cfg.sample branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/forceiso branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/frommap branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/html2man branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/inst_dir branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/inst_file branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/mkrel branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/t1fdir branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/trans branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/unhtml branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/scripts/x2gs branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/t1asm branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/t1asm.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1.1 branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1.c branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1_convert.1 branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2pt1_x2gs.1 branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/ttf2ufm branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/version.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/winbuild.bat branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm-src/windows.h branches/release-candidates/sciret-1.2/tcpdf/fonts/ttf2ufm/ttf2ufm.exe branches/release-candidates/sciret-1.2/tcpdf/fonts/vera.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/vera.php branches/release-candidates/sciret-1.2/tcpdf/fonts/vera.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verab.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verab.php branches/release-candidates/sciret-1.2/tcpdf/fonts/verab.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verabi.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verabi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/verabi.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verai.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verai.php branches/release-candidates/sciret-1.2/tcpdf/fonts/verai.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramo.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramo.php branches/release-candidates/sciret-1.2/tcpdf/fonts/veramo.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramob.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramob.php branches/release-candidates/sciret-1.2/tcpdf/fonts/veramob.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramobi.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramobi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/veramobi.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramoi.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veramoi.php branches/release-candidates/sciret-1.2/tcpdf/fonts/veramoi.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verase.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/verase.php branches/release-candidates/sciret-1.2/tcpdf/fonts/verase.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veraseb.ctg.z branches/release-candidates/sciret-1.2/tcpdf/fonts/veraseb.php branches/release-candidates/sciret-1.2/tcpdf/fonts/veraseb.z branches/release-candidates/sciret-1.2/tcpdf/html_entity_decode_php4.php branches/release-candidates/sciret-1.2/tcpdf/images/ branches/release-candidates/sciret-1.2/tcpdf/images/_blank.png branches/release-candidates/sciret-1.2/tcpdf/images/logo_example.png branches/release-candidates/sciret-1.2/tcpdf/tcpdf.php branches/release-candidates/sciret-1.2/tcpdf/test_old.php branches/release-candidates/sciret-1.2/tcpdf/test_unicode.php branches/release-candidates/sciret-1.2/tcpdf/utf8test.txt Added: branches/release-candidates/sciret-1.2/tcpdf/.eraseme.php.swp =================================================================== (Binary files differ) Property changes on: branches/release-candidates/sciret-1.2/tcpdf/.eraseme.php.swp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: branches/release-candidates/sciret-1.2/tcpdf/.eraseme2.php.swp =================================================================== (Binary files differ) Property changes on: branches/release-candidates/sciret-1.2/tcpdf/.eraseme2.php.swp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: branches/release-candidates/sciret-1.2/tcpdf/.tcpdf.php.swp =================================================================== (Binary files differ) Property changes on: branches/release-candidates/sciret-1.2/tcpdf/.tcpdf.php.swp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: branches/release-candidates/sciret-1.2/tcpdf/CHANGELOG.TXT =================================================================== --- branches/release-candidates/sciret-1.2/tcpdf/CHANGELOG.TXT (rev 0) +++ branches/release-candidates/sciret-1.2/tcpdf/CHANGELOG.TXT 2007-08-19 12:44:03 UTC (rev 507) @@ -0,0 +1,115 @@ +1.53.0.TC033_PHP4 (2007-07-30) + - fixed bug 1762550: case sensitive for font files + - NOTE: all fonts files names must be in lowercase! + +1.53.0.TC032_PHP4 (2007-07-27) + - setLastH method was added to resolve bug 1689071. + - all fonts names were converted in lowercase (bug 1713005). + - bug 1740954 was fixed. + - justification was addes as Cell option. + +1.53.0.TC031_PHP4 (2007-03-20) + - ToUnicode CMap were added on _puttruetypeunicode function. Now you may search and copy unicode text. + +1.53.0.TC030_PHP4 (2007-03-06) + - fixed bug on PHP4 version. + +1.53.0.TC029_PHP4 (2007-03-06) + - DejaVu Fonts were added. + +1.53.0.TC028_PHP4 (2007-03-03) + - MultiCell function signature were changed: the $ln parameter were added. Check documentation for further information. + - Greek language were added on example sentences. + - setPrintHeader() and setPrintFooter() functions were added to enable or disable page header and footer. + +1.53.0.TC027_PHP4 (2006-12-14) + - $attr['face'] bug were fixed. + - K_TCPDF_EXTERNAL_CONFIG control where introduced on /config/tcpdf_config.php to use external configuration files. + +1.53.0.TC026_PHP4 (2006-10-28) + - writeHTML function call were fixed on examples. + +1.53.0.TC025_PHP4 (2006-10-27) + - Bugs item #1421290 were fixed (0D - 0A substitution in some characters) + - Bugs item #1573174 were fixed (MultiCell documentation) + +1.53.0.TC024_PHP4 (2006-09-26) + - getPageHeight() function were fixed (bug 1543476). + - fixed missing breaks on closedHTMLTagHandler function (bug 1535263). + - fixed extra spaces on Write function (bug 1535262). + +1.53.0.TC023_PHP4 (2006-08-04) + - second parameter were removed from class_exists function. + - paths to barcode directory were fixed. + - documentation were updated. + +1.53.0.TC022_PHP4 (2006-07-16) + - fixed bug: [ 1516858 ] Probs with PHP autoloader and class_exists() + +1.53.0.TC021_PHP4 (2006-07-01) + - HTML attributes with whitespaces are now supported (thanks to Nelson Benitez for his support) + +1.53.0.TC020_PHP4 (2006-06-23) + - this version fixes the MBCS error on html_entity_decode + +1.53.0.TC019_PHP4 (2006-06-08) + - this version were backported to PHP4 + +1.53.0.TC019 (2006-05-21) + - fixed <strong> and <em> closing tags. + +1.53.0.TC018 (2006-05-18) + - fixed font names bug + +1.53.0.TC017 (2006-05-18) + - the TTF2UFM utility to convert True Type fonts for TCPDF were included on fonts folder. + - new free unicode fonts were included on /fonts/freefont. + - test_unicode.php example were exended. + - parameter $fill were added on Write, writeHTML and writeHTMLCell functions. + - documentation were updated. + +1.53.0.TC016 (2006-03-09) + - fixed closing <strong> tag on html parser. + +1.53.0.TC016 (2005-08-28) + - fpdf.php and tcpdf.php files were joined in one single class (you can still extend TCPDF with your own class). + - fixed problem when mb_internal_encoding is set. + +1.53.0.TC014 (2005-05-29) + - fixed WriteHTMLCell new page issue. + +1.53.0.TC013 (2005-05-29) + - fixed WriteHTMLCell across pages. + +1.53.0.TC012 (2005-05-29) + - font color attribute bug were fixed. + +1.53.0.TC011 (2005-03-31) + - SetFont function were fixed (thank Sjaak Lauwers for bug notice). + +1.53.0.TC010 (2005-03-22) + - the html functions were improved (thanks to Manfred Vervuert for bug reporting). + +1.53.0.TC009 (2005-03-19) + - a wrong reference to convertColorHexToDec were fixed. + +1.53.0.TC008 (2005-02-07) + - removed some extra bytes from PHP files. + +1.53.0.TC007 (2005-01-08) + - fill attribute were removed from writeHTMLCell method. + +1.53.0.TC006 (2005-01-08) + - the documentation were updated. + +1.53.0.TC005 (2005-01-05) + - Steven Wittens's unicode methods were removed. + - All unicode methods were rewritten from scratch. + - TCPDF is now licensed as LGPL. + +1.53.0.TC004 (2005-01-04) + - this changelog were added. + - removed comercial fonts for licensing issue. + - Bitstream Vera Fonts were added (http://www.bitstream.com/font_rendering/products/dev_fonts/vera.html). + - Now the AddFont and SetFont functions returns the basic font if the styled version do not exist. + Property changes on: branches/release-candidates/sciret-1.2/tcpdf/CHANGELOG.TXT ___________________________________________________________________ Name: svn:executable + * Added: branches/release-candidates/sciret-1.2/tcpdf/LICENSE.TXT =================================================================== --- branches/release-candidates/sciret-1.2/tcpdf/LICENSE.TXT (rev 0) +++ branches/release-candidates/sciret-1.2/tcpdf/LICENSE.TXT 2007-08-19 12:44:03 UTC (rev 507) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES P... [truncated message content] |
From: <lu...@us...> - 2007-08-22 20:18:57
|
Revision: 521 http://sciret.svn.sourceforge.net/sciret/?rev=521&view=rev Author: lugo04 Date: 2007-08-22 13:18:52 -0700 (Wed, 22 Aug 2007) Log Message: ----------- add SF patch 1778378 from Trond Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG 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 branches/release-candidates/sciret-1.2/languages/English.txt branches/release-candidates/sciret-1.2/models/Article.php branches/release-candidates/sciret-1.2/setup/final.sql branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl branches/release-candidates/sciret-1.2/views/EditPreferences.php branches/release-candidates/sciret-1.2/views/ViewArticle.php Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-22 20:18:52 UTC (rev 521) @@ -1,3 +1,13 @@ +2007-08-22 Lucie Goga <lg...@th...> + * Add SF patch 1778378 from Trond Viggo Håpnes. This patch + Restrict the possibility to modify and delete articles. + +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 Modified: branches/release-candidates/sciret-1.2/actions/DeleteArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/DeleteArticle.php 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/actions/DeleteArticle.php 2007-08-22 20:18:52 UTC (rev 521) @@ -17,6 +17,15 @@ function dispatch() { $artId = isset($_GET['id'])? (int)$_GET['id'] : 0; + if ($this->configuration->getConfigValue('restrictEditDelete')) { + $article = new Article($artId); + + if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & ROLE_ADMIN) != 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))); + } + } + $articleGateway = new ArticleGateway; $articleGateway->delete($artId); Modified: branches/release-candidates/sciret-1.2/actions/SaveArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/SaveArticle.php 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/actions/SaveArticle.php 2007-08-22 20:18:52 UTC (rev 521) @@ -17,6 +17,15 @@ function dispatch() { $articleId = isset($_POST['articleId'])? (int)$_POST['articleId'] : 0; + if ($articleId > 0 && $this->configuration->getConfigValue('restrictEditDelete')) { + $article = new Article($articleId); + + if ($article->getUserId() != $this->user->getId() && ($this->user->getRole() & ROLE_ADMIN) != 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))); + } + } + // validation if ($_POST['title'] == '') { $_SESSION['message'] = $this->user->lang('Article can\'t be saved without a title.'); Modified: branches/release-candidates/sciret-1.2/actions/SavePreferences.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/SavePreferences.php 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/actions/SavePreferences.php 2007-08-22 20:18:52 UTC (rev 521) @@ -40,6 +40,7 @@ $this->configuration->setConfigValue('publishQuestionsAuto', $_POST['publishQuestionsAuto'] == '1'? '1' : '0'); $this->configuration->setConfigValue('internalByDefault', $_POST['internalByDefault'] == '1'? '1' : '0'); $this->configuration->setConfigValue('allowCommentsRatings', $_POST['allowCommentsRatings'] == '1'? '1' : '0'); + $this->configuration->setConfigValue('restrictEditDelete', $_POST['restrictEditDelete'] == '1'? '1' : '0'); $this->configuration->setConfigValue('passwordExpirationDays', $_POST['passwordExpirationDays']); $this->configuration->setConfigValue('mailTransport', $_POST['mailTransport'] == 'smtp' ? 'smtp' : 'sendmail'); $this->configuration->setConfigValue('mailFromName', $_POST['mailFromName']); Modified: branches/release-candidates/sciret-1.2/languages/English.txt =================================================================== --- branches/release-candidates/sciret-1.2/languages/English.txt 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/languages/English.txt 2007-08-22 20:18:52 UTC (rev 521) @@ -402,6 +402,8 @@ Occurrences +Only admin and author can modify an article + Only Articles Only Bookmarks @@ -542,6 +544,10 @@ SMTP user +Sorry, only the author or an admin can delete this article. + +Sorry, only the author or an admin can modify this article. + Sorry, there was a problem trying to send the e-mail. Please try again later. Sorry, this article is for internal use only. Modified: branches/release-candidates/sciret-1.2/models/Article.php =================================================================== --- branches/release-candidates/sciret-1.2/models/Article.php 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/models/Article.php 2007-08-22 20:18:52 UTC (rev 521) @@ -239,6 +239,10 @@ $this->userId = (int)$id; } + function getUserId() { + return $this->userId; + } + function getUser() { return $this->user; } Modified: branches/release-candidates/sciret-1.2/setup/final.sql =================================================================== --- branches/release-candidates/sciret-1.2/setup/final.sql 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/setup/final.sql 2007-08-22 20:18:52 UTC (rev 521) @@ -69,6 +69,7 @@ ('publishCommentsAuto', '1'), ('publishQuestionsAuto', '0'), ('internalByDefault', '0'), +('restrictEditDelete', '0'), ('passwordExpirationDays', '60'), ('mailTransport', 'sendmail'), ('mailFromName', 'Sciret Knowledgebase'), Modified: branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql =================================================================== --- branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/setup/upgrade_1.2.0.sql 2007-08-22 20:18:52 UTC (rev 521) @@ -1,4 +1,4 @@ -INSERT INTO `configuration` (`field`, `value`) VALUES ('publishKB', '1'), ('internalByDefault', '0'), ('passwordExpirationDays', '60'), ('mailTransport', 'sendmail'), ('mailFromName', 'Sciret Knowledgebase'), ('mailFromMail', 'root@localhost'), ('smtpServer', ''), ('smtpUser', ''), ('smtpPassword', ''), ('smtpPort', '25'), ('allowCommentsRatings', '1'); +INSERT INTO `configuration` (`field`, `value`) VALUES ('publishKB', '1'), ('internalByDefault', '0'), ('passwordExpirationDays', '60'), ('mailTransport', 'sendmail'), ('mailFromName', 'Sciret Knowledgebase'), ('mailFromMail', 'root@localhost'), ('smtpServer', ''), ('smtpUser', ''), ('smtpPassword', ''), ('smtpPort', '25'), ('allowCommentsRatings', '1'), ('restrictEditDelete', '0'); ALTER TABLE `articles` ADD `internal` tinyint(4) NOT NULL default '0'; Modified: branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl =================================================================== --- branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/templates/EditPreferences.tpl 2007-08-22 20:18:52 UTC (rev 521) @@ -128,26 +128,34 @@ </select> </td> </tr> - <tr class="row_on"> + <td style="text-align:right; font-weight:bold">[l]Only admin and author can modify an article[/l]:</td> + <td> + <select name="restrictEditDelete"> + <option value="1" {restrictEditDelete_yes_selected}>[l]Yes[/l]</option> + <option value="0" {restrictEditDelete_no_selected}>[l]No[/l]</option> + </select> + </td> + </tr> + <tr class="row_off"> <td style="text-align:right; font-weight:bold">[l]Days before password expires[/l]:</td> <td> <input type="text" name="passwordExpirationDays" value="{passwordExpirationDays}" size="2" /> </td> </tr> - <tr class="row_off"> + <tr class="row_on"> <td style="text-align:right; font-weight:bold">[l]Send mail from (name)[/l]:</td> <td> <input type="text" name="mailFromName" value="{mailFromName}"/> </td> </tr> - <tr class="row_on"> + <tr class="row_off"> <td style="text-align:right; font-weight:bold">[l]Send mail from (email)[/l]:</td> <td> <input type="text" name="mailFromMail" value="{mailFromMail}"/> </td> </tr> - <tr class="row_off"> + <tr class="row_on"> <td style="text-align:right; font-weight:bold">[l]Send mail using[/l]:</td> <td> <select name="mailTransport" onchange="javascript:toggleSMTPSettings(value);"> @@ -156,7 +164,7 @@ </select> </td> </tr> - <tr class="row_on" id="smtp_options" {showSMTPOptions}> + <tr class="row_off" id="smtp_options" {showSMTPOptions}> <td colspan="2"> <p style="text-align:center; font-weight:bold">[l]SMTP settings[/l]:</p> <ul> Modified: branches/release-candidates/sciret-1.2/views/EditPreferences.php =================================================================== --- branches/release-candidates/sciret-1.2/views/EditPreferences.php 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/views/EditPreferences.php 2007-08-22 20:18:52 UTC (rev 521) @@ -49,6 +49,8 @@ 'internalByDefault_no_selected' => $this->configuration->getConfigValue('internalByDefault') == '0'? 'selected="true" ': '', 'allowCommentsRatings_yes_selected' => $this->configuration->getConfigValue('allowCommentsRatings') == '1'? 'selected="true" ': '', 'allowCommentsRatings_no_selected' => $this->configuration->getConfigValue('allowCommentsRatings') == '0'? 'selected="true" ': '', + 'restrictEditDelete_yes_selected' => $this->configuration->getConfigValue('restrictEditDelete') == '1'? 'selected="true" ': '', + 'restrictEditDelete_no_selected' => $this->configuration->getConfigValue('restrictEditDelete') == '0'? 'selected="true" ': '', 'passwordExpirationDays' => $this->configuration->getConfigValue('passwordExpirationDays'), 'mailFromName' => $this->configuration->getConfigValue('mailFromName'), 'mailFromMail' => $this->configuration->getConfigValue('mailFromMail'), Modified: branches/release-candidates/sciret-1.2/views/ViewArticle.php =================================================================== --- branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-20 22:50:39 UTC (rev 520) +++ branches/release-candidates/sciret-1.2/views/ViewArticle.php 2007-08-22 20:18:52 UTC (rev 521) @@ -49,10 +49,8 @@ $this->tpl->set_block('view_article', 'mailArticle_block', 'mailArticle'); // *** COMMENTS **** - $config = $this->configuration; - $allowCommentsRatings = $config->getConfigValue('allowCommentsRatings'); - if ($allowCommentsRatings) { + if ($this->configuration->getConfigValue('allowCommentsRatings')) { $viewComments = new ViewComments($this->user, $this->configuration); $viewComments->setArticle($article); $viewComments->setTemplate($this->tpl); @@ -190,7 +188,19 @@ $this->tpl->set_var('expDate', $this->user->formatDate($article->getExpDate())); } - if (!$this->user->isAnonymous()) { + $showEditDelete = false; + + if ($this->configuration->getConfigValue('restrictEditDelete')) { + if ($article->getUserId() == $this->user->getId() || ($this->user->getRole() & ROLE_ADMIN) == ROLE_ADMIN) { + $showEditDelete = true; + } + } else { + if (!$this->user->isAnonymous()) { + $showEditDelete = true; + } + } + + if ($showEditDelete) { $this->tpl->parse('edit_del', 'edit_del_block'); if (!$article->isPublished()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-08-22 20:32:28
|
Revision: 522 http://sciret.svn.sourceforge.net/sciret/?rev=522&view=rev Author: lugo04 Date: 2007-08-22 13:32:19 -0700 (Wed, 22 Aug 2007) Log Message: ----------- update German file Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/languages/Deutsch.txt Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-22 20:18:52 UTC (rev 521) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-22 20:32:19 UTC (rev 522) @@ -1,7 +1,8 @@ 2007-08-22 Lucie Goga <lg...@th...> * Add SF patch 1778378 from Trond Viggo Håpnes. This patch Restrict the possibility to modify and delete articles. - + * update German lang file + 2007-08-20 Lucie Goga <lg...@th...> * Update the English and German lang file. Modified: branches/release-candidates/sciret-1.2/languages/Deutsch.txt =================================================================== --- branches/release-candidates/sciret-1.2/languages/Deutsch.txt 2007-08-22 20:18:52 UTC (rev 521) +++ branches/release-candidates/sciret-1.2/languages/Deutsch.txt 2007-08-22 20:32:19 UTC (rev 522) @@ -607,6 +607,9 @@ Occurrences Soll vorkommen +Only admin and author can modify an article +Ein Artikel dürfen nur ein Administrator und ein Autor ändern + Only Articles Nur Artikel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-08-22 20:54:59
|
Revision: 523 http://sciret.svn.sourceforge.net/sciret/?rev=523&view=rev Author: lugo04 Date: 2007-08-22 13:54:55 -0700 (Wed, 22 Aug 2007) Log Message: ----------- Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/TODO Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-22 20:32:19 UTC (rev 522) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-08-22 20:54:55 UTC (rev 523) @@ -14,6 +14,7 @@ duplicates are removed 2007-08-16 Lucie Goga <lg...@th...> + * release 1.2.0-svn-r487 * Add SF patch 1775353 from Trond Viggo Håpnes. This patch allows / disallow coments and ratings. Modified: branches/release-candidates/sciret-1.2/TODO =================================================================== --- branches/release-candidates/sciret-1.2/TODO 2007-08-22 20:32:19 UTC (rev 522) +++ branches/release-candidates/sciret-1.2/TODO 2007-08-22 20:54:55 UTC (rev 523) @@ -4,6 +4,7 @@ - When a new user will be created, the password must be entered 2 times (at the moment it is only once) DONE + * Create PDF from Article * Password protected access to Sciret that only signed in users have access. Should be a configuration option (SF request 1704597) * A Question should be visible also in the categories where the question is @@ -23,7 +24,6 @@ 1.5 Release - Document Management Functionality -- Create PDF from Article - A category will be only visible when there is a article or bookmark in. Otherwise it will be hidden - Authentication again LDAP - Authentication again AD This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-03 21:17:01
|
Revision: 548 http://sciret.svn.sourceforge.net/sciret/?rev=548&view=rev Author: lugo04 Date: 2007-09-03 14:17:00 -0700 (Mon, 03 Sep 2007) Log Message: ----------- update roadmap Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/TODO Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-09-03 20:05:40 UTC (rev 547) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-09-03 21:17:00 UTC (rev 548) @@ -1,4 +1,10 @@ 2007-09-02 Lucie Goga <lg...@th...> + * update language file Russian, Spanish, Svenska. + * update Roadmap + * Sciret 1.2.0-RC1 + * Sciret language packs 1.2.0 + +2007-09-02 Lucie Goga <lg...@th...> * update language file Hebrew, Japanese, Italian, Norsk, Russian, Spanish.The file are soted now. 2007-08-24 Lucie Goga <lg...@th...> @@ -87,7 +93,7 @@ * update scriptulus to last version 2007-06-21 Lucie Goga <lg...@th...> - * Scirt 1.1.0-RC3 + * Sciret 1.1.0-RC3 2007-06-27 Reiner Jung <rj...@th...> * [BUG] Fix SF bug 1736506 Font size was overwritten Modified: branches/release-candidates/sciret-1.2/TODO =================================================================== --- branches/release-candidates/sciret-1.2/TODO 2007-09-03 20:05:40 UTC (rev 547) +++ branches/release-candidates/sciret-1.2/TODO 2007-09-03 21:17:00 UTC (rev 548) @@ -1,26 +1,15 @@ -1.2 Release -- Automatic password reset for users (SF request 1704597) -- Pre Installation check for Sciret (Check the right file system rights ...) -- When a new user will be created, the password must be entered 2 times (at the moment it is only once) - - DONE - * Create PDF from Article - * Password protected access to Sciret that only signed in users have access. - Should be a configuration option (SF request 1704597) - * A Question should be visible also in the categories where the question is - assigned so long as it is answered. It must be marked that it is clear - visible this is a question - * Preferences for a user based view of the screen - 1.3 Release - Introduce group support. Admin can restrict access to User based work groups - Search for articles by registerd users - Make an article appear in more than one category - Add tags and tag search to article, bookmarks and documents +- Admin must change the default password after first login 1.4 Release - New User Interface for Sciret based on the work from Nuno Pinheiro - Ubuntu/Debian Packages +- Cancel Editing +- Send mail as PDF 1.5 Release - Document Management Functionality @@ -31,6 +20,8 @@ 1.6 Release - One Time Passwords - Authentication with Secure Token +- Category Content [Feature RQID 1776663] +- What links here [Feature RQ ID 1776661] 1.7 Release - Sciret will use PHPUnit testing. This will delay our further releases, but will give it more stability This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <al...@us...> - 2007-09-05 00:23:27
|
Revision: 551 http://sciret.svn.sourceforge.net/sciret/?rev=551&view=rev Author: alpeb Date: 2007-09-04 17:23:25 -0700 (Tue, 04 Sep 2007) Log Message: ----------- handle special authentication case for upgrade Modified Paths: -------------- branches/release-candidates/sciret-1.2/actions/Upgrade.php branches/release-candidates/sciret-1.2/models/UserGateway.php Modified: branches/release-candidates/sciret-1.2/actions/Upgrade.php =================================================================== --- branches/release-candidates/sciret-1.2/actions/Upgrade.php 2007-09-04 00:04:01 UTC (rev 550) +++ branches/release-candidates/sciret-1.2/actions/Upgrade.php 2007-09-05 00:23:25 UTC (rev 551) @@ -17,7 +17,7 @@ function dispatch() { require 'models/UserGateway.php'; $this->userGateway = new UserGateway; - if (!($user = $this->userGateway->getValidatedUser($_POST['username'], $_POST['password'])) || !$user->isAdmin()) { + if (!($user = $this->userGateway->getValidatedUser($_POST['username'], $_POST['password'], $this->configuration)) || !$user->isAdmin()) { $_SESSION['message'] = $this->user->lang('Wrong Username or Password'); Library::redirect(Library::getLink(array('view' => 'Upgrade'))); } Modified: branches/release-candidates/sciret-1.2/models/UserGateway.php =================================================================== --- branches/release-candidates/sciret-1.2/models/UserGateway.php 2007-09-04 00:04:01 UTC (rev 550) +++ branches/release-candidates/sciret-1.2/models/UserGateway.php 2007-09-05 00:23:25 UTC (rev 551) @@ -14,8 +14,12 @@ class UserGateway extends Model { - function getValidatedUser($username, $password) { - $query = 'SELECT user_id, firstname, lastname, username, email, password_changed, admin FROM users WHERE username=? AND password=MD5(?)'; + 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(?)'; + } else { + $query = 'SELECT user_id, firstname, lastname, username, email, password_changed, admin FROM users WHERE username=? AND password=MD5(?)'; + } $result = $this->db->query($query, $username, $password); if ($row = $result->fetch()) { $user = new User; @@ -24,7 +28,9 @@ $user->setLastName($row['lastname']); $user->setUserName($row['username']); $user->setEmail($row['email']); - $user->setPasswordChanged($row['password_changed']); + if (!in_array($configuration->getConfigValue('version'), array(0, '1.1.0'))) { + $user->setPasswordChanged($row['password_changed']); + } $user->setAdmin($row['admin']); return $user; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-05 18:50:50
|
Revision: 553 http://sciret.svn.sourceforge.net/sciret/?rev=553&view=rev Author: lugo04 Date: 2007-09-05 11:50:35 -0700 (Wed, 05 Sep 2007) Log Message: ----------- Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/VERSION Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-09-05 00:26:10 UTC (rev 552) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-09-05 18:50:35 UTC (rev 553) @@ -1,4 +1,12 @@ 2007-09-03 Lucie Goga <lg...@th...> + * Sciret 1.2.0-RC1 + * Sciret language packs 1.2.0 + +2007-09-05 Alejandro Pedraza <ale...@gm...> + * [BUG] Fix in the upgrade fuction + getValidatedUser() needs the config array to need what version we're on + +2007-09-03 Lucie Goga <lg...@th...> * update language file Russian, Spanish, Svenska. * update Roadmap Modified: branches/release-candidates/sciret-1.2/VERSION =================================================================== --- branches/release-candidates/sciret-1.2/VERSION 2007-09-05 00:26:10 UTC (rev 552) +++ branches/release-candidates/sciret-1.2/VERSION 2007-09-05 18:50:35 UTC (rev 553) @@ -1 +1 @@ -1.2.0-SVN-Release-487 +1.2.0-SVN-Release-552 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-21 07:54:35
|
Revision: 555 http://sciret.svn.sourceforge.net/sciret/?rev=555&view=rev Author: lugo04 Date: 2007-09-21 00:54:30 -0700 (Fri, 21 Sep 2007) Log Message: ----------- Modified Paths: -------------- branches/release-candidates/sciret-1.2/CHANGELOG branches/release-candidates/sciret-1.2/VERSION branches/release-candidates/sciret-1.2/languages/create-translation.sh Modified: branches/release-candidates/sciret-1.2/CHANGELOG =================================================================== --- branches/release-candidates/sciret-1.2/CHANGELOG 2007-09-05 18:57:39 UTC (rev 554) +++ branches/release-candidates/sciret-1.2/CHANGELOG 2007-09-21 07:54:30 UTC (rev 555) @@ -1,3 +1,6 @@ +2007-09-21 Lucie Goga <lg...@th...> + * Sciret 1.2.0 release + 2007-09-03 Lucie Goga <lg...@th...> * Sciret 1.2.0-RC1 * Sciret language packs 1.2.0 Modified: branches/release-candidates/sciret-1.2/VERSION =================================================================== --- branches/release-candidates/sciret-1.2/VERSION 2007-09-05 18:57:39 UTC (rev 554) +++ branches/release-candidates/sciret-1.2/VERSION 2007-09-21 07:54:30 UTC (rev 555) @@ -1 +1 @@ -1.2.0-SVN-Release-552 +1.2.0-SVN-Release-554 Modified: branches/release-candidates/sciret-1.2/languages/create-translation.sh =================================================================== --- branches/release-candidates/sciret-1.2/languages/create-translation.sh 2007-09-05 18:57:39 UTC (rev 554) +++ branches/release-candidates/sciret-1.2/languages/create-translation.sh 2007-09-21 07:54:30 UTC (rev 555) @@ -55,7 +55,7 @@ clear echo "Please enter the new release number" -echo "The release number must be something like 1.1.1" +echo "The release number must be something like 1.2.0" read VERSION # create a temp build directory and copy the files @@ -71,12 +71,12 @@ zip sciret-langpack-$VERSION.zip * -echo "start upload the files to sourceforge" -lftp -f ~/sf_sciret -echo " " -echo " " -sleep 5 +#echo "start upload the files to sourceforge" +#lftp -f ~/sf_sciret +#echo " " +#echo " " +#sleep 5 -cd .. -rm -rf /sciretlanguage -echo "packages deleted" +#cd .. +#rm -rf /sciretlanguage +#echo "packages deleted" 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: <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-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: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. |