Dev Fixed merge error

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9231 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 13, 2010 · 13ed1e7 · 13ed1e7
1 parent 2b56f10
commit 13ed1e7
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/admin/tokens.php b/admin/tokens.php
@@ -52,8 +52,6 @@
 include_once("login_check.php");
 include_once("database.php");
 $js_admin_includes[]='scripts/tokens.js';
-
-
 $dateformatdetails=getDateFormatData($_SESSION['dateformat']);
 $thissurvey=getSurveyInfo($surveyid);
 
@@ -243,8 +241,8 @@
 }
 
 if ($subaction == "deletegroup" &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey') ||
 $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
 )
 {
@@ -538,16 +536,17 @@
 	."<a href=\"#\" onclick=\"window.open('$scriptname?action=tokens&amp;sid=$surveyid&amp;subaction=browsegroup', '_top')\" "
 	."title='".$clang->gTview("Display group tokens")."' >"
 	."<img name='ViewGroupTokensButton' src='$imagefiles/grouptokens.png' alt='".$clang->gT("Display group tokens")."' /></a>\n";
-	
-	if ($sumrows5['edit_survey_property'] || $sumrows5['activate_survey'] || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
+
+	if (bHasRight($surveyid,'edit_survey_property')|| bHasRight($surveyid,'activate_survey') || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
 	{
 		$tokenoutput .= "<a href=\"#\" onclick=\"window.open('$scriptname?action=tokens&amp;sid=$surveyid&amp;subaction=addnewgroup', '_top')\""
 		."title='".$clang->gTview("Add new group token entry")."' >"
 		."<img name='AddNewGroupTokenButton' src='$imagefiles/addgrouptoken.png' title='' alt='".$clang->gT("Add new group token entry")."' /></a>\n"
     ."<img src='$imagefiles/seperator.gif' alt='' />\n"
     ."<a href=\"#\" onclick=\"".get2post("$scriptname?action=tokens&amp;sid=$surveyid&amp;subaction=tokenifygroup")."\" "
     ." title='".$clang->gTview("Generate group tokens")."'>"
-    ."<img name='TokenifyGroupButton' src='$imagefiles/tokenifygroup.png' alt='".$clang->gT("Generate group tokens")."' /></a>\n"
+    ."<img name='TokenifyGroupButton' src='$imagefiles/tokenifygroup.png' alt='".$clang->gT("G
+    enerate group tokens")."' /></a>\n"
     ."<img src='$imagefiles/seperator.gif' alt='' />\n"
     ."<a href=\"#\" onclick=\"".get2post("$scriptname?action=tokens&amp;sid=$surveyid&amp;subaction=killgroup")."\" "
     ."title='".$clang->gTview("Drop group tokens table")."' >"
@@ -915,7 +914,7 @@
     $tokenoutput .= "<li><a href='#' onclick=\"".get2post("$scriptname?action=tokens&amp;sid=$surveyid&amp;subaction=kill")."\">".$clang->gT("Drop tokens table")."</a></li></ul></div>\n";
 }
 
-if ($subaction == "usegrouptokens" && ($sumrows5['edit_survey_property'] || $sumrows5['activate_survey'] || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1))
+if ($subaction == "usegrouptokens" && (bHasRight($surveyid,'edit_survey_property') || bHasRight($surveyid,'activate_survey') || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1))
 {
 	if (isset($_POST['creategrouptable']) && $_POST['creategrouptable']=="Y"
 	// make sure there are no group token tables
@@ -1692,8 +1691,8 @@
 	        if ($tokenfieldname=='gtid')
 	        {
 	            $tokenoutput .= "<td align='left' style='white-space:nowrap;'>\n";
-	            if ($sumrows5['edit_survey_property'] ||
-	            $sumrows5['activate_survey'] ||
+	            if (bHasRight($surveyid,'edit_survey_property') ||
+	            bHasRight($surveyid,'activate_survey') ||
 	            $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
 	            {
 	                $tokenoutput .="<input style='height: 16; width: 16px; font-size: 8; font-family: verdana' type='image' src='$imagefiles/token_edit.png' title='"
@@ -1827,8 +1826,8 @@
 
 
 if ($subaction == "killgroup" &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey') ||
 $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
 )
 {
@@ -2594,9 +2593,9 @@
 }
 
 if ($subaction == "tokenifygroup" &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
-$_SESSION['USER_RIGHT_SUPERADMIN'] == 1))
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey') ||
+bHasRight($surveyid,'USER_RIGHT_SUPERADMIN') == 1))
 {
     $tokenoutput .= "<div class='header'>".$clang->gT("Create group tokens")."</div>\n";
     $tokenoutput .= "<div class='messagebox'>\n";
@@ -2682,8 +2681,8 @@
 }
 
 if ($subaction == "deletegroup" &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey') ||
 $_SESSION['USER_RIGHT_SUPERADMIN'] == 1))
 {
     $tokenoutput .= "<div class='messagebox'>\n"
@@ -2973,8 +2972,8 @@
 }
 
 if (($subaction == "editgroup" || $subaction == "addnewgroup") &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey') ||
 $_SESSION['USER_RIGHT_SUPERADMIN'] == 1))
 {
     if ($subaction == "editgroup")
@@ -3143,8 +3142,8 @@
 }
 
 if ($subaction == "updategrouptoken" &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey')||
 $_SESSION['USER_RIGHT_SUPERADMIN'] == 1))
 {
     $tokenoutput .= "\t<div class='header'>".$clang->gT("Edit group token entry")."</div>\n"
@@ -3257,8 +3256,8 @@
 }
 
 if ($subaction == "insertgrouptoken" &&
-($sumrows5['edit_survey_property'] ||
-$sumrows5['activate_survey'] ||
+(bHasRight($surveyid,'edit_survey_property') ||
+bHasRight($surveyid,'activate_survey') ||
 $_SESSION['USER_RIGHT_SUPERADMIN'] == 1)
 )
 {