sciret-svn Mailing List for Sciret (Page 12)

Brought to you by: alpeb, reinerj

sciret-svn — The subversion commit mailing list

You can subscribe to this list here.

2007	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (58)	_Sep (44)	_Oct (7)	_Nov (4)	_Dec
2008	_Jan (3)	_Feb	_Mar	_Apr	_May	_Jun	_Jul (15)	_Aug (55)	_Sep (48)	_Oct (56)	_Nov (14)	_Dec

Flat | Threaded

<< < 1 .. 10 11 12 13 > >> (Page 12 of 13)

[Sciret-svn] SF.net SVN: sciret: [505] branches/release-candidates/sciret-1.2/languages/ English.txt

From: <lu...@us...> - 2007-08-19 09:51:55

Revision: 505
          http://sciret.svn.sourceforge.net/sciret/?rev=505&view=rev
Author:   lugo04
Date:     2007-08-19 02:51:54 -0700 (Sun, 19 Aug 2007)

Log Message:
-----------
update the langfiles

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/languages/English.txt

Modified: branches/release-candidates/sciret-1.2/languages/English.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/English.txt	2007-08-19 09:50:45 UTC (rev 504)
+++ branches/release-candidates/sciret-1.2/languages/English.txt	2007-08-19 09:51:54 UTC (rev 505)
@@ -598,6 +598,8 @@
 
 views
 
+Views
+
 View Unpublished
 
 View Unpublished Only


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [504] branches/release-candidates/sciret-1.2/languages/ Deutsch.txt

From: <lu...@us...> - 2007-08-19 09:50:51

Revision: 504
          http://sciret.svn.sourceforge.net/sciret/?rev=504&view=rev
Author:   lugo04
Date:     2007-08-19 02:50:45 -0700 (Sun, 19 Aug 2007)

Log Message:
-----------
update the langfiles

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/languages/Deutsch.txt

Modified: branches/release-candidates/sciret-1.2/languages/Deutsch.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/Deutsch.txt	2007-08-19 09:15:37 UTC (rev 503)
+++ branches/release-candidates/sciret-1.2/languages/Deutsch.txt	2007-08-19 09:50:45 UTC (rev 504)
@@ -226,7 +226,7 @@
 Creating new article to answer question made by %s on %s
 Creando un nuevo artículo para responder a la pregunta formulada por %s en %s
 
-Creation date
+Creation Date
 Erstellungsdatum
 
 Creator
@@ -292,6 +292,8 @@
 documents found
 Dukumente gefunden
 
+Drafts Only
+
 Due Date
 Fälligkeitsdatum
 
@@ -571,9 +573,10 @@
 Number of articles per page
 Anzahl der Artikel pro Seite
 
-Occurrence 
-Vorkommen
+Occurrence
+Soll vorkommen 
 
+
 Only Articles
 Nur Artikel
 
@@ -706,6 +709,9 @@
 Save
 Speichern
 
+Save as Draft
+Speichern als Entwurf
+
 Search
 Suchen
 
@@ -895,6 +901,12 @@
 views
 Ansicht
 
+Views
+Ansicht
+
+Views Unpublished
+Unveröffentlichte Anzeigen
+
 View Unpublished Only
 Nur unveröffentlichte Anzeigen
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [503] branches/release-candidates/sciret-1.2/languages/ English.txt

From: <lu...@us...> - 2007-08-19 09:15:39

Revision: 503
          http://sciret.svn.sourceforge.net/sciret/?rev=503&view=rev
Author:   lugo04
Date:     2007-08-19 02:15:37 -0700 (Sun, 19 Aug 2007)

Log Message:
-----------
update the langfiles

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/languages/English.txt

Modified: branches/release-candidates/sciret-1.2/languages/English.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/English.txt	2007-08-18 21:48:26 UTC (rev 502)
+++ branches/release-candidates/sciret-1.2/languages/English.txt	2007-08-19 09:15:37 UTC (rev 503)
@@ -148,7 +148,7 @@
 
 Created on
 
-Creation date
+Creation Date
 
 Creator
 
@@ -192,6 +192,8 @@
 
 documents found
 
+Drafts Only
+
 Due Date
 
 Edit
@@ -468,6 +470,8 @@
 
 Save
 
+Save as Draft
+
 Search
 
 Search has been added to favorites successfully
@@ -594,6 +598,8 @@
 
 views
 
+View Unpublished
+
 View Unpublished Only
 
 With at least one of these words*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [500] branches/release-candidates/sciret-1.2/fckeditor/ editor/filemanager/connectors/php/config.php

From: <al...@us...> - 2007-08-18 22:00:44

Revision: 500
          http://sciret.svn.sourceforge.net/sciret/?rev=500&view=rev
Author:   alpeb
Date:     2007-08-18 14:47:16 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
make the config a little smarter by figuring out itself where the upload dir must go

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php

Modified: branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php
===================================================================
--- branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php	2007-08-18 21:46:38 UTC (rev 499)
+++ branches/release-candidates/sciret-1.2/fckeditor/editor/filemanager/connectors/php/config.php	2007-08-18 21:47:16 UTC (rev 500)
@@ -35,7 +35,10 @@
 // @Packager.Remove.End
 
 // Path to user files relative to the document root.
-$Config['UserFilesPath'] = '/sciret/uploads/editor' ;
+// ***** SCIRET MODIFICATION ******
+preg_match('#(.*)/fckeditor/editor/filemanager/connectors/php/connector\.php.*#', $_SERVER['REQUEST_URI'], $matches);
+$Config['UserFilesPath'] = $matches[1].'/uploads/editor/';
+// ***** END OF SCIRET MODIFICATION ******
 
 // Fill the following value it you prefer to specify the absolute path for the
 // user files directory. Usefull if you are using a virtual directory, symbolic


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [499] branches/release-candidates/sciret-1.2/actions/ Install.php

From: <al...@us...> - 2007-08-18 22:00:42

Revision: 499
          http://sciret.svn.sourceforge.net/sciret/?rev=499&view=rev
Author:   alpeb
Date:     2007-08-18 14:46:38 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
killed ConfigNotWritable view. Show missing requirements in the view where the db credentials are shown. Also have additional checks: for db version and check if upload dirs are writable

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/actions/Install.php

Modified: branches/release-candidates/sciret-1.2/actions/Install.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/Install.php	2007-08-18 21:45:35 UTC (rev 498)
+++ branches/release-candidates/sciret-1.2/actions/Install.php	2007-08-18 21:46:38 UTC (rev 499)
@@ -17,13 +17,6 @@
 
     function dispatch() {
 
-        // is_writable() not working under windows
-        if (!$fp = @fopen(dirname(__FILE__).'/../config.php', 'a')) {
-            Library::redirect(Library::getLink(array('view' => 'ConfigNotWritable')));
-        } else {
-            fclose($fp);
-        }
-
         if (!isset($_GET['step'])) {
             $_GET['step'] = 0;
         }
@@ -35,17 +28,35 @@
             case 1:
                 $this->db =& DB::DBFactory(DB_ENGINE, $_POST['host'], $_POST['username'], $_POST['password'], true);
                 if (!$this->db->connect()) {
-                    Library::redirect(Library::getLink(array('view' => 'InstallEnterCredentials', 'error' => urlencode($this->user->lang('Couldn\'t connect to database')))));
+                    Library::redirect(Library::getLink(array('view' => 'InstallEnterCredentials', 'error' => urlencode($this->user->lang('Couldn\'t connect to database, please check your credentials.')))));
                 }
+
+                $errors = array();
+                if (!$this->_isConfigWritable()) {
+                    $errors[] = $this->user->lang('The config.php file must be writable');
+                }
+                if (!$this->_areUploadDirsWritable()) {
+                    $errors[] = $this->user->lang('All directories under the "uploads" and "uploads/editor" directories must be writable');
+                }
+                if ($this->db->isLowerThan41()) {
+                    $errors[] = $this->user->lang('You need a MySQL version no lower than 4.1');
+                }
+
                 if (!$this->db->selectDb($_POST['database'])) {
                     if (!$result = $this->db->createDB($_POST['database'])) {
-                        Library::redirect(Library::getLink(array('view' => 'InstallEnterCredentials', 'error' => urlencode($this->user->lang('Couldn\'t create database. Please create it manually and try again.')))));
+                        $errors[] = $this->user->lang('Couldn\'t create database. Please create it manually and try again.');
+                    } else {
+                        $this->db->selectDb($_POST['database']);
                     }
-                    $this->db->selectDb($_POST['database']);
                 }
+
+                if ($errors) {
+                    Library::redirect(Library::getLink(array('view' => 'InstallEnterCredentials', 'error' => urlencode(implode('<br />', $errors)))));
+                }
+
                 $this->_writeConfig(DB_ENGINE, $_POST['host'], $_POST['database'], $_POST['username'], $_POST['password']);
                 $this->_runSQLFILE('final.sql');
-                if (isset($_POST['demodata'])) {
+                if (isset($_POST['demodata']) && $_POST['demodata']) {
                     $this->_runSQLFILE('sampleData.sql');
                 }
                 Library::redirect(Library::getLink(array('view' => 'InstallOk')));
@@ -101,6 +112,31 @@
         }
         fclose($fp);
     }
+
+    function _isConfigWritable() {
+        // is_writable() not working under windows
+        if (!$fp = @fopen(dirname(__FILE__).'/../config.php', 'a')) {
+            return false;
+        }
+        fclose($fp);
+
+        return true;
+    }
+
+    function _areUploadDirsWritable() {
+        foreach (array('files', 'icons', 'editor/File', 'editor/Flash', 'editor/Image', 'editor/Media') as $folder) {
+            // is_writable() not working under windows
+            if (!$fp = @fopen(dirname(__FILE__)."/../uploads/$folder/eraseme.txt", 'a')) {
+                return false;
+            } else {
+                fclose($fp);
+                unlink(dirname(__FILE__)."/../uploads/$folder/eraseme.txt");
+            }
+
+        }
+
+        return true;
+    }
 }
 
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [497] branches/release-candidates/sciret-1.2/views/ EditArticle.php

From: <al...@us...> - 2007-08-18 22:00:40

Revision: 497
          http://sciret.svn.sourceforge.net/sciret/?rev=497&view=rev
Author:   alpeb
Date:     2007-08-18 14:45:10 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
little error

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/views/EditArticle.php

Modified: branches/release-candidates/sciret-1.2/views/EditArticle.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/EditArticle.php	2007-08-18 21:44:52 UTC (rev 496)
+++ branches/release-candidates/sciret-1.2/views/EditArticle.php	2007-08-18 21:45:10 UTC (rev 497)
@@ -86,6 +86,7 @@
             $this->tpl->set_var(array(
                 'article_id'                => '',
                 'title'                     => '',
+                'expDate'                   => '',
                 'expDateContents'           => '',
                 'removeExpDateLinkDisplay'  => 'none',
             ));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [502] branches/release-candidates/sciret-1.2/templates/ ConfigNotWritable.tpl

