Sophie

Sophie

distrib > Fedora > 13 > i386 > by-pkgid > 62ea230c2ab6b05e62344b390f806f7d > files > 6

ipplan-4.92-4.a.fc13.src.rpm

diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
--- ipplan.orig/admin/usermanager.php	2009-08-17 23:44:07.000000000 +0200
+++ ipplan/admin/usermanager.php	2011-02-12 11:45:21.116372017 +0200
@@ -22,9 +22,9 @@
 require_once("../adodb/adodb.inc.php");
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 require_once("../auth.php");
 
 
@@ -38,7 +38,7 @@
 isset($_COOKIE["ipplanLanguage"]) && myLanguage($_COOKIE['ipplanLanguage']);
 
 newhtml($p);
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p,my_("User Manager"));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu-hidden.css")));
@@ -191,12 +191,12 @@
 insert($view, block("<i>".my_("Click on a group or user")."</i>"));
 
 $mid = new TreeMenu();
-$mid->setDirroot('../menus');
-$mid->setLibjsdir('../menus/libjs/');
-$mid->setImgdir('../menus/menuimages/');
-$mid->setImgwww('../menus/menuimages/');
-$mid->setIcondir('../menus/menuicons/');
-$mid->setIconwww('../menus/menuicons/');
+$mid->setDirroot('/usr/share/php/php-layers-menu');
+$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+$mid->setImgwww('../../menus/menuimages/');
+$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+$mid->setIconwww('../../menus/menuicons/');
 $mid->SetMenuStructureString($MENU);
 $mid->setIconsize(16, 16);
 $mid->parseStructureForMenu('treemenu1');
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
--- ipplan.orig/ipplanlib.php	2009-08-17 23:43:43.000000000 +0200
+++ ipplan/ipplanlib.php	2011-02-12 11:56:12.394372210 +0200
@@ -547,11 +547,12 @@
     $BASE_URL = base_url();
     $BASE_DIR = base_dir();
 
-    $myDirPath = $BASE_DIR . '/menus/';
-    $myWwwPath = $BASE_URL . '/menus/';
+    $myDirPath = '/usr/share/php/php-layers-menu/';
+    $myMenPath = str_replace('/ipplan','',$BASE_URL);
+    $myWwwPath = $myMenPath . '/menus/';
 
     // these files should probably not be here
-    require_once $myDirPath . 'lib/PHPLIB.php';
+    require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
     require_once $myDirPath . 'lib/layersmenu-common.inc.php';
     require_once $myDirPath . 'lib/layersmenu.inc.php';
     require_once $BASE_DIR  . '/menudefs.php';
@@ -590,13 +591,13 @@
         insert($w, script("",array("language"=>"JavaScript","type"=>"text/javascript","src"=> $myWwwPath . 'libjs/layersmenu.js')));
 
         $mid= new LayersMenu(6, 7, 2, 1);
-        $mid->setDirroot ($BASE_DIR.'/menus/');
-        $mid->setLibjsdir($BASE_DIR.'/menus/libjs/');
-        $mid->setImgdir  ($BASE_DIR.'/menus/menuimages/');
-        $mid->setImgwww  ($BASE_URL.'/menus/menuimages/');
-        $mid->setIcondir ($BASE_DIR.'/menus/menuicons/');
-        $mid->setIconwww ($BASE_URL.'/menus/menuicons/');
-        $mid->setTpldir  ($BASE_DIR.'/menus/templates/');
+	$mid->setDirroot ('/usr/share/php/php-layers-menu/');
+	$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+	$mid->setImgdir  ('/usr/share/php/php-layers-menu/menuimages/');
+	$mid->setImgwww  ('../../menus/menuimages/');
+	$mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
+	$mid->setIconwww ('../../menus/menuicons/');
+	$mid->setTpldir  ('/usr/share/php/php-layers-menu/templates/');
         $mid->SetMenuStructureString($ADMIN_MENU);
         $mid->setIconsize(16, 16);
         $mid->parseStructureForMenu('hormenu1');
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
--- ipplan.orig/user/treeview.php	2009-08-17 23:43:59.000000000 +0200
+++ ipplan/user/treeview.php	2011-02-12 11:54:47.486374985 +0200
@@ -24,9 +24,9 @@
 require_once("../class.dbflib.php");
 require_once("../layout/class.layout");
 require_once("../auth.php");
-require_once '../menus/lib/PHPLIB.php';
-require_once '../menus/lib/layersmenu-common.inc.php';
-require_once '../menus/lib/treemenu.inc.php';
+require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+require_once '/usr/share/php/php-layers-menu/lib/layersmenu-common.inc.php';
+require_once '/usr/share/php/php-layers-menu/lib/treemenu.inc.php';
 
 $auth = new SQLAuthenticator(REALM, REALMERROR);
 
@@ -39,7 +39,7 @@
 $title=my_("Display subnet information");
 newhtml($p);
 
-$myWwwPath='../menus/';
+$myWwwPath='../../menus/';
 $w=myheading($p, $title);
 
 insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
@@ -133,12 +133,12 @@
   	}
 
 	$mid = new TreeMenu();
-	$mid->setDirroot('../menus');
-	$mid->setLibjsdir('../menus/libjs/');
-	$mid->setImgdir('../menus/menuimages/');
-	$mid->setImgwww('../menus/menuimages/');
-	$mid->setIcondir('../menus/menuicons/');
-	$mid->setIconwww('../menus/menuicons/');
+	$mid->setDirroot('/usr/share/php/php-layers-menu');
+	$mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
+	$mid->setImgdir('/usr/share/php/php-layers-menu/menuimages/');
+	$mid->setImgwww('../../menus/menuimages/');
+	$mid->setIcondir('/usr/share/php/php-layers-menu/menuicons/');
+	$mid->setIconwww('../../menus/menuicons/');
 	if(!$menustring) myError($w,$p, my_("No customers"));
 	$mid->setMenuStructureString($menustring);
 	$mid->setIconsize(16, 16);