# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: Joomla root
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
--- modules/mod_cblogin/mod_cblogin.php
+++ modules/mod_cblogin/mod_cblogin.php
@@ -282,6 +282,20 @@
 		$pms = $pms_type;		// RC2 quick fix
 		if($pms != 0)
 		{
+			if ( class_exists( 'moscomprofilerUser', false ) ) {
+				$viewLevels			=	CBuser::getMyInstance()->getAuthorisedViewLevelsIds( ( checkJversion() >= 2 ? false : true ) );
+			} else {
+				// Compute View Level using CMS without loading cb.table and cb.database if they are not already loaded (e.g. when using this function in modules):
+				if ( checkJversion() >= 2 ) {
+					$viewLevels		=	JUser::getInstance()->getAuthorisedViewLevels();
+				} else {
+					$viewLevels		=	range( 0, $_CB_framework->myCmsGid() );
+				}
+			}
+			$cleanedANDpubAccess	=	' AND published = 1 AND access IN (' . implode( ',', cbArrayToInts( $viewLevels ) ) . ')';
+			if ( checkJversion() >= 2 ) {
+				$cleanedANDpubAccess	.=	' AND ' . $_CB_database->NameQuote( 'language' ) . ' IN ( ' . $_CB_database->Quote( $_CB_framework->getCfg( 'lang_tag' ) ) . ', ' . $_CB_database->Quote( '*' ) . ', ' . $_CB_database->Quote( '' ) . ' )';
+			}
 			switch ($pms) {
 				case 1:
 					$pmsnameprefix = "";
@@ -289,7 +303,7 @@
 					$_CB_database->setQuery( $query_pms_count );
 					$total_pms = $_CB_database->loadResult();
 		
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."pms%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."pms%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix."pms&page=index".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -300,7 +314,7 @@
 					$_CB_database->setQuery( $query_pms_count );
 					$total_pms = $_CB_database->loadResult();
 		
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."pms%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."pms%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix."pms&task=inbox".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -310,7 +324,7 @@
 					$_CB_database->setQuery($query_pms_count);
 					$total_pms = $_CB_database->loadResult();	
 
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_uddeim%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_uddeim%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_uddeim&task=inbox".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -321,7 +335,7 @@
 					$_CB_database->setQuery( $query_pms_count );
 					$total_pms = $_CB_database->loadResult();
 		
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."pms%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."pms%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix."pms&page=inbox".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -332,7 +346,7 @@
 					$_CB_database->setQuery( $query_pms_count );
 					$total_pms = $_CB_database->loadResult();
 		
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."pms%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."pms%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix."pms&task=inbox".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -343,7 +357,7 @@
 					$_CB_database->setQuery( $query_pms_count );
 					$total_pms = $_CB_database->loadResult();
 		
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."pms%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."pms%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix."pms&page=inbox".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -354,7 +368,7 @@
                     $_CB_database->setQuery( $query_pms_count );
                     $total_pms = $_CB_database->loadResult();
                     
-                    $query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."%'";
+                    $query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."%'" . $cleanedANDpubAccess;
                     $_CB_database->setQuery( $query_pms_link );
                     $pms_link_id = $_CB_database->loadResult();
                     $pms_link = "index.php?option=com_".$pmsnameprefix."&func=showinbox".($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -365,7 +379,7 @@
                     $_CB_database->setQuery( $query_pms_count );
                     $total_pms = intval($_CB_database->loadResult());
 
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix.($pms_link_id ? "&Itemid=".$pms_link_id : "");
@@ -376,7 +390,7 @@
 					$_CB_database->setQuery( $query_pms_count );
 					$total_pms = intval($_CB_database->loadResult());
 					
-					$query_pms_link = "SELECT id FROM #__menu WHERE published>=0 AND link LIKE '%com_".$pmsnameprefix."%'";
+					$query_pms_link = "SELECT id FROM #__menu WHERE link LIKE '%com_".$pmsnameprefix."%'" . $cleanedANDpubAccess;
 					$_CB_database->setQuery( $query_pms_link );
 					$pms_link_id = $_CB_database->loadResult();
 					$pms_link = "index.php?option=com_".$pmsnameprefix.($pms_link_id ? "&Itemid=".$pms_link_id : "");