From: <al...@us...> - 2007-08-18 21:54:04

Revision: 502
          http://sciret.svn.sourceforge.net/sciret/?rev=502&view=rev
Author:   alpeb
Date:     2007-08-18 14:48:26 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
killed ConfigNotWritable view. Show missing requirements in the view where the db credentials are shown

Removed Paths:
-------------
    branches/release-candidates/sciret-1.2/templates/ConfigNotWritable.tpl

Deleted: branches/release-candidates/sciret-1.2/templates/ConfigNotWritable.tpl
===================================================================
--- branches/release-candidates/sciret-1.2/templates/ConfigNotWritable.tpl	2007-08-18 21:48:00 UTC (rev 501)
+++ branches/release-candidates/sciret-1.2/templates/ConfigNotWritable.tpl	2007-08-18 21:48:26 UTC (rev 502)
@@ -1,21 +0,0 @@
-<!--
-/*
-* @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
-*/
--->
-
-<div style="text-align:center">
-    <table cellpadding="3" cellspacing="0" border="1" style="margin:5px auto;">
-        <tr>
-            <td>[l]To be able to continue, please make your config.php file writable and then press Continue.[/l]</td>
-        </tr>
-        <tr>
-            <td style="text-align:center"><input type="button" value="[l]Continue[/l]" onclick="location.href='index.php?action=Install'" /></td>
-        </tr>
-    </table>
-</div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [501] branches/release-candidates/sciret-1.2/views/ ConfigNotWritable.php

From: <al...@us...> - 2007-08-18 21:48:01

Revision: 501
          http://sciret.svn.sourceforge.net/sciret/?rev=501&view=rev
Author:   alpeb
Date:     2007-08-18 14:48:00 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
killed ConfigNotWritable view. Show missing requirements in the view where the db credentials are shown

Removed Paths:
-------------
    branches/release-candidates/sciret-1.2/views/ConfigNotWritable.php

Deleted: branches/release-candidates/sciret-1.2/views/ConfigNotWritable.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/ConfigNotWritable.php	2007-08-18 21:47:16 UTC (rev 500)
+++ branches/release-candidates/sciret-1.2/views/ConfigNotWritable.php	2007-08-18 21:48:00 UTC (rev 501)
@@ -1,22 +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
-*/
-
-require_once 'views/View.php';
-
-class ConfigNotWritable extends View {
-
-    function dispatch() {
-        $this->tpl->set_file('main', 'ConfigNotWritable.tpl');
-        $this->tpl->pparse('out', 'main');
-    }
-}
-
-?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [498] branches/release-candidates/sciret-1.2/views/ InstallEnterCredentials.php

From: <al...@us...> - 2007-08-18 21:45:37

Revision: 498
          http://sciret.svn.sourceforge.net/sciret/?rev=498&view=rev
Author:   alpeb
Date:     2007-08-18 14:45:35 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
added explanatory message to error list

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/views/InstallEnterCredentials.php

