Explorar el Código

fix buttons (second turn) lock add newpages and visibility pages

Juan Carlos Raña hace 15 años
padre
commit
f49ecfeb76
Se han modificado 2 ficheros con 21 adiciones y 13 borrados
  1. 4 6
      main/wiki/index.php
  2. 17 7
      main/wiki/wiki.inc.php

+ 4 - 6
main/wiki/index.php

@@ -430,15 +430,13 @@ echo '<td>';
 	if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
 		// page action: enable or disable the adding of new pages
-		if (check_addnewpagelock()==1)
+		if (check_addnewpagelock()==0)
 		{
-
 			$protect_addnewpage= '<img src="../img/wiki/lockadd.gif" title="'.get_lang('AddOptionProtected').'" alt="'.get_lang('AddOptionProtected').'" width="8" height="8" />';
-			$lock_unlock_addnew='unlockaddnew';
-
+			$lock_unlock_addnew='unlockaddnew';						
 		}
 		else
-		{
+		{					
 			$protect_addnewpage= '<img src="../img/wiki/unlockadd.gif" title="'.get_lang('AddOptionUnprotected').'" alt="'.get_lang('AddOptionUnprotected').'" width="8" height="8" />';
 			$lock_unlock_addnew='lockaddnew';
 		}
@@ -1198,7 +1196,7 @@ if ($_GET['action']=='addnew')
 		}
 	}
 
-	elseif (check_addnewpagelock()==1 && (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false))
+	elseif (check_addnewpagelock()==0 && (api_is_allowed_to_edit(false,true)==false || api_is_platform_admin()==false))
 	{
 		Display::display_error_message(get_lang('AddPagesLocked'));
 	}

+ 17 - 7
main/wiki/wiki.inc.php

@@ -1068,30 +1068,34 @@ function check_addnewpagelock()
 	$row=Database::fetch_array($result);
 
 	$status_addlock=$row['addlock'];
+	
 
 	//change status
 	if (api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
 
-		if ($_GET['actionpage']=='lockaddnew' && $status_addlock==0)
+		if ($_GET['actionpage']=='lockaddnew' && $status_addlock==1)
 		{
-	    	$status_addlock=1;
+	    	$status_addlock=0;
 			}
-		if ($_GET['actionpage']=='unlockaddnew' && $status_addlock==1)
+		if ($_GET['actionpage']=='unlockaddnew' && $status_addlock==0)
 		{
-			$status_addlock=0;
+			$status_addlock=1;
 		}
-
+	
+		
 		Database::query('UPDATE '.$tbl_wiki.' SET addlock="'.Database::escape_string($status_addlock).'" WHERE '.$groupfilter.'',__LINE__,__FILE__);
 
 		$sql='SELECT * FROM '.$tbl_wiki.'WHERE '.$groupfilter.' ORDER BY id ASC';
 		$result=Database::query($sql,__LINE__,__FILE__);
 		$row=Database::fetch_array($result);
+
 	}
 
 	//show status
 
-		return $row['addlock'];
+	return $row['addlock'];
+	
 }
 
 
@@ -1190,8 +1194,14 @@ function check_visibility_page()
 
      }
 
+	if(empty($row['id']))
+	{
+		$row['visibility']= 1;
+	}
+
+
 	//show status
-		return $row['visibility'];
+	return $row['visibility'];
 }