gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.17' into develop

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Uwe Steinmann 2015-03-30 16:40:24 +02:00
commit 72c3207a75
31 changed files with 381 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -1,3 +1,12 @@
--------------------------------------------------------------------------------
Changes in version 4.3.17
--------------------------------------------------------------------------------
- when adding a document, notifications can be specified
- send mail to those users and groups next in the workflow after adding
a document or a new version (previously mails were only send when a
transition was triggered)
- clean workflow log when deleting a document version.
--------------------------------------------------------------------------------
Changes in version 4.3.16
--------------------------------------------------------------------------------

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION=4.3.16
VERSION=4.3.17
SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
# webapp

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -295,7 +295,7 @@ class SeedDMS_Core_DMS {
$this->classnames['group'] = 'SeedDMS_Core_Group';
$this->version = '@package_version@';
if($this->version[0] == '@')
$this->version = '4.3.16';
$this->version = '4.3.17';
} /* }}} */
/**

6
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -1519,6 +1519,12 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
return false;
}
$queryStr = "DELETE FROM `tblWorkflowLog` WHERE `document` = '". $this->getID() ."' AND `version` = '" . $version->_version."'";
if (!$db->getResult($queryStr)) {
$db->rollbackTransaction();
return false;
}
$db->commitTransaction();
return true;
} /* }}} */