Modified: branches/release-candidates/sciret-1.2/views/InstallEnterCredentials.php
===================================================================
--- branches/release-candidates/sciret-1.2/views/InstallEnterCredentials.php	2007-08-18 21:45:10 UTC (rev 497)
+++ branches/release-candidates/sciret-1.2/views/InstallEnterCredentials.php	2007-08-18 21:45:35 UTC (rev 498)
@@ -15,7 +15,7 @@
 
     function dispatch() {
         $this->tpl->set_file('main', 'InstallEnterCredentials.tpl');
-        $this->tpl->set_var('ERROR_MSG', isset($_GET['error'])? $_GET['error'] : '');
+        $this->tpl->set_var('ERROR_MSG', isset($_GET['error'])? 'PLEASE CORRECT THE FOLLOWING PROBLEMS AND TRY AGAIN:<br /><br />' . $_GET['error'] : '');
         $this->tpl->pparse('out', 'main');
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [496] branches/release-candidates/sciret-1.2/flowMap. php

From: <al...@us...> - 2007-08-18 21:44:54

Revision: 496
          http://sciret.svn.sourceforge.net/sciret/?rev=496&view=rev
Author:   alpeb
Date:     2007-08-18 14:44:52 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
killed ConfigNotWritable view. Show missing requirements in the view where the db credentials are shown

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/flowMap.php

Modified: branches/release-candidates/sciret-1.2/flowMap.php
===================================================================
--- branches/release-candidates/sciret-1.2/flowMap.php	2007-08-18 18:54:10 UTC (rev 495)
+++ branches/release-candidates/sciret-1.2/flowMap.php	2007-08-18 21:44:52 UTC (rev 496)
@@ -14,7 +14,6 @@
 // ClassName => array(minimumRole, loadConfiguration, showHeader, allowOnlyIfPublicKB(for ROLE_ANONYMOUS)?)
 $views = array( 
     'NotInstalled'              => array(ROLE_ANONYMOUS,    false, false, false),
-    'ConfigNotWritable'         => array(ROLE_ANONYMOUS,    false, false, false),
     'InstallEnterCredentials'   => array(ROLE_ANONYMOUS,    false, false, false),
     'InstallOk'                 => array(ROLE_ANONYMOUS,    true, false, false),
     'Login'                     => array(ROLE_ANONYMOUS,    true, true, false),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [495] branches/release-candidates/sciret-1.2/setup/ final.sql

From: <al...@us...> - 2007-08-18 18:54:11

Revision: 495
          http://sciret.svn.sourceforge.net/sciret/?rev=495&view=rev
Author:   alpeb
Date:     2007-08-18 11:54:10 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
text fields can't have a default value

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/setup/final.sql

Modified: branches/release-candidates/sciret-1.2/setup/final.sql
===================================================================
--- branches/release-candidates/sciret-1.2/setup/final.sql	2007-08-16 22:21:32 UTC (rev 494)
+++ branches/release-candidates/sciret-1.2/setup/final.sql	2007-08-18 18:54:10 UTC (rev 495)
@@ -96,7 +96,7 @@
   `date` datetime NOT NULL default '0000-00-00 00:00:00',
   `user` varchar(50) NOT NULL default '',
   `action` varchar(50) NOT NULL default '',
-  `action_args` text NOT NULL default '',
+  `action_args` text NOT NULL,
   PRIMARY KEY  (`history_id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [494] branches/release-candidates/sciret-1.2/CHANGELOG

From: <re...@us...> - 2007-08-16 22:21:36

Revision: 494
          http://sciret.svn.sourceforge.net/sciret/?rev=494&view=rev
Author:   reinerj
Date:     2007-08-16 15:21:32 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
update the chnagelog to reflect the updated lang files

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/CHANGELOG

Modified: branches/release-candidates/sciret-1.2/CHANGELOG
===================================================================
--- branches/release-candidates/sciret-1.2/CHANGELOG	2007-08-16 22:18:05 UTC (rev 493)
+++ branches/release-candidates/sciret-1.2/CHANGELOG	2007-08-16 22:21:32 UTC (rev 494)
@@ -1,4 +1,8 @@
-2007-08-15  Lucie Goga <lg...@th...>
+2007-08-16  Reiner Jung <rj...@th...>
+     * Update the English and German lang file. Files are sorted now and
+       duplicates are removed
+
+2007-08-16  Lucie Goga <lg...@th...>
      * Add SF patch 1775353 from Trond Viggo Håpnes. This patch
        allows / disallow coments and ratings.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [493] branches/release-candidates/sciret-1.2/languages

From: <re...@us...> - 2007-08-16 22:18:06

Revision: 493
          http://sciret.svn.sourceforge.net/sciret/?rev=493&view=rev
Author:   reinerj
Date:     2007-08-16 15:18:05 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
update and sort the English and the German Lang File. Hopeful they never will messed again ;-)

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/languages/Deutsch.txt
    branches/release-candidates/sciret-1.2/languages/English.txt

Modified: branches/release-candidates/sciret-1.2/languages/Deutsch.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/Deutsch.txt	2007-08-16 18:10:19 UTC (rev 492)
+++ branches/release-candidates/sciret-1.2/languages/Deutsch.txt	2007-08-16 22:18:05 UTC (rev 493)
@@ -1,1004 +1,977 @@
-If you can't find answers to your problem in the knowledge base, describe it below
-Falls Sie keine passende Antwort auf Ihre Frage in der Wissensdatenbank finden, beschreiben Sie Ihre Frage bitte unterhalb
+Action
+Aktion
 
-Your Name
-Ihr Name
+Add Article
+Artikel hinzufügen
 
-Select Category
-Eine Kategorie auswählen 
+Add article to favorites
+Artikel zu den Favoriten hinzufügen
 
-None
-Kein
+Add articles
+Artikel hinzufügen
 
-Submit
-Absenden
+Add Articles/Bookmarks
+Artikel/Bookmark hinzufügen
 
-Find Results
-Gefunden Ergebnisse
+Add Bookmark
+Bookmark hinzufügen
 
-Including these words*
-Diese Worte einbeziehen*
+Add bookmark to favorites
+Bookmark zu den Favoriten hinzufügen
 
-Including the exact phrase
-Nach dem ganzen Begriff suchen
+Add Category
+Kaegorie hinzufügen
 
-With at least one of these words*
-Mindestens eines der folgenden Worte muss vorkommen
+Add link
+Link hinzufügen
 
-Without these words*
-Ohne diese Worte*
+Add location to favorites
+Füge diese Stelle zu den Favoriten hinzu
 
-Show messages in category
-Nachrichten in der Kategorie anzeigen
+Add new
+Neu hinzufügen
 
-Include subcategories
-Unterkategorien einbeziehen
+Add results to favorites
+Füge das Ergebnis zu den Favoriten hinzu
 
-Publication date
-Datum der Veröffentlichung
+Add subcategory
+Unterkategorie hinzufügen
 
-anytime
-jederzeit
+Add User
+Benutzer hinzufügen
 
-past 3 months
-der letzten 3 Monate
+Added comment
+Kommentar hinzugefügt
 
-past 6 months
-der letzten 6 Monate
+Added related article
+Vernwandte Artikel hinzugefügt
 
-past year
-des letzten Jahres
+Admin rights
+Administrative Rechte
 
-Occurrences
-Vorkommen
+Advanced Search
+Erweiterte Suche
 
-Anywhere in the article
-Beliebigste Stelle im Artikel
+All
+Alle
 
-In the article's title
-Im Titel des Artikels
+All Articles
+Alle Artikel
 
-In the article's content
-Im Kommentar des Artikels
+Allow comments and ratings
+Kommentare und Bewertung erlauben
 
-Order results by
-Ergebnisse sortieren nach
+Always start browsing
+Immer mit der Übersicht beginnen
 
-Creation date
-Erstellungsdatum
+answer
+beantworte
 
-Creator
-Autor
+Answer
+Antwort
 
-Modification date
-Datum der letzten Bearbeitung
+anytime
+jederzeit
 
-Descendent
-Absteigend
+Anywhere in the article
+Beliebigste Stelle im Artikel
 
-Ascendent
-Aufsteigend
+Are you sure you wish to delete the article titled
+Sind Sie sicher das Sie den angezeigten Artikel löschen möchten?
 
-Separate word list with spaces
-Trennen Sie die Worte durch Leerzeichen
+Are you sure you want to delete the category
+Sind Sie sicher das Sie die Kategorie löschen möchte
 
-Search
-Suche
+Are you sure you wish to delete user
+Sind Sie sicher das Sie diesen Benutzer löschen möchten
 
-Search in all the Knowledge Base
-In der kompletten Wissensdatenbank suchen
+Article
+Artikel
 
-Before submiting a question, please search in the knowledge base first
-Bevor Sie eine Frage stellen, suchen Sie bitte zuerst in der Wissensdatenbank
+Articles and Bookmarks
+Artikel und Bookmarks
 
-Enter one or two words describing the issue, or type the article number if you know it
-Bitte geben Sie Ein oder Zwei Worte ein welche Ihre Frage beschreiben, oder geben Sie eine Artikel Nummer ein wenn Sie diese kennen
+Article created
+Artikel erstellt
 
-Advanced Search
-Erweiterte Suche
+Article deleted successfully
+Artikel gelöscht
 
-To be able to continue, please make your config.php file writable and then press Continue.
-Um vortzufahren machen Sie bitte Ihre config.php schreibbar und drücken Sie Enter
+Article does not exist
+Dieser Artikel existiert nicht
 
-Continue
-Weiter
+Article has beed added to favorites successfully
+Artikel wurde erfolgreich zu den Favoriten hinzugefügt
 
-Question
-Frage
+Article has been commented and rated successfully
+Artikel wurde erfolgreich kommnetiert und bewertet
 
-Article ID
-Artikle ID
+Article has been rated successfully
+Artikel wurde erfolgreich bewertet
 
-Save
-Speichern
+Article has been removed from favorites successfully
+Der Artikel wurde erfolgreich aus den Favoriten gelöscht
 
-Are you sure you want to delete the category 
-Sind Sie sicher das Sie die Kategorie löschen möchten
+Article hasn't been commented
+Dieser Artikel wurde noch nicht bewertet
 
-Name
-Name
+Article ID
+Artikle ID
 
-Description
-Beschreibung
+Article modified
+Artikel bearbeitet
 
-Icon
-Icon
+Article published successfully
+Artikel erfoglreich veröffentlicht
 
-Add subcategory
-Unterkategorie hinzufügen
+Article rated
+Artikel bewertet
 
-Edit
-Bearbeiten
+Article saved successfully.
+Artikel erfolgreich gespeichert.
 
-Delete
-Löschen
+Articles
+Artikel
 
-Add Category
-Kaegorie hinzufügen
+Articles only
+Nur Artikel anzeigen
 
-Edit/Add Category
-Bearbeiten/Hinzufügen einer Kategorie
+Ascendent
+Aufsteigend
 
-Parent Category
-Übergeordnete Kategorie
+Attach File
+Datei hinzufügen
 
-Number of articles per page
-Anzahl der Artikel pro Seite
+Attached Files
+Hinzugefügte Dateien
 
-Date format
-Datums Format
+Author
+Author
 
-Month Day, Year
-Monat Tag, Jahr
+Average rating
+Durchschittliche Bewertung
 
-Language
-Sprache
+Before submiting a question, please search in the knowledge base first
+Bevor Sie eine Frage stellen, suchen Sie bitte zuerst in der Wissensdatenbank
 
-Show articles from
-Zeige Artikel von
+Bookmark
+Bookmark
 
-Current category and subcategories
-Momentane Kategorie und Unterkategorie
+Bookmarks
+Bookmarks
 
-Current category only
-Nur die momentan verwendete Kategorie
+Bookmarks only
+Nur Bookmarks anzeigen
 
-Publish articles automatically
-Artikel automatisch veröffentlichen
+Browse unpublished articles/bookmarks
+Nicht veröffentlichte Artikel/Bookmarks anzeigen
 
-Yes
-Ja
+by
+durch
 
-No
-Nein
+Category
+Kategorie
 
-Publish comments automatically
-Kommentare automatisch veröffentlichen
+Category deleted successfully
+Kategorie gelöscht
 
-Publish questions automatically
-Fragen automatisch veröffentlichen
+Category saved successfully
+Kategorie erfolgreich gespeichert
 
-User Data
-Benutzerdaten
+Category will be shown in the future
+Diese Kategorie wird zukünftig sichbar sein
 
-User Name
-Benutzer Name
+Clear
+Leeren
 
-E-mail
-E-mail
+comment
+Kommentar
 
-Give Admin access?
-Administratorrechte erteilen?
+Comment deleted successfully
+Kommentar gelöscht
 
-Password
-Passwort
+Comment published successfully
+Kommentar erfolgreich veröffentlicht
 
-Enter your credentials
-Geben Sie Ihre Zugangsdaten ein
+Comment saved successfully
+Kommentar gespeichert
 
-Database Hostname
-Datenbank Hostname
+Comments
+Kommentare
 
-Database Name
-Datenbank Name
+Completed
+Komplett
 
-Database Username
-Datenbank Benutzername
+Contents
+Inhalt
 
-Database Username Password
-Datenbank Benutzer Passwort
+Continue
+Weiter
 
-Insert demo data?
-Demo Daten einspielen?
+Couldn't connect to database
+Konnte keine Verbindung zur Datenbank herstellen
 
-Installation was successful!
-Die Installation wurde erfolgreich durchgeführt!
+Couldn't connect to the database.
+Es konnte keine Verbindung zur Datenbank hergestellt werden.
 
-The superadministrator user was created, with the username 'admin' and password 'admin'
-Es wurde ein administratives Benutzerkonto erstellt mit dem Benutzernamen "Admin" und dem Passwort "admin"
+Couldn't create database. Please create it manually and try again.
+Es konnte keine Datenbak angelegt werden. Bitte erstellen sie diese manuell und versuchen Sie es erneut.
 
-Enter the Knowledge Base!!
-An der Wissensdatenbank anmelden!
+Created by %s on %s
+Erstellt von %s am %s
 
-Username
-Benutzername
+Created on
+Erstellt am
 
-Login
-Anmelden
+Creating new article to answer question made by %s on %s
+Creando un nuevo artículo para responder a la pregunta formulada por %s en %s
 
-E-mail article
-Artikel per Email versenden
+Creation date
+Erstellungsdatum
 
-Recipient (only one allowed)
-Empfänger (nur einer erlaubt)
+Creator
+Autor
 
-Subject
-Betreff
+Current category and subcategories
+Momentane Kategorie und Unterkategorie
 
-Reply-To address
-Antwort an folgende Adresse
+Current category only
+Nur die momentan verwendete Kategorie
 
-Message
-Nachricht
+Currently none.<br />Click icon to set one.
+Momentan kein..<br />Klicken Sie auf das Icon um einen zu setzen
 
-Send
-Absenden
+Database Hostname
+Datenbank Hostname
 
-All Articles
-Alle Artikel
+Database Name
+Datenbank Name
 
-Latest
-Neueste Artikel
+Database Username
+Datenbank Benutzername
 
-Most Viewed
-Meist gelesene Artikel
+Database Username Password
+Datenbank Benutzer Passwort
 
-views
-Ansicht
+Date
+Datum
 
-Unanswered Questions
-Unbeantwortete Fragen
+Date format
+Datums Format
 
-answer
-beantworten
+Days before password expires
+Tage bis das Passwort erneuert werden muss
 
-Author
-Author
+Delete
+Löschen
 
-Excerpt
-Auszug
+Delete Article
+Artikel löschen
 
-publish
-veröffentlichen
+Delete Bookmark
+Bookmark lösche
 
-delete
-löschen
+Deleted reference to related article successfully
+Die Referenz zu diesem Artikel wurde gelöscht
 
-select
-auswählen
+Deleted related article
+Der verwandte Artikel wurde gelöscht
 
-Category
-Kategorie
+Descendent
+Absteigend
 
-All
-Alle
+Description
+Beschreibung
 
-Unpublished
-Unveröffentlicht
+details
+Details
 
-Poster
-Author
+did not match any documents.
+kein passendes Dokument gefunden.
 
-Creation Date
-Erstellungsdatum
+documents found
+Dukumente gefunden
 
-Published
-Veröffentlicht
+Due Date
+Fälligkeitsdatum
 
-Answer
-Antwort
+Edit
+Bearbeiten
 
-Publish
-Veröffetnlichen
+Edit Bookmark
+Bookmark bearbeiten
 
-Are you sure you wish to delete user 
-Sind Sie sicher das Sie diesen Benutzer löschen möchten
+Edit/Add Category
+Bearbeiten/Hinzufügen einer Kategorie
 
-His articles will get passed to the main Admin User.
-Dieser Artikel wird weitergeleitet zum Administrator
+Edit Article
+Artikel bearbeiten
 
-UserName
-Bentzername
+Edit Categories
+Kategorien bearbeiten
 
-Admin rights
-Administrative Rechte
+Enter one or two words describing the issue, or type the article number if you know it
+Bitte geben Sie Ein oder Zwei Worte ein welche Ihre Frage beschreiben, oder geben Sie eine Artikel Nummer ein wenn Sie diese kennen
 
-Add User
-Benutzer hinzufügen
+Enter the Knowledge Base!!
+An der Wissensdatenbank anmelden!
 
-Couldn't connect to the database.
-Es konnte keine Verbindung zur Datenbank hergestellt werden.
+Enter your credentials
+Geben Sie Ihre Zugangsdaten ein
 
-If this is the first time you enter the Knowledge Base please proceed with the installation.
-Falls Sie zum ersten mal die Wissensdatenbank benutzen fahren Sie bitte mit der installation fort.
+Error uploading file
+Es ist ein Fehler beim hochladen der Datei aufgetreten
 
-Install
-Installieren
+Error: article does not exist
+Fehler: Dieser Artikel existiert nicht
 
-by
-durch
+Error: this article hasn't yet been published
+Fehler: Dieser Artikel wurde noch nicht veröffentlicht
 
-Related Articles
-Ähnliche Artikel
+Excellent
+Excellent
 
-Links
-Links
+Excerpt
+Auszug
 
-Search Results
-Suchergebnis
+Expiration Date
+Auslaufdatum
 
-documents found
-Dukumente gefunden
+E-mail
+E-mail
 
-seconds
-Sekunden
+E-mail article
+Artikel per Email versenden
 
-Your search
-Ihre Suche
+Favorites
+Favoriten
 
-did not match any documents.
-kein passendes Dokument gefunden.
+File deleted on database but note there was an error attempting to delete it from the filesystem
+Die Datei wurde aus der Datenbank entfernt, es trat jedoch ein Fehler auf beim Löschzufriff im Dateisystem
 
-Suggestions
-Vorschläge
+File deleted successfully
+Datei gelöscht
 
-Make sure all words are spelled correctly.
-Stellen Sie bitte sicher das Ihre Begriffe korrekt geschrieben sind.
+File not found (1)
+Datei nicht gefunden (1)
 
-Try different keywords.
-Benutzen Sie bitte unterschiedliche Stichwörter
+File not found (2)
+Datei nicht gefundeno (2)
 
-Try with rare keywords, that would more likely appear in the kind of document you're looking for.
-Versuchen Sie es bitte mit eindeutigeren Schlüsselworten. Dies wird die Suche nach einem passenden Dokument einschränken.
+File uploaded successfully
+Datei erfolgreich hochgeladen
 
-Article
-Artikel
+File '%s' attached
+Datei '%s' angefügt
 
-Printer view
-Druckvorschau
+File '%s' deleted
+Datei '%s' gelöscht
 
-Mail article
-Artikel per Email versenden
+Find Results
+Gefunden Ergebniss
 
-Title
-Titel
+First Name
+Vorname
 
-Last modification on
-Zuletzt bearbeitet am
+Give Admin access?
+Administratorrechte erteilen?
 
-Links & Files
-Links und Dateien
+Hide
+Unsichtbar
 
+His articles will get passed to the main Admin User.
+Dieser Artikel wird weitergeleitet zum Administrator
+
 History
 Historie
 
-Sort by:
-Sortieren nach
+Home
+Home
 
-Edit Article
-Artikel bearbeiten
+Icon
+Icon
 
-Delete Article
-Artikel löschen
+If this is the first time you enter the Knowledge Base please proceed with the installation.
+Falls Sie zum ersten mal die Wissensdatenbank benutzen fahren Sie bitte mit der installation fort.
 
-Are you sure you wish to delete the article titled
-Sind Sie sicher das Sie den angezeigten Artikel löschen möchten?
+If you can't find answers to your problem in the knowledge base, describe it below
+Falls Sie keine passende Antwort auf Ihre Frage in der Wissensdatenbank finden, beschreiben Sie Ihre Frage bitte unterhalb
 
-Publish Article
-Artikel veröffentlichen
+If you wish, you can add comments here
+Wenn Sie möchten können Sie hier Kommentare hinzufügen
 
-Comments
-Kommentare
-
 If you wish, you can comment this article here
 Wenn Sie möchten können Sie diesen Artikel hier kommentieren
 
-Your name
-Ihr Name
+In the article's title
+Im Titel des Artikels
 
-Please rate the pertinence and quality of this article
-Bitte bewerten Sie den Inhalt und Qualität dieses Artikels
+In the article's content
+Im Kommentar des Artikels
 
-Poor
-Schlecht
+in %s
+in %s
 
-Excellent
-Excellent
+Include subcategories
+Unterkategorien einbeziehen
 
-Average rating
-Durchschittliche Bewertung
+Including the exact phrase
+Nach dem ganzen Begriff suchen
 
-People have rated this article
-Dieser Artikel wurde von den Benutzern beurteilt mit
+Including these words*
+Diese Worte einbeziehen*
 
-Attached Files
-Hinzugefügte Dateien
+Insert demo data?
+Demo Daten einspielen?
 
-Attach File
-Datei hinzufügen
+Install
+Installieren
 
-comment
-Kommentar
+Installation was successful!
+Die Installation wurde erfolgreich durchgeführt!
 
-Upload
-Upload
+Internal article by default
+Interner Artikel als standard festlegen
 
-Maximum file size
-Maximale Dateigröße
+Internal use only
+Nur zur internen Benutzung
 
-Related articles in the Knowledge Base
-Verwandte Artikel in der Wissensdatenbank
+Invalid article ID
+Fehlerhafte Artikel ID
 
-Add articles
-Artikel hinzufügen
+Invalid recipient
+Ungültiger Empfänger
 
-Select articles
-Artikel auswählen
+Invalid Reply-To address
+Ungültige Antwortadresse
 
-Clear
-Leeren
+Knowledge Base
+Wissensdatenbank
 
-Add link
-Link hinzufügen
+Language
+Sprache
 
-History
-Historie
+Last Modified
+Zuletzt bearbeitet
 
-Date
-Datum
+Last modification on
+Zuletzt bearbeitet am
 
-User
-Benutzer
+Last Name
+Nachname
 
-Action
-Aktion
+Latest
+Neueste Artikel
 
-Knowledge Base
-Wissensdatenbank
+Link deleted successfully
+Link gelöscht
 
-Logout
-Abmelden
+Link saved successfully
+Link erfolgreich gespeichert
 
-Home
-Home
+Link '%s' added
+Link '%s' hinzugefügt
 
-Add Article
-Artikel hinzufügen
+Link '%s' removed
+Link '%s' entfernt
 
-Submit Question
-Frage hinzufügen
+Links
+Links
 
-Edit Categories
-Kategorien bearbeiten
+Links & Files
+Links und Dateien
 
-Manage Articles
-Artikel verwalten
+Location has been added to favorites successfully
+Diese Stelel wurde erfolgreich hinzugefügt zu den Favoriten
 
-Manage Questions
-Fragen verwalten
+Location has been removed from favorites successfully
+Erfolgreich entfernt von den Favoriten
 
-Manage Users
-Benutzer verwalten
+Login
+Anmelden
 
-Preferences
-Einstellungen
+Logout
+Abmelden
 
-Previous
-Vorherige
+Mail article
+Artikel per Email versende
 
-Next
-Nächste
+Manage Articles
+Artikel verwalten
 
-Please enter your name to post a comment
-Bitte geben Sie Ihren Namen ein um ein Kommentar hinzuzufügen
+Manage Articles/Bookmarks
+Artikel/Bookmarks verwalten
 
-Comment saved successfully
-Kommentar gespeichert
+Make knowledge base public
+Wissensdatenbank öffentlich zugänglich machen
 
-Added comment
-Kommentar hinzugefügt
+Manage Questions
+Fragen verwalten
 
-Article has been rated successfully
-Artikel wurde erfolgreich bewertet
+Make sure all words are spelled correctly.
+Stellen Sie bitte sicher das Ihre Begriffe korrekt geschrieben sind.
 
-Article rated
-Artikel bewertet
+Manage Categories
+Kategorien Verwalten
 
-Article has been commented and rated successfully
-Artikel wurde erfolgreich kommnetiert und bewertet
+Manage Users
+Benutzer verwalten
 
-Link saved successfully
-Link erfolgreich gespeichert
+Maximum file size
+Maximale Dateigröße
 
-Link '%s' added
-Link '%s' hinzugefügt
+Message
+Nachricht
 
-You must enter your name
-Sie müssen Ihren Namen eingeben
+Modification date
+Datum der letzten Bearbeitung
 
-Your question was empty
-Ihre Frage war leer
+Month Day, Year
+Monat Tag, Jahr
 
-Your question was added successfully
-Ihre Frage wurde hinzugefügt
+Most Viewed
+Meist gelesene Artikel
 
-Related articles saved successfully
-Verwandte Artikel wurden gespeichert
+Name
+Name
 
-Added related article
-Vernwandte Artikel hinzugefügt
+Next
+Nächste
 
-Article deleted successfully
-Artikel gelöscht
+No
+Nein
 
-Wrong category ID
-Falsche Artikel ID
+No articles/bookmarks related
+Keine verwandten Artikel/Bookmarks
 
-Category deleted successfully
-Kategorie gelöscht
+No events recorded
+Bisher keine Vorgänge
 
-Comment deleted successfully
-Kommentar gelöscht
+No files attached
+Keine Dateien angefügt
 
-Wrong file ID
-Falsche Artikel ID
+No links referenced
+Keine verwandten Links
 
-File deleted successfully
-Datei gelöscht
+No matches were found
+Keine Übereinstimmungen gefunden
 
-File deleted on database but note there was an error attempting to delete it from the filesystem
-Die Datei wurde aus der Datenbank entfernt, es trat jedoch ein Fehler auf beim Löschzufriff im Dateisystem
+Nobody has rated this article so far
+Dieser Artikel wurde noch nicht bewertet
 
-File '%s' deleted
-Datei '%s' gelöscht
+Nobody has rated this item
+Bisher wurde keine Bewertung vorgenommen
 
-Wrong link ID
-Falsche Link ID
+None
+Kein
 
-Link deleted successfully
-Link gelöscht
+Nothing was uploaded
+Kein upload durchgeführt
 
-Link '%s' removed
-Link '%s' entfernt
+Number of articles per page
+Anzahl der Artikel pro Seite
 
-Question deleted successfully
-Frage gelöscht
+Occurrence 
+Vorkommen
 
-Deleted reference to related article successfully
-Die Referenz zu diesem Artikel wurde gelöscht
+Only Articles
+Nur Artikel
 
-Deleted related article
-Der verwandte Artikel wurde gelöscht
+Only Bookmarks
+Nur Bookmarks
 
-You can't delete the main administrator user.
-Der administrative Benutzeraccount kann nicht gelöscht werden.
+Order results by
+Ergebnisse sortieren nach
 
-User deleted successfully
-Benutzer wurde gelöscht
+Parent Category
+Übergeordnete Kategorie
 
-First Name
-Vorname
-
-Last Name
-Nachname
-
-User Name
-Benutzername
-
 password
 Passwort
 
-You need to fill the following fields: 
-Sie müssen die folgenden Felder ausfüllen:
+Password
+Passwort
 
-User added successfully
-Benutzer angelegt
+past 3 months
+der letzten 3 Monate
 
-User edited successfully
-Benutzer bearbeitet
+past 6 months
+der letzten 6 Monate
 
-File not found (1)
-Datei nicht gefunden (1)
+past year
+des letzten Jahres
 
-File not found (2)
-Datei nicht gefundeno (2)
+People have rated this article
+Dieser Artikel wurde von den Benutzern beurteilt mit
 
-Couldn't connect to database
-Konnte keine Verbindung zur Datenbank herstellen
+Please enter your name to post a comment
+Bitte geben Sie Ihren Namen ein um ein Kommentar hinzuzufügen
 
-Couldn't create database. Please create it manually and try again.
-Es konnte keine Datenbak angelegt werden. Bitte erstellen sie diese manuell und versuchen Sie es erneut.
+Please rate the pertinence and quality of this article
+Bitte bewerten Sie den Inhalt und Qualität dieses Artikels
 
-Wrong Username or Password
-Falsche Benutzername oder Passwort
+Please rate the pertinence and quality of this bookmark
+Bitte bewerten Sie den Inhalt und Qualität dieses Bookmark
 
-Invalid recipient
-Ungültiger Empfänger
+Poor
+Schlecht
 
-Invalid Reply-To address
-Ungültige Antwortadresse
+Poster
+Author
 
-article_
-Artikel
+Preferences
+Einstellungen
 
-Sorry, there was a problem trying to send the e-mail. Please try again later.
-Leider ist ein Problem beim versenden der e-mail aufgetreten. Bitte versuchen Sie es nochmals später.
+Preferences saved successfully
+Einstellungen gespeichert
 
-Article published successfully
-Artikel erfoglreich veröffentlicht
+Previous
+Vorherige
 
-Wrong comment ID
-Falsche Kommentar ID 
+Printer view
+Druckvorschau
 
-Comment published successfully
-Kommentar erfolgreich veröffentlicht
+Private
+Private
 
-Question published successfully
-Frage erfolgreich veröffentlicht
+Publication date
+Datum der Veröffentlichung
 
-Article modified
-Artikel bearbeitet
+Publicly available
+Öffentlich verfügbar
 
-Article created
-Artikel erstellt
+publish
+veröffentlichen
 
-Article saved successfully.
-Artikel erfolgreich gespeichert.
+Publish
+Veröffentlichen
 
-You need to fill at least the Name field
-Sie müssen mindestens den Namen eingeben
+Publish Article
+Artikel veröffentlichen
 
-Category saved successfully
-Kategorie erfolgreich gespeichert
+Publish articles automatically
+Artikel automatisch veröffentlichen
 
-Preferences saved successfully
-Einstellungen gespeichert
+Publish bookmarks automatically
+Bookmarks automatisch veröffentlichen
 
-Article does not exist
-Dieser Artikel existiert nicht
+Publish comments automatically
+Kommentare automatisch veröffentlichen
 
-You don't have the permission to perform this operation
-Sie haben nicht die notwendigen Rechte um diese Funktion auszuführen
+Publish questions automatically
+Fragen automatisch veröffentlichen
 
-Nothing was uploaded
-Kein upload durchgeführt
+Published
+Veröffentlicht
 
-Error uploading file
-Es ist ein Fehler beim hochladen der Datei aufgetreten
+Question
+Frage
 
-File uploaded successfully
-Datei erfolgreich hochgeladen
+Question deleted successfully
+Frage gelöscht
 
-File '%s' attached
-Datei '%s' angefügt
+Question published successfully
+Frage erfolgreich veröffentlicht
 
-Your question will be published immediately
-Ihre Frage wird umgehend veröffentlicht
+Recipient (only one allowed)
+Empfänger (nur einer erlaubt)
 
-Your question will need to get approved before being published
-Ihre Frage muss zuerst geprüft werden bevor diese veröffentlicht wird
+Related Articles
+Ähnliche Artikel
 
-Creating new article to answer question made by %s on %s
-Creando un nuevo art\xC3\xADculo para responder a la pregunta formulada por %s en %s
+Related articles in the Knowledge Base
+Verwandte Artikel in der Wissensdatenbank
 
-Your article will be publicly available immediately
-Ihr Artikel wird umgehend veröffentlicht
+Related articles saved successfully
+Verwandte Artikel wurden gespeichert
 
-Your article won't be available publicly until it is explicitly set as "Published"
-Ihr Artikel wird nicht automatisch veröffentlicht bis er explizit freigegeben wurde
+Related Articles/Bookmarks
+Verwandte Artikel/Bookmarks
 
-There are no categories
-Keine Kategorien vorhanden
+Remove article from favorites
+Artikel aus den Favoriten löschen
 
-Invalid article ID
-Fehlerhafte Artikel ID
+Remove bookmark from favorites
+Bookmark von den Favoriten entfernen
 
-You are in %s
-Sie befinden sich in %s
+Remove location from favorites
+Diese Stelle aus den Favoriten löschen
 
-in %s
-in %s
+Remove results from favorites
+Das Ergebnis von den Favoriten entfernen
 
-There are no articles under this category
-Diese Kategorie beinhaltet keine Artikel
+Reply-To address
+Antwort an folgende Adresse
 
-The articles database is empty
-Die Artikeldatenbank ist leer
+Save
+Speichern
 
-No matches were found
-Keine Übereinstimmungen gefunden
+Search
+Suchen
 
-Error: article does not exist
-Fehler: Dieser Artikel existiert nicht
+Search has been added to favorites successfully
+Die Suche wurde erfolgreich zu den Favoriten hinzugefügt
 
-Error: this article hasn't yet been published
-Fehler: Dieser Artikel wurde noch nicht veröffentlicht
+Search has been removed from favorites successfully
+Die Suche wurde erfolgreich aus den Favoriten entfernt
 
-This article hasn't yet been published in the Knowledge Base
-Dieser Artikel wurde in der Wissensdatenbank noch nicht veröffentlicht
+Search in
+Suche in
 
-There are no files attached
-Es sind keine Dateien angefügt
+Search in all the Knowledge Base
+In der kompletten Wissensdatenbank suchen
 
-There are no related articles
-Es sind keine ähnlichen Artikel vorhanden
+Search Results
+Suchergebnis
 
-There are no links referenced
-Es sind keine Links referenziert
+seconds
+Sekunden
 
-Last Modified
-Zuletzt bearbeitet
+Select
+Auswählen
 
-Created on
-Erstellt am
+Select articles
+Artikel auswählen
 
-Article hasn't been commented
-Dieser Artikel wurde noch nicht bewertet 
+Select Category
+Eine Kategorie auswählen
 
-You have already rated this article
-Sie haben diesen Artikel schon bewertet. Eine weitere Bewertung ist nicht möglich.
+Send
+Absenden
 
-Submit comment
-Kommentar absenden
+Send mail from (email)
+Email Sender (Email Adresse)
 
-Submit comment and rating
-Kommentare und Beurteilung absenden
+Send mail from (name)
+Email Sender (Name)
 
-Nobody has rated this article so far
-Dieser Artikel wurde noch nicht bewertet
+Send mail using
+Benutze zum senden
 
-No files attached
-Keine Dateien angefügt
+Separate word list with spaces
+Trennen Sie die Worte durch Leerzeichen
 
-No articles/bookmarks related
-Keine verwandten Artikel/Bookmarks 
+Show
+Sichtbar
 
-No links referenced
-Keine verwandten Links
+Show articles from
+Zeige Artikel von
 
-No events recorded
-Bisher keine Vorgänge
+Show messages in category
+Nachrichten in der Kategorie anzeigen
 
-This article hasn't yet been published in the Knowledge Base
-Dieser Artikel wurde noch nicht für die Wissensdatenbank freigegeben
+SMTP password
+SMTP Passwort
 
-Created by %s on %s
-Erstellt von %s am %s
+SMTP port
+SMTP Port
 
-Add Bookmark
-Bookmark hinzufügen
+SMTP server
+SMTP Server
 
-Manage Articles/Bookmarks
-Artikel/Bookmarks verwalten
+SMTP settings
+SMTP Einstellungen
 
-Articles
-Artikel
+SMTP user
+SMTP Benutzer
 
-Bookmarks
-Bookmarks
+Sorry, there was a problem trying to send the e-mail. Please try again later.
+Leider ist ein Problem beim versenden der e-mail aufgetreten. Bitte versuchen Sie es nochmals später.
 
-Viewing All Articles and Bookmarks
-Alle Artikel und Bookmarks anzeigen
+Sorry, this article is for internal use only.
+Dieser Artikel kann nur intern benutzt werden
 
-Articles only
-Nur Artikel anzeigen
+Sort by:
+Sortieren nach
 
-Bookmarks only
-Nur Bookmarks anzeigen
+Subject
+Betreff
 
-View All
-Alles anzeigen
+Submit
+Absenden
 
-Viewing All Articles
-Zeige alle Artikel
+Submit comment
+Kommentar absenden
 
-Viewing All Bookmarks
-Zeige alle Bookmarks
+Submit comment and rating
+Kommentare und Beurteilung absenden
 
-Your article will be publicly available immediately
-Ihr Artikel wird umgehend veröffentlicht
+Submit Question
+Frage hinzufügen
 
-Your bookmark will be publicly available immediately
-Ihr Bookmark wird umgehend veröffentlicht
+Suggestions
+Vorschläge
 
 Target
 Ziel
 
-If you wish, you can add comments here
-Wenn Sie möchten können Sie hier Kommentare hinzufügen
+The articles database is empty
+Die Artikel Datenbank ist leer
 
-Please rate the pertinence and quality of this bookmark
-Bitte bewerten Sie den Inhalt und Qualität dieses Bookmark
+There are no articles under this category
+Es sind keine ähnlichen Artikel vorhanden
 
-Add Articles/Bookmarks
-Artikel/Bookmark hinzufügen
+There are no categories
+Keine Kategorien vorhanden
 
-Select
-Auswählen
-
-Edit Bookmark
-Bookmark bearbeiten
-
-Delete Bookmark
-Bookmark löschen
-
 There are no comments so far
 Es sind keine Kommentare vorhanden
 
-Nobody has rated this item
-Bisher wurde keine Bewertung vorgenommen
+There are no files attached
+Es sind keine Dateien angefügt
 
-Always start browsing
-Immer mit der Übersicht beginnen
+There are no links referenced
+Es sind keine Links referenziert
 
-Articles and Bookmarks
-Artikel und Bookmarks
+There are no related articles
+Es sind keine ähnlichen Artikel vorhanden
 
-Only Articles
-Nur Artikel
+The superadministrator user was created, with the username 'admin' and password 'admin'
+Es wurde ein administratives Benutzerkonto erstellt mit dem Benutzernamen "Admin" und dem Passwort "admin"
 
-Only Bookmarks
-Nur Bookmarks
+This article hasn't yet been published in the Knowledge Base
+Dieser Artikel wurde noch nicht für die Wissensdatenbank freigegeben
 
-Publish bookmarks automatically
-Bookmarks automatisch veröffentlichen
+Title
+Titel
 
-Search in
-Suche in 
+To be able to continue, please make your config.php file writable and then press Continue.
+Um vortzufahren machen Sie bitte Ihre config.php schreibbar und drücken Sie Enter
 
-Bookmark
-Bookmark
-
-Related Articles/Bookmarks
-Verwandte Artikel/Bookmarks
-
-Browse unpublished articles/bookmarks
-Nicht veröffentlichte Artikel/Bookmarks anzeigen
-
-View Unpublished Only
-Nur unveröffentlichte Anzeigen
-
-Favorites
-Favoriten
-
 ToDo
 Aufgaben
 
-Remove article from favorites
-Artikel aus den Favoriten löschen
+Try different keywords.
+Benutzen Sie bitte unterschiedliche Stichwörter
 
-Article has been removed from favorites successfully
-Der Artikel wurde erfolgreich aus den Favoriten gelöscht
+Try with rare keywords, that would more likely appear in the kind of document you're looking for.
+Versuchen Sie es bitte mit eindeutigeren Schlüsselworten. Dies wird die Suche nach einem passenden Dokument einschränken.
 
-Add article to favorites
-Artikel zu den Favoriten hinzufügen
+Unanswered Questions
+Unbeantwortete Fragen
 
-Article has beed added to favorites successfully
-Artikel wurde erfolgreich zu den Favoriten hinzugefügt
+Unpublished
+Unveröffentlicht
 
-Add results to favorites
-Füge das Ergebnis zu den Favoriten hinzu
+Upload
+Upload
 
-Search has been added to favorites successfully
-Die Suche wurde erfolgreich zu den Favoriten hinzugefügt
+Usage
+Benutzung
 
-Remove results from favorites
-Das Ergebnis von den Favoriten entfernen
+User
+Benutzer
 
-Search has been removed from favorites successfully
-Die Suche wurde erfolgreich aus den Favoriten entfernt
+User added successfully
+Benutzer angelegt
 
-Add location to favorites
-Füge diese Stelle zu den Favoriten hinzu
+User Data
+Benutzerdaten
 
-Location has been added to favorites successfully
-Diese Stelel wurde erfolgreich hinzugefügt zu den Favoriten
+User deleted successfully
+Benutzer wurde gelöscht
 
-Remove location from favorites
-Diese Stelle aus den Favoriten löschen
+User edited successfully
+Benutzer bearbeitet
 
-Location has been removed from favorites successfully
-Erfolgreich entfernt von den Favoriten
+User Name
+Benutzername
 
-Expiration Date
-Auslaufdatum
+Username
+Benutzername
 
-Currently none.<br />Click icon to set one.
-Momentan kein..<br />Klicken Sie auf das Icon um einen zu setzen
+View All
+Alles anzeigen
 
-details
-Details
+Viewing All Articles
+Zeige alle Artikel
 
-Add new
-Neu hinzufügen
+Viewing All Articles and Bookmarks
+Alle Artikel und Bookmarks anzeigen
 
-You have no To-Do's
-Sie haben neue Aufgaben
+Viewing All Bookmarks
+Zeige alle Bookmarks
 
-You have no Favorites
-Sie haben keine Favoriten
+views
+Ansicht
 
-Contents
-Inhalt
+View Unpublished Only
+Nur unveröffentlichte Anzeigen
 
-Due Date
-Fälligkeitsdatum
+With at least one of these words*
+Mindestens eines der folgenden Worte muss vorkommen
 
-Private
-Private
+Without these words*
+Ohne diese Worte*
 
-Completed
-Komplett
+Wrong category ID
+Falsche Artikel ID
 
-Add bookmark to favorites
-Bookmark zu den Favoriten hinzufügen
+Wrong comment ID
+Falsche Kommentar ID
 
-Remove bookmark from favorites
-Bookmark von den Favoriten entfernen
+Wrong file ID
+Falsche Artikel ID
 
-Send mail from (name)
-Email Sender (Name)
+Wrong link ID
+Falsche Link ID
 
-Send mail from (email)
-Email Sender (Email Adresse)
+Wrong Username or Password
+Falsche Benutzername oder Passwort
 
-Send mail using
-Benutze zum senden
+Yes
+Ja
 
-SMTP settings
-SMTP Einstellungen
+You are in %s
+Sie befinden sich in %s
 
-SMTP server
-SMTP Server
+You can't delete the main administrator user.
+Der administrative Benutzeraccount kann nicht gelöscht werden
 
-SMTP user 
-SMTP User
+You don't have the permission to perform this operation
+Sie haben nicht die notwendigen Rechte um diese Funktion auszuführen
 
-SMTP password
-SMTP Passwort
+You have already rated this article
+Sie haben diesen Artikel schon bewertet. Eine weitere Bewertung ist nicht möglich.
 
-SMTP port
-SMTP Port
+You have no Favorites
+Sie haben keine Favoriten
 
-Internal use only
-Nur zur internen Benutzung
+You have no To-Do's
+Sie haben keine Aufgaben
 
-Publicly available
-Öffentlich verfügbar
+You must enter your name
+Sie müssen Ihren Namen eingeben
 
-Usage
-Benutzung
+You need to fill at least the Name field
+Sie müssen mindestens den Namen eingeben
 
-Sorry, this article is for internal use only.
-Dieser Artikel kann nur intern benutzt werden
+You need to fill the following fields: 
+Sie müssen die folgenden Felder ausfüllen
 
-Category will be shown in the future
-Diese Kategorie wird zukünftig sichbar sein 
+Your article will be publicly available immediately
+Ihr Artikel wird direkt veröffentlicht
 
-Hide
-Unsichtbar
+Your article won't be available publicly until it is explicitly set as "Published"
+Ihr Artikel wird nicht automatisch veröffentlicht bis er explizit freigegeben wurde
 
-Show
-Sichtbar
+Your bookmark will be publicly available immediately
+Ihr Bookmark wird umgehend veröffentlicht
 
-Manage Categories
-Kategorien Verwalten
+Your Name
+Ihr Name
 
-Make knowledge base public
-Wissensdatenbank öffentlich zugänglich machen
+Your question was added successfully
+Ihre Frage wurde hinzugefügt
 
-Internal article by default
-Interner Artikel als standard festlegen
+Your question was empty
+Sie haben keien Frage eingegeben
 
-Days before password expires
-Tage bis das Passwort verfällt
+Your question will be published immediately
+Ihre Frage wird umgehend veröffentlicht
+
+Your question will need to get approved before being published
+Ihre Frage wird zuerst geprüft bevor diese veröffentlicht wird
+
+Your search
+Ihre Suche

Modified: branches/release-candidates/sciret-1.2/languages/English.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/English.txt	2007-08-16 18:10:19 UTC (rev 492)
+++ branches/release-candidates/sciret-1.2/languages/English.txt	2007-08-16 22:18:05 UTC (rev 493)
@@ -1,665 +1,649 @@
-If you can't find answers to your problem in the knowledge base, describe it below
+Action
 
-Your Name
+Add Article
 
-Select Category
+Add article to favorites
 
-None
+Add articles
 
-Submit
+Add Articles/Bookmarks
 
-Find Results
+Add Bookmark
 
-Including these words*
+Add bookmark to favorites
 
-Including the exact phrase
+Add Category
 
-With at least one of these words*
+Add link
 
-Without these words*
+Add location to favorites
 
-Show messages in category
+Add new
 
-Include subcategories
+Add results to favorites
 
-Publication date
+Add subcategory
 
-anytime
+Add User
 
-past 3 months
+Added comment
 
-past 6 months
+Added related article
 
-past year
+Admin rights
 
-Occurrences
+Advanced Search
 
-Anywhere in the article
+All
 
-In the article's title
+All Articles
 
-In the article's content
+Allow comments and ratings
 
-Order results by
+Always start browsing
 
-Creation date
+answer
 
-Creator
+Answer
 
-Modification date
+anytime
 
-Descendent
+Anywhere in the article
 
-Ascendent
+Are you sure you wish to delete the article titled
 
-Separate word list with spaces
+Are you sure you want to delete the category
 
-Search
+Are you sure you wish to delete user
 
-Search in all the Knowledge Base
+Article
 
-Before submiting a question, please search in the knowledge base first
+Articles and Bookmarks
 
-Enter one or two words describing the issue, or type the article number if you know it
+Article created
 
-Advanced Search
+Article deleted successfully
 
-To be able to continue, please make your config.php file writable and then press Continue.
+Article does not exist
 
-Continue
+Article has beed added to favorites successfully
 
-Question
+Article has been commented and rated successfully
 
-Article ID
+Article has been rated successfully
 
-Save
+Article has been removed from favorites successfully
 
-Are you sure you want to delete the category 
+Article hasn't been commented
 
-Name
+Article modified
 
-Description
+Article published successfully
 
-Icon
+Artikle ID
 
-Add subcategory
+Article rated
 
-Edit
+Article saved successfully.
 
-Delete
+Articles
 
-Add Category
+Articles only
 
-Edit/Add Category
+Ascendent
 
-Parent Category
+Attach File
 
-Number of articles per page
+Attached Files
 
-Date format
+Average rating
 
-Month Day, Year
+Before submiting a question, please search in the knowledge base first
 
-Language
+Bookmark
 
-Show articles from
+Bookmarks
 
-Current category and subcategories
+Bookmarks only
 
-Current category only
+Browse unpublished articles/bookmarks
 
-Publish articles automatically
+by
 
-Yes
+Category
 
-No
+Category deleted successfully
 
-Publish comments automatically
+Category saved successfully
 
-Publish questions automatically
+Category will be shown in the future
 
-User Data
+Clear
 
-User Name
+comment
 
-E-mail
+Comment deleted successfully
 
-Give Admin access?
+Comment published successfully
 
-Password
+Comment saved successfully
 
-Enter your credentials
+Comments
 
-Database Hostname
+Completed
 
-Database Name
+Contents
 
-Database Username
+Continue
 
-Database Username Password
+Couldn't connect to database
 
-Insert demo data?
+Couldn't connect to the database.
 
-Installation was successful!
+Couldn't create database. Please create it manually and try again.
 
-The superadministrator user was created, with the username 'admin' and password 'admin'
+Creating new article to answer question made by %s on %s
 
-Enter the Knowledge Base!!
+Created by %s on %s
 
-Username
+Created on
 
-Login
+Creation date
 
-E-mail article
+Creator
 
-Recipient (only one allowed)
+Current category and subcategories
 
-Subject
+Current category only
 
-Reply-To address
+Currently none.<br />Click icon to set one.
 
-Message
+Database Hostname
 
-Send
+Database Name
 
-All Articles
+Database Username
 
-Latest
+Database Username Password
 
-Most Viewed
+Date
 
-views
+Date format
 
-Unanswered Questions
+Days before password expires
 
-answer
+Delete
 
-Author
+Delete Article
 
-Excerpt
+Delete Bookmark
 
-publish
+Deleted reference to related article successfully
 
-delete
+Deleted related article
 
-select
+Descendent
 
-Category
+Description
 
-All
+details
 
-Unpublished
+did not match any documents.
 
-Poster
+documents found
 
-Creation Date
+Due Date
 
-Published
+Edit
 
-Answer
+Edit Bookmark
 
-Publish
+Edit/Add Category
 
-Are you sure you wish to delete user 
+Edit Article
 
-His articles will get passed to the main Admin User.
+Edit Categories
 
-UserName
+Enter one or two words describing the issue, or type the article number if you know it
 
-Admin rights
+Enter the Knowledge Base!!
 
-Add User
+Enter your credentials
 
-Couldn't connect to the database.
+Error uploading file
 
-If this is the first time you enter the Knowledge Base please proceed with the installation.
+Error: article does not exist
 
-Install
+Error: this article hasn't yet been published
 
-by
+Excellent
 
-Related Articles
+Excerpt
 
-Links
+Expiration Date
 
-Search Results
+E-mail
 
-documents found
+E-mail article
 
-seconds
+Favorites
 
-Your search
+File deleted on database but note there was an error attempting to delete it from the filesystem
 
-did not match any documents.
+File deleted successfully
 
-Suggestions
+File not found (1)
 
-Make sure all words are spelled correctly.
+File not found (2)
 
-Try different keywords.
+File uploaded successfully
 
-Try with rare keywords, that would more likely appear in the kind of document you're looking for.
+File '%s' attached
 
-Article
+File '%s' deleted
 
-Printer view
+Find Results
 
-Mail article
+First Name
 
-Title
+Give Admin access?
 
-Last modification on
+Hide
 
-Links & Files
+His articles will get passed to the main Admin User.
 
 History
 
-Sort by:
+Home
 
-Edit Article
+Icon
 
-Delete Article
+If this is the first time you enter the Knowledge Base please proceed with the installation.
 
-Are you sure you wish to delete the article titled
+If you can't find answers to your problem in the knowledge base, describe it below
 
-Publish Article
+If you wish, you can add comments here
 
-Comments
-
 If you wish, you can comment this article here
 
-Your name
+In the article's title
 
-Please rate the pertinence and quality of this article
+In the article's content
 
-Poor
+in %s
 
-Excellent
+Include subcategories
 
-Average rating
+Including the exact phrase
 
-People have rated this article
+Including these words*
 
-Attached Files
+Insert demo data?
 
-Attach File
+Install
 
-comment
+Installation was successful!
 
-Upload
+Internal article by default
 
-Maximum file size
+Internal use only
 
-Related articles in the Knowledge Base
+Invalid article ID
 
-Add articles
+Invalid recipient
 
-Select articles
+Invalid Reply-To address
 
-Clear
+Knowledge Base
 
-Add link
+Language
 
-History
+Last Modified
 
-Date
+Last modification on
 
-User
+Last Name
 
-Action
+Latest
 
-Knowledge Base
+Link deleted successfully
 
-Logout
+Link saved successfully
 
-Home
+Link '%s' added
 
-Add Article
+Link '%s' removed
 
-Submit Question
+Links
 
-Edit Categories
+Links & Files
 
-Manage Items
+Location has been added to favorites successfully
 
-Manage Questions
+Location has been removed from favorites successfully
 
-Manage Users
+Login
 
-Preferences
+Logout
 
-Previous
+Mail article
 
-Next
+Manage Articles
 
-Please enter your name to post a comment
+Manage Articles/Bookmarks
 
-Comment saved successfully
+Make knowledge base public
 
-Added comment
+Manage Questions
 
-Article has been rated successfully
+Make sure all words are spelled correctly.
 
-Article rated
+Manage Categories
 
-Article has been commented and rated successfully
+Manage Users
 
-Link saved successfully
+Maximum file size
 
-Link '%s' added
+Message
 
-You must enter your name
+Modification date
 
-Your question was empty
+Month Day, Year
 
-Your question was added successfully
+Most Viewed
 
-Related articles saved successfully
+Name
 
-Added related article
+Next
 
-Article deleted successfully
+No
 
-Wrong category ID
+No articles/bookmarks related
 
-Category deleted successfully
+No events recorded
 
-Comment deleted successfully
+No files attached
 
-Wrong file ID
+No links referenced
 
-File deleted successfully
+No matches were found
 
-File deleted on database but note there was an error attempting to delete it from the filesystem
+Nobody has rated this article so far
 
-File '%s' deleted
+Nobody has rated this item
 
-Wrong link ID
+None
 
-Link deleted successfully
+Nothing was uploaded
 
-Link '%s' removed
+Number of articles per page
 
-Question deleted successfully
+Occurrences
 
-Deleted reference to related article successfully
+Only Articles
 
-Deleted related article
+Only Bookmarks
 
-You can't delete the main administrator user.
+Order results by
 
-User deleted successfully
+Parent Category
 
-First Name
-
-Last Name
-
-User Name
-
 password
 
-You need to fill the following fields: 
+Password
 
-User added successfully
+past 3 months
 
-User edited successfully
+past 6 months
 
-File not found (1)
+past year
 
-File not found (2)
+People have rated this article
 
-Couldn't connect to database
+Please enter your name to post a comment
 
-Couldn't create database. Please create it manually and try again.
+Please rate the pertinence and quality of this article
 
-Wrong Username or Password
+Please rate the pertinence and quality of this bookmark
 
-Invalid recipient
+Poor
 
-Invalid Reply-To address
+Poster
 
-article_
+Preferences
 
-Sorry, there was a problem trying to send the e-mail. Please try again later.
+Preferences saved successfully
 
-Article published successfully
+Previous
 
-Wrong comment ID
+Printer view
 
-Comment published successfully
+Private
 
-Question published successfully
+Publication date
 
-Article modified
+Publicly available
 
-Article created
+publish
 
-Article saved successfully.
+Publish
 
-You need to fill at least the Name field
+Publish Article
 
-Category saved successfully
+Publish articles automatically
 
-Preferences saved successfully
+Publish bookmarks automatically
 
-Article does not exist
+Publish comments automatically
 
-You don't have the permission to perform this operation
+Publish questions automatically
 
-Nothing was uploaded
+Published
 
-Error uploading file
+Question
 
-File uploaded successfully
+Question deleted successfully
 
-File '%s' attached
+Question published successfully
 
-Your question will be published immediately
+Recipient (only one allowed)
 
-Your question will need to get approved before being published
+Related Articles
 
-Creating new article to answer question made by %s on %s
+Related articles in the Knowledge Base
 
-Your article will be publicly available immediately'
+Related articles saved successfully
 
-Your article won't be available publicly until it is explicitly set as "Published"
+Related Articles/Bookmarks
 
-There are no categories
+Remove article from favorites
 
-Invalid article ID
+Remove bookmark from favorites
 
-You are in %s
+Remove location from favorites
 
-in %s
+Remove results from favorites
 
-There are no articles under this category
+Reply-To address
 
-The articles database is empty
+Save
 
-No matches were found
+Search
 
-Error: article does not exist
+Search has been added to favorites successfully
 
-Error: this article hasn't yet been published
+Search has been removed from favorites successfully
 
-This article hasn't yet been published in the Knowledge Base
+Search in
 
-There are no files attached
+Search in all the Knowledge Base
 
-There are no related articles
+Search Results
 
-There are no links referenced
+seconds
 
-Last Modified
+Select
 
-Created on
+Select articles
 
-Article hasn't been commented
+Select Category
 
-You have already rated this article
+Send
 
-Submit comment
+Send mail from (email)
 
-Submit comment and rating
+Send mail from (name)
 
-Nobody has rated this article so far
+Send mail using
 
-No files attached
+Separate word list with spaces
 
-No articles/bookmarks related
+Show
 
-No links referenced
+Show articles from
 
-No events recorded
+Show messages in category
 
-This article hasn't yet been published in the Knowledge Base
+SMTP password
 
-Created by %s on %s
+SMTP port
 
-Add Bookmark
+SMTP server
 
-Manage Articles/Bookmarks
+SMTP settings
 
-Articles
+SMTP user
 
-Bookmarks
+Sorry, there was a problem trying to send the e-mail. Please try again later.
 
-Viewing All Articles and Bookmarks
+Sorry, this article is for internal use only.
 
-Articles only
+Sort by:
 
-Bookmarks only
+Subject
 
-View All
+Submit
 
-Viewing All Articles
+Submit comment
 
-Viewing All Bookmarks
+Submit comment and rating
 
-Your article will be publicly available immediately
+Submit Question
 
-Your bookmark will be publicly available immediately
+Suggestions
 
 Target
 
-If you wish, you can add comments here
+The articles database is empty
 
-Please rate the pertinence and quality of this bookmark
+There are no articles under this category
 
-Add Articles/Bookmarks
+There are no categories
 
-Select
-
-Edit Bookmark
-
-Delete Bookmark
-
 There are no comments so far
 
-Nobody has rated this item
+There are no files attached
 
-Always start browsing
+There are no links referenced
 
-Articles and Bookmarks
+There are no related articles
 
-Only Articles
+The superadministrator user was created, with the username 'admin' and password 'admin'
 
-Only Bookmarks
+This article hasn't yet been published in the Knowledge Base
 
-Publish bookmarks automatically 
+Title
 
-Search in
+To be able to continue, please make your config.php file writable and then press Continue.
 
-Bookmark
+ToDo
 
-Related Articles/Bookmarks
+Try different keywords.
 
-Browse unpublished articles/bookmarks
+Try with rare keywords, that would more likely appear in the kind of document you're looking for.
 
-View Unpublished Only
+Unanswered Questions
 
-Favorites
+Unpublished
 
-ToDo
+Upload
 
-Remove article from favorites
+Usage
 
-Article has been removed from favorites successfully
+User
 
-Add article to favorites
+User added successfully
 
-Article has been added to favorites successfully
+User Data
 
-Add results to favorites
+User deleted successfully
 
-Search has been added to favorites successfully
+User edited successfully
 
-Remove results from favorites
+Username
 
-Search has been removed from favorites successfully
+User Name
 
-Add location to favorites
+View All
 
-Location has been added to favorites successfully
+Viewing All Articles
 
-Remove location from favorites
+Viewing All Articles and Bookmarks
 
-Location has been removed from favorites successfully
+Viewing All Bookmarks
 
-Expiration Date
+views
 
-Currently none.<br />Click icon to set one.
+View Unpublished Only
 
-details
+With at least one of these words*
 
-Add new
+Without these words*
 
-You have no To-Do's
+Wrong category ID
 
-You have no Favorites
+Wrong comment ID
 
-Contents
+Wrong file ID
 
-Due Date
+Wrong link ID
 
-Private
+Wrong Username or Password
 
-Completed
+Yes
 
-Add bookmark to favorites
+You are in %s
 
-Remove bookmark from favorites
+You can't delete the main administrator user.
 
-Send mail from (name)
+You don't have the permission to perform this operation
 
-Send mail from (email)
+You have already rated this article
 
-Send mail using
+You have no Favorites
 
-SMTP settings
+You have no To-Do's
 
-SMTP server
+You must enter your name
 
-SMTP user
+You need to fill at least the Name field
 
-SMTP password
+You need to fill the following fields: 
 
-SMTP port
+Your article will be publicly available immediately'
 
-Internal use only
+Your article won't be available publicly until it is explicitly set as "Published"
 
-Publicly available
+Your bookmark will be publicly available immediately
 
-Usage
+Your Name
 
-Sorry, this article is for internal use only.
+Your question was added successfully
 
-Internal use only
+Your question was empty
 
-Publicly available
+Your question will be published immediately
 
-Usage
+Your question will need to get approved before being published
 
-Sorry, this article is for internal use only.
-
-Allow comments and ratings
+Your search


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [492] branches/release-candidates/sciret-1.2

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.

[Sciret-svn] SF.net SVN: sciret: [491] branches/release-candidates/sciret-1.2/languages/ Deutsch.txt

From: <re...@us...> - 2007-08-16 10:02:40

Revision: 491
          http://sciret.svn.sourceforge.net/sciret/?rev=491&view=rev
Author:   reinerj
Date:     2007-08-16 03:02:39 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
reorganize the original lang file, sort it and remive double names

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/languages/Deutsch.txt

Modified: branches/release-candidates/sciret-1.2/languages/Deutsch.txt
===================================================================
--- branches/release-candidates/sciret-1.2/languages/Deutsch.txt	2007-08-16 08:54:30 UTC (rev 490)
+++ branches/release-candidates/sciret-1.2/languages/Deutsch.txt	2007-08-16 10:02:39 UTC (rev 491)
@@ -981,3 +981,24 @@
 
 Sorry, this article is for internal use only.
 Dieser Artikel kann nur intern benutzt werden
+
+Category will be shown in the future
+Diese Kategorie wird zukünftig sichbar sein 
+
+Hide
+Unsichtbar
+
+Show
+Sichtbar
+
+Manage Categories
+Kategorien Verwalten
+
+Make knowledge base public
+Wissensdatenbank öffentlich zugänglich machen
+
+Internal article by default
+Interner Artikel als standard festlegen
+
+Days before password expires
+Tage bis das Passwort verfällt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [490] branches/release-candidates/sciret-1.2/TODO

From: <re...@us...> - 2007-08-16 08:54:32

Revision: 490
          http://sciret.svn.sourceforge.net/sciret/?rev=490&view=rev
Author:   reinerj
Date:     2007-08-16 01:54:30 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
add new functionality to the roadmap

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/TODO

Modified: branches/release-candidates/sciret-1.2/TODO
===================================================================
--- branches/release-candidates/sciret-1.2/TODO	2007-08-16 08:50:59 UTC (rev 489)
+++ branches/release-candidates/sciret-1.2/TODO	2007-08-16 08:54:30 UTC (rev 490)
@@ -24,6 +24,7 @@
 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.

[Sciret-svn] SF.net SVN: sciret: [489] branches/release-candidates/sciret-1.2/TODO

From: <re...@us...> - 2007-08-16 08:51:01

Revision: 489
          http://sciret.svn.sourceforge.net/sciret/?rev=489&view=rev
Author:   reinerj
Date:     2007-08-16 01:50:59 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
fix typo

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/TODO

Modified: branches/release-candidates/sciret-1.2/TODO
===================================================================
--- branches/release-candidates/sciret-1.2/TODO	2007-08-16 08:49:18 UTC (rev 488)
+++ branches/release-candidates/sciret-1.2/TODO	2007-08-16 08:50:59 UTC (rev 489)
@@ -13,7 +13,7 @@
 
 1.3 Release
 - Introduce group support. Admin can restrict access to User based work groups
-- Search for articles by registered users
+- 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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [488] branches/release-candidates/sciret-1.2/TODO

From: <re...@us...> - 2007-08-16 08:49:20

Revision: 488
          http://sciret.svn.sourceforge.net/sciret/?rev=488&view=rev
Author:   reinerj
Date:     2007-08-16 01:49:18 -0700 (Thu, 16 Aug 2007)

Log Message:
-----------
the roadmap was changed

Modified Paths:
--------------
    branches/release-candidates/sciret-1.2/TODO

Modified: branches/release-candidates/sciret-1.2/TODO
===================================================================
--- branches/release-candidates/sciret-1.2/TODO	2007-08-16 07:08:46 UTC (rev 487)
+++ branches/release-candidates/sciret-1.2/TODO	2007-08-16 08:49:18 UTC (rev 488)
@@ -12,16 +12,17 @@
     * Preferences for a user based view of the screen
 
 1.3 Release
-- New User Interface for Sciret based on the work from Nuno Pinheiro
+- Introduce group support. Admin can restrict access to User based work groups
+- Search for articles by registered users
 - Make an article appear in more than one category
+- Add tags and tag search to article, bookmarks and documents
 
 1.4 Release
-- Document Management Functionality
-- Add tags and tag search to article, bookmarks and documents
+- New User Interface for Sciret based on the work from Nuno Pinheiro
 - Ubuntu/Debian Packages
 
 1.5 Release
-- Introduce group support. Groups from admin for restricrted access and User based work groups
+- Document Management Functionality
 - Create PDF from Article
 - Authentication again LDAP
 - Authentication again AD
@@ -29,7 +30,6 @@
 1.6 Release 
 - One Time Passwords
 - Authentication with Secure Token
-- Search for articles by registered users
 
 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.

[Sciret-svn] SF.net SVN: sciret: [487] branches/release-candidates/sciret-1.2

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.

[Sciret-svn] SF.net SVN: sciret: [486] branches/release-candidates/sciret-1.2/actions

From: <al...@us...> - 2007-08-16 00:21:37

Revision: 486
          http://sciret.svn.sourceforge.net/sciret/?rev=486&view=rev
Author:   alpeb
Date:     2007-08-15 17:21:19 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
allow users to hide categories in the main screen

Added Paths:
-----------
    branches/release-candidates/sciret-1.2/actions/HideCategory.php
    branches/release-candidates/sciret-1.2/actions/ShowCategory.php

Added: branches/release-candidates/sciret-1.2/actions/HideCategory.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/HideCategory.php	                        (rev 0)
+++ branches/release-candidates/sciret-1.2/actions/HideCategory.php	2007-08-16 00:21:19 UTC (rev 486)
@@ -0,0 +1,23 @@
+<?php
+
+require 'actions/Action.php';
+
+class HideCategory extends Action {
+
+    function dispatch() {
+        $hideCategories = $this->user->getPreference('hiddenCategories');
+        if (!$hideCategories) {
+            $hideCategories = array();
+        } else {
+            $hideCategories = explode(',', $hideCategories);
+        }
+        $hideCategories[] = (int)$_GET['catId'];
+        $this->user->setPreference('hiddenCategories', implode(',', $hideCategories));
+        $this->user->save();
+
+        $_SESSION['message'] = $this->user->lang('Category won\'t be shown in the future');
+        Library::redirect(Library::getLink(array('view' => 'EditCategories')));
+    }
+}
+
+?>


Property changes on: branches/release-candidates/sciret-1.2/actions/HideCategory.php
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/release-candidates/sciret-1.2/actions/ShowCategory.php
===================================================================
--- branches/release-candidates/sciret-1.2/actions/ShowCategory.php	                        (rev 0)
+++ branches/release-candidates/sciret-1.2/actions/ShowCategory.php	2007-08-16 00:21:19 UTC (rev 486)
@@ -0,0 +1,31 @@
+<?php
+
+require 'actions/Action.php';
+
+class ShowCategory extends Action {
+
+    function dispatch() {
+        $hideCategories = $this->user->getPreference('hiddenCategories');
+        if (!$hideCategories) {
+            $hideCategories = array();
+        } else {
+            $hideCategories = explode(',', $hideCategories);
+        }
+
+        $newHideCategories = array();
+        foreach ($hideCategories as $catId) {
+            if ($catId == $_GET['catId']) {
+                continue;
+            }
+            $newHideCategories[] = $catId;
+        }
+
+        $this->user->setPreference('hiddenCategories', implode(',', $newHideCategories));
+        $this->user->save();
+
+        $_SESSION['message'] = $this->user->lang('Category will be shown in the future');
+        Library::redirect(Library::getLink(array('view' => 'EditCategories')));
+    }
+}
+
+?>


Property changes on: branches/release-candidates/sciret-1.2/actions/ShowCategory.php
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [485] branches/release-candidates/sciret-1.2

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>&nbsp;&nbsp;
-            <a href="{editCatLink}">[l]Edit[/l]</a>&nbsp;&nbsp;
-            <!-- 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>&nbsp;&nbsp;
+            <!-- END hideCategory_block -->
+            <!-- BEGIN showCategory_block -->
+            <a href="{showCatLink}">[l]Show[/l]</a>&nbsp;&nbsp;
+            <!-- END showCategory_block -->
+            <!-- BEGIN categoryAdminOps_block -->
+                <a href="{addSubCatLink}">[l]Add subcategory[/l]</a>&nbsp;&nbsp;
+                <a href="{editCatLink}">[l]Edit[/l]</a>&nbsp;&nbsp;
+                <!-- 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('&nbsp;&nbsp;&nbsp;&nbsp;', $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.

[Sciret-svn] SF.net SVN: sciret: [484] branches/release-candidates/sciret-1.2

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.

[Sciret-svn] SF.net SVN: sciret: [483] branches/release-candidates/sciret-1.2

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.

[Sciret-svn] SF.net SVN: sciret: [481] branches/release-candidates/sciret-1.2/images/ question.png

From: <al...@us...> - 2007-08-13 01:53:56

Revision: 481
          http://sciret.svn.sourceforge.net/sciret/?rev=481&view=rev
Author:   alpeb
Date:     2007-08-12 18:53:55 -0700 (Sun, 12 Aug 2007)

Log Message:
-----------


Added Paths:
-----------
    branches/release-candidates/sciret-1.2/images/question.png

Added: branches/release-candidates/sciret-1.2/images/question.png
===================================================================
(Binary files differ)


Property changes on: branches/release-candidates/sciret-1.2/images/question.png
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Sciret-svn] SF.net SVN: sciret: [480] branches/release-candidates/sciret-1.2

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>&nbsp;&nbsp;{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.

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 10 11 12 13 > >> (Page 12 of 13)

2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (58)	Sep (44)	Oct (7)	Nov (4)	Dec
2008	Jan (3)	Feb	Mar	Apr	May	Jun	Jul (15)	Aug (55)	Sep (48)	Oct (56)	Nov (14)	Dec