Work in progress on roles. Implemented role delete.

diff --git a/WEB-INF/lib/ttRoleHelper.class.php b/WEB-INF/lib/ttRoleHelper.class.php
index 9abef9df89803823dc563a5e5e2181126c748369..62d2bafed8c42a805a157e7e893c2ca3689f3ddc 100644 (file)
--- a/WEB-INF/lib/ttRoleHelper.class.php
+++ b/WEB-INF/lib/ttRoleHelper.class.php
@@ -28,6 +28,40 @@
 
 // The ttRoleHelper is a class to help with custom group roles.
 class ttRoleHelper {
+
+  // get - gets details of a role identified by its id.
+  static function get($id)
+  {
+    global $user;
+
+    $mdb2 = getConnection();
+
+    $sql = "select id, name, description, rank, rights, status from tt_roles
+      where id = $id and team_id = $user->team_id and (status = 0 or status = 1)";
+    $res = $mdb2->query($sql);
+
+    if (!is_a($res, 'PEAR_Error')) {
+      $val = $res->fetchRow();
+         if ($val['id'] != '') {
+        return $val;
+      } else
+        return false;
+    }
+    return false;
+  }
+
+  // delete - marks the role as deleted.
+  static function delete($role_id) {
+    global $user;
+
+    $mdb2 = getConnection();
+
+    // Mark the task as deleted.
+    $sql = "update tt_roles set status = NULL where id = $role_id and team_id = $user->team_id";
+    $affected = $mdb2->exec($sql);
+    return (!is_a($affected, 'PEAR_Error'));
+  }
+
   // insert - inserts an entry into tt_roles table.
   static function insert($fields)
   {

diff --git a/WEB-INF/lib/ttTaskHelper.class.php b/WEB-INF/lib/ttTaskHelper.class.php
index b398228b8be159a023fe7cbe0d79da038a03c98a..d238bfbc882b0809ee5346793d2c3d3e519e7047 100644 (file)
--- a/WEB-INF/lib/ttTaskHelper.class.php
+++ b/WEB-INF/lib/ttTaskHelper.class.php
@@ -29,8 +29,8 @@
 // Class ttTaskHelper is used to help with task related operations.
 class ttTaskHelper {
 
-  // getTask - gets details of the task identified by its id. 
-  static function getTask($id)
+  // get - gets details of a task identified by its id.
+  static function get($id)
   {
     global $user;
  

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index 6486845f43753f86166f869449cef29f91867b19..3ea8edcf04fbdf3f7b58c07396ad902e86733086 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -273,6 +273,7 @@ $i18n_key_words = array(
 'title.add_project' => 'Agregant projecte',
 'title.edit_project' => 'Modificant projecte',
 'title.delete_project' => 'Eliminant projecte',
+// TODO: translate the following.
 // 'title.tasks' => 'Tasks',
 // 'title.add_task' => 'Adding Task',
 // 'title.edit_task' => 'Editing Task',
@@ -281,6 +282,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Agregant usuari',
 'title.edit_user' => 'Modificant usuari',
 'title.delete_user' => 'Eliminant usuari',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clients',
 'title.add_client' => 'Agregar client',
 'title.edit_client' => 'Modificar client',

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index fbe11d688cb320ad01bb20d346b2c540c7cf642d..e7e7318b12c1ebd50d4e96531b2edab1a7fc65f5 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -294,6 +294,10 @@ $i18n_key_words = array(
 // 'title.edit_user' => 'Editing User',
 'title.delete_user' => 'Smazat uživatele',
 // TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Zákazníci',
 'title.add_client' => 'Přidat zákazníka',
 'title.edit_client' => 'Upravit zákazníka',

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d997da672d2d4df7fb69fdec122ee7f48dcde262..177b2d145976a31a73b0bba25fa7ec48063436b6 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -248,6 +248,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Tilføj Bruger',
 'title.edit_user' => 'Redigér Bruger',
 'title.delete_user' => 'Slet Bruger',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Klienter',
 'title.add_client' => 'Tilføj Klient',
 'title.edit_client' => 'Redigér Klient',

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 9ab421be423914abf04a200cef8597eab3029c82..ea9460e61eaff337c74dc5064cc207741988104f 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -240,6 +240,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Benutzerkonto erstellen',
 'title.edit_user' => 'Benutzerdaten bearbeiten',
 'title.delete_user' => 'Benutzer löschen',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Kunden',
 'title.add_client' => 'Kunden hinzufügen',
 'title.edit_client' => 'Kunden bearbeiten',

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index f5a1be1dd9c6a549bb71ca016cbdbe98c3917638..6ddf977b3c37a44586a7b973383845d7f4ba5c13 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -242,6 +242,10 @@ $i18n_key_words = array(
 'title.add_user' => 'Adding User',
 'title.edit_user' => 'Editing User',
 'title.delete_user' => 'Deleting User',
+'title.roles' => 'Roles',
+'title.add_role' => 'Adding Role',
+'title.edit_role' => 'Editing Role',
+'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clients',
 'title.add_client' => 'Adding Client',
 'title.edit_client' => 'Editing Client',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 5ab1ca4fffb31f6d459ed9d4febf1de8cab83da9..069527db58eacfc49e9aafa003c2667799b9955c 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -281,6 +281,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Creando usuario',
 'title.edit_user' => 'Modificando usuario',
 'title.delete_user' => 'Eliminando usuario',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clientes',
 'title.add_client' => 'Agregar cliente',
 'title.edit_client' => 'Modificando cliente',

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 5d0479e14c9564c835295c1ca180af74fef3c1c1..01aefb2233f1a39d0541946e009263d7d1eeb8de 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -288,6 +288,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Kasutaja lisamine', // TODO: is this correct?
 'title.edit_user' => 'Kasutaja muutmine',
 'title.delete_user' => 'Kasutaja kustutamine',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Kliendid',
 'title.add_client' => 'Lisa klient',
 'title.edit_client' => 'Muuda klienti',

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 193d74d7e918e55099bea47f171b58541da29dce..8b023751454b299699185a14208e6ba0c427de10 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -258,6 +258,11 @@ $i18n_key_words = array(
 'title.add_user' => 'درج کاربر',
 'title.edit_user' => 'ویرایش کاربر',
 'title.delete_user' => 'حذف کاربر',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'مشتریان',
 'title.add_client' => 'درج مشتری',
 'title.edit_client' => 'ویرایش مشتری',

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 776da59c8d9a84f342bc959f3847175d57797e00..68e953aaf73a56d2c867a8a5a2c3f9e69926bfc7 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -247,6 +247,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Käyttäjän lisäys',
 'title.edit_user' => 'Käyttäjän muokkaus',
 'title.delete_user' => 'Käyttäjän poisto',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Asiakkaat',
 'title.add_client' => 'Asiakkaan lisäys',
 'title.edit_client' => 'Asiakkaan muokkaus',

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index a127c51961e7e8e76b58d3fa484f3f72b0ddb131..e22f856d7b25c5dacb3d4aadd90518be643129a5 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -242,6 +242,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Création d\\\'un utilisateur',
 'title.edit_user' => 'Modification d\\\'un utilisateur',
 'title.delete_user' => 'Suppression d\\\'un utilisateur',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clients',
 'title.add_client' => 'Ajout d\\\'un client',
 'title.edit_client' => 'Modification d\\\'un client',

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 1835f96858175d2637e1306c9df1816b0eb3a45d..1c7d48de68a9e08f94b6787f4be26fa8b4f3c5ce 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -268,6 +268,11 @@ $i18n_key_words = array(
 'title.add_user' => 'הוספת משתמש',
 'title.edit_user' => 'עריכת משתמש',
 'title.delete_user' => 'מחיקת משתמש',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'לקוחות',
 'title.add_client' => 'הוספת לקוח',
 'title.edit_client' => 'עריכת לקוח',

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8070e59e121a59eee74462a3af462aec6ee74a23..9704884a6319c1f3b4aa86553c7aab4e7ff8e0f1 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -281,6 +281,10 @@ $i18n_key_words = array(
 // 'title.add_user' => 'Adding User',
 // 'title.edit_user' => 'Editing User',
 // 'title.delete_user' => 'Deleting User',
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Ügyfelek',
 'title.add_client' => 'Ügyfél hozzáadása',
 'title.edit_client' => 'Ügyfél szerkesztése',

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index e524e14abedf3cf46224d995ca205dbc73d61081..141a6f83266717dafc9593c5ac856d109354aea6 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -248,6 +248,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Crea utente',
 'title.edit_user' => 'Modifica utente',
 'title.delete_user' => 'Elimina utente',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clienti',
 'title.add_client' => 'Aggiungi cliente',
 'title.edit_client' => 'Modifica cliente',

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ee0a958e3f89bd49e34764a4d9aba07775ca4be7..42c2f109f6bf30698a338c2f4b1272e862cb6d5a 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -284,6 +284,11 @@ $i18n_key_words = array(
 'title.add_user' => 'ユーザーの作成',
 'title.edit_user' => 'ユーザーの編集',
 'title.delete_user' => 'ユーザーの削除',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'クライアント',
 'title.add_client' => 'クライアントの追加',
 'title.edit_client' => 'クライアントの編集',

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index f2cf55843a9b337f6770dc0e4757bd92552bdb88..005fb34db66fd23f49e6d6e6181c0cb9e6ba8d54 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -286,6 +286,11 @@ $i18n_key_words = array(
 'title.add_user' => '사용자를 추가하기', // TODO: is this correct?
 'title.edit_user' => '사용자를 편집하기',
 'title.delete_user' => '사용자를 삭제하기',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => '클라이언트',
 'title.add_client' => '클라이언트 추가',
 'title.edit_client' => '클라이언트 편집',

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 89c06c0e820549c537db29c25bb5ce9be12d81a5..50b4f5e7995f7d0b9f8b45539aa4d39174c904c8 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -244,6 +244,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Medewerker toevoegen',
 'title.edit_user' => 'Medewerker wijzigen',
 'title.delete_user' => 'Medewerker verwijderen',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Klanten',
 'title.add_client' => 'Klant toevoegen',
 'title.edit_client' => 'Klant wijzigen',

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index baaa0f0949a1d5b91d035217efb140fd4350a992..c7573bea371194a5a6b49c18ab65517ab107ef99 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -281,6 +281,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Legg til bruker',
 'title.edit_user' => 'Endre bruker',
 'title.delete_user' => 'Slett bruker',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Klienter',
 'title.add_client' => 'Legg til klient',
 'title.edit_client' => 'Endre klient',

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3eb14de184d3d20ad92761df673ade6e1e3b3ec7..a91a7544913f2bc604d168ecd2cf5302eb6b8b01 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -249,6 +249,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Dodawanie użytkownika',
 'title.edit_user' => 'Edytowanie użytkownika',
 'title.delete_user' => 'Usuwanie użytkownika',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Klienci',
 'title.add_client' => 'Dodawanie klienta',
 'title.edit_client' => 'Edytowanie klienta',

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index cd5f41a53e6f565cfb2be8586d4e40eba807a5f7..aecc222697514b5c53a5231994fae7454f0251b9 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -246,6 +246,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Adicionando usuário',
 'title.edit_user' => 'Editando usuário',
 'title.delete_user' => 'Apagando usuário',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clientes',
 'title.add_client' => 'Adicionando cliente',
 'title.edit_client' => 'Editando cliente',

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 96601719882423cca31ef465f72246e5f900ae18..6aeed5ed3c51a760faf52ff6e4834da07e7854eb 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -271,6 +271,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Adicionando usuário',
 'title.edit_user' => 'Editando usuário',
 'title.delete_user' => 'Apagando usuário',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 // 'title.clients' => 'Clients',
 // 'title.add_client' => 'Adding Client',
 // 'title.edit_client' => 'Editing Client',

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index e4f15bbaa1d9d362c7ff1ee969aa90a424e280b6..9dd29a1dc31b1f650a85d43dd2dd7a3fbb25bfd1 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -289,6 +289,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Adaugare utilizator',
 'title.edit_user' => 'Editare utilizator',
 'title.delete_user' => 'Stergere utilizator', // TODO: is this correct?
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Clienti',
 'title.add_client' => 'Adaugare client', // TODO: is this correct?
 'title.edit_client' => 'Editare client', // TODO: is this correct?

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index b14d9242d0e134e7046fe4e9fe3df865f5f2272d..c43a58d15c540bb794efbed70725d23e80c7a334 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -52,14 +52,13 @@ $i18n_key_words = array(
 'menu.charts' => 'Диаграммы',
 'menu.projects' => 'Проекты',
 'menu.tasks' => 'Задачи',
-'menu.users' => 'Ð\9bÑ\8eди',
+'menu.users' => 'Ð\9fолÑ\8cзоваÑ\82ели',
 'menu.teams' => 'Команды',
 'menu.export' => 'Экспорт',
 'menu.clients' => 'Клиенты',
 'menu.options' => 'Опции',
 
 // Footer - strings on the bottom of most pages.
-'footer.mobile_phones' => 'Time Tracker доступен на мобильных телефонах.',
 'footer.contribute_msg' => 'Вы можете улучшить Time Tracker разными способами.',
 'footer.credits' => 'Авторы',
 'footer.license' => 'Лицензия',
@@ -238,10 +237,14 @@ $i18n_key_words = array(
 'title.add_task' => 'Добавление задачи',
 'title.edit_task' => 'Редактирование задачи',
 'title.delete_task' => 'Удаление задачи',
-'title.users' => 'СоÑ\82Ñ\80Ñ\83дники',
-'title.add_user' => 'Создание пользователя',
+'title.users' => 'Ð\9fолÑ\8cзоваÑ\82ели',
+'title.add_user' => 'Ð\94обавление пользователя',
 'title.edit_user' => 'Редактирование пользователя',
 'title.delete_user' => 'Удаление пользователя',
+'title.roles' => 'Роли',
+'title.add_role' => 'Добавление роли',
+'title.edit_role' => 'Редактирование роли',
+'title.delete_role' => 'Удаление роли',
 'title.clients' => 'Клиенты',
 'title.add_client' => 'Добавление клиента',
 'title.edit_client' => 'Редактирование клиента',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 9c0159bdad689bfd661441677f9bf728ef736efe..90b8b0a5e951c6767d3bb76b73e7028302aeb17a 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -259,6 +259,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Pridávanie používateľa',
 'title.edit_user' => 'Upravovanie používateľa',
 'title.delete_user' => 'Vymazávanie používateľa',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Klienti',
 'title.add_client' => 'Pridávanie klienta',
 'title.edit_client' => 'Upravovanie klienta',

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 89e212735755cf46357926a4049ffde0610e4c84..72228894e4975a9790775c7aa09b45fc7c9ddfca 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -268,6 +268,10 @@ $i18n_key_words = array(
 // 'title.add_user' => 'Adding User',
 // 'title.edit_user' => 'Editing User',
 // 'title.delete_user' => 'Deleting User',
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 // 'title.clients' => 'Clients',
 // 'title.add_client' => 'Adding Client',
 // 'title.edit_client' => 'Editing Client',

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 21de811f1871d3357f53a15cc1a47bd0b3d22e2f..5137ef348a2ecc7b95310982fc5b34e32461286b 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -247,6 +247,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Dodavanje korisnika',
 'title.edit_user' => 'Izmena korisnika',
 'title.delete_user' => 'Brisanje korisnika',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Klijenti',
 'title.add_client' => 'Dodavanje klijenta',
 'title.edit_client' => 'Izmena klijenta',

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 69ebcc4cf5ea5a829ab5d855b1d1cda1e39ade1b..ba55c2c2d4cc444e59f727e2c98dd9b471fa9463 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -248,6 +248,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Lägg till användare',
 'title.edit_user' => 'Redigera användare',
 'title.delete_user' => 'Ta bort användare',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Kunder',
 'title.add_client' => 'Lägg till kund',
 'title.edit_client' => 'Redigera kund',

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index ba909dac9f12633256a75efd5ad305cda63744b7..8a9f19704de604759e3652d3c2028236ac1e2cbe 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -297,6 +297,11 @@ $i18n_key_words = array(
 'title.add_user' => 'Kullanıcı yarat', // TODO: we need consistency with all titles. Why not ekleniyor?
 'title.edit_user' => 'Kullanıcı düzenleniyor',
 'title.delete_user' => 'Kullanıcı siliniyor',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => 'Müşteriler',
 'title.add_client' => 'Müşteri ekle',
 'title.edit_client' => 'Müşteriyi düzenle',

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f046bebeee0a60210d9151a67d606c0c27c7876a..ae04c02ff89c158fb7637218e66880f0393e5ee9 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -273,6 +273,11 @@ $i18n_key_words = array(
 'title.add_user' => '添加用户', // TODO: is this correct?
 'title.edit_user' => '编辑用户',
 'title.delete_user' => '删除用户',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => '客户',
 'title.add_client' => '添加客户',
 'title.edit_client' => '编辑客户',

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index e6a8883a3dda9d9b312755e357371ca3c1373914..8424008024f3f9760982d4bbc6d337fdf7c04a2e 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -281,6 +281,11 @@ $i18n_key_words = array(
 'title.add_user' => '添加用戶', // TODO: is this correct?
 'title.edit_user' => '編輯用戶',
 'title.delete_user' => '刪除用戶',
+// TODO: translate the following.
+// 'title.roles' => 'Roles',
+// 'title.add_role' => 'Adding Role',
+// 'title.edit_role' => 'Editing Role',
+// 'title.delete_role' => 'Deleting Role',
 'title.clients' => '客戶',
 'title.add_client' => '添加客戶',
 'title.edit_client' => '編輯客戶',

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 351c189d715e82314af7e3dcec87dd361ad0aad4..3090f09bdbefebf93ae8ae8729135bee796062fa 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.17.31.4021 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.17.31.4022 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/role_delete.tpl b/WEB-INF/templates/role_delete.tpl
new file mode 100644 (file)
index 0000000..9c85d22
--- /dev/null
+++ b/WEB-INF/templates/role_delete.tpl
@@ -0,0 +1,20 @@
+{$forms.roleDeleteForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="0" cellpadding="0" border="0">
+        <tr>
+          <td colspan="2" align="center"><b>{$role_to_delete|escape}</b></td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center">&nbsp;</td>
+        </tr>
+        <tr>
+          <td align="right">{$forms.roleDeleteForm.btn_delete.control}&nbsp;</td>
+          <td align="left">&nbsp;{$forms.roleDeleteForm.btn_cancel.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.roleDeleteForm.close}

diff --git a/mobile/task_delete.php b/mobile/task_delete.php
index 1fea8e127e16f8b754acdf2a16c05afb8925fd20..44f840c1dc79d4b6a84487b7248c19bb9963a76c 100644 (file)
--- a/mobile/task_delete.php
+++ b/mobile/task_delete.php
@@ -37,7 +37,7 @@ if (!ttAccessCheck(right_manage_team) || MODE_PROJECTS_AND_TASKS != $user->track
 }
 
 $cl_task_id = (int)$request->getParameter('id');
-$task = ttTaskHelper::getTask($cl_task_id);
+$task = ttTaskHelper::get($cl_task_id);
 $task_to_delete = $task['name'];
 
 $form = new Form('taskDeleteForm');
@@ -47,7 +47,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getK
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttTaskHelper::getTask($cl_task_id)) {
+    if(ttTaskHelper::get($cl_task_id)) {
       if (ttTaskHelper::delete($cl_task_id)) {
         header('Location: tasks.php');
         exit();

diff --git a/mobile/task_edit.php b/mobile/task_edit.php
index e2dcc9908983225b23d8b1542c7f027a478037e0..b454cbe557d4ba1c592d985c8777f9faddaba437 100644 (file)
--- a/mobile/task_edit.php
+++ b/mobile/task_edit.php
@@ -46,7 +46,7 @@ if ($request->isPost()) {
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $task = ttTaskHelper::getTask($cl_task_id);
+  $task = ttTaskHelper::get($cl_task_id);
   $cl_name = $task['name'];
   $cl_description = $task['description'];
   $cl_status = $task['status'];

diff --git a/role_delete.php b/role_delete.php
new file mode 100644 (file)
index 0000000..4198ec6
--- /dev/null
+++ b/role_delete.php
@@ -0,0 +1,69 @@
+<?php
+// +----------------------------------------------------------------------+
+// | Anuko Time Tracker
+// +----------------------------------------------------------------------+
+// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
+// +----------------------------------------------------------------------+
+// | LIBERAL FREEWARE LICENSE: This source code document may be used
+// | by anyone for any purpose, and freely redistributed alone or in
+// | combination with other software, provided that the license is obeyed.
+// |
+// | There are only two ways to violate the license:
+// |
+// | 1. To redistribute this code in source form, with the copyright
+// |    notice or license removed or altered. (Distributing in compiled
+// |    forms without embedded copyright notices is permitted).
+// |
+// | 2. To redistribute modified versions of this code in *any* form
+// |    that bears insufficient indications that the modifications are
+// |    not the work of the original author(s).
+// |
+// | This license applies to this document only, not any other software
+// | that it may be combined with.
+// |
+// +----------------------------------------------------------------------+
+// | Contributors:
+// | https://www.anuko.com/time_tracker/credits.htm
+// +----------------------------------------------------------------------+
+
+require_once('initialize.php');
+import('ttRoleHelper');
+import('form.Form');
+
+// Access check.
+if (!ttAccessCheck(right_manage_team)) {
+  header('Location: access_denied.php');
+  exit();
+}
+
+$cl_role_id = (int)$request->getParameter('id');
+$role = ttRoleHelper::get($cl_role_id);
+$role_to_delete = $role['name'];
+
+$form = new Form('roleDeleteForm');
+$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    if(ttRoleHelper::get($cl_role_id)) {
+      if (ttRoleHelper::delete($cl_role_id)) {
+        header('Location: roles.php');
+        exit();
+      } else
+        $err->add($i18n->getKey('error.db'));
+    } else
+      $err->add($i18n->getKey('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: roles.php');
+    exit();
+  }
+} // isPost
+
+$smarty->assign('role_to_delete', $role_to_delete);
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
+$smarty->assign('title', $i18n->getKey('title.delete_role'));
+$smarty->assign('content_page_name', 'role_delete.tpl');
+$smarty->display('index.tpl');

diff --git a/roles.php b/roles.php
index ebf416cc5d56ab3f6dc24db8cd5f83e571a5af68..4e951e9d4cb49c7dbd4c6f05bb78314afdc91402 100644 (file)
--- a/roles.php
+++ b/roles.php
@@ -42,6 +42,6 @@ if (!ttRoleHelper::rolesExist()) ttRoleHelper::createDefaultRoles();
 
 $smarty->assign('active_roles', ttTeamHelper::getActiveRoles($user->team_id));
 $smarty->assign('inactive_roles', ttTeamHelper::getInactiveRoles($user->team_id));
-$smarty->assign('title', $i18n->getKey('label.roles'));
+$smarty->assign('title', $i18n->getKey('title.roles'));
 $smarty->assign('content_page_name', 'roles.tpl');
 $smarty->display('index.tpl');

diff --git a/task_delete.php b/task_delete.php
index ebc96e219cfd1b693cbb057636d3499e3b381e76..f04f03260ff94a25622496d02e18030a98015a17 100644 (file)
--- a/task_delete.php
+++ b/task_delete.php
@@ -37,7 +37,7 @@ if (!ttAccessCheck(right_manage_team) || MODE_PROJECTS_AND_TASKS != $user->track
 }
 
 $cl_task_id = (int)$request->getParameter('id');
-$task = ttTaskHelper::getTask($cl_task_id);
+$task = ttTaskHelper::get($cl_task_id);
 $task_to_delete = $task['name'];
 
 $form = new Form('taskDeleteForm');
@@ -47,7 +47,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getK
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttTaskHelper::getTask($cl_task_id)) {
+    if(ttTaskHelper::get($cl_task_id)) {
       if (ttTaskHelper::delete($cl_task_id)) {
         header('Location: tasks.php');
         exit();

diff --git a/task_edit.php b/task_edit.php
index 077c7c6b373b4a886f8f077ec9821ee96d9709c0..bfc1bef06d2a4f78bf281f30524241cac616ece0 100644 (file)
--- a/task_edit.php
+++ b/task_edit.php
@@ -46,7 +46,7 @@ if ($request->isPost()) {
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $task = ttTaskHelper::getTask($cl_task_id);
+  $task = ttTaskHelper::get($cl_task_id);
   $cl_name = $task['name'];
   $cl_description = $task['description'];
   $cl_status = $task['status'];