24
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2015-03-20</date>
<date>2015-03-27</date>
<time>08:02:04</time>
<version>
<release>4.3.16</release>
<api>4.3.16</api>
<release>4.3.17</release>
<api>4.3.17</api>
</version>
<stability>
<release>stable</release>
@ -24,7 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
no changes
clean workflow log when a document version was deleted
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -799,5 +799,21 @@ new release
users returned by SeedDMS_Core_DMS::getAllUsers() have language and theme set again
</notes>
</release>
<release>
<date>2015-03-20</date>
<time>08:02:04</time>
<version>
<release>4.3.16</release>
<api>4.3.16</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
no changes
</notes>
</release>
</changelog>
</package>

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version {
public $_number = "4.3.16";
public $_number = "4.3.17";
private $_string = "SeedDMS";
function SeedDMS_Version() {

2
install/install.php
View File

@ -119,7 +119,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
* Load default settings + set
*/
define("SEEDDMS_INSTALL", "on");
define("SEEDDMS_VERSION", "4.3.16");
define("SEEDDMS_VERSION", "4.3.17");
require_once('../inc/inc.ClassSettings.php');

3
languages/ar_EG/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'ادخال موافقة',
'add_document' => 'إضافة مستند',
'add_document_link' => 'إضافة رابط',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم تعيين مراجع او موافق للمستند',
'add_doc_workflow_warning' => 'ملاحظة : يتم اعتبار المستندات نهائية اذا لم يتم اختيار مسار عمل للمستند',
'add_event' => 'إضافة حدث',
@ -773,8 +774,10 @@ URL: [url]',
'select_category' => 'اضغط لاختيار قسم',
'select_groups' => 'اضغط لاختيار مجموعة',
'select_grp_approvers' => 'اضغط لاختيار مجموعة الموافقون',
'select_grp_notification' => '',
'select_grp_reviewers' => 'اضغط لاختيار مجموعة المراجعون',
'select_ind_approvers' => 'اضغط لاختيار موافق فردي',
'select_ind_notification' => '',
'select_ind_reviewers' => 'اضغط لاختيار مراجع فردي',
'select_one' => 'اختر واحد',
'select_users' => 'اضغط لاختيار المستخدم',

3
languages/bg_BG/lang.inc
View File

@ -47,6 +47,7 @@ $text = array(
'add_approval' => 'Утвърди',
'add_document' => 'Добави документ',
'add_document_link' => 'Добави препратка',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Документът получава статус ДОСТЪПЕН автоматично ако няма нито рецензент нито утвърждаващ',
'add_doc_workflow_warning' => 'N.B. Документът автоматично семаркира като освободен ако не се работи по него.',
'add_event' => 'Добави събитие',
@ -638,8 +639,10 @@ $text = array(
'select_category' => '',
'select_groups' => 'Кликни да избереш групи',
'select_grp_approvers' => 'Кликни да избереш група утвърждаващи',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Кликни да избереш група рецензенти',
'select_ind_approvers' => 'Кликни да избереш утвърждаващ',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Кликни да избереш рецензент',
'select_one' => 'Избери един',
'select_users' => 'Кликни да избереш потребители',

11
languages/ca_ES/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (651)
// Translators: Admin (654)
$text = array(
'accept' => 'Acceptar',
@ -47,6 +47,7 @@ $text = array(
'add_approval' => 'Enviar aprovació',
'add_document' => 'Afegir document',
'add_document_link' => 'Afegir vincle',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Els documents N.B. es marquen automàticament com a publicats si no hi ha revisors o aprovadors assignats',
'add_doc_workflow_warning' => '',
'add_event' => 'Afegir esdeveniment',
@ -179,7 +180,7 @@ URL: [url]',
'choose_workflow_state' => '',
'clear_clipboard' => '',
'clipboard' => '',
'close' => '',
'close' => 'Tancar',
'comment' => 'Comentaris',
'comment_changed_email' => '',
'comment_for_current_version' => 'Comentari de la versió actual',
@ -208,7 +209,7 @@ URL: [url]',
'current_version' => 'Versió actual',
'daily' => 'Daily',
'databasesearch' => 'Database search',
'date' => '',
'date' => 'Data',
'days' => '',
'december' => 'Desembre',
'default_access' => 'Mode d\'accés predeterminat',
@ -363,7 +364,7 @@ URL: [url]',
'hours' => '',
'human_readable' => 'Arxiu llegible per humans',
'hu_HU' => '',
'id' => '',
'id' => 'ID',
'identical_version' => '',
'include_documents' => 'Incloure documents',
'include_subdirectories' => 'Incloure subdirectoris',
@ -643,8 +644,10 @@ URL: [url]',
'select_category' => '',
'select_groups' => '',
'select_grp_approvers' => '',
'select_grp_notification' => '',
'select_grp_reviewers' => '',
'select_ind_approvers' => '',
'select_ind_notification' => '',
'select_ind_reviewers' => '',
'select_one' => 'Seleccionar un',
'select_users' => '',

7
languages/cs_CZ/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (678), kreml (455)
// Translators: Admin (679), kreml (455)
$text = array(
'accept' => 'Přijmout',
@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Poslat ke schválení',
'add_document' => 'Přidat dokument',
'add_document_link' => 'Přidat odkaz',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Pozn.: Dokumenty se automaticky označí jako vydané, když není přidělen žádný kontrolor nebo schvalovatel.',
'add_doc_workflow_warning' => 'Pozn. Není-li zadán pracovní postup, jsou dokumenty automaticky označeny jako uvolněné.',
'add_event' => 'Přidat akci',
@ -150,7 +151,7 @@ URL: [url]',
'backup_remove' => 'Odstranit soubor zálohy',
'backup_tools' => 'Nástroje pro zálohování',
'between' => 'mezi',
'bg_BG' => '',
'bg_BG' => 'Bulharsky',
'browse' => 'Prohlížet',
'calendar' => 'Kalendář',
'calendar_week' => 'Kaledářní týden',
@ -782,8 +783,10 @@ URL: [url]',
'select_category' => 'Kliknutím vyberte kategorii',
'select_groups' => 'Kliknutím vyberte skupiny',
'select_grp_approvers' => 'Kliknutím vyberte skupinu schvalovatele',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Kliknutím vyberte skupinu posuzovatele',
'select_ind_approvers' => 'Kliknutím vyberte jednotlivého schvalovatele',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Klepnutím vyberte jednotlivého posuzovatele',
'select_one' => 'Vyberte jeden',
'select_users' => 'Kliknutím vyberte uživatele',

5
languages/de_DE/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (1955), dgrutsch (18)
// Translators: Admin (1959), dgrutsch (18)
$text = array(
'accept' => 'Übernehmen',
@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Freigabe hinzufügen',
'add_document' => 'Dokument anlegen',
'add_document_link' => 'Verweis hinzufügen',
'add_document_notify' => 'Beobachter zuweisen',
'add_doc_reviewer_approver_warning' => 'Anmerkung: Dokumente werden automatisch geprüft und als freigegeben markiert, wenn kein Prüfer oder keine Freigabe zugewiesen wird.',
'add_doc_workflow_warning' => 'Anmerkung: Dokumente werden automatisch freigegeben, wenn kein Workflow gewählt wird.',
'add_event' => 'Ereignis hinzufügen',
@ -802,8 +803,10 @@ URL: [url]',
'select_category' => 'Klicken zur Auswahl einer Kategorie',
'select_groups' => 'Klicken zur Auswahl einer Gruppe',
'select_grp_approvers' => 'Klicken zur Auswahl einer Freigabegruppe',
'select_grp_notification' => 'Klicken zur Auswahl einer Beobachtergruppe',
'select_grp_reviewers' => 'Klicken zur Auswahl einer Prüfgruppe',
'select_ind_approvers' => 'Klicken zur Auswahl eines Freigebers',
'select_ind_notification' => 'Klicken zur Auswahl eines Beobachters',
'select_ind_reviewers' => 'Klicken zur Auswahl eines Prüfers',
'select_one' => 'Bitte wählen',
'select_users' => 'Klicken zur Auswahl eines Benutzers',

5
languages/en_GB/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (1081), dgrutsch (3), netixw (14)
// Translators: Admin (1084), dgrutsch (3), netixw (14)
$text = array(
'accept' => 'Accept',
@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Add approval',
'add_document' => 'Add document',
'add_document_link' => 'Add link',
'add_document_notify' => 'Assign notification',
'add_doc_reviewer_approver_warning' => 'N.B. Documents are automatically marked as released if no reviewer or approver is assigned.',
'add_doc_workflow_warning' => 'N.B. Documents are automatically marked as released if no workflow is assigned.',
'add_event' => 'Add event',
@ -809,8 +810,10 @@ URL: [url]',
'select_category' => 'Click to select category',
'select_groups' => 'Click to select groups',
'select_grp_approvers' => 'Click to select group approver',
'select_grp_notification' => 'Click to select a group notification',
'select_grp_reviewers' => 'Click to select group reviewer',
'select_ind_approvers' => 'Click to select individual approver',
'select_ind_notification' => 'Click to select individual notification',
'select_ind_reviewers' => 'Click to select individual reviewer',
'select_one' => 'Select one',
'select_users' => 'Click to select users',

7
languages/es_ES/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (934), angel (123), francisco (2), jaimem (14)
// Translators: Admin (935), angel (123), francisco (2), jaimem (14)
$text = array(
'accept' => 'Aceptar',
@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Enviar aprobación',
'add_document' => 'Añadir documento',
'add_document_link' => 'Añadir vínculo',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Documentos N.B. se marcan automáticamente como publicados si no hay revisores o aprobadores asignados.',
'add_doc_workflow_warning' => 'Documentos N.B. se marcan automáticamente como publicados si no hay flujo de trabajo asignado.',
'add_event' => 'Añadir evento',
@ -150,7 +151,7 @@ URL: [url]',
'backup_remove' => 'Eliminar fichero de copia de seguridad',
'backup_tools' => 'Herramientas de copia de seguridad',
'between' => 'entre',
'bg_BG' => '',
'bg_BG' => 'Búlgaro',
'browse' => 'Listar',
'calendar' => 'Calendario',
'calendar_week' => 'Calendario semanal',
@ -788,8 +789,10 @@ URL: [url]',
'select_category' => 'Haga Click para seleccionar categoría',
'select_groups' => 'Haga Click para seleccionar grupos',
'select_grp_approvers' => 'Haga Click para seleccionar grupo de aprobadores',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Haga Click para seleccionar grupo de revisores',
'select_ind_approvers' => 'Haga Click para seleccionar aprobador individual',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Haga Click para seleccionar revisor individual',
'select_one' => 'Seleccionar uno',
'select_users' => 'Haga Click para seleccionar usuarios',

3
languages/fr_FR/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Soumettre approbation',
'add_document' => 'Ajouter un document',
'add_document_link' => 'Ajouter un lien',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si il n\'y a pas de correcteur ou d\'approbateur désigné.',
'add_doc_workflow_warning' => 'N.B. Les documents sont automatiquement marqués comme publiés si aucun workflow est désigné.',
'add_event' => 'Ajouter un événement',
@ -764,8 +765,10 @@ URL: [url]',
'select_category' => 'Cliquer pour choisir une catégorie',
'select_groups' => 'Cliquer pour choisir un groupe',
'select_grp_approvers' => 'Cliquer pour choisir un groupe d\'approbateur',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Cliquer pour choisir un groupe de correcteur',
'select_ind_approvers' => 'Cliquer pour choisir un approbateur individuel',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Cliquer pour choisir un correcteur individuel',
'select_one' => 'Selectionner',
'select_users' => 'Cliquer pour choisir un utilisateur',

3
languages/hu_HU/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Jóváhagyás küldése',
'add_document' => 'Dokumentum hozzáadása',
'add_document_link' => 'Hivatkozás hozzáadása',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'A dokumentumok automatikusan kiadásra lesznek jelölve, ha nincs hozzájuk rendelve felülvizsgáló vagy elfogadó.',
'add_doc_workflow_warning' => 'A dokumentumok automatikusan kiadásra lesznek jelölve, ha nincs hozzájuk rendelve munkafolyamat.',
'add_event' => 'Esemény hozzáadása',
@ -787,8 +788,10 @@ URL: [url]',
'select_category' => 'Kattintson a kategória kiválasztásához',
'select_groups' => 'Kattintson a csoportok kijelöléséhez',
'select_grp_approvers' => 'Kattintson a csoport jóváhagyó kijelöléséhez',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Kattintson a csoport felülvizsgáló kijelöléséhez',
'select_ind_approvers' => 'Kattintson az önálló jóváhagyó kijelöléséhez',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Kattintson az önálló felülvizsgáló kijelöléséhez',
'select_one' => 'Vßlasszon egyet',
'select_users' => 'Kattintson a felhasználó kiválasztásához',

3
languages/it_IT/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Invio approvazione',
'add_document' => 'Aggiungi documento',
'add_document_link' => 'Aggiungi collegamento',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato assegnato un revisore o un approvatore.',
'add_doc_workflow_warning' => 'Nota: i documenti saranno automaticamente contrassegnati come rilasciati se non è stato istituito un flusso di lavoro.',
'add_event' => 'Aggiungi un evento',
@ -810,8 +811,10 @@ URL: [url]',
'select_category' => 'Clicca per selezionare la categoria',
'select_groups' => 'Clicca per selezionare i gruppi',
'select_grp_approvers' => 'Seleziona gruppo approvatore',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Seleziona gruppo revisore',
'select_ind_approvers' => 'Seleziona approvatore',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Seleziona revisore',
'select_one' => 'Seleziona uno',
'select_users' => 'Clicca per selezionare gli utenti',

3
languages/nl_NL/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Verzend [Goedkeuring]',
'add_document' => 'Document toevoegen',
'add_document_link' => 'Link toevoegen',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'N.B. Documenten zijn automatisch gemarkeeerd als [Gepubliceerd] als geen [Autoriseerder] of [Controleur] is toegewezen.',
'add_doc_workflow_warning' => 'N.B. Documenten worden automatisch gemarkeerd als vrijgegeven, indien er geen workflow is toegewezen.',
'add_event' => 'Activiteit toevoegen',
@ -779,8 +780,10 @@ URL: [url]',
'select_category' => 'klik om categorie te selecteren',
'select_groups' => 'Klik om groep te selecteren',
'select_grp_approvers' => 'Klik om groep beoordelaar te selecteren',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Klik om groep beoordelaar te selecteren',
'select_ind_approvers' => 'Klik om individuele beoordelaar te selecteren',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Klik om individuele beoordelaar te selecteren',
'select_one' => 'Selecteer een',
'select_users' => 'Klik om gebruikers te selecteren',

17
languages/pl_PL/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (700), netixw (84), romi (93), uGn (112)
// Translators: Admin (706), netixw (84), romi (93), uGn (112)
$text = array(
'accept' => 'Akceptuj',
@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Zaakceptuj',
'add_document' => 'Dodaj dokument',
'add_document_link' => 'Dodaj link',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Nota Bene. Dokumenty są automatycznie oznaczane jako wydane, jeśli recenzent lub zatwierdzający nie jest przypisany.',
'add_doc_workflow_warning' => 'Dokumenty zostaną automatycznie opublikowane jeżeli nie zostanie przypisany żaden proces.',
'add_event' => 'Dodaj zdarzenie',
@ -80,7 +81,7 @@ URL: [url]',
'approval_deletion_email_body' => '',
'approval_deletion_email_subject' => '',
'approval_group' => 'Grupa akceptująca',
'approval_log' => '',
'approval_log' => 'Zatwierdź log',
'approval_request_email' => 'Prośba o akceptację',
'approval_request_email_body' => 'Prośba o zatwierdzenie
Dokument: [name]
@ -134,7 +135,7 @@ URL: [url]',
'attr_no_regex_match' => 'Wartość atrybutu nie pasuje do wyrażenia regularnego',
'at_least_n_users_of_group' => 'Przynajmniej [number_of_users] użytkowników grupy [group]',
'august' => 'Sierpień',
'authentication' => '',
'authentication' => 'Autoryzacja',
'author' => '',
'automatic_status_update' => 'Automatyczna zmiana statusu',
'back' => 'Powrót',
@ -143,7 +144,7 @@ URL: [url]',
'backup_remove' => 'Usuń plik backupu',
'backup_tools' => 'Narzędzia kopii zapasowej',
'between' => 'między',
'bg_BG' => '',
'bg_BG' => 'Bułgarski',
'browse' => 'Przeglądaj',
'calendar' => 'Kalendarz',
'calendar_week' => 'Kalendarz tygodniowy',
@ -229,7 +230,7 @@ URL: [url]',
'details_version' => 'Szczegóły dla wersji: [version]',
'de_DE' => 'niemiecki',
'disclaimer' => 'To jest zastrzeżona strefa. Dostęp do niej ma wyłącznie wyznaczony personel. Wszelkie naruszenia będą ścigane zgodnie z prawem krajowym i międzynarodowym.',
'discspace' => '',
'discspace' => 'Miejsce na dysku',
'document' => 'Dokument',
'documents' => 'Dokumenty',
'documents_in_process' => 'Dokumenty procesowane',
@ -486,7 +487,7 @@ URL: [url]',
'keywords' => 'Słowa kluczowe',
'keyword_exists' => 'Słowo kluczowe już istnieje',
'language' => 'Język',
'lastaccess' => '',
'lastaccess' => 'Ostatni dostęp',
'last_update' => 'Ostatnia aktualizacja',
'legend' => 'Legenda',
'linked_documents' => 'Powiązane dokumenty',
@ -697,7 +698,7 @@ URL: [url]',
'review_deletion_email_body' => '',
'review_deletion_email_subject' => '',
'review_group' => 'Grupa recenzentów',
'review_log' => '',
'review_log' => 'Zobacz log',
'review_request_email' => 'Prośba i recenzję',
'review_request_email_body' => '',
'review_request_email_subject' => '',
@ -767,8 +768,10 @@ URL: [url]',
'select_category' => 'Kliknij by wybrać kategorię',
'select_groups' => 'Kliknij by wybrać grupy',
'select_grp_approvers' => 'Kliknij by wybrać grupę zatwierdzającą',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów',
'select_ind_approvers' => 'Kliknij by wybrać zatwierdzającego',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
'select_one' => 'Wybierz',
'select_users' => 'Kliknij by wybrać użytkowników',

9
languages/pt_BR/lang.inc
View File

@ -19,7 +19,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Translators: Admin (875), flaviove (627), lfcristofoli (352)
// Translators: Admin (877), flaviove (627), lfcristofoli (352)
$text = array(
'accept' => 'Aceitar',
@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => '',
'add_document' => 'Novo documento',
'add_document_link' => 'Adicionar link',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'N.B. Documents are automatically marked as released if no reviewer or approver is assigned.',
'add_doc_workflow_warning' => 'N.B. Os documentos são automaticamente marcados como liberados se nenhum fluxo de trabalho é atribuído.',
'add_event' => 'Add event',
@ -150,7 +151,7 @@ URL: [url]',
'backup_remove' => 'Remove backup file',
'backup_tools' => 'Ferramentas de backup',
'between' => 'entre',
'bg_BG' => '',
'bg_BG' => 'Bulgaro',
'browse' => 'Procurar',
'calendar' => 'Calendario',
'calendar_week' => 'Calendário semanal',
@ -785,8 +786,10 @@ URL: [url]',
'select_category' => 'Clique para selecionar a categoria',
'select_groups' => 'Clique para selecionar os grupos',
'select_grp_approvers' => 'Clique para selecionar o grupo aprovador',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Clique para selecionar o grupo revisor',
'select_ind_approvers' => 'Clique para selecionar aprovador indivídual',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Clique para selecionar revisor individual',
'select_one' => 'Selecione um',
'select_users' => 'Clique para selecionar os usuários',
@ -1124,7 +1127,7 @@ User: [username]
URL: [url]',
'transition_triggered_email_subject' => '[sitename]: [name] - Transição de fluxo de trabalho desencadeado',
'trigger_workflow' => 'Fluxo de trabalho',
'tr_TR' => '',
'tr_TR' => 'Turco',
'tuesday' => 'Tuesday',
'tuesday_abbr' => 'Tu',
'type_to_search' => 'Tipo de pesquisa',

3
languages/ro_RO/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Trimite aprobare',
'add_document' => 'Adaugă document',
'add_document_link' => 'Adauga link',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'N.B. Documentele care nu au atasat revizuitori(reviwers) și/sau aprobatori sunt automat marcate ca "final(released)".',
'add_doc_workflow_warning' => 'N.B. Documentele care nu au atasat un workflow sunt automat marcate ca final(released)".',
'add_event' => 'Adaugă eveniment',
@ -788,8 +789,10 @@ URL: [url]',
'select_category' => 'Click pentru a selecta categoria',
'select_groups' => 'Click pentru a selecta grupuri',
'select_grp_approvers' => 'Click pentru a selecta grupul de aprobatori',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Click pentru a selecta grupul de revizuitori',
'select_ind_approvers' => 'Click pentru a selecta un aprobator individual',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Click pentru a selecta un revizuitor individual',
'select_one' => 'Selectați unul',
'select_users' => 'Click pentru a selecta utilizatori',

3
languages/ru_RU/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Утвердить',
'add_document' => 'Добавить документ',
'add_document_link' => 'Добавить ссылку',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Документ получает статус <b>утверждён</b> автоматически, если не назначены ни рецензент, ни утверждающий.',
'add_doc_workflow_warning' => '<b>Примечание:</b> документы утверждаются автоматически, если им не назначен процесс.',
'add_event' => 'Добавить событие',
@ -778,8 +779,10 @@ URL: [url]',
'select_category' => 'Выберите категорию',
'select_groups' => 'Выберите группы',
'select_grp_approvers' => 'Выберите утверждающую группу',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Выберите рецензирующую группу',
'select_ind_approvers' => 'Выберите индивидуального утверждающего',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Выберите индивидуального рецензента',
'select_one' => 'Выберите',
'select_users' => 'Выберите пользователей',

3
languages/sk_SK/lang.inc
View File

@ -47,6 +47,7 @@ $text = array(
'add_approval' => 'Poslať schválenie',
'add_document' => 'Pridať dokument',
'add_document_link' => 'Pridať odkaz',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'Pozn.: Dokumenty sa automaticky označia ako vydané ak nie je pridelený žiadny kontrolór alebo schvaľovateľ.',
'add_doc_workflow_warning' => '',
'add_event' => 'Pridať udalosť',
@ -638,8 +639,10 @@ $text = array(
'select_category' => '',
'select_groups' => '',
'select_grp_approvers' => '',
'select_grp_notification' => '',
'select_grp_reviewers' => '',
'select_ind_approvers' => '',
'select_ind_notification' => '',
'select_ind_reviewers' => '',
'select_one' => 'Vyberte jeden',
'select_users' => '',

3
languages/sv_SE/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => 'Skicka godkännande',
'add_document' => 'Lägg till dokument',
'add_document_link' => 'Lägg till länkat dokument',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'OBS! Dokumentet kommer automatiskt att markeras klart för användning, om ingen person anges för granskning eller godkännande av dokumentet.',
'add_doc_workflow_warning' => 'OBS! Dokumentet kommer automatiskt att markeras klart för användning, om inget arbetsflöde anges.',
'add_event' => 'Lägg till händelse',
@ -773,8 +774,10 @@ URL: [url]',
'select_category' => 'Klicka för att välja en kategori',
'select_groups' => 'Välj grupper',
'select_grp_approvers' => 'Välj en grupp som ska godkänna',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Välj en grupp som ska granska',
'select_ind_approvers' => 'Välj en person som ska godkänna',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Välj en person som ska granska',
'select_one' => 'Välj',
'select_users' => 'Välj användare',

3
languages/tr_TR/lang.inc
View File

@ -50,6 +50,7 @@ URL: [url]',
'add_approval' => 'Onay ver',
'add_document' => 'Doküman ekle',
'add_document_link' => 'Link ekle',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => 'NOT: Dokümanlara onay veren veya gözden geçiren kimse atanmamışsa otomatik olarak yayınlanırlar.',
'add_doc_workflow_warning' => 'NOT: Dokümanlara iş akışı atanmamışsa otomatik olarak yayınlanırlar.',
'add_event' => 'Etkinlik ekle',
@ -789,8 +790,10 @@ URL: [url]',
'select_category' => 'Kategori seçmek için tıklayın',
'select_groups' => 'Grup seçmek için tıklayın',
'select_grp_approvers' => 'Grup onaylayıcı seçmek için tıklayın',
'select_grp_notification' => '',
'select_grp_reviewers' => 'Grup kontrol edeni seçmek için tıklayın',
'select_ind_approvers' => 'Bireysel onaylanı seçmek için tıklayın',
'select_ind_notification' => '',
'select_ind_reviewers' => 'Biresysel kontrol edeni seçmek için tıklayın',
'select_one' => 'Birini seçiniz',
'select_users' => 'Kullanıcı seçmek için tıklayın',

3
languages/zh_CN/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => '提交审核',
'add_document' => '添加文档',
'add_document_link' => '添加链接',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => '备注:如果没有指派校对人或审核人那么文档将被自动标注为发布',
'add_doc_workflow_warning' => '',
'add_event' => '添加事件',
@ -644,8 +645,10 @@ URL: [url]',
'select_category' => '选中分类',
'select_groups' => '点击选择组',
'select_grp_approvers' => '',
'select_grp_notification' => '',
'select_grp_reviewers' => '',
'select_ind_approvers' => '',
'select_ind_notification' => '',
'select_ind_reviewers' => '',
'select_one' => '选择一个',
'select_users' => '点击选择用户',

3
languages/zh_TW/lang.inc
View File

@ -51,6 +51,7 @@ URL: [url]',
'add_approval' => '提交審核',
'add_document' => '添加文檔',
'add_document_link' => '添加連結',
'add_document_notify' => '',
'add_doc_reviewer_approver_warning' => '備註:如果沒有指派校對人或審核人那麼文檔將被自動標注為發佈',
'add_doc_workflow_warning' => '',
'add_event' => '添加事件',
@ -642,8 +643,10 @@ URL: [url]',
'select_category' => '選中分類',
'select_groups' => '點擊選擇組',
'select_grp_approvers' => '',
'select_grp_notification' => '',
'select_grp_reviewers' => '',
'select_ind_approvers' => '',
'select_ind_notification' => '',
'select_ind_reviewers' => '',
'select_one' => '選擇一個',
'select_users' => '點擊選擇用戶',

184
op/op.AddDocument.php
View File

@ -138,79 +138,84 @@ $reviewers["i"] = array();
$reviewers["g"] = array();
$approvers["i"] = array();
$approvers["g"] = array();
$workflow = null;
// Retrieve the list of individual reviewers from the form.
if (isset($_POST["indReviewers"])) {
foreach ($_POST["indReviewers"] as $ind) {
$reviewers["i"][] = $ind;
}
}
// Retrieve the list of reviewer groups from the form.
if (isset($_POST["grpReviewers"])) {
foreach ($_POST["grpReviewers"] as $grp) {
$reviewers["g"][] = $grp;
}
}
// Retrieve the list of individual approvers from the form.
if (isset($_POST["indApprovers"])) {
foreach ($_POST["indApprovers"] as $ind) {
$approvers["i"][] = $ind;
}
}
// Retrieve the list of approver groups from the form.
if (isset($_POST["grpApprovers"])) {
foreach ($_POST["grpApprovers"] as $grp) {
$approvers["g"][] = $grp;
}
}
// add mandatory reviewers/approvers
$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
$res=$user->getMandatoryReviewers();
foreach ($res as $r){
if ($r['reviewerUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['reviewerUserID']){
$reviewers["i"][] = $r['reviewerUserID'];
break;
if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
if($settings->_workflowMode == 'traditional') {
// Retrieve the list of individual reviewers from the form.
if (isset($_POST["indReviewers"])) {
foreach ($_POST["indReviewers"] as $ind) {
$reviewers["i"][] = $ind;
}
}
else if ($r['reviewerGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['reviewerGroupID']){
$reviewers["g"][] = $r['reviewerGroupID'];
break;
}
// Retrieve the list of reviewer groups from the form.
if (isset($_POST["grpReviewers"])) {
foreach ($_POST["grpReviewers"] as $grp) {
$reviewers["g"][] = $grp;
}
}
}
// Retrieve the list of individual approvers from the form.
if (isset($_POST["indApprovers"])) {
foreach ($_POST["indApprovers"] as $ind) {
$approvers["i"][] = $ind;
}
}
// Retrieve the list of approver groups from the form.
if (isset($_POST["grpApprovers"])) {
foreach ($_POST["grpApprovers"] as $grp) {
$approvers["g"][] = $grp;
}
}
// add mandatory reviewers/approvers
$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
if($settings->_workflowMode == 'traditional') {
$res=$user->getMandatoryReviewers();
foreach ($res as $r){
if ($r['reviewerUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['reviewerUserID']){
$reviewers["i"][] = $r['reviewerUserID'];
break;
}
}
else if ($r['reviewerGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['reviewerGroupID']){
$reviewers["g"][] = $r['reviewerGroupID'];
break;
}
}
}
}
$res=$user->getMandatoryApprovers();
foreach ($res as $r){
if ($r['approverUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['approverUserID']){
$approvers["i"][] = $r['approverUserID'];
break;
}
}
else if ($r['approverGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['approverGroupID']){
$approvers["g"][] = $r['approverGroupID'];
break;
}
}
}
} elseif($settings->_workflowMode == 'advanced') {
if(!$workflow = $user->getMandatoryWorkflow()) {
if(isset($_POST["workflow"]))
$workflow = $dms->getWorkflow($_POST["workflow"]);
else
$workflow = null;
}
}
$res=$user->getMandatoryApprovers();
foreach ($res as $r){
if ($r['approverUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['approverUserID']){
$approvers["i"][] = $r['approverUserID'];
break;
}
}
else if ($r['approverGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['approverGroupID']){
$approvers["g"][] = $r['approverGroupID'];
break;
}
}
}
if(!$workflow = $user->getMandatoryWorkflow()) {
if(isset($_POST["workflow"]))
$workflow = $dms->getWorkflow($_POST["workflow"]);
else
$workflow = null;
}
if($settings->_dropFolderDir) {
if(isset($_POST["dropfolderfileform1"]) && $_POST["dropfolderfileform1"]) {
@ -309,6 +314,26 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
if($settings->_enableOwnerNotification) {
$res = $document->addNotify($user->getID(), true);
}
/* Check if additional notification shall be added */
if($_POST['notification_users']) {
foreach($_POST['notification_users'] as $notuserid) {
$notuser = $dms->getUser($notuserid);
if($notuser) {
if($document->getAccessMode($user) >= M_READ)
$res = $document->addNotify($notuserid, true);
}
}
}
if($_POST['notification_groups']) {
foreach($_POST['notification_groups'] as $notgroupid) {
$notgroup = $dms->getGroup($notgroupid);
if($notgroup) {
if($document->getGroupAccessMode($notgroup) >= M_READ)
$res = $document->addNotify($notgroupid, false);
}
}
}
// Send notification to subscribers of folder.
if($notifier) {
$notifyList = $folder->getNotifyList();
@ -345,6 +370,29 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
$notifier->toGroup($user, $grp, $subject, $message, $params);
}
if($workflow && $settings->_enableNotificationWorkflow) {
$subject = "request_workflow_action_email_subject";
$message = "request_workflow_action_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $reqversion;
$params['workflow'] = $workflow->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['current_state'] = $workflow->getInitState()->getName();
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
foreach($ntransition->getUsers() as $tuser) {
$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
}
foreach($ntransition->getGroups() as $tuser) {
$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
}
}
}
}
}

202
op/op.UpdateDocument.php
View File

@ -103,78 +103,94 @@ if ($_FILES['userfile']['error'] == 0) {
// Get the list of reviewers and approvers for this document.
$reviewers = array();
$approvers = array();
// Retrieve the list of individual reviewers from the form.
$reviewers["i"] = array();
if (isset($_POST["indReviewers"])) {
foreach ($_POST["indReviewers"] as $ind) {
$reviewers["i"][] = $ind;
}
}
// Retrieve the list of reviewer groups from the form.
$reviewers["g"] = array();
if (isset($_POST["grpReviewers"])) {
foreach ($_POST["grpReviewers"] as $grp) {
$reviewers["g"][] = $grp;
}
}
// Retrieve the list of individual approvers from the form.
$approvers["i"] = array();
if (isset($_POST["indApprovers"])) {
foreach ($_POST["indApprovers"] as $ind) {
$approvers["i"][] = $ind;
}
}
// Retrieve the list of approver groups from the form.
$approvers["g"] = array();
if (isset($_POST["grpApprovers"])) {
foreach ($_POST["grpApprovers"] as $grp) {
$approvers["g"][] = $grp;
$workflow = null;
if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') {
if($settings->_workflowMode == 'traditional') {
// Retrieve the list of individual reviewers from the form.
$reviewers["i"] = array();
if (isset($_POST["indReviewers"])) {
foreach ($_POST["indReviewers"] as $ind) {
$reviewers["i"][] = $ind;
}
}
// Retrieve the list of reviewer groups from the form.
$reviewers["g"] = array();
if (isset($_POST["grpReviewers"])) {
foreach ($_POST["grpReviewers"] as $grp) {
$reviewers["g"][] = $grp;
}
}
}
// Retrieve the list of individual approvers from the form.
$approvers["i"] = array();
if (isset($_POST["indApprovers"])) {
foreach ($_POST["indApprovers"] as $ind) {
$approvers["i"][] = $ind;
}
}
// Retrieve the list of approver groups from the form.
$approvers["g"] = array();
if (isset($_POST["grpApprovers"])) {
foreach ($_POST["grpApprovers"] as $grp) {
$approvers["g"][] = $grp;
}
}
// add mandatory reviewers/approvers
$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
if($settings->_workflowMode == 'traditional') {
$res=$user->getMandatoryReviewers();
foreach ($res as $r){
if ($r['reviewerUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['reviewerUserID']){
$reviewers["i"][] = $r['reviewerUserID'];
break;
}
}
else if ($r['reviewerGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['reviewerGroupID']){
$reviewers["g"][] = $r['reviewerGroupID'];
break;
}
}
}
}
$res=$user->getMandatoryApprovers();
foreach ($res as $r){
if ($r['approverUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['approverUserID']){
$approvers["i"][] = $r['approverUserID'];
break;
}
}
else if ($r['approverGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['approverGroupID']){
$approvers["g"][] = $r['approverGroupID'];
break;
}
}
}
} elseif($settings->_workflowMode == 'advanced') {
if(!$workflow = $user->getMandatoryWorkflow()) {
if(isset($_POST["workflow"]))
$workflow = $dms->getWorkflow($_POST["workflow"]);
else
$workflow = null;
}
}
// add mandatory reviewers/approvers
$docAccess = $folder->getReadAccessList($settings->_enableAdminRevApp, $settings->_enableOwnerRevApp);
$res=$user->getMandatoryReviewers();
foreach ($res as $r){
if ($r['reviewerUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['reviewerUserID']){
$reviewers["i"][] = $r['reviewerUserID'];
break;
}
}
else if ($r['reviewerGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['reviewerGroupID']){
$reviewers["g"][] = $r['reviewerGroupID'];
break;
}
}
}
$res=$user->getMandatoryApprovers();
foreach ($res as $r){
if ($r['approverUserID']!=0){
foreach ($docAccess["users"] as $usr)
if ($usr->getID()==$r['approverUserID']){
$approvers["i"][] = $r['approverUserID'];
break;
}
}
else if ($r['approverGroupID']!=0){
foreach ($docAccess["groups"] as $grp)
if ($grp->getID()==$r['approverGroupID']){
$approvers["g"][] = $r['approverGroupID'];
break;
}
}
}
$workflow = $user->getMandatoryWorkflow();
if(isset($_POST["attributes"]) && $_POST["attributes"]) {
$attributes = $_POST["attributes"];
foreach($attributes as $attrdefid=>$attribute) {
@ -208,25 +224,7 @@ if ($_FILES['userfile']['error'] == 0) {
if ($notifier){
$notifyList = $document->getNotifyList();
$folder = $document->getFolder();
/*
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("document_updated_email");
$message = getMLText("document_updated_email")."\r\n";
$message .=
getMLText("document").": ".$document->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
foreach ($document->_notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
}
// if user is not owner send notification to owner
if ($user->getID()!= $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message);
*/
$subject = "document_updated_email_subject";
$message = "document_updated_email_body";
$params = array();
@ -246,6 +244,29 @@ if ($_FILES['userfile']['error'] == 0) {
if ($user->getID() != $document->getOwner()->getID())
$notifier->toIndividual($user, $document->getOwner(), $subject, $message, $params);
if($workflow && $settings->_enableNotificationWorkflow) {
$subject = "request_workflow_action_email_subject";
$message = "request_workflow_action_email_body";
$params = array();
$params['name'] = $document->getName();
$params['version'] = $contentResult->getContent()->getVersion();
$params['workflow'] = $workflow->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['current_state'] = $workflow->getInitState()->getName();
$params['username'] = $user->getFullName();
$params['sitename'] = $settings->_siteName;
$params['http_root'] = $settings->_httpRoot;
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
foreach($workflow->getNextTransitions($workflow->getInitState()) as $ntransition) {
foreach($ntransition->getUsers() as $tuser) {
$notifier->toIndividual($user, $tuser->getUser(), $subject, $message, $params);
}
foreach($ntransition->getGroups() as $tuser) {
$notifier->toGroup($user, $tuser->getGroup(), $subject, $message, $params);
}
}
}
}
$expires = false;
@ -263,21 +284,8 @@ if ($_FILES['userfile']['error'] == 0) {
if($notifier) {
$notifyList = $document->getNotifyList();
$folder = $document->getFolder();
// Send notification to subscribers.
/*
$subject = "###SITENAME###: ".$document->getName()." - ".getMLText("expiry_changed_email");
$message = getMLText("expiry_changed_email")."\r\n";
$message .=
getMLText("document").": ".$document->getName()."\r\n".
getMLText("folder").": ".$folder->getFolderPathPlain()."\r\n".
getMLText("comment").": ".$document->getComment()."\r\n".
"URL: ###URL_PREFIX###out/out.ViewDocument.php?documentid=".$document->getID()."\r\n";
$notifier->toList($user, $document->_notifyList["users"], $subject, $message);
foreach ($document->_notifyList["groups"] as $grp) {
$notifier->toGroup($user, $grp, $subject, $message);
}
*/
// Send notification to subscribers.
$subject = "expiry_changed_email_subject";
$message = "expiry_changed_email_body";
$params = array();

2
out/out.AddDocument.php
View File

@ -48,7 +48,7 @@ if($settings->_quota > 0) {
}
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'strictformcheck'=>$settings->_strictFormCheck, 'enablelargefileupload'=>$settings->_enableLargeFileUpload, 'enableadminrevapp'=>$settings->_enableAdminRevApp, 'enableownerrevapp'=>$settings->_enableOwnerRevApp, 'enableselfrevapp'=>$settings->_enableSelfRevApp, 'dropfolderdir'=>$settings->_dropFolderDir, 'workflowmode'=>$settings->_workflowMode, 'presetexpiration'=>$settings->_presetExpirationDate, 'sortusersinlist'=>$settings->_sortUsersInList));
if($view) {
$view->show();
exit;

41
views/bootstrap/class.AddDocument.php
View File

@ -43,6 +43,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
$dropfolderdir = $this->params['dropfolderdir'];
$workflowmode = $this->params['workflowmode'];
$presetexpiration = $this->params['presetexpiration'];
$sortusersinlist = $this->params['sortusersinlist'];
$folderid = $folder->getId();
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
@ -489,10 +490,48 @@ $(document).ready(function() {
<td colspan="2">
<div class="alert"><?php printMLText("add_doc_reviewer_approver_warning")?></div>
</td>
</tr>
</tr>
<?php
}
?>
<tr>
<td>
<?php $this->contentSubHeading(getMLText("add_document_notify")); ?>
</td>
</tr>
<tr>
<td>
<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
</td>
<td>
<select class="chzn-select span9" name="notification_users[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_notification'); ?>">
<?php
$allUsers = $dms->getAllUsers($sortusersinlist);
foreach ($allUsers as $userObj) {
if (!$userObj->isGuest() && $folder->getAccessMode($userObj) >= M_READ)
print "<option value=\"".$userObj->getID()."\">" . htmlspecialchars($userObj->getLogin() . " - " . $userObj->getFullName()) . "\n";
}
?>
</select>
</td>
</tr>
<tr>
<td>
<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
</td>
<td>
<select class="chzn-select span9" name="notification_groups[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_notification'); ?>">
<?php
$allGroups = $dms->getAllGroups();
foreach ($allGroups as $groupObj) {
if ($folder->getGroupAccessMode($groupObj) >= M_READ)
print "<option value=\"".$groupObj->getID()."\">" . htmlspecialchars($groupObj->getName()) . "\n";
}
?>
</select>
</td>
</tr>
</table>
<p><input type="submit" class="btn" value="<?php printMLText("add_document");?>"></p>