fix 0009390: Keyword features not available for the admin (#400)

Use the method testlinkInitPage like in others features (Project, Platform, ...).

Author: atisne

lib/keywords/keywordsEdit.php

@@ -19,7 +19,7 @@
 require_once("keywordsEnv.php");
 
 
-testlinkInitPage($db);
+testlinkInitPage($db, false, false, "checkRights");
 $tplCfg = templateConfiguration();
 
 $tplEngine = new TLSmarty();
@@ -119,18 +119,7 @@ function initEnv(&$dbHandler) {
     throw new Exception("Error Invalid Test Project ID", 1);
   }
 
-  // Check rights before doing anything else
-  // Abort if rights are not enough 
   $args->user = $_SESSION['currentUser'];
-  $env['tproject_id'] = $args->tproject_id;
-  $env['tplan_id'] = 0;
-  
-  $check = new stdClass();
-  $check->items = array('mgt_modify_key','mgt_view_key');
-  $check->mode = 'and';
-  checkAccess($dbHandler,$args->user,$env,$check);
-
-  // OK Go ahead
   $args->canManage = true;
   $args->mgt_view_events = $args->user->hasRight($dbHandler,"mgt_view_events",$args->tproject_id);
 
@@ -346,3 +335,8 @@ function initializeGui(&$dbH,&$args) {
 
   return $gui;
 }
+
+function checkRights(&$db,&$user) {
+	return ($user->hasRightOnProj($db,'mgt_view_key')
+       || $user->hasRightOnProj($db,'mgt_modify_key'));
+}

lib/keywords/keywordsExport.php

@@ -15,7 +15,7 @@
 require_once("xml.inc.php");
 require_once("keywordsEnv.php");
 
-testlinkInitPage($db);
+testlinkInitPage($db, false, false, "checkRights");
 $templateCfg = templateConfiguration();
 $args = init_args($db);
 $gui = initializeGui($args);
@@ -46,17 +46,7 @@ function init_args(&$dbHandler) {
     throw new Exception("Error Invalid Test Project ID", 1);
   }
 
-  // Check rights before doing anything else
-  // Abort if rights are not enough 
   $args->user = $_SESSION['currentUser'];
-  $env['tproject_id'] = $args->tproject_id;
-  $env['tplan_id'] = 0;
-  
-  $check = new stdClass();
-  $check->items = array('mgt_view_key');
-  $check->mode = 'and';
-  checkAccess($dbHandler,$args->user,$env,$check);
- 
   $tproj_mgr = new testproject($dbHandler);
   $dm = $tproj_mgr->get_by_id($args->tproject_id,array('output' => 'name'));
   $args->tproject_name = $dm['name'];
@@ -131,4 +121,8 @@ function exportKeywordsToCSV($kwSet) {
   $keys = array( "keyword","notes","tcv_qty" );
   $csv = exportDataToCSV($kwSet,$keys,$keys,array('addHeader' => 1));
   return $csv;
-}
+}
+
+function checkRights(&$db,&$user) {
+	return ($user->hasRightOnProj($db,'mgt_view_key'));
+}

lib/keywords/keywordsImport.php

@@ -16,7 +16,7 @@
 require_once('csv.inc.php');
 require_once('xml.inc.php');
 
-testlinkInitPage($db);
+testlinkInitPage($db, false, false, "checkRights");
 $templateCfg = templateConfiguration();
 
 $args = init_args($db);
@@ -77,17 +77,6 @@ function init_args(&$dbHandler)
     throw new Exception(" Error Invalid Test Project ID", 1);
   }
 
-  // Check rights before doing anything else
-  // Abort if rights are not enough 
-  $user = $_SESSION['currentUser'];
-  $env['tproject_id'] = $args->tproject_id;
-  $env['tplan_id'] = 0;
-  
-  $check = new stdClass();
-  $check->items = array('mgt_modify_key');
-  $check->mode = 'and';
-  checkAccess($dbHandler,$user,$env,$check);
- 
   $tproj_mgr = new testproject($dbHandler);
   $dm = $tproj_mgr->get_by_id($args->tproject_id,
                               array('output' => 'name'));
@@ -145,4 +134,8 @@ function initializeGui(&$argsObj)
 
 
   return $gui;
-}
+}
+
+function checkRights(&$db,&$user) {
+	return ($user->hasRightOnProj($db,'mgt_modify_key'));
+}

lib/keywords/keywordsView.php

@@ -11,7 +11,7 @@
 require_once("common.php");
 require_once("keywordsEnv.php");
 
-testlinkInitPage($db);
+testlinkInitPage($db, false, false, "checkRights");
 $templateCfg = templateConfiguration();
 $gui = $args = init_args($db);
 
@@ -31,18 +31,7 @@ function init_args(&$dbHandler) {
     throw new Exception("Error Invalid Test Project ID", 1);
   }
 
-  // Check rights before doing anything else
-  // Abort if rights are not enough 
   $user = $_SESSION['currentUser'];
-  $env['tproject_id'] = $tproject_id;
-  $env['tplan_id'] = 0;
-  
-  $check = new stdClass();
-  $check->items = array('mgt_view_key');
-  $check->mode = 'and';
-  checkAccess($dbHandler,$user,$env,$check);
-  
-  // OK, go ahead
   $args = getKeywordsEnv($dbHandler,$user,$tproject_id);
   $args->tproject_id = $tproject_id;
 
@@ -62,4 +51,8 @@ function init_args(&$dbHandler) {
   }
 
   return $args;
-}
+}
+
+function checkRights(&$db,&$user) {
+	return ($user->hasRightOnProj($db,'mgt_view_key'));
+}