2d7003b4b2
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1882 6952d904-891a-0410-993b-d76249ca496b
30 lines
1.7 KiB
Diff
30 lines
1.7 KiB
Diff
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
Date: 2010-01-29
|
|
Initial Package Version: 2.3.2
|
|
Origin: https://ml.mandriva.net/wws/arc/mds-devel/2010-01/msg00004.html
|
|
Upstream Status: unknown
|
|
Description: Bulkimport required mods
|
|
|
|
diff -Naur mmc-web-base-2.3.2.orig/main.php mmc-web-base-2.3.2/main.php
|
|
--- mmc-web-base-2.3.2.orig/main.php 2010-01-29 16:07:28.784423139 +0000
|
|
+++ mmc-web-base-2.3.2/main.php 2010-01-29 16:24:06.781423783 +0000
|
|
@@ -27,6 +27,7 @@
|
|
global $conf;
|
|
|
|
ob_start();
|
|
+require ("modules/bulkimport/includes/importUsers.php"); // GLEN (load before session)
|
|
|
|
require("includes/session.inc.php");
|
|
require("includes/config.inc.php");
|
|
diff -Naur mmc-web-base-2.3.2.orig/modules/base/users/localSidebar.php mmc-web-base-2.3.2/modules/base/users/localSidebar.php
|
|
--- mmc-web-base-2.3.2.orig/modules/base/users/localSidebar.php 2010-01-29 16:07:28.771423753 +0000
|
|
+++ mmc-web-base-2.3.2/modules/base/users/localSidebar.php 2010-01-29 16:16:02.722422771 +0000
|
|
@@ -27,6 +27,7 @@
|
|
$sidemenu->setBackgroundImage("img/users/icn_users_large.gif");
|
|
$sidemenu->addSideMenuItem(new SideMenuItem(_("List"), "base","users","index", "img/users/icn_global_active.gif", "img/users/icn_global.gif"));
|
|
$sidemenu->addSideMenuItem(new SideMenuItem(_("Add"), "base","users","add", "img/users/icn_addUser_active.gif", "img/users/icn_addUser.gif"));
|
|
+$sidemenu->addSideMenuItem(new SideMenuItem(_T("Bulk Manager (CSV)"), "base", "users", "bulkimport", "img/users/icn_addUser_active.gif", "img/users/icn_addUser.gif"));
|
|
|
|
if ($_SESSION["login"] != "root") {
|
|
$sidemenu->addSideMenuItem(new SideMenuItem(_("Change your password"), "base","users","passwd", "img/access/icn_global_active.gif", "img/access/icn_global.gif"));
|