Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cosmetics #10

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Cosmetics #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2c572fc
Merge pull request #1 from nao-pon/master
mambax7 Dec 11, 2017
318bd56
missing _ADMENU_GOOGLEDRIVE
mambax7 Dec 11, 2017
b941f7f
Only variables should be assigned by reference
mambax7 Dec 11, 2017
69dd544
Callable name case mismatched in a call
mambax7 Dec 11, 2017
b93763c
Only variables should be assigned by reference
mambax7 Dec 11, 2017
605e03d
Merge branch 'master' of https://github.com/nao-pon/xelfinder
mambax7 May 20, 2018
88729a1
Merge branch 'master' of https://github.com/nao-pon/xelfinder
mambax7 Jun 29, 2018
58075f7
[ImgBot] Optimize images
ImgBotApp Jan 19, 2019
686c998
Merge pull request #2 from mambax7/imgbot
mambax7 Jan 19, 2019
1915a6c
Merge branch 'master' of https://github.com/nao-pon/xelfinder
mambax7 Aug 31, 2019
1ce83bf
Merge branch 'master' of https://github.com/mambax7/xelfinder
mambax7 Aug 31, 2019
ceb576f
https://github.com/nao-pon/xelfinder/issues/8
mambax7 Aug 31, 2019
da4afe2
cosmetics (Yoda, arrays, etc.)
mambax7 Aug 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified html/common/js/simplemodal/img/basic/x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions html/modules/xelfinder/admin/admin_menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH into mainfile.php' ) ;
if (!defined('XOOPS_TRUST_PATH')) {
die('set XOOPS_TRUST_PATH into mainfile.php');
}

$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
$mydirpath = dirname( dirname( __FILE__ ) ) ;
require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
$mydirname = basename(dirname(__DIR__));
$mydirpath = dirname(__DIR__);
require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname

require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin_menu.php' ;

?>
require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/admin_menu.php';
16 changes: 8 additions & 8 deletions html/modules/xelfinder/admin/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

require '../../../mainfile.php' ;
if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
require '../../../mainfile.php';
if (!defined('XOOPS_TRUST_PATH')) {
die('set XOOPS_TRUST_PATH in mainfile.php');
}

$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
$mydirpath = dirname( dirname( __FILE__ ) ) ;
require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
$mydirname = basename(dirname(__DIR__));
$mydirpath = dirname(__DIR__);
require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname

require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/admin.php' ;

?>
require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/admin.php';
29 changes: 16 additions & 13 deletions html/modules/xelfinder/connector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
<?php

define('PROTECTOR_SKIP_DOS_CHECK', TRUE);
define('BIGUMBRELLA_DISABLED', TRUE);
define('HYP_COMMON_SKIP_POST_FILTER', TRUE);
define('PROTECTOR_SKIP_FILESCHECKER' , 1 );
define('PROTECTOR_SKIP_DOS_CHECK', true);
define('BIGUMBRELLA_DISABLED', true);
define('HYP_COMMON_SKIP_POST_FILTER', true);
define('PROTECTOR_SKIP_FILESCHECKER', 1);

if (isset($_POST['sessionId'])) {
session_id($_POST['sessionId']);
session_id($_POST['sessionId']);
}

include '../../mainfile.php';

if( ! defined( 'XOOPS_TRUST_PATH' ) ) die( 'set XOOPS_TRUST_PATH in mainfile.php' ) ;
if (!defined('XOOPS_TRUST_PATH')) {
die('set XOOPS_TRUST_PATH in mainfile.php');
}

//error_reporting(0);

