--- /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/github_19.0.3_browser.php
+++ /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/client_browser.php
@@ -6 +6 @@
- * retrieved as GPL v2 or later
+ * retreived as GPL v2 or later
@@ -24 +24 @@
-require '../../connectors/php/config.inc.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
+require '../../connectors/php/config.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
@@ -28 +28 @@
-top_httphead();
+
@@ -31 +31,2 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+ "http://www.w3.org/TR/html4/frameset.dtd">
@@ -36,19 +36,0 @@
-<?php
-print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-$themepath = dol_buildpath($conf->css, 1);
-$themesubdir = '';
-if (!empty($conf->modules_parts['theme'])) { // This slow down
- foreach ($conf->modules_parts['theme'] as $reldir) {
- if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
- $themepath = dol_buildpath($reldir.$conf->css, 1);
- $themesubdir = $reldir;
- break;
- }
- }
-}
-
-//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-$themeparam = '';
-print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-?>
@@ -107 +89 @@
-if ( sConnUrl.substring(0,1) != '/' && sConnUrl.indexOf( '://' ) < 0 )
+if ( sConnUrl.substr(0,1) != '/' && sConnUrl.indexOf( '://' ) < 0 )
@@ -116,4 +97,0 @@
-/* @CHANGE LDR Overwrite value coming from parameters for security purpose */
-oConnector.ConnectorUrl = '<?php echo DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php?'; ?>';
-console.log('ConnectorUrl='+oConnector.ConnectorUrl);
-
@@ -214 +192 @@
- <frameset cols="200,*" framespacing="3" border="1" style="border: 2px solid #CCCCCC;">
+ <frameset cols="150,*" framespacing="3" border="1" style="border: 2px solid #CCCCCC;">
@@ -216 +194 @@
- <frameset rows="50,*,70" framespacing="0">
+ <frameset rows="50,*,50" framespacing="0">
@@ -219 +197 @@
- <frameset cols="200,*" framespacing="0" border="0">
+ <frameset cols="150,*,0" framespacing="0" border="0">
--- /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/github_19.0.3_frmactualfolder.php
+++ /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/client_frmactualfolder.php
@@ -6 +6 @@
- * retrieved as GPL v2 or later
+ * retreived as GPL v2 or later
@@ -24 +23,0 @@
-// Load Dolibarr environment
@@ -26,3 +24,0 @@
-
-top_httphead();
-
@@ -57,18 +52,0 @@
-<?php
-print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-$themepath = dol_buildpath($conf->css, 1);
-$themesubdir = '';
-if (!empty($conf->modules_parts['theme'])) { // This slow down
- foreach ($conf->modules_parts['theme'] as $reldir) {
- if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
- $themepath = dol_buildpath($reldir.$conf->css, 1);
- $themesubdir = $reldir;
- break;
- }
- }
-}
-
-//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
-?>
--- /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/github_19.0.3_frmcreatefolder.php
+++ /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/client_frmcreatefolder.php
@@ -6 +6 @@
- * retrieved as GPL v2 or later
+ * retreived as GPL v2 or later
@@ -24 +23,0 @@
-// Load Dolibarr environment
@@ -26,5 +24,0 @@
-
-$langs->load("ecm");
-
-top_httphead();
-
@@ -59,18 +52,0 @@
-<?php
-print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-$themepath = dol_buildpath($conf->css, 1);
-$themesubdir = '';
-if (!empty($conf->modules_parts['theme'])) { // This slow down
- foreach ($conf->modules_parts['theme'] as $reldir) {
- if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
- $themepath = dol_buildpath($reldir.$conf->css, 1);
- $themesubdir = $reldir;
- break;
- }
- }
-}
-
-//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
-?>
@@ -150 +126,9 @@
- <button type="button" class="butAction" onclick="CreateFolder();"><?php echo $langs->trans("ECMNewSection"); ?></button>
+ <button type="button" style="WIDTH: 100%" onclick="CreateFolder();">
+ <table cellSpacing="0" cellPadding="0" border="0">
+ <tr>
+ <td><?php echo img_picto_common('', 'treemenu/folder.gif', 'width="16" height="16"'); ?></td>
+ <td> </td>
+ <td class="nowrap">Create New Folder</td>
+ </tr>
+ </table>
+ </button>
--- /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/github_19.0.3_frmfolders.php
+++ /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/client_frmfolders.php
@@ -6 +6 @@
- * retrieved as GPL v2 or later
+ * retreived as GPL v2 or later
@@ -24 +23,0 @@
-// Load Dolibarr environment
@@ -26,3 +24,0 @@
-
-top_httphead();
-
@@ -56 +52 @@
-//top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+//echo top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
@@ -63,18 +58,0 @@
-<?php
-print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-$themepath = dol_buildpath($conf->css, 1);
-$themesubdir = '';
-if (!empty($conf->modules_parts['theme'])) { // This slow down
- foreach ($conf->modules_parts['theme'] as $reldir) {
- if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
- $themepath = dol_buildpath($reldir.$conf->css, 1);
- $themesubdir = $reldir;
- break;
- }
- }
-}
-
-//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
-?>
@@ -121 +99 @@
- oCell.innerHTML = sLink + ' <\/a>' ;
+ oCell.innerHTML = sLink + '<img alt="" src="spacer.gif" width="16" height="16" border="0"><\/a>' ;
--- /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/github_19.0.3_frmresourceslist.php
+++ /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/client_frmresourceslist.php
@@ -6 +6 @@
- * retrieved as GPL v2 or later
+ * retreived as GPL v2 or later
@@ -24 +23,0 @@
-// Load Dolibarr environment
@@ -26,3 +24,0 @@
-
-top_httphead();
-
@@ -57,18 +52,0 @@
-<?php
-print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-$themepath = dol_buildpath($conf->css, 1);
-$themesubdir = '';
-if (!empty($conf->modules_parts['theme'])) { // This slow down
- foreach ($conf->modules_parts['theme'] as $reldir) {
- if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
- $themepath = dol_buildpath($reldir.$conf->css, 1);
- $themesubdir = $reldir;
- break;
- }
- }
-}
-
-//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
-?>
@@ -140,7 +118,7 @@
- var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' );
- var oMatch = oRegex.exec( window.top.location.search );
-
- if ( oMatch && oMatch.length > 1 )
- return decodeURIComponent( oMatch[1] );
- else
- return '' ;
+ var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' );
+ var oMatch = oRegex.exec( window.top.location.search );
+
+ if ( oMatch && oMatch.length > 1 )
+ return decodeURIComponent( oMatch[1] );
+ else
+ return '' ;
@@ -152,2 +130,2 @@
- funcNum = GetUrlParam('CKEditorFuncNum');
- //window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' ));
+ funcNum = GetUrlParam('CKEditorFuncNum');
+ //window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' ));
@@ -155,4 +133,4 @@
-
- ///////////////////////////////////
- window.top.close();
- window.top.opener.focus();
+
+ ///////////////////////////////////
+ window.top.close();
+ window.top.opener.focus();
--- /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/github_19.0.3_frmupload.php
+++ /tmp/dsg/dolibarr/htdocs/core/filemanagerdol/browser/default/client_frmupload.php
@@ -6 +6 @@
- * retrieved as GPL v2 or later
+ * retreived as GPL v2 or later
@@ -24 +23,0 @@
-// Load Dolibarr environment
@@ -26,3 +24,0 @@
-
-top_httphead();
-
@@ -57,18 +52,0 @@
-<?php
-print '<!-- Includes CSS for Dolibarr theme -->'."\n";
-// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-$themepath = dol_buildpath($conf->css, 1);
-$themesubdir = '';
-if (!empty($conf->modules_parts['theme'])) { // This slow down
- foreach ($conf->modules_parts['theme'] as $reldir) {
- if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
- $themepath = dol_buildpath($reldir.$conf->css, 1);
- $themesubdir = $reldir;
- break;
- }
- }
-}
-
-//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
-print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
-?>
@@ -90 +67,0 @@
- console.log("Click on OnSubmit");
@@ -106,2 +82,0 @@
- console.log("errorNumber = "+errorNumber);
-
@@ -134 +109 @@
- alert( 'Invalid file (Bad extension)' );
+ alert( 'Invalid file' );
@@ -150 +124,0 @@
- <input type="hidden" name="token" value="<?php echo newToken(); ?>" />
@@ -153,2 +127,3 @@
- <td class="nowrap valignmiddle">
- <table width="100%" class="inline-block valignmiddle">
+ <td class="nowrap">
+ <span id="eUploadMessage">Upload a new file in this folder</span><br>
+ <table cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -156,2 +131,2 @@
- <td><input id="NewFile" name="NewFile" type="file"></td>
- <td class="nowrap"> <input id="btnUpload" type="submit" value="Upload" class="flat button"></td>
+ <td width="100%"><input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file"></td>
+ <td class="nowrap"> <input id="btnUpload" type="submit" value="Upload"></td>
@@ -160,2 +134,0 @@
- <!-- Section for upload result message -->
- <span id="eUploadMessage"></span><br>