- converting line breaks to UNIX

git-svn-id: http://dev.piwik.org/svn/trunk@526 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 105 insertions, 105 deletions

diff --git a/modules/PluginsFunctions/Menu.php b/modules/PluginsFunctions/Menu.php
index 740aef6c09..c120b868af 100644
--- a/modules/PluginsFunctions/Menu.php
+++ b/modules/PluginsFunctions/Menu.php
@@ -1,106 +1,106 @@
-<?php

-static $mainMenu = array();

-static $menuEditsToApply = array();

-static $menuRenameToApply = array();

-

-// we setup the main categories in a specific order

-$mainMenu['Dashboard'] = null;

-$mainMenu['General'] = null;

-$mainMenu['Visitors'] = null;

-$mainMenu['Actions'] = null;

-$mainMenu['Referers'] = null;

-$mainMenu['Live!'] = null;

-

-

-function Piwik_GetMenu()

-{

-	global $mainMenu;

-	global $menuEditsToApply;

-	global $menuRenameToApply;

-	

-	// we apply the list of edits we've registered so far

-	foreach($menuEditsToApply as $edit)

-	{

-		$mainMenuToEdit = $edit[0];

-		$subMenuToEdit = $edit[1];

-		$newUrl = $edit[2];

-		if(!isset($mainMenu[$mainMenuToEdit][$subMenuToEdit]))

-		{

-			Piwik_AddMenu($mainMenuToEdit, $subMenuToEdit, $newUrl);

-		}

-		else

-		{

-			$mainMenu[$mainMenuToEdit][$subMenuToEdit] = $newUrl;

-		}

-	}

-	

-	// we now apply the menu rename

-	foreach($menuRenameToApply as $rename)

-	{

-		$mainMenuOriginal = $rename[0];

-		$subMenuOriginal = $rename[1];

-		$mainMenuRenamed = $rename[2];

-		$subMenuRenamed = $rename[3];

-		if(isset($mainMenu[$mainMenuOriginal][$subMenuOriginal]))

-		{

-			$save = $mainMenu[$mainMenuOriginal][$subMenuOriginal];

-			unset($mainMenu[$mainMenuOriginal][$subMenuOriginal]);

-			$mainMenu[$mainMenuRenamed][$subMenuRenamed] = $save;

-		}

-	}	

-	

-	// we now do some cleaning on the menu

-	foreach($mainMenu as $key => &$element)

-	{

-		if(is_null($element))

-		{

-			unset($mainMenu[$key]);

-		}

-		else

-		{			

-			// we want to move some submenus in the first position

-			$priority = array('Overview','Evolution');

-			foreach($priority as $name)

-			{

-				if(isset($element[$name]))

-				{

-					$newElement = array($name => $element[$name]);

-					unset($element[$name]);

-					$element = $newElement + $element;

-				}

-			}

-			$element['_url'] = current($element);

-		}

-	}

-	return $mainMenu;

-}

-

-

-function Piwik_AddMenu( $mainMenuName, $subMenuName, $url )

-{

-	global $mainMenu;

-	

-	if(!isset($mainMenu[$mainMenuName]))

-	{

-		$mainMenu[$mainMenuName]['_url'] = $url;

-	}

-	if(!empty($subMenuName))

-	{

-		$mainMenu[$mainMenuName][$subMenuName] = $url;

-	}

-	

-}

-

-function Piwik_RenameMenuEntry($mainMenuOriginal, $subMenuOriginal, 

-								$mainMenuRenamed, $subMenuRenamed)

-{

-	global $menuRenameToApply;

-	$menuRenameToApply[] = array($mainMenuOriginal, $subMenuOriginal, 

-								$mainMenuRenamed, $subMenuRenamed);

-}

-

-function Piwik_EditMenuUrl( $mainMenuToEdit, $subMenuToEdit, $newUrl )

-{

-	global $menuEditsToApply;

-	$menuEditsToApply[] = array($mainMenuToEdit, $subMenuToEdit, $newUrl);

+<?php
+static $mainMenu = array();
+static $menuEditsToApply = array();
+static $menuRenameToApply = array();
+
+// we setup the main categories in a specific order
+$mainMenu['Dashboard'] = null;
+$mainMenu['General'] = null;
+$mainMenu['Visitors'] = null;
+$mainMenu['Actions'] = null;
+$mainMenu['Referers'] = null;
+$mainMenu['Live!'] = null;
+
+
+function Piwik_GetMenu()
+{
+	global $mainMenu;
+	global $menuEditsToApply;
+	global $menuRenameToApply;
+	
+	// we apply the list of edits we've registered so far
+	foreach($menuEditsToApply as $edit)
+	{
+		$mainMenuToEdit = $edit[0];
+		$subMenuToEdit = $edit[1];
+		$newUrl = $edit[2];
+		if(!isset($mainMenu[$mainMenuToEdit][$subMenuToEdit]))
+		{
+			Piwik_AddMenu($mainMenuToEdit, $subMenuToEdit, $newUrl);
+		}
+		else
+		{
+			$mainMenu[$mainMenuToEdit][$subMenuToEdit] = $newUrl;
+		}
+	}
+	
+	// we now apply the menu rename
+	foreach($menuRenameToApply as $rename)
+	{
+		$mainMenuOriginal = $rename[0];
+		$subMenuOriginal = $rename[1];
+		$mainMenuRenamed = $rename[2];
+		$subMenuRenamed = $rename[3];
+		if(isset($mainMenu[$mainMenuOriginal][$subMenuOriginal]))
+		{
+			$save = $mainMenu[$mainMenuOriginal][$subMenuOriginal];
+			unset($mainMenu[$mainMenuOriginal][$subMenuOriginal]);
+			$mainMenu[$mainMenuRenamed][$subMenuRenamed] = $save;
+		}
+	}	
+	
+	// we now do some cleaning on the menu
+	foreach($mainMenu as $key => &$element)
+	{
+		if(is_null($element))
+		{
+			unset($mainMenu[$key]);
+		}
+		else
+		{			
+			// we want to move some submenus in the first position
+			$priority = array('Overview','Evolution');
+			foreach($priority as $name)
+			{
+				if(isset($element[$name]))
+				{
+					$newElement = array($name => $element[$name]);
+					unset($element[$name]);
+					$element = $newElement + $element;
+				}
+			}
+			$element['_url'] = current($element);
+		}
+	}
+	return $mainMenu;
+}
+
+
+function Piwik_AddMenu( $mainMenuName, $subMenuName, $url )
+{
+	global $mainMenu;
+	
+	if(!isset($mainMenu[$mainMenuName]))
+	{
+		$mainMenu[$mainMenuName]['_url'] = $url;
+	}
+	if(!empty($subMenuName))
+	{
+		$mainMenu[$mainMenuName][$subMenuName] = $url;
+	}
+	
+}
+
+function Piwik_RenameMenuEntry($mainMenuOriginal, $subMenuOriginal, 
+								$mainMenuRenamed, $subMenuRenamed)
+{
+	global $menuRenameToApply;
+	$menuRenameToApply[] = array($mainMenuOriginal, $subMenuOriginal, 
+								$mainMenuRenamed, $subMenuRenamed);
+}
+
+function Piwik_EditMenuUrl( $mainMenuToEdit, $subMenuToEdit, $newUrl )
+{
+	global $menuEditsToApply;
+	$menuEditsToApply[] = array($mainMenuToEdit, $subMenuToEdit, $newUrl);
 }