while(ob_get_level()) {
if (! ob_end_clean()) break;
while (ob_get_level()) {
if (!ob_end_clean()) {
break;
}
}

$mydirname = basename( dirname( __FILE__ ) ) ;
$mydirpath = dirname( __FILE__ ) ;

require $mydirpath.'/mytrustdirname.php' ; // set $mytrustdirname
$mydirname = basename(__DIR__);
$mydirpath = __DIR__;

require XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname.'/connector.php' ;
require $mydirpath . '/mytrustdirname.php'; // set $mytrustdirname

require XOOPS_TRUST_PATH . '/modules/' . $mytrustdirname . '/connector.php';
40 changes: 20 additions & 20 deletions html/modules/xelfinder/include/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
div.xelfinder_main_menu {
text-align: center;
text-align: center;
}

div.xelfinder h2,
div.xelfinder h3 {
text-align: center;
border:solid 1px #ddd;
text-align: center;
border:solid 1px #ddd;
padding: 5px;
border-radius: 5px;
background: #eee;
Expand All @@ -18,8 +18,8 @@ div.xelfinder h3 {
}
div.xelfinder h2,
div.xelfinder h3 span {
border-left:5px #3cf solid;
padding-left:10px;
border-left:5px #3cf solid;
padding-left:10px;
}


Expand All @@ -30,18 +30,18 @@ div.xelfinder .button {
display: inline-block;
text-align: center;
color: #fff;

border: 1px solid #9c9c9c; /* Fallback style */
border: 1px solid rgba(0, 0, 0, 0.3);
border: 1px solid rgba(0, 0, 0, 0.3);

text-shadow: 0 1px 0 rgba(0,0,0,0.4);

box-shadow: 0 0 .05em rgba(0,0,0,0.4);
-moz-box-shadow: 0 0 .05em rgba(0,0,0,0.4);
-webkit-box-shadow: 0 0 .05em rgba(0,0,0,0.4);

}

div.xelfinder .button,
div.xelfinder .button span {
-moz-border-radius: .3em;
Expand All @@ -66,17 +66,17 @@ div.xelfinder .button span {
-moz-linear-gradient(-45deg, transparent 75%, rgba(0, 0, 0, 0.05) 75%);

/* Pattern settings */

-moz-background-size: 3px 3px;
-webkit-background-size: 3px 3px;
}

div.xelfinder .button:hover {
box-shadow: 0 0 .1em rgba(0,0,0,0.4);
-moz-box-shadow: 0 0 .1em rgba(0,0,0,0.4);
-webkit-box-shadow: 0 0 .1em rgba(0,0,0,0.4);
}

div.xelfinder .button:active {
/* When pressed, move it down 1px */
position: relative;
Expand All @@ -89,14 +89,14 @@ div.xelfinder .button-blue {
background: -moz-linear-gradient(-90deg, #81a8cb, #4477a1);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#81a8cb', endColorstr='#4477a1');
}

div.xelfinder .button-blue:hover {
background: #81a8cb;
background: -webkit-gradient(linear, left top, left bottom, from(#4477a1), to(#81a8cb) );
background: -moz-linear-gradient(-90deg, #4477a1, #81a8cb);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4477a1', endColorstr='#81a8cb');
}

div.xelfinder .button-blue:active {
background: #4477a1;
}
Expand All @@ -107,14 +107,14 @@ div.xelfinder .button-orange {
background: -moz-linear-gradient(-90deg, #F8C939, #F09C15);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#F8C939', endColorstr='#F09C15');
}

div.xelfinder .button-orange:hover {
background: #F8C939;
background: -webkit-gradient(linear, left top, left bottom, from(#F09C15), to(#F8C939) );
background: -moz-linear-gradient(-90deg, #F09C15, #F8C939);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#F09C15', endColorstr='#F8C939');
}

div.xelfinder .button-orange:active {
background: #F09C15;
}
Expand All @@ -125,14 +125,14 @@ div.xelfinder .button-green {
background: -moz-linear-gradient(-90deg, #C8DD95, #428739);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#C8DD95', endColorstr='#428739');
}

div.xelfinder .button-green:hover {
background: #C8DD95;
background: -webkit-gradient(linear, left top, left bottom, from(#428739), to(#C8DD95) );
background: -moz-linear-gradient(-90deg, #428739, #C8DD95);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#428739', endColorstr='#C8DD95');
}

div.xelfinder .button-green:active {
background: #428739;
}
Expand Down
30 changes: 15 additions & 15 deletions html/modules/xelfinder/include/css/manager.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
#elfinder .elfinder-navbar {
width:180px;
width:180px;
}
#elfinder .elfinder-resize-preview {
height: 320px;
height: 320px;
}

div.elfinder-perm-dialog input.perm-uid {
width: 2.7em;
text-align: right;
width: 2.7em;
text-align: right;
}

.elfinder-button-icon-perm { background-position: 0 -48px; }

.file_info {
font-family: Verdana,Arial,sans-serif;
font-size: 0.9em;
text-shadow: 0 -1px 1px #000,
-1px 0 1px #000,
1px 0 1px #000,
0 1px 1px #000,
1px 1px 1px #FFF,
2px 2px 2px #FFF,
3px 3px 3px #FFF;
color: #FFF;
font-family: Verdana,Arial,sans-serif;
font-size: 0.9em;
text-shadow: 0 -1px 1px #000,
-1px 0 1px #000,
1px 0 1px #000,
0 1px 1px #000,
1px 1px 1px #FFF,
2px 2px 2px #FFF,
3px 3px 3px #FFF;
color: #FFF;
}
.image-inserter-item {
background-color: #FFFFFF;
Expand All @@ -40,7 +40,7 @@ div.elfinder-perm-dialog input.perm-uid {
width: 200px;
}
.image-inserter-item span[onclick] {
cursor: pointer;
cursor: pointer;
}
/* ACE Editor IME Fix */
@font-face {
Expand Down
Loading