Skip to content
This repository has been archived by the owner on Jan 8, 2018. It is now read-only.

Commit

Permalink
Updated SSL logic, fontawesome, GeoIP, mimes
Browse files Browse the repository at this point in the history
  • Loading branch information
@chocolatkey
chocolatkey committed Nov 2, 2016
1 parent 79bc26a commit de6e5fa
Show file tree
Hide file tree
Showing 14 changed files with 2,702 additions and 704 deletions.
2 changes: 1 addition & 1 deletion application/config/constants.php
View file
Expand Up @@ -47,7 +47,7 @@

define('FOOLSLIDE_VERSION', '2.3.3');
define('GITHUB_REPO', 'chocolatkey/foolslide2');// Github repository to get updates from
define('FORCE_SSL', true);// Change to false if you really want to allow insecure access to the admin interface
define('FORCE_SSL', false);// Can be buggy when reverse proxying etc.


/* End of file constants.php */
Expand Down
36 changes: 18 additions & 18 deletions application/config/mimes.php
View file
Expand Up @@ -10,7 +10,7 @@

$mimes = array( 'hqx' => 'application/mac-binhex40',
'cpt' => 'application/mac-compactpro',
'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
'csv' => array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
'bin' => 'application/macbinary',
'dms' => 'application/octet-stream',
'lha' => 'application/octet-stream',
Expand Down Expand Up @@ -51,7 +51,7 @@
'tgz' => array('application/x-tar', 'application/x-gzip-compressed'),
'xhtml' => 'application/xhtml+xml',
'xht' => 'application/xhtml+xml',
// 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
//'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
'mid' => 'audio/midi',
'midi' => 'audio/midi',
'mpga' => 'audio/mpeg',
Expand All @@ -65,12 +65,12 @@
'rpm' => 'audio/x-pn-realaudio-plugin',
'ra' => 'audio/x-realaudio',
'rv' => 'video/vnd.rn-realvideo',
'wav' => 'audio/x-wav',
'bmp' => 'image/bmp',
'wav' => array('audio/x-wav', 'audio/wave', 'audio/wav'),
'bmp' => array('image/bmp', 'image/x-windows-bmp'),
//'gif' => 'image/gif',
///'jpeg' => array('image/jpeg', 'image/pjpeg'),
//'jpeg' => array('image/jpeg', 'image/pjpeg'),
//'jpg' => array('image/jpeg', 'image/pjpeg'),
'jpe' => array('image/jpeg', 'image/pjpeg'),
//'jpe' => array('image/jpeg', 'image/pjpeg'),
//'png' => array('image/png', 'image/x-png'),
'tiff' => 'image/tiff',
'tif' => 'image/tiff',
Expand All @@ -93,22 +93,22 @@
'avi' => 'video/x-msvideo',
'movie' => 'video/x-sgi-movie',
'doc' => 'application/msword',
'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'),
'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'),
'word' => array('application/msword', 'application/octet-stream'),
'xl' => 'application/excel',
'eml' => 'message/rfc822',
'json' => array('application/json', 'text/json'),
'gif' => array('image/gif', 'application/octet-stream'),
'jpeg' => array('image/jpeg', 'image/pjpeg','application/octet-stream'),
'jpg' => array('image/jpeg', 'image/pjpeg','application/octet-stream'),
'jpe' => array('image/jpeg', 'image/pjpeg','application/octet-stream'),
'png' => array('image/png', 'image/x-png','application/octet-stream'),
'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed','application/octet-stream'),
'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed','application/octet-stream'),
'rar' => array('application/x-rar', 'application/x-rar-compressed', 'application/rar', 'application/octet-stream')
);
// Customs
'gif' => array('image/gif', 'application/octet-stream'),
'jpeg' => array('image/jpeg', 'image/pjpeg','application/octet-stream'),
'jpg' => array('image/jpeg', 'image/pjpeg','application/octet-stream'),
'jpe' => array('image/jpeg', 'image/pjpeg','application/octet-stream'),
'png' => array('image/png', 'image/x-png','application/octet-stream'),
'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed','application/octet-stream'),
'rar' => array('application/x-rar', 'application/x-rar-compressed', 'application/rar', 'application/octet-stream')
);


/* End of file mimes.php */
/* Location: ./application/config/mimes.php */
/* Location: ./application/config/mimes.php */
2 changes: 1 addition & 1 deletion application/config/tank_auth.php
View file
Expand Up @@ -8,7 +8,7 @@
|--------------------------------------------------------------------------
*/
$config['website_name'] = 'FoOlSlide';
$config['webmaster_email'] = 'chocolatkey@gmail.com';
$config['webmaster_email'] = 'no-reply@foolsli.de';

/*
|--------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions application/views/account/default.php
View file
Expand Up @@ -167,6 +167,10 @@ function addField(e)
<div class="content">
<div class="errors">
<?php
if($_SERVER["HTTPS"] != "on" && !FORCE_SSL)
{
echo '<div class="alert alert-warning"><i class="fa fa-unlock-alt" aria-hidden="true"></i> '._("Potentially insecure connection, data could be intercepted.").'</div>';
}
if (isset($this->notices))
foreach ($this->notices as $key => $value)
{
Expand Down
4 changes: 4 additions & 0 deletions application/views/admin/default.php
View file
Expand Up @@ -190,6 +190,10 @@ function addField(e)

<div class="alerts">
<?php
if($_SERVER["HTTPS"] != "on" && !FORCE_SSL)
{
echo '<div class="alert alert-warning"><i class="fa fa-unlock-alt" aria-hidden="true"></i> '._("Potentially insecure connection, data could be intercepted.").'</div>';
}
echo get_notices();
?>
</div>
Expand Down
4 changes: 4 additions & 0 deletions application/views/install/default.php
View file
Expand Up @@ -136,6 +136,10 @@ function addField(e)

<div class="alerts">
<?php
if($_SERVER["HTTPS"] != "on" && !FORCE_SSL)
{
echo '<div class="alert alert-warning"><i class="fa fa-unlock-alt" aria-hidden="true"></i> '._("Potentially insecure connection, data could be intercepted.").'</div>';
}
if (isset($this->notices))
foreach ($this->notices as $key => $value)
{
Expand Down
4 changes: 2 additions & 2 deletions assets/css/font-awesome.min.css
View file

Large diffs are not rendered by default.

Binary file modified assets/fonts/FontAwesome.otf
View file
Binary file not shown.
Binary file modified assets/fonts/fontawesome-webfont.eot
View file
Binary file not shown.

0 comments on commit de6e5fa

Please sign in to comment.