diff --git a/core/trunk/index.php b/core/trunk/index.php
index d32036c817299fe1f4bba20f4baaeeca640a2251..d31810f8e492080e7f7f523804706a50fd8fa079 100644
--- a/core/trunk/index.php
+++ b/core/trunk/index.php
@@ -4,84 +4,27 @@
*
* Maarch Portal entry
*
-* @package maarch
-* @version 2.5
+* @package maarch
+* @version MEP 1.3
* @since 10/2005
* @license GPL v3
-* @author Laurent Giovannoni <dev@maarch.org>
+* @author Laurent Giovannoni <dev@maarch.org>
*/
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_functions.php");
-include_once('core'.DIRECTORY_SEPARATOR.'init.php');
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_portal.php");
-require_once("core".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_core_tools.php");
-if (!isset($portal)) {
- $portal = new portal();
-}
-#$portal->build_config();
+require_once('core/class/class_functions.php');
+include_once('core/init.php');
+require_once('core/class/class_core_tools.php');
$func = new functions();
$core = new core_tools();
$_SESSION['custom_override_id'] = $core->get_custom_id();
-
/**** retrieve HTTP_REQUEST FROM SSO ****/
$_SESSION['HTTP_REQUEST'] = $_REQUEST;
-
-/*
-if(isset($_SESSION['config']['defaultlang']) && !empty($_SESSION['config']['defaultlang']))
-{
- include("portal".DIRECTORY_SEPARATOR.$_SESSION['config']['defaultlang'].'.php');
-}
-*/
-if(isset($_GET['origin']) && $_GET['origin'] == "scan")
+if(isset($_GET['origin']) && $_GET['origin'] == 'scan')
{
- header("location: apps/".$_SESSION['businessapps'][0]['appid']."/reopen.php");
-}
-elseif(count($_SESSION['businessapps'])== 1)
-{
- #header("location: portal/launch_maarch.php?app=".$_SESSION['businessapps'][0]['appid']);
+ header('location: apps/'.$_SESSION['businessapps'][0]['appid'].'/reopen.php');
+} elseif(count($_SESSION['businessapps'])== 1) {
$_SESSION['config']['app_id'] = $_SESSION['businessapps'][0]['appid'];
-
- header("location: apps/".$_SESSION['config']['app_id']."/index.php?display=true&page=login&coreurl=".$_SESSION['config']['coreurl']);
-}
-/*else
-{
-?>
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $_SESSION['config']['defaultlang'] ?>" lang="<?php echo $_SESSION['config']['defaultlang'] ?>">
- <head>
- <title><?php echo _PORTAL_NAME;?></title>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
- <meta http-equiv="Content-Language" content="<?php echo $_SESSION['config']['defaultlang'] ?>" />
- <link rel="stylesheet" type="text/css" href="portal/css/styles.css" media="screen" />
- <!--[if lt IE 7.0]> <link rel="stylesheet" type="text/css" href="portal/css/style_ie.css" media="screen" /> <![endif]-->
- <!--[if gte IE 7.0]> <link rel="stylesheet" type="text/css" href="portal/css/style_ie7.css" media="screen" /> <![endif]-->
- </head>
- <body id="bodylogin">
- <div id="loginpage">
- <p id="logo"><img src="portal/img/logo.gif" alt="Maarch Archives in motion"/></p>
- <form name="formlogin" id="formlogin" method="get" action="portal/launch_maarch.php" class="forms">
- <p>
- <?php echo _SELECT_YOUR_APPLICATION;?> :
- </p>
- <p>
- <select name="app" id="app">
- <option value="">--</option>
- <?php
- for($i=0;$i<=count($_SESSION['businessapps'])-1;$i++)
- {
- echo "<option value='".$_SESSION['businessapps'][$i]['appid']."'>".$_SESSION['businessapps'][$i]['comment']."</option>";
- }
- ?>
- </select>
- </p>
- <p>
- <input type="submit" class="button" name="submit" value="<?php echo _ENTER;?>" />
- </p>
- </form>
- </div>
- </body>
- </html>
-<?php
+ header('location: apps/'.$_SESSION['config']['app_id']
+ . '/index.php?display=true&page=login&coreurl='
+ . $_SESSION['config']['coreurl']);
}
-?>
-*/
diff --git a/core/trunk/portal/css/style_ie.css b/core/trunk/portal/css/style_ie.css
deleted file mode 100644
index 0b9bbc5487910e16f09ed41e775abd17c4dd19b2..0000000000000000000000000000000000000000
--- a/core/trunk/portal/css/style_ie.css
+++ /dev/null
@@ -1,116 +0,0 @@
-.addforms {
- width: 400px;
-}
-
-input.small {
- width: 17px;
-}
-
-input.button {
- padding: 0.2em 0 0.2em 0.5em;
-}
-
-.forms p.buttons {
- margin-left: 41.7%;
-}
-
-#doctype {
- height: 10em;
-}
-
-#logo {
- margin: 0 0 20px 10px;
-}
-
-#help {
- margin-top: 42px;
- padding-bottom: 10px;
-}
-
-#inner_content {
- height: 370px;
-}
-
-#content h1 {
- height: 2em;
- padding: 0;
-}
-
-#content h1 img {
- margin-top: .4em;
-}
-
-#content h1 a.back {
- font-size: .4em;
- margin-top: 1em;
-
-}
-
-#formlogin {
- width: 265px;
-}
-
-#formlogin input {
- width: 128px;
-}
-
-#formlogin .nota, #formlogin p.buttons {
- margin-right: 12px;
-}
-
-#formlogin select {
- width: 134px;
-}
-
-#post #content {
- padding-top: 0;
-}
-
-#post_indexing input.textbox {
- width: 155px;
-}
-
-#post_indexing input.small {
- width: 17px;
-}
-
-#post_indexing div label {
- margin-right: 1px;
-}
-
-#post_indexing div ul {
- width: 30%;
-}
-
-#post_indexing .buttons {
- padding-right: 11px;
-}
-
-#post #pdf iframe {
- height: 665px;
-}
-
-#titress {
- margin-left: 5px;
-}
-
-
-#menunav {
- padding: 5px;
-}
-
-#menunav li {
- float: left;
- width: 170px;
-}
-
-#menunav li ol {
- margin-bottom: 6px;
-}
-
-
-/* aide */
-
-#helppages #nav {
- margin-bottom: -1.8em;
-}
\ No newline at end of file
diff --git a/core/trunk/portal/css/style_ie7.css b/core/trunk/portal/css/style_ie7.css
deleted file mode 100644
index b79215e39223dfed5fa7a775258c274e3fd1c6b9..0000000000000000000000000000000000000000
--- a/core/trunk/portal/css/style_ie7.css
+++ /dev/null
@@ -1,94 +0,0 @@
-#menunav {
- padding-bottom: 5px;
-}
-
-.addforms {
- width: 400px;
-}
-
-input.small {
- width: 17px;
-}
-
-input.button {
- padding: 0.2em 0 0.2em 0.5em;
-}
-
-#doctype {
- height: 10em;
-}
-
-#logo {
- margin: 0 0 20px 10px;
-}
-
-#help {
- margin-top: 42px;
- padding-bottom: 10px;
-}
-
-
-
-#content h1 {
- height: 2.05em;
- padding: 0;
-}
-
-#content h1 img {
- margin-top: .35em;
-}
-
-#content h1 a.back {
- font-size: .5em;
- margin-top: 1em;
-}
-
-#formlogin {
- width: 265px;
-}
-
-#formlogin input {
- width: 128px;
-}
-
-#formlogin .nota, #formlogin p.buttons {
- margin-right: 12px;
-}
-
-#formlogin select {
- width: 134px;
-}
-
-#post #content {
- padding-top: 0;
-}
-
-#post_indexing input.textbox {
- width: 155px;
-}
-
-#post_indexing input.small {
- width: 17px;
-}
-
-#post_indexing div label {
- margin-right: 1px;
-}
-
-#post_indexing div ul {
- width: 30%;
-}
-
-#post_indexing .buttons {
- padding-right: 11px;
-}
-
-#post #pdf iframe {
- height: 665px;
-}
-
-#titless {
- margin-left: 5px;
-}
-
-
diff --git a/core/trunk/portal/css/styles.css b/core/trunk/portal/css/styles.css
deleted file mode 100644
index 89fdd5845c193f355f519e41f24d8bc74259346e..0000000000000000000000000000000000000000
--- a/core/trunk/portal/css/styles.css
+++ /dev/null
@@ -1,270 +0,0 @@
-/* misc */
-
-html {
- height: 100%;
-}
-
-body {
- color: #666;
- background: white url(../img/bg_body.gif) top center repeat-y;
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size: 11px;
- font-weight: normal;
- letter-spacing: .02em;
- margin: 0;
- padding: 0;
- text-align: center;
- width: 100%;
-}
-
-div, h1, h2, h3, h4, h5, h6, p, ul, ol, li {
- margin: 0;
- padding: 0;
- list-style: none;
-}
-
-table {
- font-size: 1em;
-}
-
-img {
- border: none;
-}
-
-a, a:link, a:visited, a:hover {
- color: #666;
- text-decoration: none;
-}
-
-a:hover {
- color: #1B99C4;
-}
-
-/* Forms */
-
-form, fieldset {
- padding: 0;
- margin: 0;
- border: 0px solid white;
-}
-
-.addforms {
- width: 440px;
-}
-
-label, .label {
- cursor: pointer;
- vertical-align: middle;
-}
-
-input, select, textarea, .forms img {
- vertical-align: middle;
- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size: .9em;
-}
-
-.smallforms {
- padding: 0 12px;
-}
-
-.forms input, .forms select, .forms textarea, .smallforms select, .smallforms input {
- background-color: White;
- border: 1px solid #999;
- color: #666;
- width: 200px;
-}
-
-.forms input, .forms textarea {
- padding: 0.1em 0.2em;
-}
-
-.forms select {
- width: 206px;
-}
-
-input.small {
- width: 20px;
-}
-
-select.small {
- width: 5em;
-}
-
-input.medium {
- width: 120px;
-}
-
-#newpage1, #newpage2 {
- text-align: center;
- color: #007583;
-}
-
-input.detail_box {
- width: 260px;
- font-size: 1em;
-}
-
-#startpage {
- margin-right: 10px;
-}
-
-#frmletters a:hover, #frmletters a.on {
- color: #007583;
-}
-
-#frmletters fieldset {
- float: right;
-}
-
-/* particular cases */
-
-#dates label, #where label, .forms label.nofloat {
- float: none;
- display: inline;
- width: auto;
- margin: 0;
- font-size: .9em;
-}
-
-#dates .label, #fordate label {
- padding-top: .5em;
-}
-
-#doctype {
- min-height: 10em;
- height: auto;
- border: 1px solid #CCC;
- border-left: none;
- border-right: none;
- padding: 10px;
-}
-
-#doctype .label {
- padding: 3em 0;
-}
-
-/* form quicksearch */
-
-#quicksearchform input.button, input.radio {
- border: none;
- background-color: transparent;
- background-image: none;
- padding: 0;
- margin: 0;
- width: auto;
-}
-
-/* more particular cases */
-
-input.button {
- border: 1px solid #44b2bf;
- color: #007583;
- background: white url(../img/bg_but.gif) top left repeat-x;
- cursor: pointer;
- width: auto;
- padding: 0.2em 0.5em;
- text-align: left;
-}
-
-.forms label, .forms .label {
- float: left;
- display: block;
- text-align: right;
- width: 40%;
- margin-right: 1em;
-}
-
-.forms p {
- clear: left;
-}
-
-.forms p.buttons {
- margin-left: 41.3%;
-}
-
-/* Special case : back link in the title */
-
-#content h1.titdetail {
- text-align: right;
- padding-left: 17px;
- padding-right: 17px;
-}
-
-#content h1 a {
- color: White;
-}
-
-#content h1 a:hover {
- color: White;
- text-decoration: underline;
-}
-
-#content h1 a.back {
- /* float: right;
- display: block;
- margin-top: 1.1em;
- font-size: .4em;*/
- display: block;
- padding-top: .9em;
- font-size: .4em;
-}
-
-#content p, #bodylogin .forms p {
- padding-bottom: 1em;
-}
-
-#content h1 span.titre {
- font-size: 1em;
- float: left;
-}
-
-/* footer */
-
-#footer {
- text-align: center;
- font-size: .8em;
- color: #CCC;
- background: transparent url(../img/bg_footer.gif) top left no-repeat;
- padding: 30px 0;
- margin: 0 20px;
-}
-
-/* Home */
-
-#bodylogin {
- background: White url(../img/bg_home.gif) center center no-repeat;
- height: 100%;
- text-align: left;
-}
-
-#loginpage {
- width: 300px;
- height: 350px;
- margin-left: -150px;
- margin-top: -175px;
- left: 50%;
- top: 50%;
- position: absolute;
-}
-
-#formlogin {
- width: 255px;
-}
-
-#formlogin input {
- width: 135px;
-}
-
-#formlogin input.button {
- width: auto;
- margin: 0;
-}
-
-#formlogin p.buttons, #post .forms .buttons {
- text-align: right;
- margin: 0;
-}
-
-#formlogin select {
- width: 140px;
-}
diff --git a/core/trunk/portal/en.php b/core/trunk/portal/en.php
deleted file mode 100644
index fcb9b16ee3bbf7bd2de29d38a721f02348db1a22..0000000000000000000000000000000000000000
--- a/core/trunk/portal/en.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
-* File : en.php
-*
-* French language file
-*
-* @package Maarch framework 2.5
-* @version 2.5
-* @since 10/2005
-* @license GPL v3
-* @author Laurent Giovannoni <dev@maarch.org>
-*/
-/*********************** common ***********************************/
-define('_PORTAL_NAME', 'Maarch Portal');
-define('_SELECT_YOUR_APPLICATION', 'Select your application');
-define('_ENTER', 'Enter');
-?>
\ No newline at end of file
diff --git a/core/trunk/portal/fr.php b/core/trunk/portal/fr.php
deleted file mode 100644
index ef488846ed7cc82c084af6772a6dfc5428c77073..0000000000000000000000000000000000000000
--- a/core/trunk/portal/fr.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
-* File : fr.php
-*
-* French language file
-*
-* @package Maarch framework 2.5
-* @version 2.5
-* @since 10/2005
-* @license GPL v3
-* @author Laurent Giovannoni <dev@maarch.org>
-*/
-/*********************** common ***********************************/
-define('_PORTAL_NAME', 'Portail d\'accès Maarch');
-define('_SELECT_YOUR_APPLICATION', 'Sélectionnez votre application');
-define('_ENTER', 'Entrer');
-?>
\ No newline at end of file
diff --git a/core/trunk/portal/img/bg_home.gif b/core/trunk/portal/img/bg_home.gif
deleted file mode 100644
index 6d9cd010f670ce2ecdbe4a3a48dd7a7c65cf0aff..0000000000000000000000000000000000000000
Binary files a/core/trunk/portal/img/bg_home.gif and /dev/null differ
diff --git a/core/trunk/portal/img/logo.gif b/core/trunk/portal/img/logo.gif
deleted file mode 100644
index c9d9c3a75beedf603ab46f57461f4bb6338a7bdc..0000000000000000000000000000000000000000
Binary files a/core/trunk/portal/img/logo.gif and /dev/null differ
diff --git a/core/trunk/portal/launch_maarch.php b/core/trunk/portal/launch_maarch.php
deleted file mode 100644
index 0381c712daee043a9d3277c41bae21a42c9c22a0..0000000000000000000000000000000000000000
--- a/core/trunk/portal/launch_maarch.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
-* File : launch_maarch.php
-*
-* Maarch launch script
-*
-* @package maarch
-* @version 2.5
-* @since 10/2005
-* @license GPL v3
-* @author Laurent Giovannoni <dev@maarch.org>
-*/
-include('../core/init.php');
-
-if(trim($_GET['app'])<> "" )
-{
- $_SESSION['config']['app_id'] = $_GET['app'];
- header("location: ../apps/".$_GET['app']."/index.php?display=true&page=login&coreurl=".$_SESSION['config']['coreurl']);
-}
-else
-{
- header("location: ../index.php");
-}
-exit();
-?>