validation

This commit is contained in:
fredtempez 2019-01-13 17:40:46 +01:00
commit 263e0a11ee
102 changed files with 10743 additions and 15419 deletions

View File

@ -5,6 +5,15 @@
- Stockage distinct du thème et des autres données (core, config, page, module et users ) avec import des données d'une version 8 - Stockage distinct du thème et des autres données (core, config, page, module et users ) avec import des données d'une version 8
- Exporter un thème (avec les images) sous forme d'une archive ZIP à télécharger ou stocker dans Fichiers. - Exporter un thème (avec les images) sous forme d'une archive ZIP à télécharger ou stocker dans Fichiers.
- Importer un thème à partir des fichiers - Importer un thème à partir des fichiers
- Deux blocs (colonnes) à droite ou à gauche contenant des informations fixes, le paramétage est dans le thème, mais les contenus sont stockés dans les pages.
- Pas de bloc pour les écrans de configuration.
- Changement du libellé Modérateur devient Editeur
- Correction :
- Faille CSRF lors de l'effacement d'une page
- Faille CSRF lors de l'effacement d'une galerie
- Faille CSRF lors de l'effacement d'un article de blog
- Faille CSRF lors de l'effacement d'un article de news
- Faille CSRF lors de l'effacement d'un membre
## Verison 8.5.3 ## Verison 8.5.3
* Modification : * Modification :
@ -12,12 +21,12 @@
* Correction : * Correction :
- Appel de la génération de la capture d'écran OpenGraph quand le fichier est absent - Appel de la génération de la capture d'écran OpenGraph quand le fichier est absent
- CSS pour le footer des blocs et non des éléments - CSS pour le footer des blocs et non des éléments
- #footersite, #footerbody : bloc footer dans et hors site - \#footersite, \#footerbody : bloc footer dans et hors site
- #footersite, #footerbody a : liens du bloc footer dans et hors site - \#footersite, \#footerbody a : liens du bloc footer dans et hors site
- Bloc des colonnes dans et hors site : - Bloc des colonnes dans et hors site :
- #footersiteLeft, #footerbodyLef - \#footersiteLeft, \#footerbodyLef
- #footersiteCenter, #footerbodyCenter - \#footersiteCenter, \#footerbodyCenter
- #footersiteRight, #footerbodyRight - \#footersiteRight, \#footerbodyRight
## Verison 8.5.2 ## Verison 8.5.2

View File

@ -1,4 +1,4 @@
# Zwii 9 Béta # Zwii 9 Bêta
Zwii est un CMS sans base de données (Flat-File) qui permet à ses utilisateurs de créer et gérer facilement un site web sans aucune connaissance en programmation. Zwii est un CMS sans base de données (Flat-File) qui permet à ses utilisateurs de créer et gérer facilement un site web sans aucune connaissance en programmation.

View File

@ -176,6 +176,38 @@ class common {
'group' => self::GROUP_VISITOR, 'group' => self::GROUP_VISITOR,
'targetBlank' => false, 'targetBlank' => false,
'title' => 'Contact' 'title' => 'Contact'
],
'blockRight' => [
'typeMenu' => '',
'iconUrl' => '',
'disable' => false,
'content' => '<p>Bloc à droite du site</p>',
'hideTitle' => false,
'metaDescription' => '',
'metaTitle' => '',
'moduleId' => '',
'modulePosition' => '',
'parentPageId' => '',
'position' => 0,
'group' => self::GROUP_VISITOR,
'targetBlank' => false,
'title' => 'blockRight'
],
'blockLeft' => [
'typeMenu' => '',
'iconUrl' => '',
'disable' => false,
'content' => '<p>Bloc à gauche du site</p>',
'hideTitle' => false,
'metaDescription' => '',
'metaTitle' => '',
'moduleId' => '',
'modulePosition' => '',
'parentPageId' => '',
'position' => 0,
'group' => self::GROUP_VISITOR,
'targetBlank' => false,
'title' => 'blockLeft'
] ]
], ],
'module' => [ 'module' => [
@ -349,7 +381,8 @@ class common {
'backgroundColor' => 'rgba(255, 255, 255, 1)', 'backgroundColor' => 'rgba(255, 255, 255, 1)',
'radius' => '0', 'radius' => '0',
'shadow' => '0', 'shadow' => '0',
'width' => '1170px' 'width' => '960px',
'blocks' => '100'
], ],
'text' => [ 'text' => [
'font' => 'Open+Sans', 'font' => 'Open+Sans',
@ -407,24 +440,24 @@ class common {
self::GROUP_BANNED => 'Banni', self::GROUP_BANNED => 'Banni',
self::GROUP_VISITOR => 'Visiteur', self::GROUP_VISITOR => 'Visiteur',
self::GROUP_MEMBER => 'Membre', self::GROUP_MEMBER => 'Membre',
self::GROUP_MODERATOR => 'Modérateur', self::GROUP_MODERATOR => 'Éditeur',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $groupEdits = [ public static $groupEdits = [
self::GROUP_BANNED => 'Banni', self::GROUP_BANNED => 'Banni',
self::GROUP_MEMBER => 'Membre', self::GROUP_MEMBER => 'Membre',
self::GROUP_MODERATOR => 'Modérateur', self::GROUP_MODERATOR => 'Éditeur',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $groupNews = [ public static $groupNews = [
self::GROUP_MEMBER => 'Membre', self::GROUP_MEMBER => 'Membre',
self::GROUP_MODERATOR => 'Modérateur', self::GROUP_MODERATOR => 'Éditeur',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $groupPublics = [ public static $groupPublics = [
self::GROUP_VISITOR => 'Visiteur', self::GROUP_VISITOR => 'Visiteur',
self::GROUP_MEMBER => 'Membre', self::GROUP_MEMBER => 'Membre',
self::GROUP_MODERATOR => 'Modérateur', self::GROUP_MODERATOR => 'Éditeur',
self::GROUP_ADMIN => 'Administrateur' self::GROUP_ADMIN => 'Administrateur'
]; ];
public static $timezone; public static $timezone;
@ -994,7 +1027,7 @@ class common {
} }
// Version 9.0.0 // Version 9.0.0
if($this->getData(['core', 'dataVersion']) < 900) { if($this->getData(['core', 'dataVersion']) < 900) {
$this->setData(['theme', 'site', 'blocks','100']);
$this->setData(['core', 'dataVersion', 900]); $this->setData(['core', 'dataVersion', 900]);
$this->SaveData(); $this->SaveData();
} }
@ -1898,13 +1931,13 @@ class layout extends common {
echo $this->core->output['content']; echo $this->core->output['content'];
} }
/** /**
* Affiche le coyright * Affiche le copyright
*/ */
public function showCopyright() { public function showCopyright() {
$items = '<div id="footerCopyright">'; $items = '<div id="footerCopyright">';
$items .= 'Motorisé par <a href="http://zwiicms.com/" onclick="window.open(this.href);return false" title="Zwii CMS sans base de données, très léger et performant">Zwii</a>'; $items .= 'Motorisé&nbsp;par&nbsp;<a href="http://zwiicms.com/" onclick="window.open(this.href);return false" title="Zwii CMS sans base de données, très léger et performant">Zwii</a>';
$items .= ' | <a href="' . helper::baseUrl() . 'sitemap" title="Plan du site" >Plan du site</a>'; $items .= '&nbsp;|&nbsp;<a href="' . helper::baseUrl() . 'sitemap" title="Plan du site" >Plan&nbsp;du&nbsp;site</a>';
if( if(
( (
$this->getData(['theme', 'footer', 'loginLink']) $this->getData(['theme', 'footer', 'loginLink'])
@ -1912,7 +1945,7 @@ class layout extends common {
) )
OR $this->getUrl(0) === 'theme' OR $this->getUrl(0) === 'theme'
) { ) {
$items .= '<span id="footerLoginLink" ' . ($this->getUrl(0) === 'theme' ? 'class="displayNone"' : '') . '> | <a href="' . helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()) . '" title="Connexion à l\'administration" >Connexion</a></span>'; $items .= '<span id="footerLoginLink" ' . ($this->getUrl(0) === 'theme' ? 'class="displayNone"' : '') . '>&nbsp;|&nbsp;<a href="' . helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl()) . '" title="Connexion à l\'administration" >Connexion</a></span>';
} }
$items .= '</div>'; $items .= '</div>';
echo $items; echo $items;
@ -1999,8 +2032,6 @@ class layout extends common {
$targetBlank = $this->getData(['page', $childKey, 'targetBlank']) ? ' target="_blank"' : ''; $targetBlank = $this->getData(['page', $childKey, 'targetBlank']) ? ' target="_blank"' : '';
// Mise en page du sous-item // Mise en page du sous-item
// Menu Image
if ( $this->getData(['page',$childKey,'disable']) === true if ( $this->getData(['page',$childKey,'disable']) === true
AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) AND $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') )
@ -2133,11 +2164,15 @@ class layout extends common {
$leftItems .= '<option value="">Choisissez une page</option>'; $leftItems .= '<option value="">Choisissez une page</option>';
$currentPageId = $this->getData(['page', $this->getUrl(0)]) ? $this->getUrl(0) : $this->getUrl(2); $currentPageId = $this->getData(['page', $this->getUrl(0)]) ? $this->getUrl(0) : $this->getUrl(2);
foreach($this->getHierarchy(null, false) as $parentPageId => $childrenPageIds) { foreach($this->getHierarchy(null, false) as $parentPageId => $childrenPageIds) {
if ($parentPageId === 'blockLeft'
OR $parentPageId === 'blockRight') { continue; }
$leftItems .= '<option value="' . helper::baseUrl() . $parentPageId . '"' . ($parentPageId === $currentPageId ? ' selected' : false) . '>' . $this->getData(['page', $parentPageId, 'title']) . '</option>'; $leftItems .= '<option value="' . helper::baseUrl() . $parentPageId . '"' . ($parentPageId === $currentPageId ? ' selected' : false) . '>' . $this->getData(['page', $parentPageId, 'title']) . '</option>';
foreach($childrenPageIds as $childKey) { foreach($childrenPageIds as $childKey) {
$leftItems .= '<option value="' . helper::baseUrl() . $childKey . '"' . ($childKey === $currentPageId ? ' selected' : false) . '>&nbsp;&nbsp;&nbsp;&nbsp;' . $this->getData(['page', $childKey, 'title']) . '</option>'; $leftItems .= '<option value="' . helper::baseUrl() . $childKey . '"' . ($childKey === $currentPageId ? ' selected' : false) . '>&nbsp;&nbsp;&nbsp;&nbsp;' . $this->getData(['page', $childKey, 'title']) . '</option>';
} }
} }
$leftItems .= '<option value="">-------------------</option>';
$leftItems .= '<option value="' . helper::baseUrl() . 'page/block">&Eacute;dition des blocs</option>';
$leftItems .= '</select></li>'; $leftItems .= '</select></li>';
$leftItems .= '<li><a href="' . helper::baseUrl() . 'page/add" title="Créer une page">' . template::ico('plus') . '</a></li>'; $leftItems .= '<li><a href="' . helper::baseUrl() . 'page/add" title="Créer une page">' . template::ico('plus') . '</a></li>';
if( if(

View File

@ -423,6 +423,15 @@ footer .col4 {
footer #footerSocials { footer #footerSocials {
font-size: 1.0em; font-size: 1.0em;
} }
footer #footerSocials {
font-size: 1.0em;
}
footer #footerCopyright, #footerText {
font-size: 0.8em;
}
footer #footerSocials span { footer #footerSocials span {
color: #FFF; color: #FFF;
padding: 9px; padding: 9px;

View File

@ -33,11 +33,9 @@
<?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?> <?php if($this->getData(['theme', 'header', 'position']) === 'body'): ?>
<!-- Bannière dans le fond du site --> <!-- Bannière dans le fond du site -->
<!-- menu image -->
<?php <?php
if ($this->getData(['theme','header','linkHome'])){ if ($this->getData(['theme','header','linkHome'])){
echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?> echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?>
<!-- menu image -->
<header> <header>
<?php if( <?php if(
@ -45,22 +43,16 @@
// Affiche toujours le titre de la bannière pour l'édition du thème // Affiche toujours le titre de la bannière pour l'édition du thème
OR ($this->getUrl(0) === 'theme' AND $this->getUrl(1) === 'header') OR ($this->getUrl(0) === 'theme' AND $this->getUrl(1) === 'header')
): ?> ): ?>
<div class="container"> <div class="container">
<span><?php echo $this->getData(['config', 'title']); ?></span> <span><?php echo $this->getData(['config', 'title']); ?></span>
</div> </div>
<?php endif; ?> <?php endif; ?>
</header> </header>
<!-- menu image -->
<?php <?php
if ($this->getData(['theme','header','linkHome'])){echo "</a>";} if ($this->getData(['theme','header','linkHome'])){echo "</a>";}
?> ?>
<!-- menu image -->
<?php endif; ?> <?php endif; ?>
<?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?> <?php if($this->getData(['theme', 'menu', 'position']) === 'body-second'): ?>
<!-- Menu dans le fond du site après la bannière --> <!-- Menu dans le fond du site après la bannière -->
<nav> <nav>
@ -90,12 +82,9 @@
) )
): ?> ): ?>
<!-- Bannière dans le site --> <!-- Bannière dans le site -->
<!-- menu image -->
<?php <?php
if ($this->getData(['theme','header','linkHome'])){ if ($this->getData(['theme','header','linkHome'])){
echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?> echo "<a href='" . helper::baseUrl(false) . "'>" ;} ?>
<!-- menu image -->
<header <?php if($this->getData(['theme', 'header', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>> <header <?php if($this->getData(['theme', 'header', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
<?php if( <?php if(
$this->getData(['theme', 'header', 'textHide']) === false $this->getData(['theme', 'header', 'textHide']) === false
@ -126,8 +115,49 @@
</div> </div>
</nav> </nav>
<?php endif; ?> <?php endif; ?>
<!-- Corps --> <?php
// Multi colonne uniquement pour les pages du site hors config, theme etc..
if (
$this->getUrl(0) === 'user' OR
$this->getUrl(0) === 'theme' OR
$this->getUrl(0) === 'config' OR
$this->getUrl(0) === 'page' OR
$this->getUrl(1) === 'config' OR
$this->getUrl(1) === 'edit'
) { ?>
<section><?php $layout->showContent(); ?></section> <section><?php $layout->showContent(); ?></section>
<?php } else {
// multi-colonnes
$blocks = explode('-',$this->getData(['theme','site','blocks']));
$blockleft=$blockright="";
switch (sizeof($blocks)) {
case 1 : // une colonne
$content = 'col'. $blocks[0] ;
break;
case 2 : // 2 blocks
if ($blocks[0] < $blocks[1]) { // détermine la position de la colonne
$blockleft = 'col'. $blocks[0];
$content = 'col'. $blocks[1] ;
} else {
$content = 'col' . $blocks[0];
$blockright = 'col' . $blocks[1];
}
break;
case 3 : // 3 blocks
$blockleft = 'col' . $blocks[0];
$content = 'col' . $blocks[1];
$blockright = 'col' . $blocks[2];
}
?>
<section>
<div class="row">
<?php if ($blockleft !== "") :?> <div class="<?php echo $blockleft; ?>" id="contentleft"><?php echo $this->getData(['page','blockLeft','content']);?></div> <?php endif; ?>
<div class="<?php echo $content; ?>" id="contentsite"><?php $layout->showContent(); ?></div>
<?php if ($blockright !== "") :?> <div class="<?php echo $blockright; ?>" id="contentright"><?php echo $this->getData(['page','blockRight','content']);?></div> <?php endif; ?>
</div>
</section>
<?php } ?>
<!-- footer -->
<?php if( <?php if(
$this->getData(['theme', 'footer', 'position']) === 'site' $this->getData(['theme', 'footer', 'position']) === 'site'
// Affiche toujours le pied de page pour l'édition du thème // Affiche toujours le pied de page pour l'édition du thème

View File

@ -17,26 +17,26 @@ class page extends common {
public static $actions = [ public static $actions = [
'add' => self::GROUP_MODERATOR, 'add' => self::GROUP_MODERATOR,
'delete' => self::GROUP_MODERATOR, 'delete' => self::GROUP_MODERATOR,
'edit' => self::GROUP_MODERATOR 'edit' => self::GROUP_MODERATOR,
'block' => self::GROUP_ADMIN
]; ];
public static $pagesNoParentId = [ public static $pagesNoParentId = [
'' => 'Aucune' '' => 'Aucune'
]; ];
public static $moduleIds = []; public static $moduleIds = [];
// Menu image
public static $typeMenu = [ public static $typeMenu = [
'text' => 'Texte', 'text' => 'Texte',
'icon' => 'Icône', 'icon' => 'Icône',
'icontitle' => 'Icône et bulle' 'icontitle' => 'Icône et bulle'
]; ];
// menu image
// Position du module // Position du module
public static $modulePosition = [ public static $modulePosition = [
'bottom' => 'En bas', 'bottom' => 'En bas',
'top' => 'En haut', 'top' => 'En haut',
'free' => 'Libre' 'free' => 'Libre'
]; ];
/** /**
* Création * Création
*/ */
@ -47,11 +47,9 @@ class page extends common {
'page', 'page',
$pageId, $pageId,
[ [
// Menu icon
'typeMenu' => 'text', 'typeMenu' => 'text',
'iconUrl' => '', 'iconUrl' => '',
'disable' => false, 'disable' => false,
// Menu icon
'content' => 'Contenu de votre nouvelle page.', 'content' => 'Contenu de votre nouvelle page.',
'hideTitle' => false, 'hideTitle' => false,
'metaDescription' => '', 'metaDescription' => '',
@ -77,33 +75,50 @@ class page extends common {
* Suppression * Suppression
*/ */
public function delete() { public function delete() {
// $url prend l'adresse sans le token
$url = explode('&',$this->getUrl(2));
// La page n'existe pas // La page n'existe pas
if($this->getData(['page', $this->getUrl(2)]) === null) { if($this->getData(['page', $url[0]]) === null) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'access' => false 'access' => false
]); ]);
} }
// Impossible de supprimer la page d'accueil // Impossible de supprimer la page d'accueil
elseif($this->getUrl(2) === $this->getData(['config', 'homePageId'])) { elseif($url[0] === $this->getData(['config', 'homePageId'])) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . 'page/edit/' . $this->getUrl(2), 'redirect' => helper::baseUrl() . 'page/edit/' . $url[0],
'notification' => 'Impossible de supprimer la page d\'accueil' 'notification' => 'Impossible de supprimer la page d\'accueil'
]); ]);
} }
// Impossible de supprimer une page contenant des enfants // Jeton incorrect
elseif($this->getHierarchy($this->getUrl(2))) { elseif(!isset($_GET['csrf'])) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . 'page/edit/' . $this->getUrl(2), 'redirect' => helper::baseUrl() . 'page/edit/' . $url[0],
'notification' => 'Jeton invalide'
]);
}
elseif ($_GET['csrf'] !== $_SESSION['csrf']) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'page/edit/' . $url[0],
'notification' => 'Suppression non autorisée'
]);
}
// Impossible de supprimer une page contenant des enfants
elseif($this->getHierarchy($url[0])) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'page/edit/' . $url[0],
'notification' => 'Impossible de supprimer une page contenant des enfants' 'notification' => 'Impossible de supprimer une page contenant des enfants'
]); ]);
} }
// Suppression // Suppression
else { else {
$this->deleteData(['page', $this->getUrl(2)]); $this->deleteData(['page', $url[0]]);
$this->deleteData(['module', $this->getUrl(2)]); $this->deleteData(['module', $url[0]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl(false), 'redirect' => helper::baseUrl(false),
@ -113,6 +128,65 @@ class page extends common {
} }
} }
/**
* Édition des blocs
*/
public function block () {
if($this->isPost()) {
$this->setData([
'page',
'blockLeft', [
'typeMenu' => 'text',
'iconUrl' => '',
'disable' => true,
'hideTitle' => false,
'metaDescription' => '',
'metaTitle' => '',
'moduleId' => '',
'parentPageId' => '',
'modulePosition' => 'bottom',
'position' => 0,
'group' => self::GROUP_VISITOR,
'targetBlank' => false,
'title' => 'blockLeft',
'content' => (empty($this->getInput('pageBlockLeftContent', null)) ? "<p></p>" : $this->getInput('pageBlockLeftContent', null))]
]);
$this->setData([
'page',
'blockRight', [
'typeMenu' => 'text',
'iconUrl' => '',
'disable' => true,
'hideTitle' => false,
'metaDescription' => '',
'metaTitle' => '',
'moduleId' => '',
'parentPageId' => '',
'modulePosition' => 'bottom',
'position' => 0,
'group' => self::GROUP_VISITOR,
'targetBlank' => false,
'title' => 'blockRight',
'content' => (empty($this->getInput('pageBlockRightContent', null)) ? "<p></p>" : $this->getInput('pageBlockRightContent', null))]
]);
$this->addOutput([
'redirect' => helper::baseUrl(),
'notification' => 'Modifications enregistrées',
'state' => true
]);
}
// Valeurs en sortie
$this->addOutput([
'title' => 'Édition des blocs',
'vendor' => [
'tinymce'
],
'view' => 'block'
]);
}
/** /**
* Édition * Édition
*/ */

View File

@ -0,0 +1,102 @@
/**
* This file is part of Zwii.
*
* For full copyright and license information, please see the LICENSE
* file that was distributed with this source code.
*
* @author Rémi Jean <remi.jean@outlook.com>
* @copyright Copyright (C) 2008-2018, Rémi Jean
* @license GNU General Public License, version 3
* @link http://zwiicms.com/
*/
/**
* Confirmation de suppression
*/
$("#pageEditDelete").on("click", function() {
var _this = $(this);
return core.confirm("Êtes-vous sûr de vouloir supprimer cette page ?", function() {
$(location).attr("href", _this.attr("href"));
});
});
/**
* Bloque/Débloque le bouton de configuration au changement de module
*/
var pageEditModuleIdDOM = $("#pageEditModuleId");
pageEditModuleIdDOM.on("change", function() {
if($(this).val() === "") {
$("#pageEditModuleConfig").addClass("disabled");
$("#pageEditContentContainer").slideDown();
}
else {
$("#pageEditModuleConfig").removeClass("disabled");
$("#pageEditContentContainer").slideUp();
}
});
/**
* Soumission du formulaire pour éditer le module
*/
$("#pageEditModuleConfig").on("click", function() {
$("#pageEditModuleRedirect").val(1);
$("#pageEditForm").trigger("submit");
});
/**
* Affiche les pages en fonction de la page parent dans le choix de la position
*/
var hierarchy = <?php echo json_encode($this->getHierarchy()); ?>;
var pages = <?php echo json_encode($this->getData(['page'])); ?>;
$("#pageEditParentPageId").on("change", function() {
var positionDOM = $("#pageEditPosition");
positionDOM.empty().append(
$("<option>").val(0).text("Ne pas afficher"),
$("<option>").val(1).text("Au début")
);
var parentSelected = $(this).val();
var positionSelected = 0;
var positionPrevious = 1;
// Aucune page parent selectionnée
if(parentSelected === "") {
// Liste des pages sans parents
for(var key in hierarchy) {
if(hierarchy.hasOwnProperty(key)) {
// Sélectionne la page avant si il s'agit de la page courante
if(key === "<?php echo $this->getUrl(2); ?>") {
positionSelected = positionPrevious;
}
// Sinon ajoute la page à la liste
else {
// Enregistre la position de cette page afin de la sélectionner si la prochaine page de la liste est la page courante
positionPrevious++;
// Ajout à la liste
positionDOM.append(
$("<option>").val(positionPrevious).text("Après \"" + pages[key].title + "\"")
);
}
}
}
}
// Un page parent est selectionnée
else {
// Liste des pages enfants de la page parent
for(var i = 0; i < hierarchy[parentSelected].length; i++) {
// Pour page courante sélectionne la page précédente (pas de - 1 à positionSelected à cause des options par défaut)
if(hierarchy[parentSelected][i] === "<?php echo $this->getUrl(2); ?>") {
positionSelected = positionPrevious;
}
// Sinon ajoute la page à la liste
else {
// Enregistre la position de cette page afin de la sélectionner si la prochaine page de la liste est la page courante
positionPrevious++;
// Ajout à la liste
positionDOM.append(
$("<option>").val(positionPrevious).text("Après \"" + pages[hierarchy[parentSelected][i]].title + "\"")
);
}
}
}
// Sélectionne la bonne position
positionDOM.val(positionSelected);
}).trigger("change");

View File

@ -0,0 +1,33 @@
<?php echo template::formOpen('pageblockEditForm'); ?>
<div class="row">
<div class="col2">
<?php $href = helper::baseUrl() . $this->getUrl(2); ?>
<?php if ($this->getData(['page', $this->getUrl(2), 'moduleId']) === 'redirection')$href = helper::baseUrl(); ?>
<?php echo template::button('pageblockEditBack', [
'class' => 'buttonGrey',
'href' => $href,
'ico' => 'left',
'value' => 'Retour'
]); ?>
</div>
<div class="col2 offset8">
<?php echo template::submit('pageblockEditSubmit'); ?>
</div>
</div>
<div class='row'>
<div class="col6">
<?php echo template::textarea('pageBlockLeftContent', [
'label' => 'Contenu du bloc à gauche :',
'class' => 'editorWysiwyg',
'value' => $this->getData(['page','blockLeft', 'content'])
]); ?>
</div>
<div class="col6">
<?php echo template::textarea('pageBlockRightContent', [
'label' => 'Contenu du bloc à droite :',
'class' => 'editorWysiwyg',
'value' => $this->getData(['page','blockRight', 'content'])
]); ?>
</div>
</div>
<?php echo template::formClose(); ?>

View File

@ -13,7 +13,7 @@
<div class="col2 offset6"> <div class="col2 offset6">
<?php echo template::button('pageEditDelete', [ <?php echo template::button('pageEditDelete', [
'class' => 'buttonRed', 'class' => 'buttonRed',
'href' => helper::baseUrl() . 'page/delete/' . $this->getUrl(2), 'href' => helper::baseUrl() . 'page/delete/' . $this->getUrl(2) . '&csrf=' . $_SESSION['csrf'],
'value' => 'Supprimer', 'value' => 'Supprimer',
'ico' => 'cancel' 'ico' => 'cancel'
]); ?> ]); ?>
@ -56,7 +56,6 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col6"> <div class="col6">
<?php echo template::select('pageTypeMenu', $module::$typeMenu,[ <?php echo template::select('pageTypeMenu', $module::$typeMenu,[
'help' => 'Sélectionnez le type de menu.', 'help' => 'Sélectionnez le type de menu.',
'label' => 'Type de menu', 'label' => 'Type de menu',
@ -64,7 +63,6 @@
]); ?> ]); ?>
</div> </div>
<div class="col6"> <div class="col6">
<?php echo template::file('pageIconUrl', [ <?php echo template::file('pageIconUrl', [
'label' => 'Icône', 'label' => 'Icône',
'value' => $this->getData(['page', $this->getUrl(2), 'iconUrl']) 'value' => $this->getData(['page', $this->getUrl(2), 'iconUrl'])

View File

@ -15,6 +15,14 @@ body {
#site { #site {
} }
/* Blocs dans le site */
#contentleft {
}
#contentright {
}
#contentsite {
}
/* Bannière */ /* Bannière */
header { header {
} }
@ -40,23 +48,26 @@ nav a.active {
} }
/* Bas de page */ /* Bas de page */
#footersite, #footerbody { footer {
}
footer #footersite, #footerbody {
} }
/* Liens du bas de page */ /* Liens du bas de page */
#footersite, #footerbody a { footer #footersite, #footerbody a {
} }
/* footer bloc gauche */ /* footer bloc gauche */
#footersiteLeft, #footerbodyLeft { footer #footersiteLeft, #footerbodyLeft {
} }
/* footer bloc central */ /* footer bloc central */
#footersiteCenter, #footerbodyCenter { footer #footersiteCenter, #footerbodyCenter {
} }
/* footer bloc droite */ /* footer bloc droite */
#footersiteRight, #footerbodyRight { footer #footersiteRight, #footerbodyRight {
} }
/** /**

View File

@ -201,9 +201,18 @@ class theme extends common {
'contain' => 'Image entière', 'contain' => 'Image entière',
'cover' => 'Largeur adaptée au fond', 'cover' => 'Largeur adaptée au fond',
'100% 100%' => 'Taille adaptée au fond' '100% 100%' => 'Taille adaptée au fond'
]; ];
public static $siteBlocks = [
'12' => 'Un seul bloc, uniquement le site',
'4-8' => 'Deux blocs : 1/3 - 2/3',
'8-4' => 'Deux blocs : 2/3 - 1/3',
'3-9' => 'Deux blocs : 1/4 - 3/4',
'9-3' => 'Deux blocs : 3/4 - 1/2',
'3-6-3' => 'Trois blocs : 1/4 - 1/2 - 1/4'
];
/** /**
* Mode avancé * Mode avancé
*/ */
@ -424,7 +433,8 @@ class theme extends common {
'backgroundColor' => $this->getInput('themeSiteBackgroundColor'), 'backgroundColor' => $this->getInput('themeSiteBackgroundColor'),
'radius' => $this->getInput('themeSiteRadius'), 'radius' => $this->getInput('themeSiteRadius'),
'shadow' => $this->getInput('themeSiteShadow'), 'shadow' => $this->getInput('themeSiteShadow'),
'width' => $this->getInput('themeSiteWidth') 'width' => $this->getInput('themeSiteWidth'),
'blocks' => $this->getInput('themeSiteBlocks')
]]); ]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
@ -437,7 +447,8 @@ class theme extends common {
$this->addOutput([ $this->addOutput([
'title' => 'Personnalisation du site', 'title' => 'Personnalisation du site',
'vendor' => [ 'vendor' => [
'tinycolorpicker' 'tinycolorpicker',
'tinymce'
], ],
'view' => 'site' 'view' => 'site'
]); ]);

View File

@ -5,7 +5,7 @@
): ?> ): ?>
<?php echo template::speech('Cliquez sur une zone afin d\'accéder à ses options de personnalisation. Vous pouvez également afficher les zones cachées à l\'aide du bouton ci-dessous.'); ?> <?php echo template::speech('Cliquez sur une zone afin d\'accéder à ses options de personnalisation. Vous pouvez également afficher les zones cachées à l\'aide du bouton ci-dessous.'); ?>
<div class="row"> <div class="row">
<div class="col3"> <div class="col2 offset2">
<?php echo template::button('themeBack', [ <?php echo template::button('themeBack', [
'class' => 'buttonGrey', 'class' => 'buttonGrey',
'href' => helper::baseUrl(false), 'href' => helper::baseUrl(false),
@ -13,21 +13,21 @@
'value' => 'Accueil' 'value' => 'Accueil'
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col2">
<?php echo template::button('themeManage', [ <?php echo template::button('themeManage', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'ico' => 'download', 'ico' => 'download',
'value' => 'Gestion des thèmes' 'value' => 'Gestion des thèmes'
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col2">
<?php echo template::button('themeAdvanced', [ <?php echo template::button('themeAdvanced', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced', 'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced',
'value' => 'Mode avancé', 'value' => 'Mode avancé',
'ico' => 'code' 'ico' => 'code'
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col2">
<?php echo template::button('themeShowAll', [ <?php echo template::button('themeShowAll', [
'ico' => 'eye', 'ico' => 'eye',
'value' => 'Zones cachées' 'value' => 'Zones cachées'
@ -37,7 +37,7 @@
<?php else: ?> <?php else: ?>
<?php echo template::speech('Cliquez sur une zone afin d\'accéder à ses options de personnalisation.'); ?> <?php echo template::speech('Cliquez sur une zone afin d\'accéder à ses options de personnalisation.'); ?>
<div class="row"> <div class="row">
<div class="col3 offset2"> <div class="col2 offset3">
<?php echo template::button('themeBack', [ <?php echo template::button('themeBack', [
'class' => 'buttonGrey', 'class' => 'buttonGrey',
'href' => helper::baseUrl(false), 'href' => helper::baseUrl(false),
@ -45,14 +45,14 @@
'value' => 'Accueil' 'value' => 'Accueil'
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col2">
<?php echo template::button('themeManage', [ <?php echo template::button('themeManage', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/manage', 'href' => helper::baseUrl() . $this->getUrl(0) . '/manage',
'ico' => 'download', 'ico' => 'download',
'value' => 'Gestion des thèmes' 'value' => 'Gestion des thèmes'
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col2">
<?php echo template::button('themeAdvanced', [ <?php echo template::button('themeAdvanced', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced', 'href' => helper::baseUrl() . $this->getUrl(0) . '/advanced',
'value' => 'Mode avancé', 'value' => 'Mode avancé',

View File

@ -40,7 +40,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col4"> <div class="col4 offset2">
<?php echo template::text('themeButtonBackgroundColor', [ <?php echo template::text('themeButtonBackgroundColor', [
'class' => 'colorPicker', 'class' => 'colorPicker',
'label' => 'Boutons', 'label' => 'Boutons',
@ -82,6 +82,15 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<div class='row'>
<div class="col4 offset4">
<?php echo template::select('themeSiteBlocks', $module::$siteBlocks, [
'label' => 'Répartition des blocs :',
'help' => 'Pour éditer le contenu des blocs, sélectionnez \'Édition des blocs\' dans la liste des pages.',
'selected' => $this->getData(['theme', 'site', 'blocks'])
]); ?>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -88,10 +88,13 @@ class user extends common {
* Suppression * Suppression
*/ */
public function delete() { public function delete() {
//
// $url prend l'adresse sans le token
$url = explode('&',$this->getUrl(2));
// Accès refusé // Accès refusé
if( if(
// L'utilisateur n'existe pas // L'utilisateur n'existe pas
$this->getData(['user', $this->getUrl(2)]) === null $this->getData(['user', $url[0]]) === null
// Groupe insuffisant // Groupe insuffisant
AND ($this->getUrl('group') < self::GROUP_MODERATOR) AND ($this->getUrl('group') < self::GROUP_MODERATOR)
) { ) {
@ -100,8 +103,23 @@ class user extends common {
'access' => false 'access' => false
]); ]);
} }
// Jeton incorrect
elseif(!isset($_GET['csrf'])) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'user',
'notification' => 'Jeton invalide'
]);
}
elseif ($_GET['csrf'] !== $_SESSION['csrf']) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'user',
'notification' => 'Suppression non autorisée'
]);
}
// Bloque la suppression de son propre compte // Bloque la suppression de son propre compte
elseif($this->getUser('id') === $this->getUrl(2)) { elseif($this->getUser('id') === $url[0]) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . 'user', 'redirect' => helper::baseUrl() . 'user',
@ -110,7 +128,7 @@ class user extends common {
} }
// Suppression // Suppression
else { else {
$this->deleteData(['user', $this->getUrl(2)]); $this->deleteData(['user', $url[0]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . 'user', 'redirect' => helper::baseUrl() . 'user',
@ -280,7 +298,7 @@ class user extends common {
]), ]),
template::button('userDelete' . $userId, [ template::button('userDelete' . $userId, [
'class' => 'userDelete buttonRed', 'class' => 'userDelete buttonRed',
'href' => helper::baseUrl() . 'user/delete/' . $userId, 'href' => helper::baseUrl() . 'user/delete/' . $userId. '&csrf=' . $_SESSION['csrf'],
'value' => template::ico('cancel') 'value' => template::ico('cancel')
]) ])
]; ];

View File

@ -43,7 +43,7 @@
<li>Accès aux pages privées membres</li> <li>Accès aux pages privées membres</li>
</ul> </ul>
<ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userAddGroupDescription displayNone"> <ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userAddGroupDescription displayNone">
<li>Accès aux pages privées membres et modérateurs</li> <li>Accès aux pages privées membres et éditeurs</li>
<li>Ajout / Édition / Suppression de pages</li> <li>Ajout / Édition / Suppression de pages</li>
<li>Ajout / Édition / Suppression de fichiers</li> <li>Ajout / Édition / Suppression de fichiers</li>
</ul> </ul>

View File

@ -58,7 +58,7 @@
<li>Accès aux pages privées membres</li> <li>Accès aux pages privées membres</li>
</ul> </ul>
<ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userEditGroupDescription displayNone"> <ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userEditGroupDescription displayNone">
<li>Accès aux pages privées membres et modérateurs</li> <li>Accès aux pages privées membres et éditeurs</li>
<li>Ajout / Édition / Suppression de pages</li> <li>Ajout / Édition / Suppression de pages</li>
<li>Ajout / Édition / Suppression de fichiers</li> <li>Ajout / Édition / Suppression de fichiers</li>
</ul> </ul>

View File

@ -380,6 +380,10 @@ class UploadHandler
$file->error = $this->get_error_message('accept_file_types'); $file->error = $this->get_error_message('accept_file_types');
return false; return false;
} }
if (preg_match($this->options['image_file_types'], $file->name) && function_exists('exif_imagetype') && !@exif_imagetype($uploaded_file)) {
$file->error = $this->get_error_message('accept_file_types');
return false;
}
if ($uploaded_file && is_uploaded_file($uploaded_file)) { if ($uploaded_file && is_uploaded_file($uploaded_file)) {
$file_size = $this->get_file_size($uploaded_file); $file_size = $this->get_file_size($uploaded_file);
} else { } else {
@ -519,7 +523,7 @@ class UploadHandler
// Remove path information and dots around the filename, to prevent uploading // Remove path information and dots around the filename, to prevent uploading
// into different directories or replacing hidden system files. // into different directories or replacing hidden system files.
// Also remove control characters and spaces (\x00..\x20) around the filename: // Also remove control characters and spaces (\x00..\x20) around the filename:
$name = trim($this->basename(stripslashes($name)), ".\x00..\x20"); $name = trim($this->basename(stripslashes($name)), "\x00..\x20");
// Use a timestamp for empty filenames: // Use a timestamp for empty filenames:
if (!$name) { if (!$name) {
$name = str_replace('.', '-', microtime(true)); $name = str_replace('.', '-', microtime(true));
@ -1330,6 +1334,11 @@ class UploadHandler
'', '',
$content_disposition_header $content_disposition_header
)) : null; )) : null;
// TODO check
// if (isset($content_disposition_header) && !empty($content_disposition_header) ) {
// $file_name = str_replace('attachment; filename=&#34;', '', $content_disposition_header);
// $file_name = str_replace('&#34;', '', $file_name);
// }
// Parse the Content-Range header, which has the following form: // Parse the Content-Range header, which has the following form:
// Content-Range: bytes 0-524287/2000000 // Content-Range: bytes 0-524287/2000000
$content_range_header = $this->get_server_var('HTTP_CONTENT_RANGE'); $content_range_header = $this->get_server_var('HTTP_CONTENT_RANGE');

View File

@ -1,8 +1,6 @@
<?php <?php
$config = include 'config/config.php'; $config = include 'config/config.php';
//TODO switch to array
extract($config, EXTR_OVERWRITE);
require_once 'include/utils.php'; require_once 'include/utils.php';
@ -25,6 +23,21 @@ if (isset($_SESSION['RF']['language']) && file_exists('lang/' . basename($_SESSI
response(trans('Lang_Not_Found').AddErrorLocation())->send(); response(trans('Lang_Not_Found').AddErrorLocation())->send();
exit; exit;
} }
//check $_GET['file']
if(isset($_GET['file']) && !checkRelativePath($_GET['file'])) {
response(trans('wrong path').AddErrorLocation())->send();
exit;
}
//check $_POST['file']
if(isset($_POST['path']) && !checkRelativePath($_POST['path'])) {
response(trans('wrong path').AddErrorLocation())->send();
exit;
}
$ftp = ftp_con($config); $ftp = ftp_con($config);
if(isset($_GET['action'])) if(isset($_GET['action']))
@ -52,7 +65,7 @@ if(isset($_GET['action']))
case 'filter': case 'filter':
if (isset($_GET['type'])) if (isset($_GET['type']))
{ {
if (isset($remember_text_filter) && $remember_text_filter) if (isset($config['remember_text_filter']) && $config['remember_text_filter'])
{ {
$_SESSION['RF']["filter"] = $_GET['type']; $_SESSION['RF']["filter"] = $_GET['type'];
} }
@ -73,24 +86,10 @@ if(isset($_GET['action']))
$_SESSION['RF']["descending"] = $_GET['descending']; $_SESSION['RF']["descending"] = $_GET['descending'];
} }
break; break;
case 'image_size': // not used
$pos = strpos($_POST['path'], $upload_dir);
if ($pos !== false)
{
$info = getimagesize(substr_replace($_POST['path'], $current_path, $pos, strlen($upload_dir)));
response($info)->send();
exit;
}
break;
case 'save_img': case 'save_img':
$info = pathinfo($_POST['name']); $info = pathinfo($_POST['name']);
if ( if ((strpos($_POST['url'], 'http://s3.amazonaws.com/feather') !== 0 && strpos($_POST['url'], 'https://s3.amazonaws.com/feather') !== 0)
strpos($_POST['path'], '/') === 0
|| strpos($_POST['path'], '../') !== false
|| strpos($_POST['path'], '..\\') !== false
|| strpos($_POST['path'], './') === 0
|| (strpos($_POST['url'], 'http://s3.amazonaws.com/feather') !== 0 && strpos($_POST['url'], 'https://s3.amazonaws.com/feather') !== 0)
|| $_POST['name'] != fix_filename($_POST['name'], $config) || $_POST['name'] != fix_filename($_POST['name'], $config)
|| ! in_array(strtolower($info['extension']), array( 'jpg', 'jpeg', 'png' )) || ! in_array(strtolower($info['extension']), array( 'jpg', 'jpeg', 'png' ))
) )
@ -106,7 +105,7 @@ if(isset($_GET['action']))
} }
if (!checkresultingsize(strlen($image_data))) { if (!checkresultingsize(strlen($image_data))) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
if($ftp){ if($ftp){
@ -116,42 +115,36 @@ if(isset($_GET['action']))
$temp .=".".substr(strrchr($_POST['url'],'.'),1); $temp .=".".substr(strrchr($_POST['url'],'.'),1);
file_put_contents($temp,$image_data); file_put_contents($temp,$image_data);
$ftp->put($ftp_base_folder.$upload_dir . $_POST['path'] . $_POST['name'], $temp, FTP_BINARY); $ftp->put($config['ftp_base_folder'].$config['upload_dir'] . $_POST['path'] . $_POST['name'], $temp, FTP_BINARY);
create_img($temp,$temp,122,91); create_img($temp,$temp,122,91);
$ftp->put($ftp_base_folder.$ftp_thumbs_dir. $_POST['path'] . $_POST['name'], $temp, FTP_BINARY); $ftp->put($config['ftp_base_folder'].$config['ftp_thumbs_dir']. $_POST['path'] . $_POST['name'], $temp, FTP_BINARY);
unlink($temp); unlink($temp);
}else{ }else{
file_put_contents($current_path . $_POST['path'] . $_POST['name'],$image_data); file_put_contents($config['current_path'] . $_POST['path'] . $_POST['name'],$image_data);
create_img($current_path . $_POST['path'] . $_POST['name'], $thumbs_base_path.$_POST['path'].$_POST['name'], 122, 91); create_img($config['current_path'] . $_POST['path'] . $_POST['name'], $config['thumbs_base_path'].$_POST['path'].$_POST['name'], 122, 91);
// TODO something with this function cause its blowing my mind // TODO something with this function cause its blowing my mind
new_thumbnails_creation( new_thumbnails_creation(
$current_path.$_POST['path'], $config['current_path'].$_POST['path'],
$current_path.$_POST['path'].$_POST['name'], $config['current_path'].$_POST['path'].$_POST['name'],
$_POST['name'], $_POST['name'],
$current_path, $config['current_path'],
$config $config
); );
} }
break; break;
case 'extract': case 'extract':
if ( strpos($_POST['path'], '/') === 0 if(!$config['extract_files']){
|| strpos($_POST['path'], '../') !== false response(trans('wrong action').AddErrorLocation())->send();
|| strpos($_POST['path'], '..\\') !== false
|| strpos($_POST['path'], './') === 0)
{
response(trans('wrong path'.AddErrorLocation()))->send();
exit;
} }
if($ftp){ if($ftp){
$path = $ftp_base_url.$upload_dir . $_POST['path']; $path = $config['ftp_base_url'].$config['upload_dir'] . $_POST['path'];
$base_folder = $ftp_base_url.$upload_dir . fix_dirname($_POST['path']) . "/"; $base_folder = $config['ftp_base_url'].$config['upload_dir'] . fix_dirname($_POST['path']) . "/";
}else{ }else{
$path = $current_path . $_POST['path']; $path = $config['current_path'] . $_POST['path'];
$base_folder = $current_path . fix_dirname($_POST['path']) . "/"; $base_folder = $config['current_path'] . fix_dirname($_POST['path']) . "/";
} }
$info = pathinfo($path); $info = pathinfo($path);
@ -184,32 +177,28 @@ if(isset($_GET['action']))
$sizeTotalFinal += $aStat['size']; $sizeTotalFinal += $aStat['size'];
} }
if (!checkresultingsize($sizeTotalFinal)) { if (!checkresultingsize($sizeTotalFinal)) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
//make all the folders //make all the folders and unzip into the folders
for ($i = 0; $i < $zip->numFiles; $i++) for ($i = 0; $i < $zip->numFiles; $i++)
{ {
$OnlyFileName = $zip->getNameIndex($i);
$FullFileName = $zip->statIndex($i); $FullFileName = $zip->statIndex($i);
if(checkRelativePath($FullFileName['name'])){
if (substr($FullFileName['name'], -1, 1) == "/") if (substr($FullFileName['name'], -1, 1) == "/")
{ {
create_folder($base_folder . $FullFileName['name']); create_folder($base_folder . $FullFileName['name']);
} }
}
//unzip into the folders
for ($i = 0; $i < $zip->numFiles; $i++)
{
$OnlyFileName = $zip->getNameIndex($i);
$FullFileName = $zip->statIndex($i);
if ( ! (substr($FullFileName['name'], -1, 1) == "/")) if ( ! (substr($FullFileName['name'], -1, 1) == "/"))
{ {
$fileinfo = pathinfo($OnlyFileName); $fileinfo = pathinfo($FullFileName['name']);
if (in_array(strtolower($fileinfo['extension']), $ext)) if (in_array(strtolower($fileinfo['extension']), $config['ext']))
{ {
copy('zip://' . $path . '#' . $OnlyFileName, $base_folder . $FullFileName['name']); copy('zip://' . $path . '#' . $FullFileName['name'], $base_folder . $FullFileName['name']);
}
} }
} }
} }
@ -234,7 +223,7 @@ if(isset($_GET['action']))
$phar = new PharData($path); $phar = new PharData($path);
$phar->decompressFiles(); $phar->decompressFiles();
$files = array(); $files = array();
check_files_extensions_on_phar($phar, $files, '', $ext); check_files_extensions_on_phar($phar, $files, '', $config);
$phar->extractTo($base_folder, $files, true); $phar->extractTo($base_folder, $files, true);
break; break;
@ -246,22 +235,28 @@ if(isset($_GET['action']))
if($ftp){ if($ftp){
unlink($path); unlink($path);
$ftp->putAll($base_folder, "/".$ftp_base_folder . $upload_dir . fix_dirname($_POST['path']), FTP_BINARY); $ftp->putAll($base_folder, "/".$config['ftp_base_folder'] . $config['upload_dir'] . fix_dirname($_POST['path']), FTP_BINARY);
deleteDir($base_folder); deleteDir($base_folder);
} }
break; break;
case 'media_preview': case 'media_preview':
if(isset($_GET['file'])){
$_GET['file'] = sanitize($_GET['file']);
}
if(isset($_GET['title'])){
$_GET['title'] = sanitize($_GET['title']);
}
if($ftp){ if($ftp){
$preview_file = $ftp_base_url.$upload_dir . $_GET['file']; $preview_file = $config['ftp_base_url'].$config['upload_dir'] . $_GET['file'];
}else{ }else{
$preview_file = $current_path . $_GET["file"]; $preview_file = $config['current_path'] . $_GET["file"];
} }
$info = pathinfo($preview_file); $info = pathinfo($preview_file);
ob_start(); ob_start();
?> ?>
<div id="jp_container_1" class="jp-video " style="margin:0 auto;"> <div id="jp_container_1" class="jp-video" style="margin:0 auto;">
<div class="jp-type-single"> <div class="jp-type-single">
<div id="jquery_jplayer_1" class="jp-jplayer"></div> <div id="jquery_jplayer_1" class="jp-jplayer"></div>
<div class="jp-gui"> <div class="jp-gui">
@ -308,7 +303,7 @@ if(isset($_GET['action']))
</div> </div>
</div> </div>
</div> </div>
<?php if(in_array(strtolower($info['extension']), $ext_music)): ?> <?php if(in_array(strtolower($info['extension']), $config['ext_music'])): ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
@ -332,7 +327,7 @@ if(isset($_GET['action']))
}); });
</script> </script>
<?php elseif(in_array(strtolower($info['extension']), $ext_video)): ?> <?php elseif(in_array(strtolower($info['extension']), $config['ext_video'])): ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
@ -371,15 +366,6 @@ if(isset($_GET['action']))
exit; exit;
} }
if (strpos($_POST['path'],'../') !== FALSE
|| strpos($_POST['path'],'./') !== FALSE
|| strpos($_POST['path'],'..\\') !== FALSE
|| strpos($_POST['path'],'.\\') !== FALSE )
{
response(trans('wrong path'.AddErrorLocation()))->send();
exit;
}
if (trim($_POST['path']) == '') if (trim($_POST['path']) == '')
{ {
response(trans('no path').AddErrorLocation())->send(); response(trans('no path').AddErrorLocation())->send();
@ -387,12 +373,12 @@ if(isset($_GET['action']))
} }
$msg_sub_action = ($_POST['sub_action'] == 'copy' ? trans('Copy') : trans('Cut')); $msg_sub_action = ($_POST['sub_action'] == 'copy' ? trans('Copy') : trans('Cut'));
$path = $current_path . $_POST['path']; $path = $config['current_path'] . $_POST['path'];
if (is_dir($path)) if (is_dir($path))
{ {
// can't copy/cut dirs // can't copy/cut dirs
if ($copy_cut_dirs === false) if ($config['copy_cut_dirs'] === false)
{ {
response(sprintf(trans('Copy_Cut_Not_Allowed'), $msg_sub_action, trans('Folders')).AddErrorLocation())->send(); response(sprintf(trans('Copy_Cut_Not_Allowed'), $msg_sub_action, trans('Folders')).AddErrorLocation())->send();
exit; exit;
@ -400,30 +386,30 @@ if(isset($_GET['action']))
list($sizeFolderToCopy,$fileNum,$foldersCount) = folder_info($path,false); list($sizeFolderToCopy,$fileNum,$foldersCount) = folder_info($path,false);
// size over limit // size over limit
if ($copy_cut_max_size !== false && is_int($copy_cut_max_size)) { if ($config['copy_cut_max_size'] !== false && is_int($config['copy_cut_max_size'])) {
if (($copy_cut_max_size * 1024 * 1024) < $sizeFolderToCopy) { if (($config['copy_cut_max_size'] * 1024 * 1024) < $sizeFolderToCopy) {
response(sprintf(trans('Copy_Cut_Size_Limit'), $msg_sub_action, $copy_cut_max_size).AddErrorLocation())->send(); response(sprintf(trans('Copy_Cut_Size_Limit'), $msg_sub_action, $config['copy_cut_max_size']).AddErrorLocation())->send();
exit; exit;
} }
} }
// file count over limit // file count over limit
if ($copy_cut_max_count !== false && is_int($copy_cut_max_count)) if ($config['copy_cut_max_count'] !== false && is_int($config['copy_cut_max_count']))
{ {
if ($copy_cut_max_count < $fileNum) if ($config['copy_cut_max_count'] < $fileNum)
{ {
response(sprintf(trans('Copy_Cut_Count_Limit'), $msg_sub_action, $copy_cut_max_count).AddErrorLocation())->send(); response(sprintf(trans('Copy_Cut_Count_Limit'), $msg_sub_action, $config['copy_cut_max_count']).AddErrorLocation())->send();
exit; exit;
} }
} }
if (!checkresultingsize($sizeFolderToCopy)) { if (!checkresultingsize($sizeFolderToCopy)) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
} else { } else {
// can't copy/cut files // can't copy/cut files
if ($copy_cut_files === false) if ($config['copy_cut_files'] === false)
{ {
response(sprintf(trans('Copy_Cut_Not_Allowed'), $msg_sub_action, trans('Files')).AddErrorLocation())->send(); response(sprintf(trans('Copy_Cut_Not_Allowed'), $msg_sub_action, trans('Files')).AddErrorLocation())->send();
exit; exit;
@ -439,10 +425,10 @@ if(isset($_GET['action']))
break; break;
case 'chmod': case 'chmod':
if($ftp){ if($ftp){
$path = $ftp_base_url . $upload_dir . $_POST['path']; $path = $config['ftp_base_url'] . $config['upload_dir'] . $_POST['path'];
if ( if (
($_POST['folder']==1 && $chmod_dirs === false) ($_POST['folder']==1 && $config['chmod_dirs'] === false)
|| ($_POST['folder']==0 && $chmod_files === false) || ($_POST['folder']==0 && $config['chmod_files'] === false)
|| (is_function_callable("chmod") === false) ) || (is_function_callable("chmod") === false) )
{ {
response(sprintf(trans('File_Permission_Not_Allowed'), (is_dir($path) ? trans('Folders') : trans('Files')), 403).AddErrorLocation())->send(); response(sprintf(trans('File_Permission_Not_Allowed'), (is_dir($path) ? trans('Folders') : trans('Files')), 403).AddErrorLocation())->send();
@ -450,10 +436,10 @@ if(isset($_GET['action']))
} }
$info = $_POST['permissions']; $info = $_POST['permissions'];
}else{ }else{
$path = $current_path . $_POST['path']; $path = $config['current_path'] . $_POST['path'];
if ( if (
(is_dir($path) && $chmod_dirs === false) (is_dir($path) && $config['chmod_dirs'] === false)
|| (is_file($path) && $chmod_files === false) || (is_file($path) && $config['chmod_files'] === false)
|| (is_function_callable("chmod") === false) ) || (is_function_callable("chmod") === false) )
{ {
response(sprintf(trans('File_Permission_Not_Allowed'), (is_dir($path) ? trans('Folders') : trans('Files')), 403).AddErrorLocation())->send(); response(sprintf(trans('File_Permission_Not_Allowed'), (is_dir($path) ? trans('Folders') : trans('Files')), 403).AddErrorLocation())->send();
@ -586,9 +572,9 @@ if(isset($_GET['action']))
break; break;
case 'cad_preview': case 'cad_preview':
if($ftp){ if($ftp){
$selected_file = $ftp_base_url.$upload_dir . $_GET['file']; $selected_file = $config['ftp_base_url'].$config['upload_dir'] . $_GET['file'];
}else{ }else{
$selected_file = $current_path . $_GET['file']; $selected_file = $config['current_path'] . $_GET['file'];
if ( ! file_exists($selected_file)) if ( ! file_exists($selected_file))
{ {
@ -599,7 +585,7 @@ if(isset($_GET['action']))
if($ftp){ if($ftp){
$url_file = $selected_file; $url_file = $selected_file;
}else{ }else{
$url_file = $base_url . $upload_dir . str_replace($current_path, '', $_GET["file"]); $url_file = $config['base_url'] . $config['upload_dir'] . str_replace($config['current_path'], '', $_GET["file"]);
} }
$cad_url = urlencode($url_file); $cad_url = urlencode($url_file);
@ -618,9 +604,9 @@ if(isset($_GET['action']))
} }
if($ftp){ if($ftp){
$selected_file = ($sub_action == 'preview' ? $ftp_base_url.$upload_dir . $_GET['file'] : $ftp_base_url.$upload_dir . $_POST['path']); $selected_file = ($sub_action == 'preview' ? $config['ftp_base_url'].$config['upload_dir'] . $_GET['file'] : $config['ftp_base_url'].$config['upload_dir'] . $_POST['path']);
}else{ }else{
$selected_file = ($sub_action == 'preview' ? $current_path . $_GET['file'] : $current_path . $_POST['path']); $selected_file = ($sub_action == 'preview' ? $config['current_path'] . $_GET['file'] : $config['current_path'] . $_POST['path']);
if ( ! file_exists($selected_file)) if ( ! file_exists($selected_file))
{ {
@ -633,11 +619,11 @@ if(isset($_GET['action']))
if ($preview_mode == 'text') if ($preview_mode == 'text')
{ {
$is_allowed = ($sub_action == 'preview' ? $preview_text_files : $edit_text_files); $is_allowed = ($sub_action == 'preview' ? $config['preview_text_files'] : $config['edit_text_files']);
$allowed_file_exts = ($sub_action == 'preview' ? $previewable_text_file_exts : $editable_text_file_exts); $allowed_file_exts = ($sub_action == 'preview' ? $config['previewable_text_file_exts'] : $config['editable_text_file_exts']);
}elseif($preview_mode == 'google') { }elseif($preview_mode == 'google') {
$is_allowed = $googledoc_enabled; $is_allowed = $config['googledoc_enabled'];
$allowed_file_exts = $googledoc_file_exts; $allowed_file_exts = $config['googledoc_file_exts'];
} }
if ( ! isset($allowed_file_exts) || ! is_array($allowed_file_exts)) if ( ! isset($allowed_file_exts) || ! is_array($allowed_file_exts))
@ -645,6 +631,9 @@ if(isset($_GET['action']))
$allowed_file_exts = array(); $allowed_file_exts = array();
} }
if(!isset($info['extension'])){
$info['extension']='';
}
if ( ! in_array($info['extension'], $allowed_file_exts) if ( ! in_array($info['extension'], $allowed_file_exts)
|| ! isset($is_allowed) || ! isset($is_allowed)
|| $is_allowed === false || $is_allowed === false
@ -663,31 +652,31 @@ if(isset($_GET['action']))
$data = htmlspecialchars(htmlspecialchars_decode($data)); $data = htmlspecialchars(htmlspecialchars_decode($data));
$ret = ''; $ret = '';
if ( ! in_array($info['extension'],$previewable_text_file_exts_no_prettify))
{
$ret .= '<script src="https://rawgit.com/google/code-prettify/master/loader/run_prettify.js?autoload=true&skin=sunburst"></script>'; $ret .= '<script src="https://rawgit.com/google/code-prettify/master/loader/run_prettify.js?autoload=true&skin=sunburst"></script>';
$ret .= '<?prettify lang='.$info['extension'].' linenums=true?><pre class="prettyprint"><code class="language-'.$info['extension'].'">'.$data.'</code></pre>'; $ret .= '<?prettify lang='.$info['extension'].' linenums=true?><pre class="prettyprint"><code class="language-'.$info['extension'].'">'.$data.'</code></pre>';
} else {
$ret .= '<pre class="no-prettify">'.$data.'</pre>';
}
} }
elseif ($preview_mode == 'google') { elseif ($preview_mode == 'google') {
if($ftp){ if($ftp){
$url_file = $selected_file; $url_file = $selected_file;
}else{ }else{
$url_file = $base_url . $upload_dir . str_replace($current_path, '', $_GET["file"]); $url_file = $config['base_url'] . $config['upload_dir'] . str_replace($config['current_path'], '', $_GET["file"]);
} }
$googledoc_url = urlencode($url_file); $googledoc_url = urlencode($url_file);
$googledoc_html = "<iframe src=\"https://docs.google.com/viewer?url=" . $url_file . "&embedded=true\" class=\"google-iframe\"></iframe>"; $ret = "<iframe src=\"https://docs.google.com/viewer?url=" . $url_file . "&embedded=true\" class=\"google-iframe\"></iframe>";
$ret = $googledoc_html;
} }
} else { }else{
$data = stripslashes(htmlspecialchars(file_get_contents($selected_file))); $data = stripslashes(htmlspecialchars(file_get_contents($selected_file)));
if(in_array($info['extension'],array('html','html'))){
$ret = '<script src="https://cdn.ckeditor.com/ckeditor5/11.1.1/classic/ckeditor.js"></script><textarea id="textfile_edit_area" style="width:100%;height:300px;">'.$data.'</textarea><script>setTimeout(function(){ ClassicEditor
.create( document.querySelector( "#textfile_edit_area" ),{ }).then( newEditor => { window.editor = newEditor; } ); }, 500);</script>';
}else{
$ret = '<textarea id="textfile_edit_area" style="width:100%;height:300px;">'.$data.'</textarea>'; $ret = '<textarea id="textfile_edit_area" style="width:100%;height:300px;">'.$data.'</textarea>';
} }
}
response($ret)->send(); response($ret)->send();
exit; exit;
@ -700,4 +689,3 @@ if(isset($_GET['action']))
response(trans('no action passed').AddErrorLocation())->send(); response(trans('no action passed').AddErrorLocation())->send();
exit; exit;
} }
?>

View File

@ -1,5 +1,5 @@
<?php <?php
$version = "9.13.1"; $version = "9.13.4";
if (session_id() == '') session_start(); if (session_id() == '') session_start();
mb_internal_encoding('UTF-8'); mb_internal_encoding('UTF-8');
@ -8,7 +8,7 @@ mb_http_input('UTF-8');
mb_language('uni'); mb_language('uni');
mb_regex_encoding('UTF-8'); mb_regex_encoding('UTF-8');
ob_start('mb_output_handler'); ob_start('mb_output_handler');
date_default_timezone_set('Europe/Rome'); date_default_timezone_set('Europe/Paris');
setlocale(LC_CTYPE, 'fr_FR'); //correct transliteration setlocale(LC_CTYPE, 'fr_FR'); //correct transliteration
/* /*
@ -149,14 +149,14 @@ $config = array(
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| The user can delete multiple files, select all files , deselect all files | The user can delete multiple files, select all files , deselect all files
*/ */
'multiple_selection' => false, 'multiple_selection' => true,
/* /*
| |
| The user can have a select button that pass a json to external input or pass the first file selected to editor | The user can have a select button that pass a json to external input or pass the first file selected to editor
| If you use responsivefilemanager tinymce extension can copy into editor multiple object like images, videos, audios, links in the same time | If you use responsivefilemanager tinymce extension can copy into editor multiple object like images, videos, audios, links in the same time
| |
*/ */
'multiple_selection_action_button' => false, 'multiple_selection_action_button' => true,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -330,23 +330,28 @@ $config = array(
'rename_files' => true, 'rename_files' => true,
'rename_folders' => true, 'rename_folders' => true,
'duplicate_files' => true, 'duplicate_files' => true,
'extract_files' => true,
'copy_cut_files' => true, // for copy/cut files 'copy_cut_files' => true, // for copy/cut files
'copy_cut_dirs' => true, // for copy/cut directories 'copy_cut_dirs' => true, // for copy/cut directories
'chmod_files' => true, // change file permissions 'chmod_files' => true, // change file permissions
'chmod_dirs' => true, // change folder permissions 'chmod_dirs' => true, // change folder permissions
'preview_text_files' => true, // eg.: txt, log etc. 'preview_text_files' => true, // eg.: txt, log etc.
'edit_text_files' => true, // eg.: txt, log etc. 'edit_text_files' => true, // eg.: txt, log etc.
'create_text_files' => true, // only create files with exts. defined in $editable_text_file_exts 'create_text_files' => true, // only create files with exts. defined in $config['editable_text_file_exts']
'download_files' => true, // allow download files or just preview
// you can preview these type of files if $preview_text_files is true // you can preview these type of files if $preview_text_files is true
'previewable_text_file_exts' => array( "bsh", "c","css", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html", "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh", "xhtml", "xml","xsl" ), 'previewable_text_file_exts' => array( "bsh", "c","css", "cc", "cpp", "cs", "csh", "cyc", "cv", "htm", "html", "java", "js", "m", "mxml", "perl", "pl", "pm", "py", "rb", "sh", "xhtml", "xml","xsl",'txt', 'log','' ),
'previewable_text_file_exts_no_prettify' => array( 'txt', 'log' ),
// you can edit these type of files if $edit_text_files is true (only text based files) // you can edit these type of files if $edit_text_files is true (only text based files)
// you can create these type of files if $create_text_files is true (only text based files) // you can create these type of files if $config['create_text_files'] is true (only text based files)
// if you want you can add html,css etc. // if you want you can add html,css etc.
// but for security reasons it's NOT RECOMMENDED! // but for security reasons it's NOT RECOMMENDED!
'editable_text_file_exts' => array( 'txt', 'log', 'xml', 'html', 'css', 'htm', 'js' ), 'editable_text_file_exts' => array( 'txt', 'log', 'xml', 'html', 'css', 'htm', 'js','' ),
'jplayer_exts' => array("mp4","flv","webmv","webma","webm","m4a","m4v","ogv","oga","mp3","midi","mid","ogg","wav"),
'cad_exts' => array('dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'svg'),
// Preview with Google Documents // Preview with Google Documents
'googledoc_enabled' => true, 'googledoc_enabled' => true,
@ -363,8 +368,8 @@ $config = array(
//********************** //**********************
//Allowed extensions (lowercase insert) //Allowed extensions (lowercase insert)
//********************** //**********************
'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg', 'ico' ), //Images 'ext_img' => array( 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff','svg', 'ico' ), //Images
'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'tiff'), //Files 'ext_file' => array( 'doc', 'docx', 'rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv', 'html', 'xhtml', 'psd', 'sql', 'log', 'fla', 'xml', 'ade', 'adp', 'mdb', 'accdb', 'ppt', 'pptx', 'odt', 'ots', 'ott', 'odb', 'odg', 'otp', 'otg', 'odf', 'ods', 'odp', 'css', 'ai', 'kmz','dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'tiff',''), //Files
'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm" ), //Video 'ext_video' => array( 'mov', 'mpeg', 'm4v', 'mp4', 'avi', 'mpg', 'wma', "flv", "webm" ), //Video
'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio 'ext_music' => array( 'mp3', 'mpga', 'm4a', 'ac3', 'aiff', 'mid', 'ogg', 'wav' ), //Audio
'ext_misc' => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg' ), //Archives 'ext_misc' => array( 'zip', 'rar', 'gz', 'tar', 'iso', 'dmg' ), //Archives
@ -374,7 +379,21 @@ $config = array(
// If you insert an extensions blacklist array the filemanager don't check any extensions but simply block the extensions in the list // If you insert an extensions blacklist array the filemanager don't check any extensions but simply block the extensions in the list
// otherwise check Allowed extensions configuration // otherwise check Allowed extensions configuration
//********************* //*********************
'ext_blacklist' => false, //['jpg'], 'ext_blacklist' => false,//['exe','bat','jpg'],
//Empty filename permits like .htaccess, .env, ...
'empty_filename' => false,
/*
|--------------------------------------------------------------------------
| accept files without extension
|--------------------------------------------------------------------------
|
| If you want to accept files without extension, remember to add '' extension on allowed extension
|
*/
'files_without_extension' => false,
/****************** /******************
* AVIARY config * AVIARY config
@ -480,4 +499,3 @@ return array_merge(
), ),
) )
); );
?>

Binary file not shown.

View File

@ -4,17 +4,14 @@ $time = time();
$config = include 'config/config.php'; $config = include 'config/config.php';
//TODO switch to array
extract($config, EXTR_OVERWRITE);
if (USE_ACCESS_KEYS == TRUE){ if (USE_ACCESS_KEYS == TRUE){
if (!isset($_GET['akey'], $access_keys) || empty($access_keys)){ if (!isset($_GET['akey'], $config['access_keys']) || empty($config['access_keys'])){
die('Access Denied!'); die('Access Denied!');
} }
$_GET['akey'] = strip_tags(preg_replace( "/[^a-zA-Z0-9\._-]/", '', $_GET['akey'])); $_GET['akey'] = strip_tags(preg_replace( "/[^a-zA-Z0-9\._-]/", '', $_GET['akey']));
if (!in_array($_GET['akey'], $access_keys)){ if (!in_array($_GET['akey'], $config['access_keys'])){
die('Access Denied!'); die('Access Denied!');
} }
} }
@ -24,19 +21,22 @@ $_SESSION['RF']["verify"] = "RESPONSIVEfilemanager";
if(isset($_POST['submit'])){ if(isset($_POST['submit'])){
include 'upload.php'; include 'upload.php';
}else{ }else{
$config['default_language'] = $config['default_language'];
$available_languages = include 'lang/languages.php';
$lang = $config['default_language']; list($preferred_language) = array_values(array_filter(array(
$languages = include 'lang/languages.php'; isset($_GET['lang']) ? $_GET['lang'] : null,
if (isset($_GET['lang'])) isset($_SESSION['RF']['language']) ? $_SESSION['RF']['language'] : null,
{ $config['default_language']
$lang = strip_tags($_GET['lang']); )));
if(array_key_exists($lang,$languages)){
$_SESSION['RF']['language'] = $lang; if(array_key_exists($preferred_language, $available_languages))
{
$_SESSION['RF']['language'] = $preferred_language;
} }
}elseif(isset($_SESSION['RF']['language']) && $_SESSION['RF']['language']) else
$lang = strip_tags($_SESSION['RF']['language']); {
if(array_key_exists($lang,$languages)){ $_SESSION['RF']['language'] = $config['default_language'];
$_SESSION['RF']['language'] = $lang;
} }
} }
include 'include/utils.php'; include 'include/utils.php';
@ -47,10 +47,8 @@ if (isset($_GET['fldr']) && !empty($_GET['fldr'])) {
}elseif(isset($_SESSION['RF']['fldr']) && !empty($_SESSION['RF']['fldr'])){ }elseif(isset($_SESSION['RF']['fldr']) && !empty($_SESSION['RF']['fldr'])){
$subdir_path = rawurldecode(trim(strip_tags($_SESSION['RF']['fldr']),"/")); $subdir_path = rawurldecode(trim(strip_tags($_SESSION['RF']['fldr']),"/"));
} }
if (strpos($subdir_path,'../') === FALSE
&& strpos($subdir_path,'./') === FALSE if ( checkRelativePath($subdir_path))
&& strpos($subdir_path,'..\\') === FALSE
&& strpos($subdir_path,'.\\') === FALSE)
{ {
$subdir = strip_tags($subdir_path) ."/"; $subdir = strip_tags($subdir_path) ."/";
$_SESSION['RF']['fldr'] = $subdir_path; $_SESSION['RF']['fldr'] = $subdir_path;
@ -70,11 +68,11 @@ setcookie('last_position',$subdir,time() + (86400 * 7));
if ($subdir == "/") { $subdir = ""; } if ($subdir == "/") { $subdir = ""; }
// If hidden folders are specified // If hidden folders are specified
if(count($hidden_folders)){ if(count($config['hidden_folders'])){
// If hidden folder appears in the path specified in URL parameter "fldr" // If hidden folder appears in the path specified in URL parameter "fldr"
$dirs = explode('/', $subdir); $dirs = explode('/', $subdir);
foreach($dirs as $dir){ foreach($dirs as $dir){
if($dir !== '' && in_array($dir, $hidden_folders)){ if($dir !== '' && in_array($dir, $config['hidden_folders'])){
// Ignore the path // Ignore the path
$subdir = ""; $subdir = "";
break; break;
@ -82,8 +80,8 @@ if(count($hidden_folders)){
} }
} }
if ($show_total_size) { if ($config['show_total_size']) {
list($sizeCurrentFolder,$fileCurrentNum,$foldersCurrentCount) = folder_info($current_path,false); list($sizeCurrentFolder,$fileCurrentNum,$foldersCurrentCount) = folder_info($config['current_path'],false);
} }
/*** /***
*SUB-DIR CODE *SUB-DIR CODE
@ -94,9 +92,10 @@ if (!isset($_SESSION['RF']["subfolder"]))
} }
$rfm_subfolder = ''; $rfm_subfolder = '';
if (!empty($_SESSION['RF']["subfolder"]) && strpos($_SESSION['RF']["subfolder"],'../') === FALSE && strpos($_SESSION['RF']["subfolder"],'..\\') === FALSE if (!empty($_SESSION['RF']["subfolder"])
&& strpos($_SESSION['RF']["subfolder"],'./') === FALSE && strpos($_SESSION['RF']["subfolder"],"/") !== 0 && strpos($_SESSION['RF']["subfolder"],"/") !== 0
&& strpos($_SESSION['RF']["subfolder"],'.') === FALSE) && strpos($_SESSION['RF']["subfolder"],'.') === FALSE
)
{ {
$rfm_subfolder = $_SESSION['RF']['subfolder']; $rfm_subfolder = $_SESSION['RF']['subfolder'];
} }
@ -105,23 +104,23 @@ if ($rfm_subfolder != "" && $rfm_subfolder[strlen($rfm_subfolder)-1] != "/") { $
$ftp=ftp_con($config); $ftp=ftp_con($config);
if (($ftp && !$ftp->isDir($ftp_base_folder.$upload_dir.$rfm_subfolder.$subdir)) || (!$ftp && !file_exists($current_path.$rfm_subfolder.$subdir))) if (($ftp && !$ftp->isDir($config['ftp_base_folder'].$config['upload_dir'].$rfm_subfolder.$subdir)) || (!$ftp && !file_exists($config['current_path'].$rfm_subfolder.$subdir)))
{ {
$subdir = ''; $subdir = '';
$rfm_subfolder = ""; $rfm_subfolder = "";
} }
$cur_dir = $upload_dir.$rfm_subfolder.$subdir; $cur_dir = $config['upload_dir'].$rfm_subfolder.$subdir;
$cur_path = $current_path.$rfm_subfolder.$subdir; $cur_path = $config['current_path'].$rfm_subfolder.$subdir;
$thumbs_path = $thumbs_base_path.$rfm_subfolder; $thumbs_path = $config['thumbs_base_path'].$rfm_subfolder;
$parent = $rfm_subfolder.$subdir; $parent = $rfm_subfolder.$subdir;
if($ftp){ if($ftp){
$cur_dir = $ftp_base_folder.$cur_dir; $cur_dir = $config['ftp_base_folder'].$cur_dir;
$cur_path = str_replace(array('/..','..'),'',$cur_dir); $cur_path = str_replace(array('/..','..'),'',$cur_dir);
$thumbs_path = str_replace(array('/..','..'),'',$ftp_base_folder.$ftp_thumbs_dir.$rfm_subfolder); $thumbs_path = str_replace(array('/..','..'),'',$config['ftp_base_folder'].$config['ftp_thumbs_dir'].$rfm_subfolder);
$parent = $ftp_base_folder.$parent; $parent = $config['ftp_base_folder'].$parent;
} }
if(!$ftp){ if(!$ftp){
@ -132,11 +131,10 @@ if(!$ftp){
$i++; $i++;
if ($parent=="./") $parent=""; if ($parent=="./") $parent="";
if (file_exists($current_path.$parent."config.php")) if (file_exists($config['current_path'].$parent."config.php"))
{ {
$configTemp = include $current_path.$parent.'config.php'; $configTemp = include $config['current_path'].$parent.'config.php';
$config = array_merge($config,$configTemp); $config = array_merge($config,$configTemp);
extract($config, EXTR_OVERWRITE);
$cycle = FALSE; $cycle = FALSE;
} }
@ -192,7 +190,7 @@ $crossdomain=!!$crossdomain;
//view type //view type
if(!isset($_SESSION['RF']["view_type"])) if(!isset($_SESSION['RF']["view_type"]))
{ {
$view = $default_view; $view = $config['default_view'];
$_SESSION['RF']["view_type"] = $view; $_SESSION['RF']["view_type"] = $view;
} }
@ -253,7 +251,7 @@ if (isset($_GET['extensions'])){
$ext_tmp = array(); $ext_tmp = array();
foreach($extensions as $extension){ foreach($extensions as $extension){
$extension = fix_strtolower($extension); $extension = fix_strtolower($extension);
if(in_array( $extension, $config['ext'])){ if(check_file_extension( $extension, $config)){
$ext_tmp[]=$extension; $ext_tmp[]=$extension;
} }
} }
@ -311,7 +309,7 @@ $get_params['fldr'] ='';
$get_params = http_build_query($get_params); $get_params = http_build_query($get_params);
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="https://www.w3.org/1999/xhtml"> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" > <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" >
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -325,7 +323,7 @@ $get_params = http_build_query($get_params);
<!-- CSS adjustments for browsers with JavaScript disabled --> <!-- CSS adjustments for browsers with JavaScript disabled -->
<noscript><link rel="stylesheet" href="css/jquery.fileupload-noscript.css"></noscript> <noscript><link rel="stylesheet" href="css/jquery.fileupload-noscript.css"></noscript>
<noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript> <noscript><link rel="stylesheet" href="css/jquery.fileupload-ui-noscript.css"></noscript>
<link href="js/jPlayer/skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jplayer/2.2.0/skin/blue.monday/jplayer.blue.monday.min.css" />
<link href="css/style.css?v=<?php echo $version; ?>" rel="stylesheet" type="text/css" /> <link href="css/style.css?v=<?php echo $version; ?>" rel="stylesheet" type="text/css" />
<!--[if lt IE 8]><style> <!--[if lt IE 8]><style>
.img-container span, .img-container-mini span { .img-container span, .img-container-mini span {
@ -337,11 +335,11 @@ $get_params = http_build_query($get_params);
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js" type="text/javascript"></script> <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js" type="text/javascript"></script>
<script src="js/plugins.js?v=<?php echo $version; ?>"></script> <script src="js/plugins.js?v=<?php echo $version; ?>"></script>
<script src="js/jPlayer/jquery.jplayer/jquery.jplayer.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jplayer/2.9.2/jplayer/jquery.jplayer.min.js"></script>
<script src="js/modernizr.custom.js"></script> <script src="js/modernizr.custom.js"></script>
<?php <?php
if ($aviary_active){ if ($config['aviary_active']){
if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) { ?> if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) { ?>
<script src="https://dme0ih8comzn4.cloudfront.net/imaging/v3/editor.js"></script> <script src="https://dme0ih8comzn4.cloudfront.net/imaging/v3/editor.js"></script>
<?php }else{ ?> <?php }else{ ?>
@ -354,12 +352,12 @@ $get_params = http_build_query($get_params);
<![endif]--> <![endif]-->
<script> <script>
var ext_img=new Array('<?php echo implode("','", $ext_img)?>'); var ext_img=new Array('<?php echo implode("','", $config['ext_img'])?>');
var image_editor=<?php echo $aviary_active?"true":"false";?>; var image_editor=<?php echo $config['aviary_active']?"true":"false";?>;
if (image_editor) { if (image_editor) {
var featherEditor = new Aviary.Feather({ var featherEditor = new Aviary.Feather({
<?php <?php
foreach ($aviary_defaults_config as $aopt_key => $aopt_val) { foreach ($config['aviary_defaults_config'] as $aopt_key => $aopt_val) {
echo $aopt_key.": ".json_encode($aopt_val).","; echo $aopt_key.": ".json_encode($aopt_val).",";
} ?> } ?>
onReady: function() { onReady: function() {
@ -430,7 +428,7 @@ $get_params = http_build_query($get_params);
<input type="hidden" id="field_id" value="<?php echo $field_id;?>" /> <input type="hidden" id="field_id" value="<?php echo $field_id;?>" />
<input type="hidden" id="multiple" value="<?php echo $multiple;?>" /> <input type="hidden" id="multiple" value="<?php echo $multiple;?>" />
<input type="hidden" id="type_param" value="<?php echo $type_param;?>" /> <input type="hidden" id="type_param" value="<?php echo $type_param;?>" />
<input type="hidden" id="upload_dir" value="<?php echo $upload_dir;?>" /> <input type="hidden" id="upload_dir" value="<?php echo $config['upload_dir'];?>" />
<input type="hidden" id="cur_dir" value="<?php echo $cur_dir;?>" /> <input type="hidden" id="cur_dir" value="<?php echo $cur_dir;?>" />
<input type="hidden" id="cur_dir_thumb" value="<?php echo $thumbs_path.$subdir;?>" /> <input type="hidden" id="cur_dir_thumb" value="<?php echo $thumbs_path.$subdir;?>" />
<input type="hidden" id="insert_folder_name" value="<?php echo trans('Insert_Folder_Name');?>" /> <input type="hidden" id="insert_folder_name" value="<?php echo trans('Insert_Folder_Name');?>" />
@ -440,21 +438,21 @@ $get_params = http_build_query($get_params);
<input type="hidden" id="cancel" value="<?php echo trans('Cancel');?>" /> <input type="hidden" id="cancel" value="<?php echo trans('Cancel');?>" />
<input type="hidden" id="rename" value="<?php echo trans('Rename');?>" /> <input type="hidden" id="rename" value="<?php echo trans('Rename');?>" />
<input type="hidden" id="lang_duplicate" value="<?php echo trans('Duplicate');?>" /> <input type="hidden" id="lang_duplicate" value="<?php echo trans('Duplicate');?>" />
<input type="hidden" id="duplicate" value="<?php if($duplicate_files) echo 1; else echo 0;?>" /> <input type="hidden" id="duplicate" value="<?php if($config['duplicate_files']) echo 1; else echo 0;?>" />
<input type="hidden" id="base_url" value="<?php echo $base_url?>"/> <input type="hidden" id="base_url" value="<?php echo $config['base_url']?>"/>
<input type="hidden" id="ftp_base_url" value="<?php echo $ftp_base_url?>"/> <input type="hidden" id="ftp_base_url" value="<?php echo $config['ftp_base_url']?>"/>
<input type="hidden" id="fldr_value" value="<?php echo $subdir;?>"/> <input type="hidden" id="fldr_value" value="<?php echo $subdir;?>"/>
<input type="hidden" id="sub_folder" value="<?php echo $rfm_subfolder;?>"/> <input type="hidden" id="sub_folder" value="<?php echo $rfm_subfolder;?>"/>
<input type="hidden" id="return_relative_url" value="<?php echo $return_relative_url == true ? 1 : 0;?>"/> <input type="hidden" id="return_relative_url" value="<?php echo $return_relative_url == true ? 1 : 0;?>"/>
<input type="hidden" id="file_number_limit_js" value="<?php echo $file_number_limit_js;?>" /> <input type="hidden" id="file_number_limit_js" value="<?php echo $config['file_number_limit_js'];?>" />
<input type="hidden" id="sort_by" value="<?php echo $sort_by;?>" /> <input type="hidden" id="sort_by" value="<?php echo $sort_by;?>" />
<input type="hidden" id="descending" value="<?php echo $descending?1:0;?>" /> <input type="hidden" id="descending" value="<?php echo $descending?1:0;?>" />
<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter,'&sort_by='.$sort_by,'&descending='.intval($descending)),array(''),$base_url.$_SERVER['REQUEST_URI']);?>" /> <input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter,'&sort_by='.$sort_by,'&descending='.intval($descending)),array(''),$config['base_url'].$_SERVER['REQUEST_URI']);?>" />
<input type="hidden" id="lang_show_url" value="<?php echo trans('Show_url');?>" /> <input type="hidden" id="lang_show_url" value="<?php echo trans('Show_url');?>" />
<input type="hidden" id="copy_cut_files_allowed" value="<?php if($config['copy_cut_files']) echo 1; else echo 0;?>" /> <input type="hidden" id="copy_cut_files_allowed" value="<?php if($config['copy_cut_files']) echo 1; else echo 0;?>" />
<input type="hidden" id="copy_cut_dirs_allowed" value="<?php if($config['copy_cut_dirs']) echo 1; else echo 0;?>" /> <input type="hidden" id="copy_cut_dirs_allowed" value="<?php if($config['copy_cut_dirs']) echo 1; else echo 0;?>" />
<input type="hidden" id="copy_cut_max_size" value="<?php echo $copy_cut_max_size;?>" /> <input type="hidden" id="copy_cut_max_size" value="<?php echo $config['copy_cut_max_size'];?>" />
<input type="hidden" id="copy_cut_max_count" value="<?php echo $copy_cut_max_count;?>" /> <input type="hidden" id="copy_cut_max_count" value="<?php echo $config['copy_cut_max_count'];?>" />
<input type="hidden" id="lang_copy" value="<?php echo trans('Copy');?>" /> <input type="hidden" id="lang_copy" value="<?php echo trans('Copy');?>" />
<input type="hidden" id="lang_cut" value="<?php echo trans('Cut');?>" /> <input type="hidden" id="lang_cut" value="<?php echo trans('Cut');?>" />
<input type="hidden" id="lang_paste" value="<?php echo trans('Paste');?>" /> <input type="hidden" id="lang_paste" value="<?php echo trans('Paste');?>" />
@ -466,10 +464,10 @@ $get_params = http_build_query($get_params);
<input type="hidden" id="clipboard" value="<?php echo ((isset($_SESSION['RF']['clipboard']['path']) && trim($_SESSION['RF']['clipboard']['path']) != null) ? 1 : 0);?>" /> <input type="hidden" id="clipboard" value="<?php echo ((isset($_SESSION['RF']['clipboard']['path']) && trim($_SESSION['RF']['clipboard']['path']) != null) ? 1 : 0);?>" />
<input type="hidden" id="lang_clear_clipboard_confirm" value="<?php echo trans('Clear_Clipboard_Confirm');?>" /> <input type="hidden" id="lang_clear_clipboard_confirm" value="<?php echo trans('Clear_Clipboard_Confirm');?>" />
<input type="hidden" id="lang_file_permission" value="<?php echo trans('File_Permission');?>" /> <input type="hidden" id="lang_file_permission" value="<?php echo trans('File_Permission');?>" />
<input type="hidden" id="chmod_files_allowed" value="<?php if($chmod_files) echo 1; else echo 0;?>" /> <input type="hidden" id="chmod_files_allowed" value="<?php if($config['chmod_files']) echo 1; else echo 0;?>" />
<input type="hidden" id="chmod_dirs_allowed" value="<?php if($chmod_dirs) echo 1; else echo 0;?>" /> <input type="hidden" id="chmod_dirs_allowed" value="<?php if($config['chmod_dirs']) echo 1; else echo 0;?>" />
<input type="hidden" id="lang_lang_change" value="<?php echo trans('Lang_Change');?>" /> <input type="hidden" id="lang_lang_change" value="<?php echo trans('Lang_Change');?>" />
<input type="hidden" id="edit_text_files_allowed" value="<?php if($edit_text_files) echo 1; else echo 0;?>" /> <input type="hidden" id="edit_text_files_allowed" value="<?php if($config['edit_text_files']) echo 1; else echo 0;?>" />
<input type="hidden" id="lang_edit_file" value="<?php echo trans('Edit_File');?>" /> <input type="hidden" id="lang_edit_file" value="<?php echo trans('Edit_File');?>" />
<input type="hidden" id="lang_new_file" value="<?php echo trans('New_File');?>" /> <input type="hidden" id="lang_new_file" value="<?php echo trans('New_File');?>" />
<input type="hidden" id="lang_filename" value="<?php echo trans('Filename');?>" /> <input type="hidden" id="lang_filename" value="<?php echo trans('Filename');?>" />
@ -478,13 +476,14 @@ $get_params = http_build_query($get_params);
<input type="hidden" id="lang_error_upload" value="<?php echo trans('Error_Upload');?>" /> <input type="hidden" id="lang_error_upload" value="<?php echo trans('Error_Upload');?>" />
<input type="hidden" id="lang_select" value="<?php echo trans('Select');?>" /> <input type="hidden" id="lang_select" value="<?php echo trans('Select');?>" />
<input type="hidden" id="lang_extract" value="<?php echo trans('Extract');?>" /> <input type="hidden" id="lang_extract" value="<?php echo trans('Extract');?>" />
<input type="hidden" id="transliteration" value="<?php echo $transliteration?"true":"false";?>" /> <input type="hidden" id="extract_files" value="<?php if($config['extract_files']) echo 1; else echo 0;?>" />
<input type="hidden" id="convert_spaces" value="<?php echo $convert_spaces?"true":"false";?>" /> <input type="hidden" id="transliteration" value="<?php echo $config['transliteration']?"true":"false";?>" />
<input type="hidden" id="replace_with" value="<?php echo $convert_spaces? $replace_with : "";?>" /> <input type="hidden" id="convert_spaces" value="<?php echo $config['convert_spaces']?"true":"false";?>" />
<input type="hidden" id="lower_case" value="<?php echo $lower_case?"true":"false";?>" /> <input type="hidden" id="replace_with" value="<?php echo $config['convert_spaces']? $config['replace_with'] : "";?>" />
<input type="hidden" id="show_folder_size" value="<?php echo $show_folder_size;?>" /> <input type="hidden" id="lower_case" value="<?php echo $config['lower_case']?"true":"false";?>" />
<input type="hidden" id="add_time_to_img" value="<?php echo $add_time_to_img;?>" /> <input type="hidden" id="show_folder_size" value="<?php echo $config['show_folder_size'];?>" />
<?php if($upload_files){ ?> <input type="hidden" id="add_time_to_img" value="<?php echo $config['add_time_to_img'];?>" />
<?php if($config['upload_files']){ ?>
<!-- uploader div start --> <!-- uploader div start -->
<div class="uploader"> <div class="uploader">
<div class="flex"> <div class="flex">
@ -496,7 +495,7 @@ $get_params = http_build_query($get_params);
<div class="container1"> <div class="container1">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#baseUpload" data-toggle="tab"><?php echo trans('Upload_base');?></a></li> <li class="active"><a href="#baseUpload" data-toggle="tab"><?php echo trans('Upload_base');?></a></li>
<?php if($url_upload){ ?> <?php if($config['url_upload']){ ?>
<li><a href="#urlUpload" data-toggle="tab"><?php echo trans('Upload_url');?></a></li> <li><a href="#urlUpload" data-toggle="tab"><?php echo trans('Upload_url');?></a></li>
<?php } ?> <?php } ?>
</ul> </ul>
@ -601,7 +600,7 @@ $get_params = http_build_query($get_params);
{% } %} {% } %}
</script> </script>
</div> </div>
<?php if($url_upload){ ?> <?php if($config['url_upload']){ ?>
<div class="tab-pane" id="urlUpload"> <div class="tab-pane" id="urlUpload">
<br/> <br/>
<form class="form-horizontal"> <form class="form-horizontal">
@ -634,9 +633,9 @@ $class_ext = '';
$src = ''; $src = '';
if($ftp){ if($ftp){
try{ try{
$files = $ftp->scanDir($ftp_base_folder.$upload_dir.$rfm_subfolder.$subdir); $files = $ftp->scanDir($config['ftp_base_folder'].$config['upload_dir'].$rfm_subfolder.$subdir);
if (!$ftp->isDir($ftp_base_folder.$ftp_thumbs_dir.$rfm_subfolder.$subdir)){ if (!$ftp->isDir($config['ftp_base_folder'].$config['ftp_thumbs_dir'].$rfm_subfolder.$subdir)){
create_folder(false,$ftp_base_folder.$ftp_thumbs_dir.$rfm_subfolder.$subdir,$ftp,$config); create_folder(false,$config['ftp_base_folder'].$config['ftp_thumbs_dir'].$rfm_subfolder.$subdir,$ftp,$config);
} }
}catch(FtpClient\FtpException $e){ }catch(FtpClient\FtpException $e){
echo "Error: "; echo "Error: ";
@ -645,7 +644,7 @@ if($ftp){
die(); die();
} }
}else{ }else{
$files = scandir($current_path.$rfm_subfolder.$subdir); $files = scandir($config['current_path'].$rfm_subfolder.$subdir);
} }
$n_files= count($files); $n_files= count($files);
@ -664,11 +663,14 @@ foreach($files as $k=>$file){
if($file['type']=='file'){ if($file['type']=='file'){
$current_files_number++; $current_files_number++;
$file_ext = substr(strrchr($file['name'],'.'),1); $file_ext = substr(strrchr($file['name'],'.'),1);
$is_dir = false;
}else{ }else{
$current_folders_number++; $current_folders_number++;
$file_ext=trans('Type_dir'); $file_ext=trans('Type_dir');
$is_dir = true;
} }
$sorted[$k]=array( $sorted[$k]=array(
'is_dir'=>$is_dir,
'file'=>$file['name'], 'file'=>$file['name'],
'file_lcase'=>strtolower($file['name']), 'file_lcase'=>strtolower($file['name']),
'date'=>$date, 'date'=>$date,
@ -680,16 +682,17 @@ foreach($files as $k=>$file){
if($file!="." && $file!=".."){ if($file!="." && $file!=".."){
if(is_dir($current_path.$rfm_subfolder.$subdir.$file)){ if(is_dir($config['current_path'].$rfm_subfolder.$subdir.$file)){
$date=filemtime($current_path.$rfm_subfolder.$subdir. $file); $date=filemtime($config['current_path'].$rfm_subfolder.$subdir. $file);
$current_folders_number++; $current_folders_number++;
if($show_folder_size){ if($config['show_folder_size']){
list($size,$nfiles,$nfolders) = folder_info($current_path.$rfm_subfolder.$subdir.$file,false); list($size,$nfiles,$nfolders) = folder_info($config['current_path'].$rfm_subfolder.$subdir.$file,false);
} else { } else {
$size=0; $size=0;
} }
$file_ext=trans('Type_dir'); $file_ext=trans('Type_dir');
$sorted[$k]=array( $sorted[$k]=array(
'is_dir'=>true,
'file'=>$file, 'file'=>$file,
'file_lcase'=>strtolower($file), 'file_lcase'=>strtolower($file),
'date'=>$date, 'date'=>$date,
@ -697,17 +700,18 @@ foreach($files as $k=>$file){
'permissions' =>'', 'permissions' =>'',
'extension'=>fix_strtolower($file_ext) 'extension'=>fix_strtolower($file_ext)
); );
if($show_folder_size){ if($config['show_folder_size']){
$sorted[$k]['nfiles'] = $nfiles; $sorted[$k]['nfiles'] = $nfiles;
$sorted[$k]['nfolders'] = $nfolders; $sorted[$k]['nfolders'] = $nfolders;
} }
}else{ }else{
$current_files_number++; $current_files_number++;
$file_path=$current_path.$rfm_subfolder.$subdir.$file; $file_path=$config['current_path'].$rfm_subfolder.$subdir.$file;
$date=filemtime($file_path); $date=filemtime($file_path);
$size=filesize($file_path); $size=filesize($file_path);
$file_ext = substr(strrchr($file,'.'),1); $file_ext = substr(strrchr($file,'.'),1);
$sorted[$k]=array( $sorted[$k]=array(
'is_dir'=>false,
'file'=>$file, 'file'=>$file,
'file_lcase'=>strtolower($file), 'file_lcase'=>strtolower($file),
'date'=>$date, 'date'=>$date,
@ -720,18 +724,52 @@ foreach($files as $k=>$file){
} }
} }
function filenameSort($x, $y) { function filenameSort($x, $y) {
return $x['file_lcase'] < $y['file_lcase']; global $descending;
if($x['is_dir'] !== $y['is_dir']){
return $y['is_dir'];
} else {
return ($descending)
? $x['file_lcase'] < $y['file_lcase']
: $x['file_lcase'] >= $y['file_lcase'];
}
} }
function dateSort($x, $y) { function dateSort($x, $y) {
return $x['date'] < $y['date']; global $descending;
if($x['is_dir'] !== $y['is_dir']){
return $y['is_dir'];
} else {
return ($descending)
? $x['date'] < $y['date']
: $x['date'] >= $y['date'];
}
} }
function sizeSort($x, $y) { function sizeSort($x, $y) {
return $x['size'] < $y['size']; global $descending;
if($x['is_dir'] !== $y['is_dir']){
return $y['is_dir'];
} else {
return ($descending)
? $x['size'] < $y['size']
: $x['size'] >= $y['size'];
}
} }
function extensionSort($x, $y) { function extensionSort($x, $y) {
return $x['extension'] < $y['extension']; global $descending;
if($x['is_dir'] !== $y['is_dir']){
return $y['is_dir'];
} else {
return ($descending)
? $x['extension'] < $y['extension']
: $x['extension'] >= $y['extension'];
}
} }
switch($sort_by){ switch($sort_by){
@ -749,15 +787,12 @@ switch($sort_by){
break; break;
} }
if(!$descending){
$sorted=array_reverse($sorted);
}
if($subdir!=""){ if($subdir!=""){
$sorted = array_merge(array(array('file'=>'..')),$sorted); $sorted = array_merge(array(array('file'=>'..')),$sorted);
} }
$files=$sorted; $files=$sorted;
?> ?>
<!-- header div start --> <!-- header div start -->
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
@ -773,13 +808,13 @@ $files=$sorted;
<div class="filters"> <div class="filters">
<div class="row-fluid"> <div class="row-fluid">
<div class="span4 half"> <div class="span4 half">
<?php if($upload_files){ ?> <?php if($config['upload_files']){ ?>
<button class="tip btn upload-btn" title="<?php echo trans('Upload_file');?>"><i class="rficon-upload"></i></button> <button class="tip btn upload-btn" title="<?php echo trans('Upload_file');?>"><i class="rficon-upload"></i></button>
<?php } ?> <?php } ?>
<?php if($create_text_files){ ?> <?php if($config['create_text_files']){ ?>
<button class="tip btn create-file-btn" title="<?php echo trans('New_File');?>"><i class="icon-plus"></i><i class="icon-file"></i></button> <button class="tip btn create-file-btn" title="<?php echo trans('New_File');?>"><i class="icon-plus"></i><i class="icon-file"></i></button>
<?php } ?> <?php } ?>
<?php if($create_folders){ ?> <?php if($config['create_folders']){ ?>
<button class="tip btn new-folder" title="<?php echo trans('New_Folder')?>"><i class="icon-plus"></i><i class="icon-folder-open"></i></button> <button class="tip btn new-folder" title="<?php echo trans('New_Folder')?>"><i class="icon-plus"></i><i class="icon-folder-open"></i></button>
<?php } ?> <?php } ?>
<?php if($config['copy_cut_files'] || $config['copy_cut_dirs']){ ?> <?php if($config['copy_cut_files'] || $config['copy_cut_dirs']){ ?>
@ -807,28 +842,28 @@ $files=$sorted;
<div class="span6 entire types"> <div class="span6 entire types">
<span><?php echo trans('Filters');?>:</span> <span><?php echo trans('Filters');?>:</span>
<?php if($_GET['type']!=1 && $_GET['type']!=3 && $config['show_filter_buttons']){ ?> <?php if($_GET['type']!=1 && $_GET['type']!=3 && $config['show_filter_buttons']){ ?>
<?php if(count($ext_file)>0 or false){ ?> <?php if(count($config['ext_file'])>0 or false){ ?>
<input id="select-type-1" name="radio-sort" type="radio" data-item="ff-item-type-1" checked="checked" class="hide" /> <input id="select-type-1" name="radio-sort" type="radio" data-item="ff-item-type-1" checked="checked" class="hide" />
<label id="ff-item-type-1" title="<?php echo trans('Files');?>" for="select-type-1" class="tip btn ff-label-type-1"><i class="icon-file"></i></label> <label id="ff-item-type-1" title="<?php echo trans('Files');?>" for="select-type-1" class="tip btn ff-label-type-1"><i class="icon-file"></i></label>
<?php } ?> <?php } ?>
<?php if(count($ext_img)>0 or false){ ?> <?php if(count($config['ext_img'])>0 or false){ ?>
<input id="select-type-2" name="radio-sort" type="radio" data-item="ff-item-type-2" class="hide" /> <input id="select-type-2" name="radio-sort" type="radio" data-item="ff-item-type-2" class="hide" />
<label id="ff-item-type-2" title="<?php echo trans('Images');?>" for="select-type-2" class="tip btn ff-label-type-2"><i class="icon-picture"></i></label> <label id="ff-item-type-2" title="<?php echo trans('Images');?>" for="select-type-2" class="tip btn ff-label-type-2"><i class="icon-picture"></i></label>
<?php } ?> <?php } ?>
<?php if(count($ext_misc)>0 or false){ ?> <?php if(count($config['ext_misc'])>0 or false){ ?>
<input id="select-type-3" name="radio-sort" type="radio" data-item="ff-item-type-3" class="hide" /> <input id="select-type-3" name="radio-sort" type="radio" data-item="ff-item-type-3" class="hide" />
<label id="ff-item-type-3" title="<?php echo trans('Archives');?>" for="select-type-3" class="tip btn ff-label-type-3"><i class="icon-inbox"></i></label> <label id="ff-item-type-3" title="<?php echo trans('Archives');?>" for="select-type-3" class="tip btn ff-label-type-3"><i class="icon-inbox"></i></label>
<?php } ?> <?php } ?>
<?php if(count($ext_video)>0 or false){ ?> <?php if(count($config['ext_video'])>0 or false){ ?>
<input id="select-type-4" name="radio-sort" type="radio" data-item="ff-item-type-4" class="hide" /> <input id="select-type-4" name="radio-sort" type="radio" data-item="ff-item-type-4" class="hide" />
<label id="ff-item-type-4" title="<?php echo trans('Videos');?>" for="select-type-4" class="tip btn ff-label-type-4"><i class="icon-film"></i></label> <label id="ff-item-type-4" title="<?php echo trans('Videos');?>" for="select-type-4" class="tip btn ff-label-type-4"><i class="icon-film"></i></label>
<?php } ?> <?php } ?>
<?php if(count($ext_music)>0 or false){ ?> <?php if(count($config['ext_music'])>0 or false){ ?>
<input id="select-type-5" name="radio-sort" type="radio" data-item="ff-item-type-5" class="hide" /> <input id="select-type-5" name="radio-sort" type="radio" data-item="ff-item-type-5" class="hide" />
<label id="ff-item-type-5" title="<?php echo trans('Music');?>" for="select-type-5" class="tip btn ff-label-type-5"><i class="icon-music"></i></label> <label id="ff-item-type-5" title="<?php echo trans('Music');?>" for="select-type-5" class="tip btn ff-label-type-5"><i class="icon-music"></i></label>
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<input accesskey="f" type="text" class="filter-input <?php echo (($_GET['type']!=1 && $_GET['type']!=3) ? '' : 'filter-input-notype');?>" id="filter-input" name="filter" placeholder="<?php echo fix_strtolower(trans('Text_filter'));?>..." value="<?php echo $filter;?>"/><?php if($n_files>$file_number_limit_js){ ?><label id="filter" class="btn"><i class="icon-play"></i></label><?php } ?> <input accesskey="f" type="text" class="filter-input <?php echo (($_GET['type']!=1 && $_GET['type']!=3) ? '' : 'filter-input-notype');?>" id="filter-input" name="filter" placeholder="<?php echo fix_strtolower(trans('Text_filter'));?>..." value="<?php echo $filter;?>"/><?php if($n_files>$config['file_number_limit_js']){ ?><label id="filter" class="btn"><i class="icon-play"></i></label><?php } ?>
<input id="select-type-all" name="radio-sort" type="radio" data-item="ff-item-type-all" class="hide" /> <input id="select-type-all" name="radio-sort" type="radio" data-item="ff-item-type-all" class="hide" />
<label id="ff-item-type-all" title="<?php echo trans('All');?>" <?php if($_GET['type']==1 || $_GET['type']==3){ ?>style="visibility: hidden;" <?php } ?> data-item="ff-item-type-all" for="select-type-all" style="margin-rigth:0px;" class="tip btn btn-inverse ff-label-type-all"><i class="icon-remove icon-white"></i></label> <label id="ff-item-type-all" title="<?php echo trans('All');?>" <?php if($_GET['type']==1 || $_GET['type']==3){ ?>style="visibility: hidden;" <?php } ?> data-item="ff-item-type-all" for="select-type-all" style="margin-rigth:0px;" class="tip btn btn-inverse ff-label-type-all"><i class="icon-remove icon-white"></i></label>
@ -867,7 +902,7 @@ $files=$sorted;
?> ?>
<li class="pull-right"><a class="btn-small" href="javascript:void('')" id="info"><i class="icon-question-sign"></i></a></li> <li class="pull-right"><a class="btn-small" href="javascript:void('')" id="info"><i class="icon-question-sign"></i></a></li>
<?php if($show_language_selection){ ?> <?php if($config['show_language_selection']){ ?>
<li class="pull-right"><a class="btn-small" href="javascript:void('')" id="change_lang_btn"><i class="icon-globe"></i></a></li> <li class="pull-right"><a class="btn-small" href="javascript:void('')" id="change_lang_btn"><i class="icon-globe"></i></a></li>
<?php } ?> <?php } ?>
<li class="pull-right"><a id="refresh" class="btn-small" href="dialog.php?<?php echo $get_params.$subdir."&".uniqid() ?>"><i class="icon-refresh"></i></a></li> <li class="pull-right"><a id="refresh" class="btn-small" href="dialog.php?<?php echo $get_params.$subdir."&".uniqid() ?>"><i class="icon-refresh"></i></a></li>
@ -888,8 +923,8 @@ $files=$sorted;
</div> </div>
</li> </li>
<li><small class="hidden-phone">(<span id="files_number"><?php echo $current_files_number."</span> ".trans('Files')." - <span id='folders_number'>".$current_folders_number."</span> ".trans('Folders');?>)</small></li> <li><small class="hidden-phone">(<span id="files_number"><?php echo $current_files_number."</span> ".trans('Files')." - <span id='folders_number'>".$current_folders_number."</span> ".trans('Folders');?>)</small></li>
<?php if($show_total_size){ ?> <?php if($config['show_total_size']){ ?>
<li><small class="hidden-phone"><span title="<?php echo trans('total size').$MaxSizeTotal;?>"><?php echo trans('total size').": ".makeSize($sizeCurrentFolder).(($MaxSizeTotal !== false && is_int($MaxSizeTotal))? '/'.$MaxSizeTotal.' '.trans('MB'):'');?></span></small> <li><small class="hidden-phone"><span title="<?php echo trans('total size').$config['MaxSizeTotal'];?>"><?php echo trans('total size').": ".makeSize($sizeCurrentFolder).(($config['MaxSizeTotal'] !== false && is_int($config['MaxSizeTotal']))? '/'.$config['MaxSizeTotal'].' '.trans('MB'):'');?></span></small>
</li> </li>
<?php } ?> <?php } ?>
</ul> </ul>
@ -897,15 +932,15 @@ $files=$sorted;
<!-- breadcrumb div end --> <!-- breadcrumb div end -->
<div class="row-fluid ff-container"> <div class="row-fluid ff-container">
<div class="span12"> <div class="span12">
<?php if( ($ftp && !$ftp->isDir($ftp_base_folder.$upload_dir.$rfm_subfolder.$subdir)) || (!$ftp && @opendir($current_path.$rfm_subfolder.$subdir)===FALSE)){ ?> <?php if( ($ftp && !$ftp->isDir($config['ftp_base_folder'].$config['upload_dir'].$rfm_subfolder.$subdir)) || (!$ftp && @opendir($config['current_path'].$rfm_subfolder.$subdir)===FALSE)){ ?>
<br/> <br/>
<div class="alert alert-error">There is an error! The upload folder there isn't. Check your config.php file. </div> <div class="alert alert-error">There is an error! The upload folder there isn't. Check your config.php file. </div>
<?php }else{ ?> <?php }else{ ?>
<h4 id="help"><?php echo trans('Swipe_help');?></h4> <h4 id="help"><?php echo trans('Swipe_help');?></h4>
<?php if(isset($folder_message)){ ?> <?php if(isset($config['folder_message'])){ ?>
<div class="alert alert-block"><?php echo $folder_message;?></div> <div class="alert alert-block"><?php echo $config['folder_message'];?></div>
<?php } ?> <?php } ?>
<?php if($show_sorting_bar){ ?> <?php if($config['show_sorting_bar']){ ?>
<!-- sorter --> <!-- sorter -->
<div class="sorter-container <?php echo "list-view".$view;?>"> <div class="sorter-container <?php echo "list-view".$view;?>">
<div class="file-name"><a class="sorter sort-name <?php if($sort_by=="name"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="name"><?php echo trans('Filename');?></a></div> <div class="file-name"><a class="sorter sort-name <?php if($sort_by=="name"){ echo ($descending)?"descending":"ascending"; } ?>" href="javascript:void('')" data-sort="name"><?php echo trans('Filename');?></a></div>
@ -921,18 +956,17 @@ $files=$sorted;
<!--ul class="thumbnails ff-items"--> <!--ul class="thumbnails ff-items"-->
<ul class="grid cs-style-2 <?php echo "list-view".$view;?>" id="main-item-container"> <ul class="grid cs-style-2 <?php echo "list-view".$view;?>" id="main-item-container">
<?php <?php
$jplayer_ext=array("mp4","flv","webmv","webma","webm","m4a","m4v","ogv","oga","mp3","midi","mid","ogg","wav");
foreach ($files as $file_array) { foreach ($files as $file_array) {
$file=$file_array['file']; $file=$file_array['file'];
if($file == '.' || ( substr($file, 0, 1) == '.' && isset( $file_array[ 'extension' ] ) && $file_array[ 'extension' ] == fix_strtolower(trans( 'Type_dir' ) )) || (isset($file_array['extension']) && $file_array['extension']!=fix_strtolower(trans('Type_dir'))) || ($file == '..' && $subdir == '') || in_array($file, $hidden_folders) || ($filter!='' && $n_files>$file_number_limit_js && $file!=".." && stripos($file,$filter)===false)){ if($file == '.' || ( substr($file, 0, 1) == '.' && isset( $file_array[ 'extension' ] ) && $file_array[ 'extension' ] == fix_strtolower(trans( 'Type_dir' ) )) || (isset($file_array['extension']) && $file_array['extension']!=fix_strtolower(trans('Type_dir'))) || ($file == '..' && $subdir == '') || in_array($file, $config['hidden_folders']) || ($filter!='' && $n_files>$config['file_number_limit_js'] && $file!=".." && stripos($file,$filter)===false)){
continue; continue;
} }
$new_name=fix_filename($file,$config); $new_name=fix_filename($file,$config);
if($ftp && $file!='..' && $file!=$new_name){ if($ftp && $file!='..' && $file!=$new_name){
//rename //rename
rename_folder($current_path.$subdir.$file,$new_name,$ftp,$config); rename_folder($config['current_path'].$subdir.$file,$new_name,$ftp,$config);
$file=$new_name; $file=$new_name;
} }
//add in thumbs folder if not exist //add in thumbs folder if not exist
@ -961,7 +995,7 @@ $files=$sorted;
$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename']; $file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete']; $file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
} }
?><figure data-name="<?php echo $file ?>" class="<?php if($file=="..") echo "back-";?>directory" data-type="<?php if($file!=".."){ echo "dir"; } ?>"> ?><figure data-name="<?php echo $file ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file;?>" class="<?php if($file=="..") echo "back-";?>directory" data-type="<?php if($file!=".."){ echo "dir"; } ?>">
<?php if($file==".."){ ?> <?php if($file==".."){ ?>
<input type="hidden" class="path" value="<?php echo str_replace('.','',dirname($rfm_subfolder.$subdir));?>"/> <input type="hidden" class="path" value="<?php echo str_replace('.','',dirname($rfm_subfolder.$subdir));?>"/>
<input type="hidden" class="path_thumb" value="<?php echo dirname($thumbs_path.$subdir)."/";?>"/> <input type="hidden" class="path_thumb" value="<?php echo dirname($thumbs_path.$subdir)."/";?>"/>
@ -969,13 +1003,13 @@ $files=$sorted;
<a class="folder-link" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".($callback?'callback='.$callback."&":'').uniqid() ?>"> <a class="folder-link" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".($callback?'callback='.$callback."&":'').uniqid() ?>">
<div class="img-precontainer"> <div class="img-precontainer">
<div class="img-container directory"><span></span> <div class="img-container directory"><span></span>
<img class="directory-img" data-src="img/<?php echo $icon_theme;?>/folder<?php if($file==".."){ echo "_back"; }?>.png" /> <img class="directory-img" data-src="img/<?php echo $config['icon_theme'];?>/folder<?php if($file==".."){ echo "_back"; }?>.png" />
</div> </div>
</div> </div>
<div class="img-precontainer-mini directory"> <div class="img-precontainer-mini directory">
<div class="img-container-mini"> <div class="img-container-mini">
<span></span> <span></span>
<img class="directory-img" data-src="img/<?php echo $icon_theme;?>/folder<?php if($file==".."){ echo "_back"; }?>.png" /> <img class="directory-img" data-src="img/<?php echo $config['icon_theme'];?>/folder<?php if($file==".."){ echo "_back"; }?>.png" />
</div> </div>
</div> </div>
<?php if($file==".."){ ?> <?php if($file==".."){ ?>
@ -987,24 +1021,24 @@ $files=$sorted;
<?php }else{ ?> <?php }else{ ?>
</a> </a>
<div class="box"> <div class="box">
<h4 class="<?php if($ellipsis_title_after_first_row){ echo "ellipsis"; } ?>"><a class="folder-link" data-file="<?php echo $file ?>" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>"><?php echo $file;?></a></h4> <h4 class="<?php if($config['ellipsis_title_after_first_row']){ echo "ellipsis"; } ?>"><a class="folder-link" data-file="<?php echo $file ?>" href="dialog.php?<?php echo $get_params.rawurlencode($src)."&".uniqid() ?>"><?php echo $file;?></a></h4>
</div> </div>
<input type="hidden" class="name" value="<?php echo $file_array['file_lcase'];?>"/> <input type="hidden" class="name" value="<?php echo $file_array['file_lcase'];?>"/>
<input type="hidden" class="date" value="<?php echo $file_array['date'];?>"/> <input type="hidden" class="date" value="<?php echo $file_array['date'];?>"/>
<input type="hidden" class="size" value="<?php echo $file_array['size'];?>"/> <input type="hidden" class="size" value="<?php echo $file_array['size'];?>"/>
<input type="hidden" class="extension" value="<?php echo fix_strtolower(trans('Type_dir'));?>"/> <input type="hidden" class="extension" value="<?php echo fix_strtolower(trans('Type_dir'));?>"/>
<div class="file-date"><?php echo date(trans('Date_type'),$file_array['date']);?></div> <div class="file-date"><?php echo date(trans('Date_type'),$file_array['date']);?></div>
<?php if($show_folder_size){ ?> <?php if($config['show_folder_size']){ ?>
<div class="file-size"><?php echo makeSize($file_array['size']);?></div> <div class="file-size"><?php echo makeSize($file_array['size']);?></div>
<input type="hidden" class="nfiles" value="<?php echo $file_array['nfiles'];?>"/> <input type="hidden" class="nfiles" value="<?php echo $file_array['nfiles'];?>"/>
<input type="hidden" class="nfolders" value="<?php echo $file_array['nfolders'];?>"/> <input type="hidden" class="nfolders" value="<?php echo $file_array['nfolders'];?>"/>
<?php } ?> <?php } ?>
<div class='file-extension'><?php echo fix_strtolower(trans('Type_dir'));?></div> <div class='file-extension'><?php echo fix_strtolower(trans('Type_dir'));?></div>
<figcaption> <figcaption>
<a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_folders && !$file_prevent_rename) echo "rename-folder";?>" title="<?php echo trans('Rename')?>" data-folder="1" data-permissions="<?php echo $file_array['permissions']; ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file;?>"> <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($config['rename_folders'] && !$file_prevent_rename) echo "rename-folder";?>" title="<?php echo trans('Rename')?>" data-folder="1" data-permissions="<?php echo $file_array['permissions']; ?>">
<i class="icon-pencil <?php if(!$rename_folders || $file_prevent_rename) echo 'icon-white';?>"></i></a> <i class="icon-pencil <?php if(!$config['rename_folders'] || $file_prevent_rename) echo 'icon-white';?>"></i></a>
<a href="javascript:void('')" class="tip-left erase-button <?php if($delete_folders && !$file_prevent_delete) echo "delete-folder";?>" title="<?php echo trans('Erase')?>" data-confirm="<?php echo trans('Confirm_Folder_del');?>" data-path="<?php echo $rfm_subfolder.$subdir.$file;?>" > <a href="javascript:void('')" class="tip-left erase-button <?php if($config['delete_folders'] && !$file_prevent_delete) echo "delete-folder";?>" title="<?php echo trans('Erase')?>" data-confirm="<?php echo trans('Confirm_Folder_del');?>" >
<i class="icon-trash <?php if(!$delete_folders || $file_prevent_delete) echo 'icon-white';?>"></i> <i class="icon-trash <?php if(!$config['delete_folders'] || $file_prevent_delete) echo 'icon-white';?>"></i>
</a> </a>
</figcaption> </figcaption>
<?php } ?> <?php } ?>
@ -1018,40 +1052,45 @@ $files=$sorted;
foreach ($files as $nu=>$file_array) { foreach ($files as $nu=>$file_array) {
$file=$file_array['file']; $file=$file_array['file'];
if($file == '.' || $file == '..' || $file_array['extension']==fix_strtolower(trans('Type_dir')) || (!$config['ext_blacklist'] && !in_array(fix_strtolower($file_array['extension']), $ext)) || ($config['ext_blacklist'] && in_array(fix_strtolower($file_array['extension']), $config['ext_blacklist'])) || ($filter!='' && $n_files>$file_number_limit_js && stripos($file,$filter)===false)) if($file == '.' || $file == '..' || $file_array['extension']==fix_strtolower(trans('Type_dir')) || !check_extension($file_array['extension'],$config) || ($filter!='' && $n_files>$config['file_number_limit_js'] && stripos($file,$filter)===false))
continue; continue;
foreach ( $hidden_files as $hidden_file ) { foreach ( $config['hidden_files'] as $hidden_file ) {
if ( fnmatch($hidden_file, $file, FNM_PATHNAME) ) { if ( fnmatch($hidden_file, $file, FNM_PATHNAME) ) {
continue 2; continue 2;
} }
} }
$filename=substr($file, 0, '-' . (strlen($file_array['extension']) + 1)); $filename=substr($file, 0, '-' . (strlen($file_array['extension']) + 1));
if(strlen($file_array['extension'])===0){
$filename = $file;
}
if(!$ftp){ if(!$ftp){
$file_path=$current_path.$rfm_subfolder.$subdir.$file; $file_path=$config['current_path'].$rfm_subfolder.$subdir.$file;
//check if file have illegal caracter //check if file have illegal caracter
if($file!=fix_filename($file,$config)){ if($file!=fix_filename($file,$config)){
$file1=fix_filename($file,$config); $file1=fix_filename($file,$config);
$file_path1=($current_path.$rfm_subfolder.$subdir.$file1); $file_path1=($config['current_path'].$rfm_subfolder.$subdir.$file1);
if(file_exists($file_path1)){ if(file_exists($file_path1)){
$i = 1; $i = 1;
$info=pathinfo($file1); $info=pathinfo($file1);
while(file_exists($current_path.$rfm_subfolder.$subdir.$info['filename'].".[".$i."].".$info['extension'])) { while(file_exists($config['current_path'].$rfm_subfolder.$subdir.$info['filename'].".[".$i."].".$info['extension'])) {
$i++; $i++;
} }
$file1=$info['filename'].".[".$i."].".$info['extension']; $file1=$info['filename'].".[".$i."].".$info['extension'];
$file_path1=($current_path.$rfm_subfolder.$subdir.$file1); $file_path1=($config['current_path'].$rfm_subfolder.$subdir.$file1);
} }
$filename=substr($file1, 0, '-' . (strlen($file_array['extension']) + 1)); $filename=substr($file1, 0, '-' . (strlen($file_array['extension']) + 1));
if(strlen($file_array['extension'])===0){
$filename = $file1;
}
rename_file($file_path,fix_filename($filename,$config),$ftp,$config); rename_file($file_path,fix_filename($filename,$config),$ftp,$config);
$file=$file1; $file=$file1;
$file_array['extension']=fix_filename($file_array['extension'],$config); $file_array['extension']=fix_filename($file_array['extension'],$config);
$file_path=$file_path1; $file_path=$file_path1;
} }
}else{ }else{
$file_path = $config['ftp_base_url'].$upload_dir.$rfm_subfolder.$subdir.$file; $file_path = $config['ftp_base_url'].$config['upload_dir'].$rfm_subfolder.$subdir.$file;
} }
$is_img=false; $is_img=false;
@ -1061,14 +1100,14 @@ $files=$sorted;
$show_original_mini=false; $show_original_mini=false;
$mini_src=""; $mini_src="";
$src_thumb=""; $src_thumb="";
if(in_array($file_array['extension'], $ext_img)){ if(in_array($file_array['extension'], $config['ext_img'])){
$src = $file_path; $src = $file_path;
$is_img=true; $is_img=true;
$img_width = $img_height = ""; $img_width = $img_height = "";
if($ftp){ if($ftp){
$mini_src = $src_thumb = $config['ftp_base_url'].$ftp_thumbs_dir.$subdir. $file; $mini_src = $src_thumb = $config['ftp_base_url'].$config['ftp_thumbs_dir'].$subdir. $file;
$creation_thumb_path = "/".$config['ftp_base_folder'].$ftp_thumbs_dir.$subdir. $file; $creation_thumb_path = "/".$config['ftp_base_folder'].$config['ftp_thumbs_dir'].$subdir. $file;
}else{ }else{
$creation_thumb_path = $mini_src = $src_thumb = $thumbs_path.$subdir. $file; $creation_thumb_path = $mini_src = $src_thumb = $thumbs_path.$subdir. $file;
@ -1086,7 +1125,7 @@ $files=$sorted;
} }
if($img_width<45 && $img_height<38){ if($img_width<45 && $img_height<38){
$mini_src=$current_path.$rfm_subfolder.$subdir.$file; $mini_src=$config['current_path'].$rfm_subfolder.$subdir.$file;
$show_original_mini=true; $show_original_mini=true;
} }
} }
@ -1096,10 +1135,10 @@ $files=$sorted;
$no_thumb=false; $no_thumb=false;
if($src_thumb==""){ if($src_thumb==""){
$no_thumb=true; $no_thumb=true;
if(file_exists('img/'.$icon_theme.'/'.$file_array['extension'].".jpg")){ if(file_exists('img/'.$config['icon_theme'].'/'.$file_array['extension'].".jpg")){
$src_thumb ='img/'.$icon_theme.'/'.$file_array['extension'].".jpg"; $src_thumb ='img/'.$config['icon_theme'].'/'.$file_array['extension'].".jpg";
}else{ }else{
$src_thumb = "img/".$icon_theme."/default.jpg"; $src_thumb = "img/".$config['icon_theme']."/default.jpg";
} }
$is_icon_thumb=true; $is_icon_thumb=true;
} }
@ -1108,15 +1147,15 @@ $files=$sorted;
} }
$class_ext=0; $class_ext=0;
if (in_array($file_array['extension'], $ext_video)) { if (in_array($file_array['extension'], $config['ext_video'])) {
$class_ext = 4; $class_ext = 4;
$is_video=true; $is_video=true;
}elseif (in_array($file_array['extension'], $ext_img)) { }elseif (in_array($file_array['extension'], $config['ext_img'])) {
$class_ext = 2; $class_ext = 2;
}elseif (in_array($file_array['extension'], $ext_music)) { }elseif (in_array($file_array['extension'], $config['ext_music'])) {
$class_ext = 5; $class_ext = 5;
$is_audio=true; $is_audio=true;
}elseif (in_array($file_array['extension'], $ext_misc)) { }elseif (in_array($file_array['extension'], $config['ext_misc'])) {
$class_ext = 3; $class_ext = 3;
}else{ }else{
$class_ext = 1; $class_ext = 1;
@ -1133,7 +1172,8 @@ $files=$sorted;
$file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename']; $file_prevent_rename = isset($filePermissions[$file]['prevent_rename']) && $filePermissions[$file]['prevent_rename'];
$file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete']; $file_prevent_delete = isset($filePermissions[$file]['prevent_delete']) && $filePermissions[$file]['prevent_delete'];
} }
?> <figure data-name="<?php echo $file ?>" data-type="<?php if($is_img){ echo "img"; }else{ echo "file"; } ?>"> ?>
<figure data-name="<?php echo $file ?>" data-path="<?php echo $rfm_subfolder.$subdir.$file;?>" data-type="<?php if($is_img){ echo "img"; }else{ echo "file"; } ?>">
<a href="javascript:void('')" class="link" data-file="<?php echo $file;?>" data-function="<?php echo $apply;?>"> <a href="javascript:void('')" class="link" data-file="<?php echo $file;?>" data-function="<?php echo $apply;?>">
<div class="img-precontainer"> <div class="img-precontainer">
<?php if($is_icon_thumb){ ?><div class="filetype"><?php echo $file_array['extension'] ?></div><?php } ?> <?php if($is_icon_thumb){ ?><div class="filetype"><?php echo $file_array['extension'] ?></div><?php } ?>
@ -1156,7 +1196,7 @@ $files=$sorted;
</label> </label>
</div> </div>
<?php } ?> <?php } ?>
<div class="filetype <?php echo $file_array['extension'] ?> <?php if(in_array($file_array['extension'], $editable_text_file_exts)) echo 'edit-text-file-allowed' ?> <?php if(!$is_icon_thumb){ echo "hide"; }?>"><?php echo $file_array['extension'] ?></div> <div class="filetype <?php echo $file_array['extension'] ?> <?php if(in_array($file_array['extension'], $config['editable_text_file_exts'])) echo 'edit-text-file-allowed' ?> <?php if(!$is_icon_thumb){ echo "hide"; }?>"><?php echo $file_array['extension'] ?></div>
<div class="img-container-mini"> <div class="img-container-mini">
<?php if($mini_src!=""){ ?> <?php if($mini_src!=""){ ?>
<img class="<?php echo $show_original_mini ? "original" : "" ?><?php echo $is_icon_thumb_mini ? " icon" : "" ?>" data-src="<?php echo $mini_src;?>"> <img class="<?php echo $show_original_mini ? "original" : "" ?><?php echo $is_icon_thumb_mini ? " icon" : "" ?>" data-src="<?php echo $mini_src;?>">
@ -1167,7 +1207,7 @@ $files=$sorted;
<div class="cover"></div> <div class="cover"></div>
<?php } ?> <?php } ?>
<div class="box"> <div class="box">
<h4 class="<?php if($ellipsis_title_after_first_row){ echo "ellipsis"; } ?>"> <h4 class="<?php if($config['ellipsis_title_after_first_row']){ echo "ellipsis"; } ?>">
<?php echo $filename;?></h4> <?php echo $filename;?></h4>
</div></a> </div></a>
<input type="hidden" class="date" value="<?php echo $file_array['date'];?>"/> <input type="hidden" class="date" value="<?php echo $file_array['date'];?>"/>
@ -1183,30 +1223,31 @@ $files=$sorted;
<input type="hidden" name="path" value="<?php echo $rfm_subfolder.$subdir?>"/> <input type="hidden" name="path" value="<?php echo $rfm_subfolder.$subdir?>"/>
<input type="hidden" class="name_download" name="name" value="<?php echo $file?>"/> <input type="hidden" class="name_download" name="name" value="<?php echo $file?>"/>
<a title="<?php echo trans('Download')?>" class="tip-right" href="javascript:void('')" onclick="$('#form<?php echo $nu;?>').submit();"><i class="icon-download"></i></a> <a title="<?php echo trans('Download')?>" class="tip-right" href="javascript:void('')" <?php if($config['download_files']) echo "onclick=\"$('#form".$nu."').submit();\"" ?>><i class="icon-download <?php if(!$config['download_files']) echo 'icon-white'; ?>"></i></a>
<?php if($is_img && $src_thumb!=""){ ?> <?php if($is_img && $src_thumb!=""){ ?>
<a class="tip-right preview" title="<?php echo trans('Preview')?>" data-url="<?php echo $src;?>" data-toggle="lightbox" href="#previewLightbox"><i class=" icon-eye-open"></i></a> <a class="tip-right preview" title="<?php echo trans('Preview')?>" data-url="<?php echo $src;?>" data-toggle="lightbox" href="#previewLightbox"><i class=" icon-eye-open"></i></a>
<?php }elseif(($is_video || $is_audio) && in_array($file_array['extension'],$jplayer_ext)){ ?> <?php }elseif(($is_video || $is_audio) && in_array($file_array['extension'],$config['jplayer_exts'])){ ?>
<a class="tip-right modalAV <?php if($is_audio){ echo "audio"; }else{ echo "video"; } ?>" <a class="tip-right modalAV <?php if($is_audio){ echo "audio"; }else{ echo "video"; } ?>"
title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=media_preview&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=media_preview&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>"
href="javascript:void('');" ><i class=" icon-eye-open"></i></a> href="javascript:void('');" ><i class=" icon-eye-open"></i></a>
<?php }elseif(in_array($file_array['extension'],array('dwg', 'dxf', 'hpgl', 'plt', 'spl', 'step', 'stp', 'iges', 'igs', 'sat', 'cgm', 'svg'))){ ?> <?php }elseif(in_array($file_array['extension'],$config['cad_exts'])){ ?>
<a class="tip-right file-preview-btn" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=cad_preview&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>" <a class="tip-right file-preview-btn" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=cad_preview&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>"
href="javascript:void('');" ><i class=" icon-eye-open"></i></a> href="javascript:void('');" ><i class=" icon-eye-open"></i></a>
<?php }elseif($preview_text_files && in_array($file_array['extension'],$previewable_text_file_exts)){ ?> <?php }elseif($config['preview_text_files'] && in_array($file_array['extension'],$config['previewable_text_file_exts'])){ ?>
<a class="tip-right file-preview-btn" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=get_file&sub_action=preview&preview_mode=text&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>" <a class="tip-right file-preview-btn" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=get_file&sub_action=preview&preview_mode=text&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>"
href="javascript:void('');" ><i class=" icon-eye-open"></i></a> href="javascript:void('');" ><i class=" icon-eye-open"></i></a>
<?php }elseif($googledoc_enabled && in_array($file_array['extension'],$googledoc_file_exts)){ ?> <?php }elseif($config['googledoc_enabled'] && in_array($file_array['extension'],$config['googledoc_file_exts'])){ ?>
<a class="tip-right file-preview-btn" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=get_file&sub_action=preview&preview_mode=google&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>" <a class="tip-right file-preview-btn" title="<?php echo trans('Preview')?>" data-url="ajax_calls.php?action=get_file&sub_action=preview&preview_mode=google&title=<?php echo $filename;?>&file=<?php echo $rfm_subfolder.$subdir.$file;?>"
href="docs.google.com;" ><i class=" icon-eye-open"></i></a> href="docs.google.com;" ><i class=" icon-eye-open"></i></a>
<?php }else{ ?> <?php }else{ ?>
<a class="preview disabled"><i class="icon-eye-open icon-white"></i></a> <a class="preview disabled"><i class="icon-eye-open icon-white"></i></a>
<?php } ?> <?php } ?>
<a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($rename_files && !$file_prevent_rename) echo "rename-file";?>" title="<?php echo trans('Rename')?>" data-folder="0" data-permissions="<?php echo $file_array['permissions']; ?>" data-path="<?php echo $rfm_subfolder.$subdir .$file;?>"> <a href="javascript:void('')" class="tip-left edit-button rename-file-paths <?php if($config['rename_files'] && !$file_prevent_rename) echo "rename-file";?>" title="<?php echo trans('Rename')?>" data-folder="0" data-permissions="<?php echo $file_array['permissions']; ?>">
<i class="icon-pencil <?php if(!$rename_files || $file_prevent_rename) echo 'icon-white';?>"></i></a> <i class="icon-pencil <?php if(!$config['rename_files'] || $file_prevent_rename) echo 'icon-white';?>"></i></a>
<a href="javascript:void('')" class="tip-left erase-button <?php if($delete_files && !$file_prevent_delete) echo "delete-file";?>" title="<?php echo trans('Erase')?>" data-confirm="<?php echo trans('Confirm_del');?>" data-path="<?php echo $rfm_subfolder.$subdir.$file;?>"> <a href="javascript:void('')" class="tip-left erase-button <?php if($config['delete_files'] && !$file_prevent_delete) echo "delete-file";?>" title="<?php echo trans('Erase')?>" data-confirm="<?php echo trans('Confirm_del');?>">
<i class="icon-trash <?php if(!$delete_files || $file_prevent_delete) echo 'icon-white';?>"></i> <i class="icon-trash <?php if(!$config['delete_files'] || $file_prevent_delete) echo 'icon-white';?>"></i>
</a> </a>
</form> </form>
</figcaption> </figcaption>
@ -1222,6 +1263,7 @@ $files=$sorted;
</div> </div>
</div> </div>
</div> </div>
<script> <script>
var files_prevent_duplicate = new Array(); var files_prevent_duplicate = new Array();
<?php <?php

View File

@ -1,7 +1,5 @@
<?php <?php
$config = include 'config/config.php'; $config = include 'config/config.php';
//TODO switch to array
extract($config, EXTR_OVERWRITE);
include 'include/utils.php'; include 'include/utils.php';
@ -11,13 +9,9 @@ if ($_SESSION['RF']["verify"] != "RESPONSIVEfilemanager")
exit; exit;
} }
if (strpos($_POST['path'],'/')===0 if (!checkRelativePath($_POST['path']))
|| strpos($_POST['path'],'../')!==FALSE
|| strpos($_POST['path'],'./')===0
|| strpos($_POST['path'],'..\\')!==FALSE
|| strpos($_POST['path'],'.\\')===0)
{ {
response(trans('wrong path'.AddErrorLocation()))->send(); response(trans('wrong path').AddErrorLocation())->send();
exit; exit;
} }
@ -39,7 +33,7 @@ else
$ftp = ftp_con($config); $ftp = ftp_con($config);
$base = $current_path; $base = $config['current_path'];
$path = $base.$_POST['path']; $path = $base.$_POST['path'];
$cycle = TRUE; $cycle = TRUE;
$max_cycles = 50; $max_cycles = 50;
@ -81,6 +75,11 @@ function returnPaths($_path,$_name,$config){
if(isset($_POST['paths'])){ if(isset($_POST['paths'])){
$paths = $paths_thumb = $names = array(); $paths = $paths_thumb = $names = array();
foreach ($_POST['paths'] as $key => $path) { foreach ($_POST['paths'] as $key => $path) {
if (!checkRelativePath($path))
{
response(trans('wrong path').AddErrorLocation())->send();
exit;
}
$name = null; $name = null;
if(isset($_POST['names'][$key])){ if(isset($_POST['names'][$key])){
$name = $_POST['names'][$key]; $name = $_POST['names'][$key];
@ -101,10 +100,7 @@ if(isset($_POST['paths'])){
$info = pathinfo($path); $info = pathinfo($path);
if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action']=='delete_folder') && if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action']=='delete_folder') &&
( !check_extension($info['extension'],$config)
(!$config['ext_blacklist'] && !in_array(strtolower($info['extension']), $ext)) ||
($config['ext_blacklist'] && in_array(fix_strtolower($file_array['extension']),$config['ext_blacklist']))
)
&& $_GET['action'] != 'create_file' ) && $_GET['action'] != 'create_file' )
{ {
response(trans('wrong extension').AddErrorLocation())->send(); response(trans('wrong extension').AddErrorLocation())->send();
@ -127,7 +123,7 @@ if (isset($_GET['action']))
break; break;
case 'delete_folder': case 'delete_folder':
if ($delete_folders){ if ($config['delete_folders']){
if($ftp){ if($ftp){
deleteDir($path,$ftp,$config); deleteDir($path,$ftp,$config);
@ -135,19 +131,19 @@ if (isset($_GET['action']))
}else{ }else{
if (is_dir($path_thumb)) if (is_dir($path_thumb))
{ {
deleteDir($path_thumb); deleteDir($path_thumb,NULL,$config);
} }
if (is_dir($path)) if (is_dir($path))
{ {
deleteDir($path); deleteDir($path,NULL,$config);
if ($fixed_image_creation) if ($config['fixed_image_creation'])
{ {
foreach($fixed_path_from_filemanager as $k=>$paths){ foreach($config['fixed_path_from_filemanager'] as $k=>$paths){
if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.="/"; if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.="/";
$base_dir=$paths.substr_replace($path, '', 0, strlen($current_path)); $base_dir=$paths.substr_replace($path, '', 0, strlen($config['current_path']));
if (is_dir($base_dir)) deleteDir($base_dir); if (is_dir($base_dir)) deleteDir($base_dir,NULL,$config);
} }
} }
} }
@ -155,7 +151,7 @@ if (isset($_GET['action']))
} }
break; break;
case 'create_folder': case 'create_folder':
if ($create_folders) if ($config['create_folders'])
{ {
$name = fix_filename($_POST['name'],$config); $name = fix_filename($_POST['name'],$config);
@ -168,9 +164,9 @@ if (isset($_GET['action']))
} }
break; break;
case 'rename_folder': case 'rename_folder':
if ($rename_folders){ if ($config['rename_folders']){
if(!is_dir($path)) { if(!is_dir($path)) {
response(trans('wrong path'))->send(); response(trans('wrong path').AddErrorLocation())->send();
exit; exit;
} }
$name=fix_filename($name,$config); $name=fix_filename($name,$config);
@ -183,11 +179,11 @@ if (isset($_GET['action']))
exit; exit;
} }
rename_folder($path_thumb,$name,$ftp,$config); rename_folder($path_thumb,$name,$ftp,$config);
if (!$ftp && $fixed_image_creation){ if (!$ftp && $config['fixed_image_creation']){
foreach($fixed_path_from_filemanager as $k=>$paths){ foreach($config['fixed_path_from_filemanager'] as $k=>$paths){
if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.="/"; if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.="/";
$base_dir=$paths.substr_replace($path, '', 0, strlen($current_path)); $base_dir=$paths.substr_replace($path, '', 0, strlen($config['current_path']));
rename_folder($base_dir,$name,$ftp,$config); rename_folder($base_dir,$name,$ftp,$config);
} }
} }
@ -198,18 +194,18 @@ if (isset($_GET['action']))
} }
break; break;
case 'create_file': case 'create_file':
if ($create_text_files === FALSE) { if ($config['create_text_files'] === FALSE) {
response(sprintf(trans('File_Open_Edit_Not_Allowed'), strtolower(trans('Edit'))).AddErrorLocation())->send(); response(sprintf(trans('File_Open_Edit_Not_Allowed'), strtolower(trans('Edit'))).AddErrorLocation())->send();
exit; exit;
} }
if (!isset($editable_text_file_exts) || !is_array($editable_text_file_exts)){ if (!isset($config['editable_text_file_exts']) || !is_array($config['editable_text_file_exts'])){
$editable_text_file_exts = array(); $config['editable_text_file_exts'] = array();
} }
// check if user supplied extension // check if user supplied extension
if (strpos($name, '.') === FALSE){ if (strpos($name, '.') === FALSE){
response(trans('No_Extension').' '.sprintf(trans('Valid_Extensions'), implode(', ', $editable_text_file_exts)).AddErrorLocation())->send(); response(trans('No_Extension').' '.sprintf(trans('Valid_Extensions'), implode(', ', $config['editable_text_file_exts'])).AddErrorLocation())->send();
exit; exit;
} }
@ -224,8 +220,8 @@ if (isset($_GET['action']))
// check extension // check extension
$parts = explode('.', $name); $parts = explode('.', $name);
if (!in_array(end($parts), $editable_text_file_exts)) { if (!in_array(end($parts), $config['editable_text_file_exts'])) {
response(trans('Error_extension').' '.sprintf(trans('Valid_Extensions'), implode(', ', $editable_text_file_exts)), 400)->send(); response(trans('Error_extension').' '.sprintf(trans('Valid_Extensions'), implode(', ', $config['editable_text_file_exts'])).AddErrorLocation(), 400)->send();
exit; exit;
} }
@ -239,7 +235,7 @@ if (isset($_GET['action']))
response(trans('File_Save_OK'))->send(); response(trans('File_Save_OK'))->send();
}else{ }else{
if (!checkresultingsize(strlen($content))) { if (!checkresultingsize(strlen($content))) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
// file already exists // file already exists
@ -262,7 +258,7 @@ if (isset($_GET['action']))
break; break;
case 'rename_file': case 'rename_file':
if ($rename_files){ if ($config['rename_files']){
$name=fix_filename($name,$config); $name=fix_filename($name,$config);
if (!empty($name)) if (!empty($name))
{ {
@ -274,18 +270,18 @@ if (isset($_GET['action']))
rename_file($path_thumb,$name,$ftp,$config); rename_file($path_thumb,$name,$ftp,$config);
if ($fixed_image_creation) if ($config['fixed_image_creation'])
{ {
$info=pathinfo($path); $info=pathinfo($path);
foreach($fixed_path_from_filemanager as $k=>$paths) foreach($config['fixed_path_from_filemanager'] as $k=>$paths)
{ {
if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.="/"; if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.="/";
$base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path)); $base_dir = $paths.substr_replace($info['dirname']."/", '', 0, strlen($config['current_path']));
if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'])) if (file_exists($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension']))
{ {
rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k],$ftp,$config); rename_file($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension'],$config['fixed_image_creation_name_to_prepend'][$k].$name.$config['fixed_image_creation_to_append'][$k],$ftp,$config);
} }
} }
} }
@ -296,13 +292,13 @@ if (isset($_GET['action']))
} }
break; break;
case 'duplicate_file': case 'duplicate_file':
if ($duplicate_files) if ($config['duplicate_files'])
{ {
$name=fix_filename($name,$config); $name=fix_filename($name,$config);
if (!empty($name)) if (!empty($name))
{ {
if (!$ftp && !checkresultingsize(filesize($path))) { if (!$ftp && !checkresultingsize(filesize($path))) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
if (!duplicate_file($path,$name,$ftp,$config)) if (!duplicate_file($path,$name,$ftp,$config))
@ -313,18 +309,18 @@ if (isset($_GET['action']))
duplicate_file($path_thumb,$name,$ftp,$config); duplicate_file($path_thumb,$name,$ftp,$config);
if (!$ftp && $fixed_image_creation) if (!$ftp && $config['fixed_image_creation'])
{ {
$info=pathinfo($path); $info=pathinfo($path);
foreach($fixed_path_from_filemanager as $k=>$paths) foreach($config['fixed_path_from_filemanager'] as $k=>$paths)
{ {
if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.= "/"; if ($paths!="" && $paths[strlen($paths)-1] != "/") $paths.= "/";
$base_dir=$paths.substr_replace($info['dirname']."/", '', 0, strlen($current_path)); $base_dir=$paths.substr_replace($info['dirname']."/", '', 0, strlen($config['current_path']));
if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'])) if (file_exists($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension']))
{ {
duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'],$fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]); duplicate_file($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension'],$config['fixed_image_creation_name_to_prepend'][$k].$name.$config['fixed_image_creation_to_append'][$k]);
} }
} }
} }
@ -358,8 +354,8 @@ if (isset($_GET['action']))
$data['path_thumb'] = DIRECTORY_SEPARATOR.$config['ftp_base_folder'].$config['ftp_thumbs_dir'].$data['path']; $data['path_thumb'] = DIRECTORY_SEPARATOR.$config['ftp_base_folder'].$config['ftp_thumbs_dir'].$data['path'];
$data['path'] = DIRECTORY_SEPARATOR.$config['ftp_base_folder'].$config['upload_dir'].$data['path']; $data['path'] = DIRECTORY_SEPARATOR.$config['ftp_base_folder'].$config['upload_dir'].$data['path'];
}else{ }else{
$data['path_thumb'] = $thumbs_base_path.$data['path']; $data['path_thumb'] = $config['thumbs_base_path'].$data['path'];
$data['path'] = $current_path.$data['path']; $data['path'] = $config['current_path'].$data['path'];
} }
$pinfo = pathinfo($data['path']); $pinfo = pathinfo($data['path']);
@ -418,7 +414,7 @@ if (isset($_GET['action']))
{ {
list($sizeFolderToCopy,$fileNum,$foldersCount) = folder_info($path,false); list($sizeFolderToCopy,$fileNum,$foldersCount) = folder_info($path,false);
if (!checkresultingsize($sizeFolderToCopy)) { if (!checkresultingsize($sizeFolderToCopy)) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
rcopy($data['path'], $path); rcopy($data['path'], $path);
@ -444,7 +440,7 @@ if (isset($_GET['action']))
$mode = $_POST['new_mode']; $mode = $_POST['new_mode'];
$rec_option = $_POST['is_recursive']; $rec_option = $_POST['is_recursive'];
$valid_options = array('none', 'files', 'folders', 'both'); $valid_options = array('none', 'files', 'folders', 'both');
$chmod_perm = ($_POST['folder'] ? $chmod_dirs : $chmod_files); $chmod_perm = ($_POST['folder'] ? $config['chmod_dirs'] : $config['chmod_files']);
// check perm // check perm
if ($chmod_perm === FALSE) { if ($chmod_perm === FALSE) {
@ -499,13 +495,13 @@ if (isset($_GET['action']))
} }
// not writable or edit not allowed // not writable or edit not allowed
if (!is_writable($path) || $edit_text_files === FALSE) { if (!is_writable($path) || $config['edit_text_files'] === FALSE) {
response(sprintf(trans('File_Open_Edit_Not_Allowed'), strtolower(trans('Edit'))).AddErrorLocation())->send(); response(sprintf(trans('File_Open_Edit_Not_Allowed'), strtolower(trans('Edit'))).AddErrorLocation())->send();
exit; exit;
} }
if (!checkresultingsize(strlen($content))) { if (!checkresultingsize(strlen($content))) {
response(sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation())->send(); response(sprintf(trans('max_size_reached'),$config['MaxSizeTotal']).AddErrorLocation())->send();
exit; exit;
} }
if (@file_put_contents($path, $content) === FALSE) { if (@file_put_contents($path, $content) === FALSE) {
@ -523,4 +519,3 @@ if (isset($_GET['action']))
exit; exit;
} }
} }
?>

View File

@ -2,134 +2,117 @@
$config = include 'config/config.php'; $config = include 'config/config.php';
//TODO switch to array
extract($config, EXTR_OVERWRITE);
include 'include/utils.php'; include 'include/utils.php';
include 'include/mime_type_lib.php';
$ftp = ftp_con($config); $ftp = ftp_con($config);
if ($_SESSION['RF']["verify"] != "RESPONSIVEfilemanager") if ($_SESSION['RF']["verify"] != "RESPONSIVEfilemanager") {
{ response(trans('forbiden') . AddErrorLocation(), 403)->send();
response(trans('forbiden').AddErrorLocation(), 403)->send();
exit; exit;
} }
include 'include/mime_type_lib.php';
if (!checkRelativePath($_POST['path']) ||
if (
strpos($_POST['path'], '/') === 0 strpos($_POST['path'], '/') === 0
|| strpos($_POST['path'], '../') !== false ) {
|| strpos($_POST['path'], './') === 0 response(trans('wrong path').AddErrorLocation(), 400)->send();
|| strpos($_POST['path'], '..\\') !== false
|| strpos($_POST['path'], '.\\') === 0
)
{
response(trans('wrong path'.AddErrorLocation()), 400)->send();
exit; exit;
} }
if (strpos($_POST['name'], '/') !== false) if (strpos($_POST['name'], '/') !== false) {
{ response(trans('wrong path').AddErrorLocation(), 400)->send();
response(trans('wrong path'.AddErrorLocation()), 400)->send();
exit; exit;
} }
if($ftp){
$path = $ftp_base_url . $upload_dir . $_POST['path']; if ($ftp) {
}else{ $path = $config['ftp_base_url'] . $config['upload_dir'] . $_POST['path'];
$path = $current_path . $_POST['path']; } else {
$path = $config['current_path'] . $_POST['path'];
} }
$name = $_POST['name']; $name = $_POST['name'];
$info = pathinfo($name); $info = pathinfo($name);
if ( ! in_array(fix_strtolower($info['extension']), $ext)) if (!check_extension($info['extension'], $config)) {
{ response(trans('wrong extension').AddErrorLocation(), 400)->send();
response(trans('wrong extension'.AddErrorLocation()), 400)->send();
exit; exit;
} }
$file_name = $info['basename']; $file_name = $info['basename'];
$file_ext = $info['extension']; $file_ext = $info['extension'];
$file_path = $path . $name; $file_path = $path . $name;
// make sure the file exists // make sure the file exists
if($ftp){ if ($ftp) {
$file_url = 'http://www.myremoteserver.com/file.exe';
header('Content-Type: application/octet-stream'); header('Content-Type: application/octet-stream');
header("Content-Transfer-Encoding: Binary"); header("Content-Transfer-Encoding: Binary");
header("Content-disposition: attachment; filename=\"" . $file_name . "\""); header("Content-disposition: attachment; filename=\"" . $file_name . "\"");
readfile($file_path); readfile($file_path);
}elseif (is_file($file_path) && is_readable($file_path)) } elseif (is_file($file_path) && is_readable($file_path)) {
{ if (!file_exists($path . $name)) {
if ( ! file_exists($path . $name)) response(trans('File_Not_Found') . AddErrorLocation(), 404)->send();
{
response(trans('File_Not_Found'.AddErrorLocation()), 404)->send();
exit; exit;
} }
$size = filesize($file_path); $size = filesize($file_path);
$file_name = rawurldecode($file_name); $file_name = rawurldecode($file_name);
if (function_exists('mime_content_type')){
if (function_exists('mime_content_type')) {
$mime_type = mime_content_type($file_path); $mime_type = mime_content_type($file_path);
}elseif(function_exists('finfo_open')){ } elseif (function_exists('finfo_open')) {
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$mime_type = finfo_file($finfo, $file_path); $mime_type = finfo_file($finfo, $file_path);
}else{ } else {
include 'include/mime_type_lib.php';
$mime_type = get_file_mime_type($file_path); $mime_type = get_file_mime_type($file_path);
} }
@ob_end_clean(); @ob_end_clean();
if(ini_get('zlib.output_compression')){ if (ini_get('zlib.output_compression')) {
ini_set('zlib.output_compression', 'Off'); ini_set('zlib.output_compression', 'Off');
} }
header('Content-Type: ' . $mime_type); header('Content-Type: ' . $mime_type);
header('Content-Disposition: attachment; filename="'.$file_name.'"'); header('Content-Disposition: attachment; filename="' . $file_name . '"');
header("Content-Transfer-Encoding: binary"); header("Content-Transfer-Encoding: binary");
header('Accept-Ranges: bytes'); header('Accept-Ranges: bytes');
if(isset($_SERVER['HTTP_RANGE'])) if (isset($_SERVER['HTTP_RANGE'])) {
{ list($a, $range) = explode("=", $_SERVER['HTTP_RANGE'], 2);
list($a, $range) = explode("=",$_SERVER['HTTP_RANGE'],2); list($range) = explode(",", $range, 2);
list($range) = explode(",",$range,2);
list($range, $range_end) = explode("-", $range); list($range, $range_end) = explode("-", $range);
$range=intval($range); $range = intval($range);
if(!$range_end) { if (!$range_end) {
$range_end=$size-1; $range_end = $size - 1;
} else { } else {
$range_end=intval($range_end); $range_end = intval($range_end);
} }
$new_length = $range_end-$range+1; $new_length = $range_end - $range + 1;
header("HTTP/1.1 206 Partial Content"); header("HTTP/1.1 206 Partial Content");
header("Content-Length: $new_length"); header("Content-Length: $new_length");
header("Content-Range: bytes $range-$range_end/$size"); header("Content-Range: bytes $range-$range_end/$size");
} else { } else {
$new_length=$size; $new_length = $size;
header("Content-Length: ".$size); header("Content-Length: " . $size);
} }
$chunksize = 1*(1024*1024); $chunksize = 1 * (1024 * 1024);
$bytes_send = 0; $bytes_send = 0;
if ($file = fopen($file_path, 'r')) if ($file = fopen($file_path, 'r')) {
{ if (isset($_SERVER['HTTP_RANGE'])) {
if(isset($_SERVER['HTTP_RANGE']))
fseek($file, $range); fseek($file, $range);
}
while(!feof($file) && while (!feof($file) &&
(!connection_aborted()) && (!connection_aborted()) &&
($bytes_send<$new_length) ($bytes_send < $new_length)
) ) {
{
$buffer = fread($file, $chunksize); $buffer = fread($file, $chunksize);
echo($buffer); echo $buffer;
flush(); flush();
$bytes_send += strlen($buffer); $bytes_send += strlen($buffer);
} }
@ -139,13 +122,9 @@ if($ftp){
} }
die(); die();
} else {
}
else
{
// file does not exist // file does not exist
header("HTTP/1.0 404 Not Found"); header("HTTP/1.0 404 Not Found");
exit;
} }
exit; exit;

View File

@ -9,6 +9,7 @@ $mime_types = array(
"application/x-bcpio" => "bcpio", "application/x-bcpio" => "bcpio",
"application/octet-stream" => "so", "application/octet-stream" => "so",
"image/bmp" => "bmp", "image/bmp" => "bmp",
"application/x-rar" => "rar",
"application/x-bzip2" => "bz2", "application/x-bzip2" => "bz2",
"application/x-netcdf" => "nc", "application/x-netcdf" => "nc",
"application/x-kchart" => "chrt", "application/x-kchart" => "chrt",

View File

@ -1,6 +1,6 @@
<?php <?php
if ($_SESSION['RF']["verify"] != "RESPONSIVEfilemanager") if (!isset($_SESSION['RF']) || $_SESSION['RF']["verify"] != "RESPONSIVEfilemanager")
{ {
die('forbiden'); die('forbiden');
} }
@ -48,7 +48,7 @@ if ( ! function_exists('trans'))
|| ! is_readable('lang/' . basename($_SESSION['RF']['language']) . '.php') || ! is_readable('lang/' . basename($_SESSION['RF']['language']) . '.php')
) )
{ {
$lang = $default_language; $lang = $config['default_language'];
if (isset($_GET['lang']) && $_GET['lang'] != 'undefined' && $_GET['lang'] != '') if (isset($_GET['lang']) && $_GET['lang'] != 'undefined' && $_GET['lang'] != '')
{ {
@ -56,7 +56,7 @@ if ( ! function_exists('trans'))
$lang = trim($lang); $lang = trim($lang);
} }
if ($lang != $default_language) if ($lang != $config['default_language'])
{ {
$path_parts = pathinfo($lang); $path_parts = pathinfo($lang);
$lang = $path_parts['basename']; $lang = $path_parts['basename'];
@ -94,14 +94,63 @@ if ( ! function_exists('trans'))
} }
} }
function checkRelativePathPartial($path){
if (strpos($path, '../') !== false
|| strpos($path, './') !== false
|| strpos($path, '/..') !== false
|| strpos($path, '..\\') !== false
|| strpos($path, '\\..') !== false
|| strpos($path, '.\\') !== false
|| $path === ".."
){
return false;
}
return true;
}
/**
* Check relative path
*
* @param string $path
*
* @return boolean is it correct?
*/
function checkRelativePath($path){
$path_correct = checkRelativePathPartial($path);
if($path_correct){
$path_decoded = rawurldecode($path);
$path_correct = checkRelativePathPartial($path_decoded);
}
return $path_correct;
}
/**
* Check if the given path is an upload dir based on config
*
* @param string $path
* @param array $config
*
* @return boolean is it an upload dir?
*/
function isUploadDir($path, $config){
$upload_dir = $config['current_path'];
$thumbs_dir = $config['thumbs_base_path'];
if (realpath($path) === realpath($upload_dir) || realpath($path) === realpath($thumbs_dir))
{
return true;
}
return false;
}
/** /**
* Delete file * Delete file
* *
* @param string $path * @param string $path
* @param string $path_thumb * @param string $path_thumb
* @param string $config * @param array $config
* *
* @return nothing * @return null
*/ */
function deleteFile($path,$path_thumb,$config){ function deleteFile($path,$path_thumb,$config){
if ($config['delete_files']){ if ($config['delete_files']){
@ -141,7 +190,7 @@ function deleteFile($path,$path_thumb,$config){
{ {
if ($path!="" && $path[strlen($path)-1] != "/") $path.="/"; if ($path!="" && $path[strlen($path)-1] != "/") $path.="/";
$base_dir=$path.substr_replace($info['dirname']."/", '', 0, strlen($current_path)); $base_dir=$path.substr_replace($info['dirname']."/", '', 0, strlen($config['current_path']));
if (file_exists($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension'])) if (file_exists($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension']))
{ {
unlink($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension']); unlink($base_dir.$config['fixed_image_creation_name_to_prepend'][$k].$info['filename'].$config['fixed_image_creation_to_append'][$k].".".$info['extension']);
@ -171,7 +220,7 @@ function deleteDir($dir,$ftp = null, $config = null)
} }
}else{ }else{
if ( ! file_exists($dir)) if ( ! file_exists($dir) || isUploadDir($dir, $config))
{ {
return false; return false;
} }
@ -219,7 +268,7 @@ function duplicate_file( $old_path, $name, $ftp = null, $config = null )
return null; return null;
} }
}else{ }else{
if (file_exists($old_path)) if (file_exists($old_path) && is_file($old_path))
{ {
if (file_exists($new_path) && $old_path == $new_path) if (file_exists($new_path) && $old_path == $new_path)
{ {
@ -253,7 +302,7 @@ function rename_file($old_path, $name, $ftp = null, $config = null)
return false; return false;
} }
}else{ }else{
if (file_exists($old_path)) if (file_exists($old_path) && is_file($old_path))
{ {
$new_path = $info['dirname'] . "/" . $name . "." . $info['extension']; $new_path = $info['dirname'] . "/" . $name . "." . $info['extension'];
if (file_exists($new_path) && $old_path == $new_path) if (file_exists($new_path) && $old_path == $new_path)
@ -302,13 +351,12 @@ function rename_folder($old_path, $name, $ftp = null, $config = null)
return $ftp->rename("/".$old_path, "/".$new_path); return $ftp->rename("/".$old_path, "/".$new_path);
} }
}else{ }else{
if (file_exists($old_path)) if (file_exists($old_path) && is_dir($old_path) && !isUploadDir($old_path, $config))
{ {
if (file_exists($new_path) && $old_path == $new_path) if (file_exists($new_path) && $old_path == $new_path)
{ {
return false; return false;
} }
return rename($old_path, $new_path); return rename($old_path, $new_path);
} }
} }
@ -420,7 +468,7 @@ function makeSize($size)
*/ */
function folder_info($path,$count_hidden=true) function folder_info($path,$count_hidden=true)
{ {
global $hidden_folders,$hidden_files; global $config;
$total_size = 0; $total_size = 0;
$files = scandir($path); $files = scandir($path);
$cleanPath = rtrim($path, '/') . '/'; $cleanPath = rtrim($path, '/') . '/';
@ -430,7 +478,7 @@ function folder_info($path,$count_hidden=true)
{ {
if ($t != "." && $t != "..") if ($t != "." && $t != "..")
{ {
if ($count_hidden or !(in_array($t,$hidden_folders) or in_array($t,$hidden_files))) if ($count_hidden or !(in_array($t,$config['hidden_folders']) or in_array($t,$config['hidden_files'])))
{ {
$currentFile = $cleanPath . $t; $currentFile = $cleanPath . $t;
if (is_dir($currentFile)) if (is_dir($currentFile))
@ -460,7 +508,7 @@ function folder_info($path,$count_hidden=true)
*/ */
function filescount($path,$count_hidden=true) function filescount($path,$count_hidden=true)
{ {
global $hidden_folders,$hidden_files; global $config;
$total_count = 0; $total_count = 0;
$files = scandir($path); $files = scandir($path);
$cleanPath = rtrim($path, '/') . '/'; $cleanPath = rtrim($path, '/') . '/';
@ -469,7 +517,7 @@ function filescount($path,$count_hidden=true)
{ {
if ($t != "." && $t != "..") if ($t != "." && $t != "..")
{ {
if ($count_hidden or !(in_array($t,$hidden_folders) or in_array($t,$hidden_files))) if ($count_hidden or !(in_array($t,$config['hidden_folders']) or in_array($t,$config['hidden_files'])))
{ {
$currentFile = $cleanPath . $t; $currentFile = $cleanPath . $t;
if (is_dir($currentFile)) if (is_dir($currentFile))
@ -496,11 +544,12 @@ function filescount($path,$count_hidden=true)
*/ */
function checkresultingsize($sizeAdded) function checkresultingsize($sizeAdded)
{ {
global $MaxSizeTotal,$current_path; global $config;
if ($MaxSizeTotal !== false && is_int($MaxSizeTotal)) {
list($sizeCurrentFolder,$fileCurrentNum,$foldersCurrentCount) = folder_info($current_path,false); if ($config['MaxSizeTotal'] !== false && is_int($config['MaxSizeTotal'])) {
list($sizeCurrentFolder,$fileCurrentNum,$foldersCurrentCount) = folder_info($config['current_path'],false);
// overall size over limit // overall size over limit
if (($MaxSizeTotal * 1024 * 1024) < ($sizeCurrentFolder + $sizeAdded)) { if (($config['MaxSizeTotal'] * 1024 * 1024) < ($sizeCurrentFolder + $sizeAdded)) {
return false; return false;
} }
} }
@ -519,21 +568,21 @@ function create_folder($path = null, $path_thumbs = null,$ftp = null,$config = n
$ftp->mkdir($path); $ftp->mkdir($path);
$ftp->mkdir($path_thumbs); $ftp->mkdir($path_thumbs);
}else{ }else{
if(file_exists($path)){ if(file_exists($path) || file_exists($path_thumbs)){
return false; return false;
} }
$oldumask = umask(0); $oldumask = umask(0);
if ($path && !file_exists($path)) $permission = 0755;
{
$permission = $config['folderPermission'];
if(isset($config['folderPermission'])){ if(isset($config['folderPermission'])){
$permission = $config['folderPermission']; $permission = $config['folderPermission'];
} }
if ($path && !file_exists($path))
{
mkdir($path, $permission, true); mkdir($path, $permission, true);
} // or even 01777 so you get the sticky bit set } // or even 01777 so you get the sticky bit set
if ($path_thumbs && ! file_exists($path_thumbs)) if ($path_thumbs)
{ {
mkdir($path_thumbs, $config['folderPermission'], true) or die("$path_thumbs cannot be found"); mkdir($path_thumbs, $permission, true) or die("$path_thumbs cannot be found");
} // or even 01777 so you get the sticky bit set } // or even 01777 so you get the sticky bit set
umask($oldumask); umask($oldumask);
return true; return true;
@ -566,6 +615,34 @@ function check_files_extensions_on_path($path, $ext)
} }
} }
/**
* Check file extension
*
* @param string $extension
* @param array $config
*/
function check_file_extension($extension,$config){
$check = false;
if (!$config['ext_blacklist']) {
if(in_array(mb_strtolower($extension), $conf['ext'])){
$check = true;
}
} else {
if(!in_array(mb_strtolower($extension), $conf['ext_blacklist'])){
$check = true;
}
}
if($config['files_without_extension'] && $extension == ''){
$check = true;
}
return $check;
}
/** /**
* Get file extension present in PHAR file * Get file extension present in PHAR file
* *
@ -574,13 +651,13 @@ function check_files_extensions_on_path($path, $ext)
* @param string $basepath * @param string $basepath
* @param string $ext * @param string $ext
*/ */
function check_files_extensions_on_phar($phar, &$files, $basepath, $ext) function check_files_extensions_on_phar($phar, &$files, $basepath, $config)
{ {
foreach ($phar as $file) foreach ($phar as $file)
{ {
if ($file->isFile()) if ($file->isFile())
{ {
if (in_array(mb_strtolower($file->getExtension()), $ext)) if (check_file_extension($file->getExtension()))
{ {
$files[] = $basepath . $file->getFileName(); $files[] = $basepath . $file->getFileName();
} }
@ -590,7 +667,7 @@ function check_files_extensions_on_phar($phar, &$files, $basepath, $ext)
if ($file->isDir()) if ($file->isDir())
{ {
$iterator = new DirectoryIterator($file); $iterator = new DirectoryIterator($file);
check_files_extensions_on_phar($iterator, $files, $basepath . $file->getFileName() . '/', $ext); check_files_extensions_on_phar($iterator, $files, $basepath . $file->getFileName() . '/', $config);
} }
} }
} }
@ -608,6 +685,38 @@ function fix_get_params($str)
return strip_tags(preg_replace("/[^a-zA-Z0-9\.\[\]_| -]/", '', $str)); return strip_tags(preg_replace("/[^a-zA-Z0-9\.\[\]_| -]/", '', $str));
} }
/**
* Check extension
*
* @param string $extension
* @param array $config
*
* @return bool
*/
function check_extension($extension,$config){
$extension = fix_strtolower($extension);
if((!$config['ext_blacklist'] && !in_array($extension, $config['ext'])) || ($config['ext_blacklist'] && in_array($extension, $config['ext_blacklist']))){
return false;
}
return true;
}
/**
* Sanitize filename
*
* @param string $str
*
* @return string
*/
function sanitize($str)
{
return strip_tags(htmlspecialchars($str));
}
/** /**
* Cleanup filename * Cleanup filename
* *
@ -621,6 +730,7 @@ function fix_get_params($str)
*/ */
function fix_filename($str, $config, $is_folder = false) function fix_filename($str, $config, $is_folder = false)
{ {
$str = sanitize($str);
if ($config['convert_spaces']) if ($config['convert_spaces'])
{ {
$str = str_replace(' ', $config['replace_with'], $str); $str = str_replace(' ', $config['replace_with'], $str);
@ -650,7 +760,7 @@ function fix_filename($str, $config, $is_folder = false)
// Empty or incorrectly transliterated filename. // Empty or incorrectly transliterated filename.
// Here is a point: a good file UNKNOWN_LANGUAGE.jpg could become .jpg in previous code. // Here is a point: a good file UNKNOWN_LANGUAGE.jpg could become .jpg in previous code.
// So we add that default 'file' name to fix that issue. // So we add that default 'file' name to fix that issue.
if (strpos($str, '.') === 0 && $is_folder === false) if (!$config['empty_filename'] && strpos($str, '.') === 0 && $is_folder === false)
{ {
$str = 'file' . $str; $str = 'file' . $str;
} }
@ -762,7 +872,12 @@ function image_check_memory_usage($img, $max_breedte, $max_hoogte)
$K64 = 65536; // number of bytes in 64K $K64 = 65536; // number of bytes in 64K
$memory_usage = memory_get_usage(); $memory_usage = memory_get_usage();
if(ini_get('memory_limit') > 0 ){ if(ini_get('memory_limit') > 0 ){
$memory_limit = abs(intval(str_replace('M', '', ini_get('memory_limit')) * 1024 * 1024));
$mem = ini_get('memory_limit');
$memory_limit = 0;
if (strpos($mem, 'M') !== false) $memory_limit = abs(intval(str_replace(array('M'), '', $mem) * 1024 * 1024));
if (strpos($mem, 'G') !== false) $memory_limit = abs(intval(str_replace(array('G'), '', $mem) * 1024 * 1024 * 1024));
$image_properties = getimagesize($img); $image_properties = getimagesize($img);
$image_width = $image_properties[0]; $image_width = $image_properties[0];
$image_height = $image_properties[1]; $image_height = $image_properties[1];
@ -792,9 +907,11 @@ function image_check_memory_usage($img, $max_breedte, $max_hoogte)
* *
* @return bool * @return bool
*/ */
function ends_with($haystack, $needle) if(!function_exists('ends_with')){
{ function ends_with($haystack, $needle)
{
return $needle === "" || substr($haystack, -strlen($needle)) === $needle; return $needle === "" || substr($haystack, -strlen($needle)) === $needle;
}
} }
/** /**
@ -1226,4 +1343,3 @@ function AddErrorLocation()
} }
return ""; return "";
} }
?>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,21 +0,0 @@
Copyright (c) 2009 - 2013 Happyworm Ltd
http://happyworm.com
http://jplayer.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View File

@ -1,32 +0,0 @@
# [jPlayer](http://jplayer.org/) : HTML5 Audio & Video for [jQuery](http://jquery.com/)
Support for [Zepto](http://zeptojs.com/) 1.0+ compiled with the data module.
## What is jPlayer?
### jPlayer is a jQuery/Zepto plugin that allows you to:
* **play and control media** files in your webpage.
* create a **consistent interface** and experience across all browsers.
* create and style a media player using **just HTML and CSS**.
* add **audio** and **video** to your jQuery/Zepto projects.
* support more devices using **HTML5**.
* support older browsers using a Flash _fall-back/forward_.
* control media on your website using a [JavaScript API](http://www.jplayer.org/latest/developer-guide/).
### jPlayer supports:
* HTML5: **mp3, m4a (AAC), m4v (H.264),** ogv*, oga*, wav*, webm*
* Flash: **mp3, m4a (AAC), m4v (H.264),** rtmp, flv.
_(*) Optional counterpart formats to increase HTML5 cross-browser support._
## License
[jPlayer](http://jplayer.org/) is licensed under the [MIT license](http://opensource.org/licenses/MIT).
## More information:
* [jPlayer.org](http://jplayer.org/)
* [Quick Start Guide](http://www.jplayer.org/latest/quick-start-guide/)
* [Developer Guide and API Reference](http://www.jplayer.org/latest/developer-guide/)
## Author:
Mark J Panaghiston [@thepag](http://twitter.com/thepag)
[happyworm.com](http://happyworm.com/)

View File

@ -1,638 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 2.4.0
* Date: 5th June 2013
*
* FlashVars expected: (AS3 property of: loaderInfo.parameters)
* id: (URL Encoded: String) Id of jPlayer instance
* vol: (Number) Sets the initial volume
* muted: (Boolean in a String) Sets the initial muted state
* jQuery: (URL Encoded: String) Sets the jQuery var name. Used with: someVar = jQuery.noConflict(true); The someVar name must contain jQuery in it.
*
* Compiled using: Adobe Flex Compiler (mxmlc) Version 4.5.1 build 21328
*/
package {
import flash.system.Security;
import flash.external.ExternalInterface;
import flash.utils.Timer;
import flash.events.TimerEvent;
import flash.text.TextField;
import flash.text.TextFormat;
import flash.events.KeyboardEvent;
import flash.display.Sprite;
import happyworm.jPlayer.*;
import flash.display.StageAlign;
import flash.display.StageScaleMode;
import flash.events.Event;
import flash.net.LocalConnection;
import flash.events.StatusEvent;
import flash.events.MouseEvent;
import flash.ui.ContextMenu;
import flash.ui.ContextMenuItem;
import flash.events.ContextMenuEvent;
import flash.net.URLRequest;
import flash.net.navigateToURL;
import flash.media.Video;
public class Jplayer extends Sprite {
private var jQuery:String;
private var sentNumberFractionDigits:uint = 2;
public var commonStatus:JplayerStatus = new JplayerStatus(); // Used for inital ready event so volume is correct.
private var myInitTimer:Timer = new Timer(100, 0);
private var myMp3Player:JplayerMp3;
private var myMp4Player:JplayerMp4;
private var myRtmpPlayer:JplayerRtmp;
private var isRtmp:Boolean = false;
private var isMp4:Boolean = false;
private var isMp3:Boolean = false;
private var isVideo:Boolean = false;
private var securityIssue:Boolean = false; // On direct access and when SWF parameters contain illegal characters
private var contextMenuFix:Sprite = new Sprite(); // A sprite that will be on top and fix the content menu over video bug. (A Flash plugin bug.)
private var txLog:TextField;
private var debug:Boolean = false; // Set debug to false for release compile!
private var localAIRDebug:Boolean = false; // This is autodetermined by AIR app - leave false!
private var traceOut:TraceOut;
public function Jplayer() {
flash.system.Security.allowDomain("*");
traceOut = new TraceOut();
// Fix to the security exploit reported by Jason Calvert http://appsec.ws/
checkFlashVars(loaderInfo.parameters);
stage.scaleMode = StageScaleMode.NO_SCALE;
stage.align = StageAlign.TOP_LEFT;
if(!securityIssue) {
// The jQuery param is the primary cause of security concerns.
jQuery = loaderInfo.parameters.jQuery + "('#" + loaderInfo.parameters.id + "').jPlayer";
commonStatus.volume = Number(loaderInfo.parameters.vol);
commonStatus.muted = loaderInfo.parameters.muted == "true";
stage.addEventListener(Event.RESIZE, resizeHandler);
stage.addEventListener(MouseEvent.CLICK, clickHandler);
var initialVolume:Number = commonStatus.volume;
if(commonStatus.muted) {
initialVolume = 0;
}
myMp3Player = new JplayerMp3(initialVolume);
addChild(myMp3Player);
myMp4Player = new JplayerMp4(initialVolume);
addChild(myMp4Player);
myRtmpPlayer = new JplayerRtmp(initialVolume);
addChild(myRtmpPlayer);
switchType("mp3"); // set default state to mp3
}
// The ContextMenu only partially works. The menu select events never occur.
// Investigated and it is something to do with the way jPlayer inserts the Flash on the page.
// A simple test inserting the Jplayer.swf on a page using: 1) SWFObject 2.2 works. 2) AC_FL_RunContent() works.
// jPlayer Flash insertion is based on SWFObject 2.2 and the resaon behind this failure is not clear. The Flash insertion HTML on the page looks similar.
var myContextMenu:ContextMenu = new ContextMenu();
myContextMenu.hideBuiltInItems();
var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION);
var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2013 Happyworm Ltd", true);
menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer);
menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm);
myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm);
contextMenu = myContextMenu;
// Log console for dev compile option: debug
if(debug || securityIssue) {
txLog = new TextField();
txLog.x = 5;
txLog.y = 5;
txLog.width = stage.stageWidth - 10;
txLog.height = stage.stageHeight - 10;
txLog.backgroundColor = 0xEEEEFF;
txLog.border = true;
txLog.background = true;
txLog.multiline = true;
txLog.text = "jPlayer " + JplayerStatus.VERSION;
if(securityIssue) {
txLog.visible = true;
} else if(debug) {
txLog.visible = false;
}
this.addChild(txLog);
if(debug && !securityIssue) {
this.stage.addEventListener(KeyboardEvent.KEY_UP, keyboardHandler);
myMp3Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
myMp4Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
myRtmpPlayer.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
}
}
// Known Flash problem with contextMenu over video player.
// Add a transparent rectangle into the sprite.
contextMenuFix.graphics.beginFill(0x000000, 0); // Transparent black
contextMenuFix.graphics.drawRect(0, 0, 10, 10); // Arbitary rectangle
contextMenuFix.graphics.endFill();
addChild(contextMenuFix); // Put the sprite on the top layer.
if(!securityIssue) {
// Delay init() because Firefox 3.5.7+ developed a bug with local testing in Firebug.
myInitTimer.addEventListener(TimerEvent.TIMER, init);
myInitTimer.start();
}
}
private function switchType(playType:String):void {
switch(playType) {
case "rtmpa":
isRtmp=true;
isMp3=false;
isMp4=false;
isVideo=false;
break;
case "rtmpv":
isRtmp=true;
isMp3=false;
isMp4=false;
isVideo=true;
break;
case "mp3":
isRtmp=false;
isMp3=true;
isMp4=false;
isVideo=false;
break;
case "mp4":
isRtmp=false;
isMp3=false;
isMp4=true;
isVideo=false;
break;
case "m4v":
isRtmp=false;
isMp3=false;
isMp4=true;
isVideo=true;
break;
}
listenToMp3(isMp3);
listenToMp4(isMp4);
listenToRtmp(isRtmp);
}
private function init(e:TimerEvent):void {
myInitTimer.stop();
if(ExternalInterface.available && !securityIssue) {
ExternalInterface.addCallback("fl_setAudio_mp3", fl_setAudio_mp3);
ExternalInterface.addCallback("fl_setAudio_m4a", fl_setAudio_m4a);
ExternalInterface.addCallback("fl_setVideo_m4v", fl_setVideo_m4v);
ExternalInterface.addCallback("fl_setAudio_rtmp", fl_setAudio_rtmp);
ExternalInterface.addCallback("fl_setVideo_rtmp", fl_setVideo_rtmp);
ExternalInterface.addCallback("fl_clearMedia", fl_clearMedia);
ExternalInterface.addCallback("fl_load", fl_load);
ExternalInterface.addCallback("fl_play", fl_play);
ExternalInterface.addCallback("fl_pause", fl_pause);
ExternalInterface.addCallback("fl_play_head", fl_play_head);
ExternalInterface.addCallback("fl_volume", fl_volume);
ExternalInterface.addCallback("fl_mute", fl_mute);
ExternalInterface.call(jQuery, "jPlayerFlashEvent", JplayerEvent.JPLAYER_READY, extractStatusData(commonStatus)); // See JplayerStatus() class for version number.
}
}
private function checkFlashVars(p:Object):void {
// Check for direct access. Inspired by mediaelement.js - Also added name to HTML object for non-IE browsers.
if(ExternalInterface.objectID != null && ExternalInterface.objectID.toString() != "") {
for each (var s:String in p) {
if(illegalChar(s)) {
securityIssue = true; // Found a security concern.
}
}
if(!securityIssue) {
if(jQueryIllegal(p.jQuery)) {
securityIssue = true; // Found a security concern.
}
}
} else {
securityIssue = true; // Direct access disables the callbacks, which were a security concern.
}
}
private function illegalChar(s:String):Boolean {
// A whitelist of accepted chars.
var validParam:RegExp = /^[-A-Za-z0-9_.]+$/;
return !validParam.test(s);
}
private function jQueryIllegal(s:String):Boolean {
// Check param contains the term jQuery.
var validParam:RegExp = /(jQuery)/;
return !validParam.test(s);
}
// switchType() here
private function listenToMp3(active:Boolean):void {
if(active) {
myMp3Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
myMp3Player.addEventListener(JplayerEvent.JPLAYER_WAITING, jPlayerFlashEvent); // only MP3 atm
myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAYING, jPlayerFlashEvent); // only MP3 atm
myMp3Player.addEventListener(JplayerEvent.JPLAYER_CANPLAY, jPlayerFlashEvent); // only MP3 atm
myMp3Player.addEventListener(JplayerEvent.JPLAYER_CANPLAYTHROUGH, jPlayerFlashEvent); // only MP3 atm
} else {
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_WAITING, jPlayerFlashEvent); // only MP3 atm
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAYING, jPlayerFlashEvent); // only MP3 atm
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_CANPLAY, jPlayerFlashEvent); // only MP3 atm
myMp3Player.removeEventListener(JplayerEvent.JPLAYER_CANPLAYTHROUGH, jPlayerFlashEvent); // only MP3 atm
}
}
private function listenToMp4(active:Boolean):void {
if(active) {
myMp4Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
} else {
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
}
}
private function listenToRtmp(active:Boolean):void {
if(active) {
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_CANPLAY, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
} else {
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
myRtmpPlayer.addEventListener(JplayerEvent.JPLAYER_CANPLAY, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
myRtmpPlayer.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
}
}
private function fl_setAudio_mp3(src:String):Boolean {
if (src != null) {
log("fl_setAudio_mp3: "+src);
switchType("mp3");
myMp4Player.clearFile();
myRtmpPlayer.clearFile();
myMp3Player.setFile(src);
return true;
} else {
log("fl_setAudio_mp3: null");
return false;
}
}
private function fl_setAudio_rtmp(src:String):Boolean {
tracer("SET RTMP: "+src);
if (src != null) {
log("fl_setAudio_rtmp: "+src);
switchType("rtmpa");
myMp4Player.clearFile();
myMp3Player.clearFile();
myRtmpPlayer.setFile(src,false);
return true;
} else {
log("fl_setAudio_rtmp: null");
return false;
}
}
private function fl_setVideo_rtmp(src:String):Boolean {
tracer("SET RTMP: "+src);
if (src != null) {
log("fl_setVideo_rtmp: "+src);
switchType("rtmpv");
myMp4Player.clearFile();
myMp3Player.clearFile();
myRtmpPlayer.setFile(src,true);
return true;
} else {
log("fl_setVideo_rtmp: null");
return false;
}
}
private function fl_setAudio_m4a(src:String):Boolean {
if (src != null) {
log("fl_setAudio_m4a: "+src);
switchType("mp4")
myMp3Player.clearFile();
myRtmpPlayer.clearFile();
myMp4Player.setFile(src);
return true;
} else {
log("fl_setAudio_m4a: null");
return false;
}
}
private function fl_setVideo_m4v(src:String):Boolean {
if (src != null) {
log("fl_setVideo_m4v: "+src);
switchType("m4v");
myMp3Player.clearFile();
myRtmpPlayer.clearFile();
myMp4Player.setFile(src);
return true;
} else {
log("fl_setVideo_m4v: null");
return false;
}
}
private function fl_clearMedia():void {
log("clearMedia.");
myMp3Player.clearFile();
myMp4Player.clearFile();
myRtmpPlayer.clearFile();
}
private function getType():Object {
var returnType:Object;
if(isMp3) {
returnType=myMp3Player;
}
if(isRtmp) {
returnType=myRtmpPlayer;
}
if(isMp4) {
returnType=myMp4Player;
}
return returnType;
}
private function fl_load():Boolean {
log("load.");
var returnType:Object = getType();
return returnType.load();
}
private function fl_play(time:Number = NaN):Boolean {
log("play: time = " + time);
var returnType:Object = getType();
return returnType.play(time * 1000); // Flash uses milliseconds
}
private function fl_pause(time:Number = NaN):Boolean {
log("pause: time = " + time);
var returnType:Object = getType();
return returnType.pause(time * 1000); // Flash uses milliseconds
}
private function fl_play_head(percent:Number):Boolean {
log("play_head: "+percent+"%");
var returnType:Object = getType();
return returnType.playHead(percent);
}
private function fl_volume(v:Number):void {
log("volume: "+v);
commonStatus.volume = v;
if(!commonStatus.muted) {
myMp3Player.setVolume(v);
myMp4Player.setVolume(v);
myRtmpPlayer.setVolume(v);
}
}
private function fl_mute(mute:Boolean):void {
log("mute: "+mute);
commonStatus.muted = mute;
if(mute) {
myMp3Player.setVolume(0);
myMp4Player.setVolume(0);
myRtmpPlayer.setVolume(0);
} else {
myMp3Player.setVolume(commonStatus.volume);
myMp4Player.setVolume(commonStatus.volume);
myRtmpPlayer.setVolume(commonStatus.volume);
}
}
private function jPlayerFlashEvent(e:JplayerEvent):void {
log("jPlayer Flash Event: " + e.type + ": " + e.target);
//tracer("jPlayer Flash Event: " + e.type + ": " + e.target);
if(ExternalInterface.available && !securityIssue) {
ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
}
}
private function tracer(msg:String):void {
traceOut.tracer(msg);
}
private function extractStatusData(data:JplayerStatus):Object {
var myStatus:Object = {
version: JplayerStatus.VERSION,
src: data.src,
paused: !data.isPlaying, // Changing this name requires inverting all assignments and conditional statements.
srcSet: data.srcSet,
seekPercent: data.seekPercent,
currentPercentRelative: data.currentPercentRelative,
currentPercentAbsolute: data.currentPercentAbsolute,
currentTime: data.currentTime / 1000, // JavaScript uses seconds
duration: data.duration / 1000, // JavaScript uses seconds
videoWidth: data.videoWidth,
videoHeight: data.videoHeight,
volume: commonStatus.volume,
muted: commonStatus.muted
};
log("extractStatusData: sp="+myStatus.seekPercent+" cpr="+myStatus.currentPercentRelative+" cpa="+myStatus.currentPercentAbsolute+" ct="+myStatus.currentTime+" d="+myStatus.duration);
return myStatus;
}
private function jPlayerMetaDataHandler(e:JplayerEvent):void {
log("jPlayerMetaDataHandler:" + e.target);
if(ExternalInterface.available && !securityIssue) {
resizeHandler(new Event(Event.RESIZE));
ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
}
}
private function resizeHandler(e:Event):void {
log("resizeHandler: stageWidth = " + stage.stageWidth + " | stageHeight = " + stage.stageHeight);
var mediaX:Number = 0;
var mediaY:Number = 0;
var mediaWidth:Number = 0;
var mediaHeight:Number = 0;
var aspectRatioStage:Number = 0;
var aspectRatioVideo:Number = 0;
var videoItem:*;
if(isRtmp) {
videoItem = myRtmpPlayer;
}
if(isMp4) {
videoItem = myMp4Player;
}
if(videoItem) {
if(stage.stageWidth > 0 && stage.stageHeight > 0 && videoItem.myVideo.width > 0 && videoItem.myVideo.height > 0) {
aspectRatioStage = stage.stageWidth / stage.stageHeight;
aspectRatioVideo = videoItem.myVideo.width / videoItem.myVideo.height;
if(aspectRatioStage < aspectRatioVideo) {
mediaWidth = stage.stageWidth;
mediaHeight = stage.stageWidth / aspectRatioVideo;
mediaX = 0;
mediaY = (stage.stageHeight - mediaHeight) / 2;
} else {
mediaWidth = stage.stageHeight * aspectRatioVideo;
mediaHeight = stage.stageHeight;
mediaX = (stage.stageWidth - mediaWidth) / 2;
mediaY = 0;
}
resizeEntity(videoItem, mediaX, mediaY, mediaWidth, mediaHeight);
}
}
if((debug || securityIssue) && stage.stageWidth > 20 && stage.stageHeight > 20) {
txLog.width = stage.stageWidth - 10;
txLog.height = stage.stageHeight - 10;
}
// Resize the sprite so it covers the entire stage area
contextMenuFix.x = 0;
contextMenuFix.y = 0;
contextMenuFix.width = stage.stageWidth;
contextMenuFix.height = stage.stageHeight;
}
private function resizeEntity(entity:Sprite, mediaX:Number, mediaY:Number, mediaWidth:Number, mediaHeight:Number):void {
entity.x = mediaX;
entity.y = mediaY;
entity.width = mediaWidth;
entity.height = mediaHeight;
}
private function clickHandler(e:MouseEvent):void {
// This needs to work with RTMP format too!
if(isMp3) {
jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp3Player.myStatus, "click"))
} else {
jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp4Player.myStatus, "click"))
}
}
// This event is never called. See comments in class constructor.
private function menuSelectHandler_jPlayer(e:ContextMenuEvent):void {
navigateToURL(new URLRequest("http://jplayer.org/"), "_blank");
}
// This event is never called. See comments in class constructor.
private function menuSelectHandler_happyworm(e:ContextMenuEvent):void {
navigateToURL(new URLRequest("http://happyworm.com/"), "_blank");
}
private function log(t:String):void {
if(debug) {
txLog.text = t + "\n" + txLog.text;
localAIRDebug = traceOut.localAIRDebug();
if(localAIRDebug) {
tracer(t);
}
if(ExternalInterface.available && !securityIssue) {
ExternalInterface.call("console.log", t);
}
}
}
private function debugMsgHandler(e:JplayerEvent):void {
log(e.msg);
}
private function keyboardHandler(e:KeyboardEvent):void {
log("keyboardHandler: e.keyCode = " + e.keyCode);
switch(e.keyCode) {
case 68 : // d
txLog.visible = !txLog.visible;
log("Toggled log display: " + txLog.visible);
break;
case 76 : // l
if(e.ctrlKey && e.shiftKey) {
txLog.text = "Cleared log.";
}
break;
}
}
}
}

View File

@ -1,295 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Robert M. Hall
* Date: 7th August 2012
* Custom NetConnection Manager for more robust RTMP support
* Based in part on work by Will Law for the old Akamai NCManager.as
* and some of Will's new work in the OVP base classes (Open Video Player)
* as well as similar approaches by many other NetConnection managers
*
*/
/*
TODO LIST 08/18/2011:
1. Wired up errors to dispatch events to Jplayer events to allow them to bubble up to JS
2. Rework event dispatch to handoff netconnection instead of a passed in reference
3. Allow a customizeable list of protocols and ports to be used instead of entire list
4. Allow a specific port/protocol (1 connect type) to be used first, and then optionally fallback on a custom list or the default list
5. Remove some traces and check a few other items below where I've made notes
*/
package happyworm.jPlayer {
import flash.events.*;
import flash.net.*;
import flash.utils.Timer;
import flash.utils.getTimer;
import flash.utils.clearInterval;
import flash.utils.setInterval;
public class ConnectManager extends Object {
private var protocols_arr:Array = new Array("rtmp","rtmpt","rtmpe","rtmpte","rtmps");
private var ports_arr:Array = new Array("",":1935",":80",":443");
private const protCount:Number = 5;
private const portCount:Number = 4;
private var _ncRef:Object;
private var _aNC:Array;
private var k_TIMEOUT:Number = 30000;
private var k_startConns:Number;
private var m_connList:Array = [];
private var m_serverName:String;
private var m_appName:String;
private var m_streamName:String;
private var m_connListCounter:Number;
private var m_flashComConnectTimeOut:Number;
private var m_validNetConnection:NetConnection;
private var connectSuccess:Boolean=false;
private var negotiating:Boolean=false;
private var idleTimeOut:Boolean=false;
public function ConnectManager() {
trace ("ConnectManager Initialized Version: 1.00 DT");
createPortsProtocolsArray();
}
private function createPortsProtocolsArray():void {
var outerLoop:Number=0;
var innerLoop:Number=0;
for (outerLoop=0; outerLoop<protocols_arr.length; outerLoop++) {
for (innerLoop=0; innerLoop<ports_arr.length; innerLoop++) {
m_connList.push( { protocol: protocols_arr[outerLoop], port: ports_arr[innerLoop] } );
}
}
}
public function negotiateConnect(ncRef:Object,p_serverName:String,p_appName:String):void
{
negotiating=true;
_ncRef=ncRef;
trace("*** SERVER NAME: "+p_serverName);
trace("*** APP NAME: "+p_serverName);
k_startConns = getTimer();
m_serverName = p_serverName;
m_appName = p_appName;
// Set a timeout function, just in case we never connect successfully
clearInterval(m_flashComConnectTimeOut);
m_flashComConnectTimeOut = setInterval(onFlashComConnectTimeOut,k_TIMEOUT,k_TIMEOUT);
// Createe a NetConnection for each of the protocols/ports listed in the m_connList list.
// Connection attempts occur at intervals of 1.5 seconds.
// The first connection to succeed will be used, all the others will be closed.
_aNC = new Array();
for (var i:uint = 0; i < m_connList.length; i++)
{
_aNC[i] = new NetConnection();
_aNC[i].addEventListener(NetStatusEvent.NET_STATUS,netStatus);
_aNC[i].addEventListener(SecurityErrorEvent.SECURITY_ERROR,netSecurityError);
_aNC[i].addEventListener(AsyncErrorEvent.ASYNC_ERROR,asyncError);
_aNC[i].client = new Object;
_aNC[i].client.owner = this;
_aNC[i].client.connIndex = i;
_aNC[i].client.id = i;
_aNC[i].client.pending = true;
/* Revisit this chunk - not needed at the moment as NC is handed off and this
// is handled elsewhere
// Need to put in some event dispatching as a more elegant solution and leave it here
_aNC[i].client.onBWDone = function (p_bw, deltaDown, deltaTime, latency) {
//this.owner.dispatchEvent ({type:"ncBandWidth", kbps:p_bw, latency:latency});
};
_aNC[i].client.onBWCheck = function (counter) {
return ++counter;
};
_aNC[i].client.onStatus = function (info) {
//
};
*/
}
m_connListCounter = 0;
nextConnect ();
}
private function nextConnect():void
{
trace("*** Connection: "+ m_connListCounter + ": "+m_connList[m_connListCounter].protocol + "://" + m_serverName + m_connList[m_connListCounter].port + "/" + m_appName);
try {
_aNC[m_connListCounter].connect(m_connList[m_connListCounter].protocol + "://" + m_serverName + m_connList[m_connListCounter].port + "/" + m_appName);
} catch (error:Error) {
// statements
trace("*** Caught an error condition: "+error);
m_connListCounter = m_connList.length+1;
}
// statements
clearInterval(_aNC["ncInt" + m_connListCounter]);
if ((m_connListCounter < m_connList.length - 1))
{
m_connListCounter++;
_aNC["ncInt" + m_connListCounter] = setInterval(nextConnect,1500);
}
}
// Cleans up all connections if none have succeeded by the timeout interval
private function onFlashComConnectTimeOut(timeout:Number):void
{
stopAll();
}
private function handleGoodConnect(_nc:NetConnection):void {
negotiating=false;
trace("Handing OFF NetConnection");
clearInterval(m_flashComConnectTimeOut);
_ncRef.connectStream();
_ncRef.onBWDone(null,_nc);
//dispatchEvent(event);
// Need to enable and pass to Jplayer event system- revisit
// right now handing back a hardcoded reference that is passed in
// Should come up with a more loosely coupled way via event dispatch
}
public function getNegotiating():Boolean {
return negotiating;
}
public function setNegotiating(bool:Boolean):void {
negotiating=bool;
}
public function stopAll(bool:Boolean=false):void {
//this.dispatchEvent ({type:"ncFailedToConnect", timeout:timeout});
// Need to enable and pass to Jplayer event system- revisit
// trace(_aNC+":"+m_flashComConnectTimeOut+":"+m_connList.length)
if(_aNC!=null && !isNaN(m_flashComConnectTimeOut) ) {
clearInterval(m_flashComConnectTimeOut);
for (var i:uint = 0; i < m_connList.length; i++)
{
if (_aNC[i]!=null)
{
clearInterval(_aNC["ncInt" + i]);
_aNC[i].close();
if(bool==false) {
_aNC[i].client = null;
}
_aNC[i] = null;
delete _aNC[i];
}
}
}
}
private function netStatus(event:NetStatusEvent):void {
trace(event.info.code);
if(event.info.description != undefined) {
trace(event.info.description);
}
_aNC[event.target.client.id].client.pending = true;
// this.owner.m_validNetConnection = this.client.owner[this.client.connIndex];
// if (info.description == "[ License.Limit.Exceeded ]") {
switch (event.info.code) {
case "NetConnection.Connect.IdleTimeOut":
trace("IDLE TIMEOUT OCCURRED!")
negotiating=true;
idleTimeOut=true;
_ncRef.shutDownNcNs();
break;
case "NetConnection.Connect.Closed":
if(!negotiating && !idleTimeOut) {
idleTimeOut = false;
_ncRef.doneYet();
}
break;
case "NetConnection.Connect.InvalidApp":
case "NetConnection.Connect.Rejected":
//handleRejectedOrInvalid(event)
break;
case "NetConnection.Call.Failed":
/*
if (event.info.description.indexOf("_checkbw") != -1) {
event.target.expectBWDone = true;
event.target.call("checkBandwidth",null);
}
*/
break;
case "NetConnection.Connect.Success":
var i:uint=0;
for ( i = 0; i<_aNC.length; i++) {
if (_aNC[i] && (i != event.target.client.id)) {
_aNC[i].close();
_aNC[i] = null;
}
}
var _nc:NetConnection = NetConnection(event.target);
var connID:Number = event.target.client.id;
var _actualPort:String = m_connList[m_connListCounter].port;
var _actualProtocol:String = m_connList[m_connListCounter].protocol;
// See if we have version info
var _serverVersion:String = "UNKNOWN";
if (event.info.data && event.info.data.version) {
_serverVersion = event.info.data.version;
}
trace("Connect ID: "+connID+" - PORT: "+_actualPort+" - PROTOCOL: "+_actualProtocol+" - FMS Version: "+_serverVersion);
clearInterval(_aNC["ncInt" + connID]);
clearInterval(_aNC["ncInt" + m_connListCounter]);
handleGoodConnect(_nc);
break;
}
}
/** Catches any netconnection net security errors
* @private
*/
private function netSecurityError(event:SecurityErrorEvent):void {
trace("SECURITY ERROR:"+event);
//dispatchEvent(event);
// Need to enable and pass to Jplayer event system- revisit
}
/** Catches any async errors
* @private
*/
private function asyncError(event:AsyncErrorEvent):void {
trace("ASYNC ERROR:"+event.error);
//dispatchEvent(event);
// Need to enable and pass to Jplayer event system- revisit
}
}// class
} //package

View File

@ -1,68 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Date: 20th May 2013
*/
package happyworm.jPlayer {
import flash.events.Event;
public class JplayerEvent extends Event {
// The event strings must match those in the JavaScript's $.jPlayer.event object
public static const JPLAYER_READY:String = "jPlayer_ready";
public static const JPLAYER_FLASHRESET:String = "jPlayer_flashreset"; // Handled in JavaScript
public static const JPLAYER_RESIZE:String = "jPlayer_resize"; // Handled in JavaScript
public static const JPLAYER_REPEAT:String = "jPlayer_repeat"; // Handled in JavaScript
public static const JPLAYER_CLICK:String = "jPlayer_click";
public static const JPLAYER_ERROR:String = "jPlayer_error";
public static const JPLAYER_WARNING:String = "jPlayer_warning"; // Currently not used by the flash solution
public static const JPLAYER_LOADSTART:String = "jPlayer_loadstart";
public static const JPLAYER_PROGRESS:String = "jPlayer_progress";
public static const JPLAYER_SUSPEND:String = "jPlayer_suspend"; // Not implemented
public static const JPLAYER_ABORT:String = "jPlayer_abort"; // Not implemented
public static const JPLAYER_EMPTIED:String = "jPlayer_emptied"; // Not implemented
public static const JPLAYER_STALLED:String = "jPlayer_stalled"; // Not implemented
public static const JPLAYER_PLAY:String = "jPlayer_play";
public static const JPLAYER_PAUSE:String = "jPlayer_pause";
public static const JPLAYER_LOADEDMETADATA:String = "jPlayer_loadedmetadata"; // MP3 has no equivilent
public static const JPLAYER_LOADEDDATA:String = "jPlayer_loadeddata"; // Not implemented
public static const JPLAYER_WAITING:String = "jPlayer_waiting"; // Not implemented (Done in: MP3)
public static const JPLAYER_PLAYING:String = "jPlayer_playing"; // Not implemented (Done in: MP3)
public static const JPLAYER_CANPLAY:String = "jPlayer_canplay"; // Not implemented (Done in: MP3)
public static const JPLAYER_CANPLAYTHROUGH:String = "jPlayer_canplaythrough"; // Not implemented (Done in: MP3)
public static const JPLAYER_SEEKING:String = "jPlayer_seeking";
public static const JPLAYER_SEEKED:String = "jPlayer_seeked";
public static const JPLAYER_TIMEUPDATE:String = "jPlayer_timeupdate";
public static const JPLAYER_ENDED:String = "jPlayer_ended";
public static const JPLAYER_RATECHANGE:String = "jPlayer_ratechange"; // Not implemented
public static const JPLAYER_DURATIONCHANGE:String = "jPlayer_durationchange"; // Not implemented
public static const JPLAYER_VOLUMECHANGE:String = "jPlayer_volumechange"; // See JavaScript
// Events used internal to jPlayer's Flash.
public static const DEBUG_MSG:String = "debug_msg";
public var data:JplayerStatus;
public var msg:String = "";
public function JplayerEvent(type:String, data:JplayerStatus, msg:String = "", bubbles:Boolean = false, cancelable:Boolean = false) {
super(type, bubbles, cancelable);
this.data = data;
this.msg = msg;
}
public override function clone():Event {
return new JplayerEvent(type, data, msg, bubbles, cancelable);
}
public override function toString():String {
return formatToString("JplayerEvent", "type", "bubbles", "cancelable", "eventPhase", "data", "msg");
}
}
}

View File

@ -1,367 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Date: 28th May 2013
*/
package happyworm.jPlayer {
import flash.display.Sprite;
import flash.media.Sound;
import flash.media.SoundChannel;
import flash.media.SoundLoaderContext;
import flash.media.SoundTransform;
import flash.net.URLRequest;
import flash.utils.Timer;
import flash.errors.IOError;
import flash.events.*;
public class JplayerMp3 extends Sprite {
private var mySound:Sound = new Sound();
private var myChannel:SoundChannel = new SoundChannel();
private var myContext:SoundLoaderContext = new SoundLoaderContext(3000, false);
private var myTransform:SoundTransform = new SoundTransform();
private var myRequest:URLRequest = new URLRequest();
private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
private var playingTimer:Timer = new Timer(100, 0); // Internal: How often waiting/playing is checked.
private var waitingTimer:Timer = new Timer(3000, 0); // Internal: Check from loadstart to loadOpen. Generates a waiting event.
public var myStatus:JplayerStatus = new JplayerStatus();
public function JplayerMp3(volume:Number) {
timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
playingTimer.addEventListener(TimerEvent.TIMER, playingHandler);
waitingTimer.addEventListener(TimerEvent.TIMER, waitingHandler);
setVolume(volume);
}
public function setFile(src:String):void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "setFile: " + src));
if(myStatus.isPlaying) {
myChannel.stop();
}
progressUpdates(false);
timeUpdates(false);
waitingTimer.stop();
try {
mySound.close();
} catch (err:IOError) {
// Occurs if the file is either yet to be opened or has finished downloading.
}
mySound = null;
mySound = new Sound();
mySound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
mySound.addEventListener(Event.OPEN, loadOpen);
mySound.addEventListener(Event.COMPLETE, loadComplete);
myRequest = new URLRequest(src);
myStatus.reset();
myStatus.src = src;
myStatus.srcSet = true;
timeUpdateEvent();
}
public function clearFile():void {
setFile("");
myStatus.srcSet = false;
}
private function errorHandler(err:IOErrorEvent):void {
// MP3 player needs to stop progress and timeupdate events as they are started before the error occurs.
// NB: The MP4 player works differently and the error occurs before they are started.
progressUpdates(false);
timeUpdates(false);
myStatus.error(); // Resets status except the src, and it sets srcError property.
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
}
private function loadOpen(e:Event):void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadOpen:"));
waitingTimer.stop();
myStatus.loading();
if(myStatus.playOnLoad) {
myStatus.playOnLoad = false; // Capture the flag
// this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); // So loadstart event happens before play event occurs.
play();
} else {
// this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
pause();
}
progressUpdates(true);
}
private function loadComplete(e:Event):void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadComplete:"));
myStatus.loaded();
progressUpdates(false);
progressEvent();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_CANPLAYTHROUGH, myStatus));
}
private function soundCompleteHandler(e:Event):void {
myStatus.pausePosition = 0;
myStatus.isPlaying = false;
timeUpdates(false);
timeUpdateEvent();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
}
private function progressUpdates(active:Boolean):void {
// Using a timer rather than Flash's load progress event, because that event gave data at about 200Hz. The 10Hz timer is closer to HTML5 norm.
if(active) {
progressTimer.start();
} else {
progressTimer.stop();
}
}
private function progressHandler(e:TimerEvent):void {
progressEvent();
}
private function progressEvent():void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
}
private function timeUpdates(active:Boolean):void {
if(active) {
timeUpdateTimer.start();
playingTimer.start();
} else {
timeUpdateTimer.stop();
playingTimer.stop();
}
}
private function timeUpdateHandler(e:TimerEvent):void {
timeUpdateEvent();
}
private function timeUpdateEvent():void {
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
}
private function seeking(active:Boolean):void {
if(active) {
seekingEvent();
waitingEvent();
seekingTimer.start();
} else {
seekingTimer.stop();
}
}
private function seekingHandler(e:TimerEvent):void {
if(myStatus.pausePosition <= getDuration()) {
seekedEvent();
seeking(false);
if(myStatus.playOnSeek) {
myStatus.playOnSeek = false; // Capture the flag.
play();
}
} else if(myStatus.isLoaded && (myStatus.pausePosition > getDuration())) {
// Illegal seek time
seeking(false);
seekedEvent();
pause(0);
}
}
private function seekingEvent():void {
myStatus.isSeeking = true;
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
}
private function seekedEvent():void {
myStatus.isSeeking = false;
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
}
private function playingHandler(e:TimerEvent):void {
checkPlaying(false); // Without forcing playing event.
}
private function checkPlaying(force:Boolean):void {
if(mySound.isBuffering) {
if(!myStatus.isWaiting) {
waitingEvent();
}
} else {
if(myStatus.isWaiting || force) {
playingEvent();
}
}
}
private function waitingEvent():void {
myStatus.isWaiting = true;
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_WAITING, myStatus));
}
private function playingEvent():void {
myStatus.isWaiting = false;
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_CANPLAY, myStatus));
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAYING, myStatus));
}
private function waitingHandler(e:TimerEvent):void {
waitingTimer.stop();
if(myStatus.playOnLoad) {
waitingEvent();
}
}
public function load():Boolean {
if(myStatus.loadRequired()) {
myStatus.startingDownload();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
waitingTimer.start();
mySound.load(myRequest, myContext);
return true;
} else {
return false;
}
}
public function play(time:Number = NaN):Boolean {
var wasPlaying:Boolean = myStatus.isPlaying;
if(!isNaN(time) && myStatus.srcSet) {
if(myStatus.isPlaying) {
myChannel.stop();
myStatus.isPlaying = false;
}
myStatus.pausePosition = time;
}
if(myStatus.isStartingDownload) {
myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
return true;
} else if(myStatus.loadRequired()) {
myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
return load();
} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
myStatus.pausePosition = 0;
timeUpdates(false);
timeUpdateEvent();
if(wasPlaying) { // For when playing and then get a play(huge)
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
}
} else if(myStatus.pausePosition > getDuration()) {
myStatus.playOnSeek = true;
seeking(true);
} else {
myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
myChannel = mySound.play(myStatus.pausePosition);
myChannel.soundTransform = myTransform;
myChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler);
timeUpdates(true);
if(!wasPlaying) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
}
checkPlaying(true); // Force the playing event unless waiting, which will be dealt with in the playingTimer.
}
return true;
} else {
return false;
}
}
public function pause(time:Number = NaN):Boolean {
myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before loadOpen() event.
myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
var wasPlaying:Boolean = myStatus.isPlaying;
// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
var alreadyPausedAtTime:Boolean = false;
if(!isNaN(time) && myStatus.pausePosition == time) {
alreadyPausedAtTime = true;
}
if(myStatus.isPlaying) {
myStatus.isPlaying = false;
myChannel.stop();
if(myChannel.position > 0) { // Required otherwise a fast play then pause causes myChannel.position to equal zero and not the correct value. ie., When it happens leave pausePosition alone.
myStatus.pausePosition = myChannel.position;
}
}
if(!isNaN(time) && myStatus.srcSet) {
myStatus.pausePosition = time;
}
if(wasPlaying) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
}
if(myStatus.isStartingDownload) {
return true;
} else if(myStatus.loadRequired()) {
if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
return load();
} else {
return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
}
} else if(myStatus.isLoading || myStatus.isLoaded) {
if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
myStatus.pausePosition = 0;
} else if(myStatus.pausePosition > getDuration()) {
seeking(true);
}
timeUpdates(false);
// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
// Neither pause() nor pause(time) will cause a timeupdate loop.
if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
timeUpdateEvent();
}
return true;
} else {
return false;
}
}
public function playHead(percent:Number):Boolean {
var time:Number = percent * getDuration() / 100;
if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
return play(time);
} else {
return pause(time);
}
}
public function setVolume(v:Number):void {
myStatus.volume = v;
myTransform.volume = v;
myChannel.soundTransform = myTransform;
}
private function updateStatusValues():void {
myStatus.seekPercent = 100 * getLoadRatio();
myStatus.currentTime = getCurrentTime();
myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
myStatus.duration = getDuration();
}
public function getLoadRatio():Number {
if((myStatus.isLoading || myStatus.isLoaded) && mySound.bytesTotal > 0) {
return mySound.bytesLoaded / mySound.bytesTotal;
} else {
return 0;
}
}
public function getDuration():Number {
if(mySound.length > 0) {
return mySound.length;
} else {
return 0;
}
}
public function getCurrentTime():Number {
if(myStatus.isPlaying) {
return myChannel.position;
} else {
return myStatus.pausePosition;
}
}
public function getCurrentRatioRel():Number {
if((getDuration() > 0) && (getCurrentTime() <= getDuration())) {
return getCurrentTime() / getDuration();
} else {
return 0;
}
}
public function getCurrentRatioAbs():Number {
return getCurrentRatioRel() * getLoadRatio();
}
}
}

View File

@ -1,412 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Date: 29th January 2013
*/
package happyworm.jPlayer {
import flash.display.Sprite;
import flash.media.Video;
import flash.media.SoundTransform;
import flash.net.NetConnection;
import flash.net.NetStream;
import flash.utils.Timer;
import flash.events.NetStatusEvent;
import flash.events.SecurityErrorEvent;
import flash.events.TimerEvent;
public class JplayerMp4 extends Sprite {
public var myVideo:Video = new Video();
private var myConnection:NetConnection;
private var myStream:NetStream;
private var myTransform:SoundTransform = new SoundTransform();
public var myStatus:JplayerStatus = new JplayerStatus();
private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
public function JplayerMp4(volume:Number) {
myConnection = new NetConnection();
myConnection.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
myVideo.smoothing = true;
this.addChild(myVideo);
timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
myStatus.volume = volume;
}
private function progressUpdates(active:Boolean):void {
if(active) {
progressTimer.start();
} else {
progressTimer.stop();
}
}
private function progressHandler(e:TimerEvent):void {
if(myStatus.isLoading) {
if(getLoadRatio() == 1) { // Close as can get to a loadComplete event since client.onPlayStatus only works with FMS
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressHandler: loadComplete"));
myStatus.loaded();
progressUpdates(false);
}
}
progressEvent();
}
private function progressEvent():void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
}
private function timeUpdates(active:Boolean):void {
if(active) {
timeUpdateTimer.start();
} else {
timeUpdateTimer.stop();
}
}
private function timeUpdateHandler(e:TimerEvent):void {
timeUpdateEvent();
}
private function timeUpdateEvent():void {
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
}
private function seeking(active:Boolean):void {
if(active) {
if(!myStatus.isSeeking) {
seekingEvent();
}
seekingTimer.start();
} else {
if(myStatus.isSeeking) {
seekedEvent();
}
seekingTimer.stop();
}
}
private function seekingHandler(e:TimerEvent):void {
if(getSeekTimeRatio() <= getLoadRatio()) {
seeking(false);
if(myStatus.playOnSeek) {
myStatus.playOnSeek = false; // Capture the flag.
play(myStatus.pausePosition); // Must pass time or the seek time is never set.
} else {
pause(myStatus.pausePosition); // Must pass time or the stream.time is read.
}
} else if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) {
// Illegal seek time
seeking(false);
pause(0);
}
}
private function seekingEvent():void {
myStatus.isSeeking = true;
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
}
private function seekedEvent():void {
myStatus.isSeeking = false;
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
}
private function netStatusHandler(e:NetStatusEvent):void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "netStatusHandler: '" + e.info.code + "'"));
switch(e.info.code) {
case "NetConnection.Connect.Success":
connectStream();
break;
case "NetStream.Play.Start":
// This event code occurs once, when the media is opened. Equiv to loadOpen() in mp3 player.
myStatus.loading();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
progressUpdates(true);
// See onMetaDataHandler() for other condition, since duration is vital.
break;
case "NetStream.Play.Stop":
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime())));
// Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough.
if(Math.abs(getDuration() - getCurrentTime()) < 150) { // Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play.
endedEvent();
}
break;
case "NetStream.Seek.InvalidTime":
// Used for capturing invalid set times and clicks on the end of the progress bar.
endedEvent();
break;
case "NetStream.Play.StreamNotFound":
myStatus.error(); // Resets status except the src, and it sets srcError property.
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
break;
}
// "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready.
}
private function endedEvent():void {
var wasPlaying:Boolean = myStatus.isPlaying;
pause(0);
timeUpdates(false);
timeUpdateEvent();
if(wasPlaying) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
}
}
private function securityErrorHandler(event:SecurityErrorEvent):void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "securityErrorHandler."));
}
private function connectStream():void {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "connectStream."));
var customClient:Object = new Object();
customClient.onMetaData = onMetaDataHandler;
// customClient.onPlayStatus = onPlayStatusHandler; // According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server).
myStream = null;
myStream = new NetStream(myConnection);
myStream.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
myStream.client = customClient;
myVideo.attachNetStream(myStream);
setVolume(myStatus.volume);
myStream.play(myStatus.src);
}
public function setFile(src:String):void {
if(myStream != null) {
myStream.close();
}
myVideo.clear();
progressUpdates(false);
timeUpdates(false);
myStatus.reset();
myStatus.src = src;
myStatus.srcSet = true;
timeUpdateEvent();
}
public function clearFile():void {
setFile("");
myStatus.srcSet = false;
}
public function load():Boolean {
if(myStatus.loadRequired()) {
myStatus.startingDownload();
myConnection.connect(null);
return true;
} else {
return false;
}
}
public function play(time:Number = NaN):Boolean {
var wasPlaying:Boolean = myStatus.isPlaying;
if(!isNaN(time) && myStatus.srcSet) {
if(myStatus.isPlaying) {
myStream.pause();
myStatus.isPlaying = false;
}
myStatus.pausePosition = time;
}
if(myStatus.isStartingDownload) {
myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
return true;
} else if(myStatus.loadRequired()) {
myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
return load();
} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
myStream.pause(); // Since it is playing by default at this point.
myStatus.pausePosition = 0;
myStream.seek(0);
timeUpdates(false);
timeUpdateEvent();
if(wasPlaying) { // For when playing and then get a play(huge)
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
}
} else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
myStatus.playOnSeek = true;
seeking(true);
myStream.pause(); // Since it is playing by default at this point.
} else {
if(!isNaN(time)) { // Avoid using seek() when it is already correct.
myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds
}
myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
myStream.resume();
timeUpdates(true);
if(!wasPlaying) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
}
}
return true;
} else {
return false;
}
}
public function pause(time:Number = NaN):Boolean {
myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event.
myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
var wasPlaying:Boolean = myStatus.isPlaying;
// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
var alreadyPausedAtTime:Boolean = false;
if(!isNaN(time) && myStatus.pausePosition == time) {
alreadyPausedAtTime = true;
}
// Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready.
if(myStream != null && myStatus.metaDataReady) { // myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t).
myStream.pause();
}
if(myStatus.isPlaying) {
myStatus.isPlaying = false;
myStatus.pausePosition = myStream.time * 1000;
}
if(!isNaN(time) && myStatus.srcSet) {
myStatus.pausePosition = time;
}
if(wasPlaying) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
}
if(myStatus.isStartingDownload) {
return true;
} else if(myStatus.loadRequired()) {
if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
return load();
} else {
return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
}
} else if(myStatus.isLoading || myStatus.isLoaded) {
if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
myStatus.pausePosition = 0;
myStream.seek(0);
seekedEvent(); // Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event.
} else if(!isNaN(time)) {
if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
seeking(true);
} else {
if(myStatus.metaDataReady) { // Otherwise seek(0) will stop the metadata loading.
myStream.seek(myStatus.pausePosition/1000);
}
}
}
timeUpdates(false);
// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
// Neither pause() nor pause(time) will cause a timeupdate loop.
if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
timeUpdateEvent();
}
return true;
} else {
return false;
}
}
public function playHead(percent:Number):Boolean {
var time:Number = percent * getDuration() * getLoadRatio() / 100;
if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
return play(time);
} else {
return pause(time);
}
}
public function setVolume(v:Number):void {
myStatus.volume = v;
myTransform.volume = v;
if(myStream != null) {
myStream.soundTransform = myTransform;
}
}
private function updateStatusValues():void {
myStatus.seekPercent = 100 * getLoadRatio();
myStatus.currentTime = getCurrentTime();
myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
myStatus.duration = getDuration();
}
public function getLoadRatio():Number {
if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) {
return myStream.bytesLoaded / myStream.bytesTotal;
} else {
return 0;
}
}
public function getDuration():Number {
return myStatus.duration; // Set from meta data.
}
public function getCurrentTime():Number {
if(myStatus.isPlaying) {
return myStream.time * 1000;
} else {
return myStatus.pausePosition;
}
}
public function getCurrentRatioRel():Number {
if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) {
return getCurrentRatioAbs() / getLoadRatio();
} else {
return 0;
}
}
public function getCurrentRatioAbs():Number {
if(getDuration() > 0) {
return getCurrentTime() / getDuration();
} else {
return 0;
}
}
public function getSeekTimeRatio():Number {
if(getDuration() > 0) {
return myStatus.pausePosition / getDuration();
} else {
return 1;
}
}
public function onMetaDataHandler(info:Object):void { // Used in connectStream() in myStream.client object.
// This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur.
if(!myStatus.metaDataReady) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height));
myStatus.metaDataReady = true; // Set flag so that this event only effects jPlayer the 1st time.
myStatus.metaData = info;
myStatus.duration = info.duration * 1000; // Only available via Meta Data.
if(info.width != undefined) {
myVideo.width = myStatus.videoWidth = info.width;
}
if(info.height != undefined) {
myVideo.height = myStatus.videoHeight = info.height;
}
if(myStatus.playOnLoad) {
myStatus.playOnLoad = false; // Capture the flag
if(myStatus.pausePosition > 0 ) { // Important for setMedia followed by play(time).
play(myStatus.pausePosition);
} else {
play(); // Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
}
} else {
pause(myStatus.pausePosition); // Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
}
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA, myStatus));
} else {
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: Already read (NO EFFECT)"));
}
}
}
}

View File

@ -1,983 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Robert M. Hall
* Date: 29th January 2013
* Based on JplayerMp4.as with modifications for rtmp
*/
package happyworm.jPlayer
{
import flash.display.Sprite;
import flash.media.Video;
import flash.media.SoundTransform;
import flash.net.NetConnection;
import flash.net.NetStream;
import flash.net.Responder;
import flash.utils.Timer;
import flash.utils.getTimer;
import flash.events.NetStatusEvent;
import flash.events.SecurityErrorEvent;
import flash.events.TimerEvent;
import flash.events.ErrorEvent;
import flash.events.UncaughtErrorEvent;
import flash.utils.clearInterval;
import flash.utils.setInterval;
import happyworm.jPlayer.ConnectManager;
public class JplayerRtmp extends Sprite
{
public var myVideo:Video = new Video;
private var myConnection:NetConnection;
private var myStream:NetStream;
public var responder:Responder;
private var streamName:String;
private var connectString:Object;
private var firstTime:Boolean = true;
private var myTransform:SoundTransform = new SoundTransform ;
public var myStatus:JplayerStatus = new JplayerStatus ;
private var ConnMgr:ConnectManager=new ConnectManager();
private var timeUpdateTimer:Timer = new Timer(250,0);// Matched to HTML event freq
private var progressTimer:Timer = new Timer(250,0);// Matched to HTML event freq
private var seekingTimer:Timer = new Timer(100,0);// Internal: How often seeking is checked to see if it is over.
private var startBuffer:Number = 3;
private var maxBuffer:Number = 12;
public function JplayerRtmp(volume:Number)
{
myConnection = new NetConnection ;
myConnection.client = this;
// Moved the netconnection negotiation into the ConnectManager.as class - not needed for initial connection
// may need to add eventHandler back in for errors only or just dispatch from the ConnectManager..revisit...
// myConnection.addEventListener(NetStatusEvent.NET_STATUS,netStatusHandler);
// myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR,securityErrorHandler);
myVideo.smoothing = true;
this.addChild(myVideo);
timeUpdateTimer.addEventListener(TimerEvent.TIMER,timeUpdateHandler);
progressTimer.addEventListener(TimerEvent.TIMER,progressHandler);
seekingTimer.addEventListener(TimerEvent.TIMER,seekingHandler);
myStatus.volume = volume;
addEventListener(UncaughtErrorEvent.UNCAUGHT_ERROR, uncaughtErrorHandler);
}
private function uncaughtErrorHandler(event:UncaughtErrorEvent):void
{
trace("UNCAUGHT ERROR - try loading again");
if (event.error is Error)
{
var error:Error = event.error as Error;
trace(error);
// do something with the error
}
else if (event.error is ErrorEvent)
{
var errorEvent:ErrorEvent = event.error as ErrorEvent;
// do something with the error
trace(errorEvent);
}
else
{
// a non-Error, non-ErrorEvent type was thrown and uncaught
}
load();
}
private function progressUpdates(active:Boolean):void
{
if (active)
{
progressTimer.start();
}
else
{
progressTimer.stop();
}
}
private function progressHandler(e:TimerEvent):void
{
if (myStatus.isLoading)
{
if ((getLoadRatio() == 1))
{// Close as can get to a loadComplete event since client.onPlayStatus only works with FMS
this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"progressHandler: loadComplete"));
myStatus.loaded();
progressUpdates(false);
}
}
progressEvent();
}
private function progressEvent():void
{
// temporarily disabled progress event dispatching - not really needed for rtmp
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"progressEvent:"));
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS,myStatus));
}
private function timeUpdates(active:Boolean):void
{
if (active)
{
timeUpdateTimer.start();
}
else
{
timeUpdateTimer.stop();
}
}
private function timeUpdateHandler(e:TimerEvent):void
{
timeUpdateEvent();
}
private function timeUpdateEvent():void
{
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE,myStatus));
}
private function seeking(active:Boolean):void
{
if (active)
{
if (! myStatus.isSeeking)
{
seekingEvent();
}
seekingTimer.start();
}
else
{
if (myStatus.isSeeking)
{
seekedEvent();
}
seekingTimer.stop();
}
}
private function seekingHandler(e:TimerEvent):void
{
if ((getSeekTimeRatio() <= getLoadRatio()))
{
seeking(false);
if (myStatus.playOnSeek)
{
myStatus.playOnSeek = false;// Capture the flag.
play(myStatus.pausePosition);// Must pass time or the seek time is never set.
}
else
{
pause(myStatus.pausePosition);// Must pass time or the stream.time is read.
}
}
else if (myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration)
{
// Illegal seek time
seeking(false);
pause(0);
}
}
private function seekingEvent():void
{
myStatus.isSeeking = true;
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING,myStatus));
}
private function seekedEvent():void
{
myStatus.isSeeking = false;
updateStatusValues();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED,myStatus));
}
private function netStatusHandler(e:NetStatusEvent):void
{
trace(("netStatusHandler: " + e.info.code));
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"netStatusHandler: '" + e.info.code + "'"));
//trace("BEFORE: bufferTime: "+myStream.bufferTime+" - bufferTimeMax: "+myStream.bufferTimeMax);
switch (e.info.code)
{
case "NetConnection.Connect.Success" :
// connectStream(); // This method did not do anything sensible anyway.
// Do not think this case occurs. This was for the static file connection.
// Which now seems to be handled by the Connection Manager.
break;
case "NetStream.Buffer.Full":
if(connectString.streamTYPE == "LIVE") {
myStream.bufferTime = startBuffer;
} else {
myStream.bufferTime = maxBuffer;
}
break;
case "NetStream.Buffer.Flush":
myStream.bufferTime = startBuffer;
break;
case "NetStream.Buffer.Empty":
myStream.bufferTime = startBuffer;
break;
case "NetStream.Seek.Notify":
myStream.bufferTime = startBuffer;
break;
case "NetStream.Play.Start" :
if (firstTime) {
firstTime = false; // Capture flag
myStatus.loading();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART,myStatus));
// NB: With MP4 player both audio and video types get connected to myVideo.
// NB: Had believed it was important for the audio too, otherwise what plays it?
if(videoBinding) {
myVideo.attachNetStream(myStream);
}
setVolume(myStatus.volume);
// Really the progress event just needs to be generated once, and should probably happen before now.
progressUpdates(true);
// This is an ASSUMPTION! Made it so that the default GUI worked.
// Hence why this part should be refactored.
// Lots of commands sequences after setMedia would be corrupted by this assumption.
// Bascally, we assume that after a setMedia, you will play it.
// Doing setMedia and pause(15) cause the flag to be set incorrectly and the GUI locks up.
myStatus.isPlaying = true; // Should be handled elsewhere.
}
// Under RTMP, this event code occurs every time the media starts playing and when a new position is seeked to, even when paused.
// Since under RTMP the event behaviour is quite different, believe a refactor is best here.
// ie., Under RTMP we should be able to know a lot more info about the stream.
// See onMetaDataHandler() for other condition, since duration is vital.
// See onResult() response handler too.
// Appears to be some duplication between onMetaDataHandler() and onResult(), along with a race between them occuring.
break;
case "NetStream.Play.UnpublishNotify":
myStream.bufferTime = startBuffer; // was 3
case "NetStream.Play.Stop" :
myStream.bufferTime = startBuffer; // was 3
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime())));
// Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough.
if (Math.abs((getDuration() - getCurrentTime())) < 150)
{// Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play.
//endedEvent();
}
break;
case "NetStream.Seek.InvalidTime" :
// Used for capturing invalid set times and clicks on the end of the progress bar.
endedEvent();
break;
case "NetStream.Play.StreamNotFound" :
myStatus.error();
// Resets status except the src, and it sets srcError property.;
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR,myStatus));
break;
}
//trace("AFTER: bufferTime: "+myStream.bufferTime+" - bufferTimeMax: "+myStream.bufferTimeMax);
// "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready.
}
private function endedEvent():void
{
trace("ENDED STREAM EVENT");
var wasPlaying:Boolean = myStatus.isPlaying;
// timeUpdates(false);
// timeUpdateEvent();
pause(0);
if (wasPlaying)
{
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED,myStatus));
}
}
private function securityErrorHandler(event:SecurityErrorEvent):void
{
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"securityErrorHandler."));
}
public function connectStream():void
{
trace("CONNECTING");
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"connectStream."));
//this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_CANPLAY,myStatus));
timeUpdates(true);
progressUpdates(true);
//myVideo.attachNetStream(myStream);
//setVolume(myStatus.volume);
}
private function onResult(result:Object):void
{
trace("OnResult EVENT FIRED!");
myStatus.duration = parseFloat(result.toString()) * 1000;
trace((("The stream length is " + result) + " seconds"));
if(!myConnection.connected) {
load();
} else {
//this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_CANPLAY,myStatus,"Rockit!"));
//myStatus.loaded();
//myStatus.isPlaying=true;
if (! myStatus.metaDataReady)
{
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"onMetaDataHandler: " + myStatus.duration));
// Allow multiple onResult Handlers to affect size. As per PR #131 and #98.
// myStatus.metaDataReady = true;
/*var info:Object = new Object();
info.duration=myStatus.duration
info.width=undefined;
info.height=undefined;
myStatus.metaData = info;
*/
if (myStatus.playOnLoad)
{
myStatus.playOnLoad = false;// Capture the flag
if (myStatus.pausePosition > 0)
{// Important for setMedia followed by play(time).
play(myStatus.pausePosition);
}
else
{
play();// Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
}
}
else
{
pause(myStatus.pausePosition);// Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
}
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA,myStatus));
}
else
{
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"onMetaDataHandler: Already read (NO EFFECT)"));
}
myStream.play(streamName);
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY,myStatus));
// timeUpdates(false);
}
}
private var overRideConnect:Boolean=false;
public function doneYet():void {
if(!myConnection.connected) {
// try again
ConnMgr.stopAll(true);
overRideConnect=true;
trace("Connected: "+myConnection.connected+" - "+myStatus.loadRequired());
load();
}
}
private var videoBinding:Boolean=false;
public function setFile(src:String,videoSupport:Boolean=false):void
{
// videoSupport turns on/off video - by default no video, audio only
videoBinding=videoSupport;
/* Dont close the stream or netconnection here anymore so we can recycle if host/appname are the same
if ((myStream != null))
{
myStream.close();
myConnection.close();
}
*/
if(ConnMgr.getNegotiating() == true) {
//ConnMgr.stopAll();
ConnMgr.setNegotiating(false);
}
myVideo.clear();
progressUpdates(false);
timeUpdates(false);
myStatus.reset();
myStatus.src = src;
myStatus.srcSet = true;
firstTime = true;
//myStatus.loaded();
if(src != "") {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_CANPLAY,myStatus));
}
//timeUpdateEvent();
}
public function shutDownNcNs():void {
trace("Connections Closed");
timeUpdates(false);
progressUpdates(false);
myStream.close();
myConnection.close();
myStatus.reset();
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED,myStatus));
}
public function clearFile():void
{
if (myStream != null)
{
myStream.close();
// Dont close the netConnection here any longer, as we may recycle it later
// may need an extra way to close manually if switching media types after an rtmp session - revisit
// myConnection.close();
myStatus.reset();
}
setFile("");
myStatus.srcSet = false;
}
public function parseRTMPsrcConnect(rtmpSrc:String):Object
{
// rtmp://cp76372.live.edgefcs.net/live/Flash1Office@60204
var appName:String = "";
var streamFileName:String = "";
var startIndex:uint = 2 + rtmpSrc.indexOf("//");
var streamTYPE:String = "recorded";
var host:String = rtmpSrc.substr(startIndex);
var port:String = "";
host = host.substr(0,host.indexOf("/"));
var endHost:Number = startIndex + host.length + 1;
// See if there is a host port specified
if(host.indexOf(":") != -1) {
port = host.substr(host.indexOf(":")+1);
host = host.substr(0,host.indexOf(":"));
}
// Akamai specific live streams
if (rtmpSrc.lastIndexOf("/live/") != -1)
{
trace("LIVE!");
appName = rtmpSrc.substring(endHost,rtmpSrc.lastIndexOf("/live/") + 6);
streamFileName = rtmpSrc.substr(rtmpSrc.lastIndexOf("/live/") + 6);
streamTYPE="LIVE";
} else {
streamTYPE="RECORDED";
}
// Mp3 streams with standard appname/no instance name, mp3: prefix
if (rtmpSrc.indexOf(".mp3") != -1)
{
appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp3:"));
streamFileName = rtmpSrc.substr(rtmpSrc.indexOf("mp3:"));
streamFileName = streamFileName.substr(0,streamFileName.length - 4);
}
// rtmp://cp83813.edgefcs.net/ondemand/rob_hall/bruce_campbell_oldspice.flv
// Mp4 streams with standard appname/no instance name, mp4: prefix
if (rtmpSrc.indexOf("mp4:") != -1)
{
appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp4:"));
streamFileName = rtmpSrc.substr(rtmpSrc.indexOf("mp4:"));
streamFileName = streamFileName.substr(0,streamFileName.length - 4);
}
// .f4v streams with standard appname/no instance name, .flv extension
if (rtmpSrc.indexOf(".flv") != -1)
{
// allow use of ^ in rtmp string to indicate break point for an appname or instance name that
// contains a / in it where it would require multiple connection attempts or manual configuratiom
// of the appname/instancename
var endApp:Number=0;
if(rtmpSrc.indexOf("^") != -1) {
endApp=rtmpSrc.indexOf("^");
rtmpSrc.replace("^", "/");
} else {
endApp = rtmpSrc.indexOf("/",endHost);
}
appName = rtmpSrc.substring(endHost,endApp) + "/";
streamFileName = rtmpSrc.substr(endApp+1);
}
if(port=="") {
port="MULTI";
}
//rtmp, rtmpt, rtmps, rtmpe, rtmpte
trace(("\n\n*** HOST: " + host));
trace(("*** PORT: " + port));
trace(("*** APPNAME: " + appName));
trace(("*** StreamName: " + streamFileName));
var streamParts:Object = new Object;
streamParts.streamTYPE=streamTYPE;
streamParts.appName = appName;
streamParts.streamFileName = streamFileName;
streamParts.hostName = host;
streamName = streamFileName;
return streamParts;
}
public function load():Boolean
{
//trace("LOAD: "+myStatus.src);
if (myStatus.loadRequired() || overRideConnect==true)
{
overRideConnect=false;
myStatus.startingDownload();
var lastAppName:String;
var lastHostName:String;
try{
// we do a try, as these properties might not exist yet
if(connectString.appName != "" && connectString.appName != undefined) {
trace("PREVIOUS APP/HOST INFO AVAILABLE");
lastAppName = connectString.appName;
lastHostName = connectString.hostName;
trace("LAST: "+lastAppName,lastHostName);
}
} catch (error:Error) {
//trace("*** Caught an error condition: "+error);
}
connectString = parseRTMPsrcConnect(myStatus.src);
trace("**** LOAD :: CONNECT SOURCE: " +connectString.hostName +" "+ connectString.appName);
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_WAITING, myStatus));
if((connectString.appName == lastAppName && connectString.hostName == lastHostName) && (myConnection.connected)) {
// recycle the netConnection
trace("RECYCLING NETCONNECTION");
if ((myStream != null))
{
myStream.close();
}
connectStream();
onBWDone(null,myConnection);
} else {
// myConnection.connect(connectString.appName);
trace("NEW NetConnection Negotiation");
if ((myStream != null))
{
myStream.close();
myConnection.close();
}
ConnMgr.stopAll(true);
ConnMgr.negotiateConnect(this,connectString.hostName,connectString.appName);
}
trace("**** LOAD2 :: CONNECT SOURCE: " +connectString.hostName +" "+ connectString.appName);
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_WAITING, myStatus));
return true;
}
else
{
return false;
}
}
public function onFCUnsubscribe(info:Object):void
{
trace(("onFCUnSubscribe worked" + info));
}
public function onFCSubscribe(info:Object):void
{
trace(("onFCSubscribe worked" + info));
}
public function onBWDone(info:Object,nc:NetConnection):void
{
if(nc.connected) {
myConnection=nc;
trace(((("onBWDone " + info) + " :: ") + myStatus.src));
var customClient:Object = new Object ;
customClient.onMetaData = onMetaDataHandler;
customClient.onPlayStatus = onPlayStatusHandler;// According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server).
myStream = null;
myStream = new NetStream(myConnection);
myStream.addEventListener(NetStatusEvent.NET_STATUS,netStatusHandler);
myStream.client = customClient;
if(connectString.streamTYPE == "LIVE") {
myStream.bufferTime = 3; // was 3
myStream.bufferTimeMax = 24;
startBuffer = 3;
maxBuffer = 12;
} else {
myStream.bufferTime = .2; // was 3
myStream.bufferTimeMax = 0;
startBuffer = .2;
maxBuffer = 12;
}
//streamName="";
//var connectString:Object = parseRTMPsrcConnect(myStatus.src);
//streamName=connectString.streamFileName;
responder = new Responder(onResult);
myConnection.call("getStreamLength",responder,streamName);
} else {
connectStream();
}
trace("PLAY SOURCE: "+connectString);
}
public function play(time:Number = NaN):Boolean {
//trace("PLAY: "+time+" - isPlaying: "+myStatus.isPlaying +" - myStatus.isStartingDownload:"+myStatus.isStartingDownload);
var wasPlaying:Boolean = myStatus.isPlaying;
if(!isNaN(time) && myStatus.srcSet) {
if(myStatus.isPlaying) {
myStream.pause();
myStatus.isPlaying = false;
}
myStatus.pausePosition = time;
}
if(myStatus.isStartingDownload) {
myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
return true;
} else if(myStatus.loadRequired()) {
myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
return load();
} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration && connectString.streamTYPE != "LIVE") { // The time is invalid, ie., past the end.
myStream.pause(); // Since it is playing by default at this point.
myStatus.pausePosition = 0;
trace("SEEKER!");
myStream.seek(0);
timeUpdates(false);
timeUpdateEvent();
if(wasPlaying) { // For when playing and then get a play(huge)
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
}
} else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
myStatus.playOnSeek = true;
seeking(true);
trace("SEEKER PAUSE!");
myStream.pause(); // Since it is playing by default at this point.
} else {
if(!isNaN(time)) { // Avoid using seek() when it is already correct.
trace("SEEKER3");
myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds
}
myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
trace("SHOULD GET RESUME!");
myStream.resume();
timeUpdates(true);
if(!wasPlaying) {
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
}
}
return true;
} else {
return false;
}
}
public function pause(time:Number=NaN):Boolean
{
//trace("PAUSE: "+time);
myStatus.playOnLoad = false;// Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event.
myStatus.playOnSeek = false;// Reset flag in case play(time) issued before the command and is still seeking to time set.
var wasPlaying:Boolean = myStatus.isPlaying;
// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
var alreadyPausedAtTime:Boolean = false;
if(!isNaN(time) && myStatus.pausePosition == time) {
alreadyPausedAtTime = true;
}
trace("!isNaN: "+!isNaN(time) +" isNaN: "+isNaN(time));
// Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready.
if (((myStream != null) && myStatus.metaDataReady))
{// myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t).
if(connectString.streamTYPE == "LIVE") {
trace("PAUSING LIVE");
myStream.play(false)
} else {
trace("PAUSING RECORDED");
myStream.pause();
}
}
if (myStatus.isPlaying)
{
myStatus.isPlaying = false;
myStatus.pausePosition = myStream.time * 1000;
}
if (! isNaN(time) && myStatus.srcSet)
{
myStatus.pausePosition = time;
}
if (wasPlaying)
{
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE,myStatus));
}
if (myStatus.isStartingDownload)
{
return true;
}
else if (myStatus.loadRequired())
{
if ((time > 0))
{// We do not want the stop() command, which does pause(0), causing a load operation.
return load();
}
else
{
return true;// Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
}
}
else if (myStatus.isLoading || myStatus.isLoaded)
{
if (myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration && connectString.streamTYPE != "LIVE" )
{// The time is invalid, ie., past the end.
myStatus.pausePosition = 0;
trace("GOT HERE!");
myStream.seek(0);
seekedEvent();// Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event.
}
else if (! isNaN(time))
{
if ((getSeekTimeRatio() > getLoadRatio()))
{// Use an estimate based on the downloaded amount
seeking(true);
}
else
{
if (myStatus.metaDataReady && connectString.streamTYPE != "LIVE")
{// Otherwise seek(0) will stop the metadata loading.
trace("GOT HERE TOO!");
myStream.seek(myStatus.pausePosition / 1000);
}
}
}
timeUpdates(false);
// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
// Neither pause() nor pause(time) will cause a timeupdate loop.
if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
timeUpdateEvent();
}
return true;
}
else
{
return false;
}
}
public function playHead(percent:Number):Boolean
{
var time:Number = percent * getDuration() * getLoadRatio() / 100;
if (myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek)
{
return play(time);
}
else
{
return pause(time);
}
}
public function setVolume(v:Number):void
{
myStatus.volume = v;
myTransform.volume = v;
if ((myStream != null))
{
myStream.soundTransform = myTransform;
}
}
private function updateStatusValues():void
{
//myStatus.seekPercent = 100 * getLoadRatio();
myStatus.seekPercent = 100;
myStatus.currentTime = getCurrentTime();
myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
myStatus.duration = getDuration();
}
public function getLoadRatio():Number
{
return 1;
/*trace("LoadRatio:"+myStream.bytesLoaded, myStream.bytesTotal);
if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) {
return myStream.bytesLoaded / myStream.bytesTotal;
} else {
return 0;
}
*/
}
public function getDuration():Number
{
return myStatus.duration;// Set from meta data.
}
public function getCurrentTime():Number
{
if (myStatus.isPlaying)
{
//trace(myStream.time * 1000);
return myStream.time * 1000; // was +1000
}
else
{
return myStatus.pausePosition;
}
}
public function getCurrentRatioRel():Number
{
if ((getCurrentRatioAbs() <= getLoadRatio()))
{
//if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) {
return getCurrentRatioAbs() / getLoadRatio();
}
else
{
return 0;
}
}
public function getCurrentRatioAbs():Number
{
if ((getDuration() > 0))
{
return getCurrentTime() / getDuration();
}
else
{
return 0;
}
}
public function getSeekTimeRatio():Number
{
if ((getDuration() > 0))
{
return myStatus.pausePosition / getDuration();
}
else
{
return 1;
}
}
public function onPlayStatusHandler(infoObject:Object):void
{
trace((("OnPlayStatusHandler called: (" + getTimer()) + " ms)"));
for (var prop:* in infoObject)
{
trace(((("\t" + prop) + ":\t") + infoObject[prop]));
}
if (infoObject.code == "NetStream.Play.Complete")
{
endedEvent();
}
}
public function onMetaDataHandler(info:Object):void
{// Used in connectStream() in myStream.client object.
// This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur.
if (! myStatus.metaDataReady)
{
trace("\n\n*** METADATA FIRED! ***\n\n");
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height));
myStatus.metaDataReady = true;// Set flag so that this event only effects jPlayer the 1st time.
myStatus.metaData = info;
myStatus.duration = info.duration * 1000;// Only available via Meta Data.
if (info.width != undefined)
{
myVideo.width = myStatus.videoWidth = info.width;
}
if (info.height != undefined)
{
myVideo.height = myStatus.videoHeight = info.height;
}
if (myStatus.playOnLoad)
{
myStatus.playOnLoad = false;// Capture the flag
if (myStatus.pausePosition > 0)
{// Important for setMedia followed by play(time).
play(myStatus.pausePosition);
}
else
{
play();// Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
}
}
else
{
pause(myStatus.pausePosition);// Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
}
this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA,myStatus));
}
else
{
//this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG,myStatus,"onMetaDataHandler: Already read (NO EFFECT)"));
}
}
}
}

View File

@ -1,110 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Date: 5th June 2013
*/
package happyworm.jPlayer {
public class JplayerStatus {
public static const VERSION:String = "2.4.0"; // The version of the Flash jPlayer entity.
public var volume:Number = 0.5; // Not affected by reset()
public var muted:Boolean = false; // Not affected by reset()
public var src:String;
public var srcError:Boolean;
public var srcSet:Boolean;
public var isPlaying:Boolean;
public var isSeeking:Boolean;
public var isWaiting:Boolean;
public var playOnLoad:Boolean;
public var playOnSeek:Boolean;
public var isStartingDownload:Boolean;
public var isLoading:Boolean;
public var isLoaded:Boolean;
public var pausePosition:Number;
public var seekPercent:Number;
public var currentTime:Number;
public var currentPercentRelative:Number;
public var currentPercentAbsolute:Number;
public var duration:Number;
public var videoWidth:Number;
public var videoHeight:Number;
public var metaDataReady:Boolean;
public var metaData:Object;
public function JplayerStatus() {
reset();
}
public function reset():void {
src = "";
srcError = false;
srcSet = false;
isPlaying = false;
isSeeking = false;
isWaiting = false;
playOnLoad = false;
playOnSeek = false;
isStartingDownload = false;
isLoading = false;
isLoaded = false;
pausePosition = 0;
seekPercent = 0;
currentTime = 0;
currentPercentRelative = 0;
currentPercentAbsolute = 0;
duration = 0;
videoWidth = 0;
videoHeight = 0;
metaDataReady = false;
metaData = {};
}
public function error():void {
var srcSaved:String = src;
reset();
src = srcSaved;
srcError = true;
}
public function loadRequired():Boolean {
return (srcSet && !isStartingDownload && !isLoading && !isLoaded);
}
public function startingDownload():void {
isStartingDownload = true;
isLoading = false;
isLoaded = false;
}
public function loading():void {
isStartingDownload = false;
isLoading = true;
isLoaded = false;
}
public function loaded():void {
isStartingDownload = false;
isLoading = false;
isLoaded = true;
}
}
}

View File

@ -1,62 +0,0 @@
/*
* jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2013 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Robert M. Hall
* Date: 7th August 2012
*/
package happyworm.jPlayer
{
import flash.net.LocalConnection;
import flash.events.StatusEvent;
import flash.system.Capabilities;
import flash.utils.getTimer;
public class TraceOut
{
private var outgoing_lc:LocalConnection = new LocalConnection ();
private var firstEvent:Boolean = true;
private var _localAIRDebug:Boolean = false;
public function TraceOut()
{
outgoing_lc.addEventListener(StatusEvent.STATUS, lcListener);
outgoing_lc.send("_log_output","startLogging","");
}
private function lcListener(event:StatusEvent):void
{
// Must have this listener to avoid errors
if (event.level == "error")
{
_localAIRDebug = false;
}
else if(event.level =="status" && firstEvent==true)
{
firstEvent = false;
tracer("<< Successful Connection To Event Logger >>");
tracer("DEBUG INFO: \n<"+Capabilities.serverString + ">\nFlash Player Version: " + Capabilities.version + "\n");
_localAIRDebug = true;
}
}
public function localAIRDebug():Boolean
{
return _localAIRDebug;
}
public function tracer(msg:String):void
{
trace(msg);
var outMsg:String = "[" + getTimer() + "ms] " + msg;
outgoing_lc.send("_log_output","displayMsg",outMsg);
}
}
}

View File

@ -1,496 +0,0 @@
/*
* Playlist Object for the jPlayer Plugin
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* http://www.opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 2.4.1
* Date: 19th November 2014
*
* Requires:
* - jQuery 1.7.0+
* - jPlayer 2.8.2+
*/
/*global jPlayerPlaylist:true */
(function($, undefined) {
jPlayerPlaylist = function(cssSelector, playlist, options) {
var self = this;
this.current = 0;
this.loop = false; // Flag used with the jPlayer repeat event
this.shuffled = false;
this.removing = false; // Flag is true during remove animation, disabling the remove() method until complete.
this.cssSelector = $.extend({}, this._cssSelector, cssSelector); // Object: Containing the css selectors for jPlayer and its cssSelectorAncestor
this.options = $.extend(true, {
keyBindings: {
next: {
key: 221, // ]
fn: function() {
self.next();
}
},
previous: {
key: 219, // [
fn: function() {
self.previous();
}
},
shuffle: {
key: 83, // s
fn: function() {
self.shuffle();
}
}
},
stateClass: {
shuffled: "jp-state-shuffled"
}
}, this._options, options); // Object: The jPlayer constructor options for this playlist and the playlist options
this.playlist = []; // Array of Objects: The current playlist displayed (Un-shuffled or Shuffled)
this.original = []; // Array of Objects: The original playlist
this._initPlaylist(playlist); // Copies playlist to this.original. Then mirrors this.original to this.playlist. Creating two arrays, where the element pointers match. (Enables pointer comparison.)
// Setup the css selectors for the extra interface items used by the playlist.
this.cssSelector.details = this.cssSelector.cssSelectorAncestor + " .jp-details"; // Note that jPlayer controls the text in the title element.
this.cssSelector.playlist = this.cssSelector.cssSelectorAncestor + " .jp-playlist";
this.cssSelector.next = this.cssSelector.cssSelectorAncestor + " .jp-next";
this.cssSelector.previous = this.cssSelector.cssSelectorAncestor + " .jp-previous";
this.cssSelector.shuffle = this.cssSelector.cssSelectorAncestor + " .jp-shuffle";
this.cssSelector.shuffleOff = this.cssSelector.cssSelectorAncestor + " .jp-shuffle-off";
// Override the cssSelectorAncestor given in options
this.options.cssSelectorAncestor = this.cssSelector.cssSelectorAncestor;
// Override the default repeat event handler
this.options.repeat = function(event) {
self.loop = event.jPlayer.options.loop;
};
// Create a ready event handler to initialize the playlist
$(this.cssSelector.jPlayer).bind($.jPlayer.event.ready, function() {
self._init();
});
// Create an ended event handler to move to the next item
$(this.cssSelector.jPlayer).bind($.jPlayer.event.ended, function() {
self.next();
});
// Create a play event handler to pause other instances
$(this.cssSelector.jPlayer).bind($.jPlayer.event.play, function() {
$(this).jPlayer("pauseOthers");
});
// Create a resize event handler to show the title in full screen mode.
$(this.cssSelector.jPlayer).bind($.jPlayer.event.resize, function(event) {
if(event.jPlayer.options.fullScreen) {
$(self.cssSelector.details).show();
} else {
$(self.cssSelector.details).hide();
}
});
// Create click handlers for the extra buttons that do playlist functions.
$(this.cssSelector.previous).click(function(e) {
e.preventDefault();
self.previous();
self.blur(this);
});
$(this.cssSelector.next).click(function(e) {
e.preventDefault();
self.next();
self.blur(this);
});
$(this.cssSelector.shuffle).click(function(e) {
e.preventDefault();
if(self.shuffled && $(self.cssSelector.jPlayer).jPlayer("option", "useStateClassSkin")) {
self.shuffle(false);
} else {
self.shuffle(true);
}
self.blur(this);
});
$(this.cssSelector.shuffleOff).click(function(e) {
e.preventDefault();
self.shuffle(false);
self.blur(this);
}).hide();
// Put the title in its initial display state
if(!this.options.fullScreen) {
$(this.cssSelector.details).hide();
}
// Remove the empty <li> from the page HTML. Allows page to be valid HTML, while not interfereing with display animations
$(this.cssSelector.playlist + " ul").empty();
// Create .on() handlers for the playlist items along with the free media and remove controls.
this._createItemHandlers();
// Instance jPlayer
$(this.cssSelector.jPlayer).jPlayer(this.options);
};
jPlayerPlaylist.prototype = {
_cssSelector: { // static object, instanced in constructor
jPlayer: "#jquery_jplayer_1",
cssSelectorAncestor: "#jp_container_1"
},
_options: { // static object, instanced in constructor
playlistOptions: {
autoPlay: false,
loopOnPrevious: false,
shuffleOnLoop: true,
enableRemoveControls: false,
displayTime: 'slow',
addTime: 'fast',
removeTime: 'fast',
shuffleTime: 'slow',
itemClass: "jp-playlist-item",
freeGroupClass: "jp-free-media",
freeItemClass: "jp-playlist-item-free",
removeItemClass: "jp-playlist-item-remove"
}
},
option: function(option, value) { // For changing playlist options only
if(value === undefined) {
return this.options.playlistOptions[option];
}
this.options.playlistOptions[option] = value;
switch(option) {
case "enableRemoveControls":
this._updateControls();
break;
case "itemClass":
case "freeGroupClass":
case "freeItemClass":
case "removeItemClass":
this._refresh(true); // Instant
this._createItemHandlers();
break;
}
return this;
},
_init: function() {
var self = this;
this._refresh(function() {
if(self.options.playlistOptions.autoPlay) {
self.play(self.current);
} else {
self.select(self.current);
}
});
},
_initPlaylist: function(playlist) {
this.current = 0;
this.shuffled = false;
this.removing = false;
this.original = $.extend(true, [], playlist); // Copy the Array of Objects
this._originalPlaylist();
},
_originalPlaylist: function() {
var self = this;
this.playlist = [];
// Make both arrays point to the same object elements. Gives us 2 different arrays, each pointing to the same actual object. ie., Not copies of the object.
$.each(this.original, function(i) {
self.playlist[i] = self.original[i];
});
},
_refresh: function(instant) {
/* instant: Can be undefined, true or a function.
* undefined -> use animation timings
* true -> no animation
* function -> use animation timings and excute function at half way point.
*/
var self = this;
if(instant && !$.isFunction(instant)) {
$(this.cssSelector.playlist + " ul").empty();
$.each(this.playlist, function(i) {
$(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i]));
});
this._updateControls();
} else {
var displayTime = $(this.cssSelector.playlist + " ul").children().length ? this.options.playlistOptions.displayTime : 0;
$(this.cssSelector.playlist + " ul").slideUp(displayTime, function() {
var $this = $(this);
$(this).empty();
$.each(self.playlist, function(i) {
$this.append(self._createListItem(self.playlist[i]));
});
self._updateControls();
if($.isFunction(instant)) {
instant();
}
if(self.playlist.length) {
$(this).slideDown(self.options.playlistOptions.displayTime);
} else {
$(this).show();
}
});
}
},
_createListItem: function(media) {
var self = this;
// Wrap the <li> contents in a <div>
var listItem = "<li><div>";
// Create remove control
listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.removeItemClass + "'>&times;</a>";
// Create links to free media
if(media.free) {
var first = true;
listItem += "<span class='" + this.options.playlistOptions.freeGroupClass + "'>(";
$.each(media, function(property,value) {
if($.jPlayer.prototype.format[property]) { // Check property is a media format.
if(first) {
first = false;
} else {
listItem += " | ";
}
listItem += "<a class='" + self.options.playlistOptions.freeItemClass + "' href='" + value + "' tabindex='-1'>" + property + "</a>";
}
});
listItem += ")</span>";
}
// The title is given next in the HTML otherwise the float:right on the free media corrupts in IE6/7
listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.itemClass + "' tabindex='0'>" + media.title + (media.artist ? " <span class='jp-artist'>by " + media.artist + "</span>" : "") + "</a>";
listItem += "</div></li>";
return listItem;
},
_createItemHandlers: function() {
var self = this;
// Create live handlers for the playlist items
$(this.cssSelector.playlist).off("click", "a." + this.options.playlistOptions.itemClass).on("click", "a." + this.options.playlistOptions.itemClass, function(e) {
e.preventDefault();
var index = $(this).parent().parent().index();
if(self.current !== index) {
self.play(index);
} else {
$(self.cssSelector.jPlayer).jPlayer("play");
}
self.blur(this);
});
// Create live handlers that disable free media links to force access via right click
$(this.cssSelector.playlist).off("click", "a." + this.options.playlistOptions.freeItemClass).on("click", "a." + this.options.playlistOptions.freeItemClass, function(e) {
e.preventDefault();
$(this).parent().parent().find("." + self.options.playlistOptions.itemClass).click();
self.blur(this);
});
// Create live handlers for the remove controls
$(this.cssSelector.playlist).off("click", "a." + this.options.playlistOptions.removeItemClass).on("click", "a." + this.options.playlistOptions.removeItemClass, function(e) {
e.preventDefault();
var index = $(this).parent().parent().index();
self.remove(index);
self.blur(this);
});
},
_updateControls: function() {
if(this.options.playlistOptions.enableRemoveControls) {
$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).show();
} else {
$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).hide();
}
if(this.shuffled) {
$(this.cssSelector.jPlayer).jPlayer("addStateClass", "shuffled");
} else {
$(this.cssSelector.jPlayer).jPlayer("removeStateClass", "shuffled");
}
if($(this.cssSelector.shuffle).length && $(this.cssSelector.shuffleOff).length) {
if(this.shuffled) {
$(this.cssSelector.shuffleOff).show();
$(this.cssSelector.shuffle).hide();
} else {
$(this.cssSelector.shuffleOff).hide();
$(this.cssSelector.shuffle).show();
}
}
},
_highlight: function(index) {
if(this.playlist.length && index !== undefined) {
$(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current");
$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
// $(this.cssSelector.details + " li").html("<span class='jp-title'>" + this.playlist[index].title + "</span>" + (this.playlist[index].artist ? " <span class='jp-artist'>by " + this.playlist[index].artist + "</span>" : ""));
}
},
setPlaylist: function(playlist) {
this._initPlaylist(playlist);
this._init();
},
add: function(media, playNow) {
$(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);
this._updateControls();
this.original.push(media);
this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system.
if(playNow) {
this.play(this.playlist.length - 1);
} else {
if(this.original.length === 1) {
this.select(0);
}
}
},
remove: function(index) {
var self = this;
if(index === undefined) {
this._initPlaylist([]);
this._refresh(function() {
$(self.cssSelector.jPlayer).jPlayer("clearMedia");
});
return true;
} else {
if(this.removing) {
return false;
} else {
index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
if(0 <= index && index < this.playlist.length) {
this.removing = true;
$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() {
$(this).remove();
if(self.shuffled) {
var item = self.playlist[index];
$.each(self.original, function(i) {
if(self.original[i] === item) {
self.original.splice(i, 1);
return false; // Exit $.each
}
});
self.playlist.splice(index, 1);
} else {
self.original.splice(index, 1);
self.playlist.splice(index, 1);
}
if(self.original.length) {
if(index === self.current) {
self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
self.select(self.current);
} else if(index < self.current) {
self.current--;
}
} else {
$(self.cssSelector.jPlayer).jPlayer("clearMedia");
self.current = 0;
self.shuffled = false;
self._updateControls();
}
self.removing = false;
});
}
return true;
}
}
},
select: function(index) {
index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
if(0 <= index && index < this.playlist.length) {
this.current = index;
this._highlight(index);
$(this.cssSelector.jPlayer).jPlayer("setMedia", this.playlist[this.current]);
} else {
this.current = 0;
}
},
play: function(index) {
index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
if(0 <= index && index < this.playlist.length) {
if(this.playlist.length) {
this.select(index);
$(this.cssSelector.jPlayer).jPlayer("play");
}
} else if(index === undefined) {
$(this.cssSelector.jPlayer).jPlayer("play");
}
},
pause: function() {
$(this.cssSelector.jPlayer).jPlayer("pause");
},
next: function() {
var index = (this.current + 1 < this.playlist.length) ? this.current + 1 : 0;
if(this.loop) {
// See if we need to shuffle before looping to start, and only shuffle if more than 1 item.
if(index === 0 && this.shuffled && this.options.playlistOptions.shuffleOnLoop && this.playlist.length > 1) {
this.shuffle(true, true); // playNow
} else {
this.play(index);
}
} else {
// The index will be zero if it just looped round
if(index > 0) {
this.play(index);
}
}
},
previous: function() {
var index = (this.current - 1 >= 0) ? this.current - 1 : this.playlist.length - 1;
if(this.loop && this.options.playlistOptions.loopOnPrevious || index < this.playlist.length - 1) {
this.play(index);
}
},
shuffle: function(shuffled, playNow) {
var self = this;
if(shuffled === undefined) {
shuffled = !this.shuffled;
}
if(shuffled || shuffled !== this.shuffled) {
$(this.cssSelector.playlist + " ul").slideUp(this.options.playlistOptions.shuffleTime, function() {
self.shuffled = shuffled;
if(shuffled) {
self.playlist.sort(function() {
return 0.5 - Math.random();
});
} else {
self._originalPlaylist();
}
self._refresh(true); // Instant
if(playNow || !$(self.cssSelector.jPlayer).data("jPlayer").status.paused) {
self.play(0);
} else {
self.select(0);
}
$(this).slideDown(self.options.playlistOptions.shuffleTime);
});
}
},
blur: function(that) {
if($(this.cssSelector.jPlayer).jPlayer("option", "autoBlur")) {
$(that).blur();
}
}
};
})(jQuery);

File diff suppressed because one or more lines are too long

View File

@ -1,338 +0,0 @@
/*
* jPlayerInspector Plugin for jPlayer Plugin for jQuery JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2009 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* http://www.opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 1.0.5
* Date: 1st April 2014
*
* For use with jPlayer Version: 2.6.0+
*
* Note: Declare inspector instances after jPlayer instances. ie., Otherwise the jPlayer instance is nonsense.
*/
(function($, undefined) {
$.jPlayerInspector = {};
$.jPlayerInspector.i = 0;
$.jPlayerInspector.defaults = {
jPlayer: undefined, // The jQuery selector of the jPlayer instance to inspect.
idPrefix: "jplayer_inspector_",
visible: false
};
var methods = {
init: function(options) {
var self = this;
var $this = $(this);
var config = $.extend({}, $.jPlayerInspector.defaults, options);
$(this).data("jPlayerInspector", config);
config.id = $(this).attr("id");
config.jPlayerId = config.jPlayer.attr("id");
config.windowId = config.idPrefix + "window_" + $.jPlayerInspector.i;
config.statusId = config.idPrefix + "status_" + $.jPlayerInspector.i;
config.configId = config.idPrefix + "config_" + $.jPlayerInspector.i;
config.toggleId = config.idPrefix + "toggle_" + $.jPlayerInspector.i;
config.eventResetId = config.idPrefix + "event_reset_" + $.jPlayerInspector.i;
config.updateId = config.idPrefix + "update_" + $.jPlayerInspector.i;
config.eventWindowId = config.idPrefix + "event_window_" + $.jPlayerInspector.i;
config.eventId = {};
config.eventJq = {};
config.eventTimeout = {};
config.eventOccurrence = {};
$.each($.jPlayer.event, function(eventName,eventType) {
config.eventId[eventType] = config.idPrefix + "event_" + eventName + "_" + $.jPlayerInspector.i;
config.eventOccurrence[eventType] = 0;
});
var structure =
'<p><a href="#" id="' + config.toggleId + '">' + (config.visible ? "Hide" : "Show") + '</a> jPlayer Inspector</p>'
+ '<div id="' + config.windowId + '">'
+ '<div id="' + config.statusId + '"></div>'
+ '<div id="' + config.eventWindowId + '" style="padding:5px 5px 0 5px;background-color:#eee;border:1px dotted #000;">'
+ '<p style="margin:0 0 10px 0;"><strong>jPlayer events that have occurred over the past 1 second:</strong>'
+ '<br />(Backgrounds: <span style="padding:0 5px;background-color:#eee;border:1px dotted #000;">Never occurred</span> <span style="padding:0 5px;background-color:#fff;border:1px dotted #000;">Occurred before</span> <span style="padding:0 5px;background-color:#9f9;border:1px dotted #000;">Occurred</span> <span style="padding:0 5px;background-color:#ff9;border:1px dotted #000;">Multiple occurrences</span> <a href="#" id="' + config.eventResetId + '">reset</a>)</p>';
// MJP: Would use the next 3 lines for ease, but the events are just slapped on the page.
// $.each($.jPlayer.event, function(eventName,eventType) {
// structure += '<div id="' + config.eventId[eventType] + '" style="float:left;">' + eventName + '</div>';
// });
var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;";
// MJP: Doing it longhand so order and layout easier to control.
structure +=
'<div id="' + config.eventId[$.jPlayer.event.ready] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.setmedia] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.flashreset] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.resize] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.repeat] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.click] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.warning] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.loadstart] + '" style="clear:left;' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.progress] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.timeupdate] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.volumechange] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.error] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.play] + '" style="clear:left;' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.pause] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.waiting] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.playing] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.seeking] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.seeked] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.ended] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.loadeddata] + '" style="clear:left;' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.loadedmetadata] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.canplay] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.canplaythrough] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.suspend] + '" style="clear:left;' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.abort] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.emptied] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.stalled] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.ratechange] + '" style="' + eventStyle + '"></div>'
+ '<div id="' + config.eventId[$.jPlayer.event.durationchange] + '" style="' + eventStyle + '"></div>'
+ '<div style="clear:both"></div>';
// MJP: Would like a check here in case we missed an event.
// MJP: Check fails, since it is not on the page yet.
/* $.each($.jPlayer.event, function(eventName,eventType) {
if($("#" + config.eventId[eventType])[0] === undefined) {
structure += '<div id="' + config.eventId[eventType] + '" style="clear:left;' + eventStyle + '">' + eventName + '</div>';
}
});
*/
structure +=
'</div>'
+ '<p><a href="#" id="' + config.updateId + '">Update</a> jPlayer Inspector</p>'
+ '<div id="' + config.configId + '"></div>'
+ '</div>';
$(this).html(structure);
config.windowJq = $("#" + config.windowId);
config.statusJq = $("#" + config.statusId);
config.configJq = $("#" + config.configId);
config.toggleJq = $("#" + config.toggleId);
config.eventResetJq = $("#" + config.eventResetId);
config.updateJq = $("#" + config.updateId);
$.each($.jPlayer.event, function(eventName,eventType) {
config.eventJq[eventType] = $("#" + config.eventId[eventType]);
config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0);
config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) {
config.eventOccurrence[e.type]++;
if(config.eventOccurrence[e.type] > 1) {
config.eventJq[e.type].css("background-color","#ff9");
} else {
config.eventJq[e.type].css("background-color","#9f9");
}
config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
// The timer to handle the color
clearTimeout(config.eventTimeout[e.type]);
config.eventTimeout[e.type] = setTimeout(function() {
config.eventJq[e.type].css("background-color","#fff");
}, 1000);
// The timer to handle the occurences.
setTimeout(function() {
config.eventOccurrence[e.type]--;
config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
}, 1000);
if(config.visible) { // Update the status, if inspector open.
$this.jPlayerInspector("updateStatus");
}
});
});
config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) {
$this.jPlayerInspector("updateConfig");
});
config.toggleJq.click(function() {
if(config.visible) {
$(this).text("Show");
config.windowJq.hide();
config.statusJq.empty();
config.configJq.empty();
} else {
$(this).text("Hide");
config.windowJq.show();
config.updateJq.click();
}
config.visible = !config.visible;
$(this).blur();
return false;
});
config.eventResetJq.click(function() {
$.each($.jPlayer.event, function(eventName,eventType) {
config.eventJq[eventType].css("background-color","#eee");
});
$(this).blur();
return false;
});
config.updateJq.click(function() {
$this.jPlayerInspector("updateStatus");
$this.jPlayerInspector("updateConfig");
return false;
});
if(!config.visible) {
config.windowJq.hide();
} else {
// config.updateJq.click();
}
$.jPlayerInspector.i++;
return this;
},
destroy: function() {
$(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector");
$(this).empty();
},
updateConfig: function() { // This displays information about jPlayer's configuration in inspector
var jPlayerInfo = "<p>This jPlayer instance is running in your browser where:<br />"
for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) {
var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i];
jPlayerInfo += "&nbsp;jPlayer's <strong>" + solution + "</strong> solution is";
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) {
jPlayerInfo += " being <strong>used</strong> and will support:<strong>";
for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) {
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) {
jPlayerInfo += " " + format;
}
}
jPlayerInfo += "</strong><br />";
} else {
jPlayerInfo += " <strong>not required</strong><br />";
}
}
jPlayerInfo += "</p>";
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) {
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
jPlayerInfo += "<strong>Problem with jPlayer since both HTML5 and Flash are active.</strong>";
} else {
jPlayerInfo += "The <strong>HTML5 is active</strong>.";
}
} else {
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
jPlayerInfo += "The <strong>Flash is active</strong>.";
} else {
jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia().";
}
}
jPlayerInfo += "</p>";
var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType;
jPlayerInfo += "<p><code>status.formatType = '" + formatType + "'</code><br />";
if(formatType) {
jPlayerInfo += "<code>Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')</code>";
} else {
jPlayerInfo += "</p>";
}
jPlayerInfo += "<p><code>status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'</code></p>";
jPlayerInfo += "<p><code>status.media = {<br />";
for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) {
jPlayerInfo += "&nbsp;" + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "<br />"; // Some are strings
}
jPlayerInfo += "};</code></p>"
jPlayerInfo += "<p>";
jPlayerInfo += "<code>status.videoWidth = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.videoWidth + "'</code>";
jPlayerInfo += " | <code>status.videoHeight = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.videoHeight + "'</code>";
jPlayerInfo += "<br /><code>status.width = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.width + "'</code>";
jPlayerInfo += " | <code>status.height = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.height + "'</code>";
jPlayerInfo += "</p>";
+ "<p>Raw browser test for HTML5 support. Should equal a function if HTML5 is available.<br />";
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) {
jPlayerInfo += "<code>htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"</code><br />"
}
if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) {
jPlayerInfo += "<code>htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +"</code>";
}
jPlayerInfo += "</p>";
jPlayerInfo += "<p>This instance is using the constructor options:<br />"
+ "<code>$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({<br />"
+ "&nbsp;swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',<br />"
+ "&nbsp;solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',<br />"
+ "&nbsp;supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',<br />"
+ "&nbsp;preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',<br />"
+ "&nbsp;volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",<br />"
+ "&nbsp;muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",<br />"
+ "&nbsp;backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',<br />"
+ "&nbsp;cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',<br />"
+ "&nbsp;cssSelector: {";
var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector");
for(prop in cssSelector) {
// jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys.
jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "',"
}
jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me.
jPlayerInfo += "<br />&nbsp;},<br />"
+ "&nbsp;errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",<br />"
+ "&nbsp;warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "<br />"
+ "});</code></p>";
$(this).data("jPlayerInspector").configJq.html(jPlayerInfo);
return this;
},
updateStatus: function() { // This displays information about jPlayer's status in the inspector
$(this).data("jPlayerInspector").statusJq.html(
"<p>jPlayer is " +
($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") +
" at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." +
" (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" +
", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" +
", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" +
", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)</p>"
);
return this;
}
};
$.fn.jPlayerInspector = function( method ) {
// Method calling logic
if ( methods[method] ) {
return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
} else if ( typeof method === 'object' || ! method ) {
return methods.init.apply( this, arguments );
} else {
$.error( 'Method ' + method + ' does not exist on jQuery.jPlayerInspector' );
}
};
})(jQuery);

File diff suppressed because one or more lines are too long

View File

@ -1,33 +0,0 @@
{
"name": "jplayer",
"title": "jPlayer : HTML5 Audio & Video",
"description": "jPlayer allows you to create a media player with a consistent interface and experience across all browsers.",
"keywords": [
"audio",
"video",
"media",
"player",
"jplayer",
"html5",
"streaming"
],
"version": "2.4.0",
"author": {
"name": "Mark J Panaghiston",
"url": "http://happyworm.com/"
},
"licenses": [
{
"type": "MIT",
"url": "https://github.com/happyworm/jPlayer/blob/master/MIT-LICENSE.txt"
}
],
"dependencies": {
"jquery": ">=1.7"
},
"homepage": "http://jplayer.org/",
"demo": "http://jplayer.org/latest/demos/",
"docs": "http://jplayer.org/latest/developer-guide/",
"download": "http://jplayer.org/download/",
"bugs": "https://github.com/happyworm/jPlayer/issues"
}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -1,27 +0,0 @@
{
"name": "jplayer",
"version": "2.4.0",
"description": "The jQuery HTML5 Audio / Video Library",
"homepage": "http://www.jplayer.org/",
"keywords": [
"audio",
"video"
],
"dependencies": {
"jquery": ">1.7.0"
},
"licenses": [
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/MIT"
}
],
"repositories": [
{
"type": "git",
"url": "https://github.com/happyworm/jPlayer.git"
}
],
"github": "http://github.com/happyworm/jPlayer",
"main": "jquery.jplayer/jquery.jplayer.js"
}

View File

@ -1,579 +0,0 @@
/*
* jPlayer Player Plugin for Popcorn JavaScript Library
* http://www.jplayer.org
*
* Copyright (c) 2012 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* http://opensource.org/licenses/MIT
*
* Author: Mark J Panaghiston
* Version: 1.1.6
* Date: 27th November 2014
*
* For Popcorn Version: 1.3
* For jPlayer Version: 2.9.0
* Requires: jQuery 1.7+
* Note: jQuery dependancy cannot be removed since jPlayer 2 is a jQuery plugin. Use of jQuery will be kept to a minimum.
*/
(function(Popcorn) {
var JQUERY_SCRIPT = '//code.jquery.com/jquery-1.11.1.min.js', // Used if jQuery not already present.
JPLAYER_SCRIPT = '//code.jplayer.org/2.9.0/jplayer/jquery.jplayer.min.js', // Used if jPlayer not already present.
JPLAYER_SWFPATH = '//code.jplayer.org/2.9.0/jplayer/jquery.jplayer.swf', // Used if not specified in jPlayer options via SRC Object.
SOLUTION = 'html,flash', // The default solution option.
DEBUG = false, // Decided to leave the debugging option and console output in for the time being. Overhead is trivial.
jQueryDownloading = false, // Flag to stop multiple instances from each pulling in jQuery, thus corrupting it.
jPlayerDownloading = false, // Flag to stop multiple instances from each pulling in jPlayer, thus corrupting it.
format = { // Duplicate of jPlayer 2.5.0 object, to avoid always requiring jQuery and jPlayer to be loaded before performing the _canPlayType() test.
mp3: {
codec: 'audio/mpeg',
flashCanPlay: true,
media: 'audio'
},
m4a: { // AAC / MP4
codec: 'audio/mp4; codecs="mp4a.40.2"',
flashCanPlay: true,
media: 'audio'
},
m3u8a: { // AAC / MP4 / Apple HLS
codec: 'application/vnd.apple.mpegurl; codecs="mp4a.40.2"',
flashCanPlay: false,
media: 'audio'
},
m3ua: { // M3U
codec: 'audio/mpegurl',
flashCanPlay: false,
media: 'audio'
},
oga: { // OGG
codec: 'audio/ogg; codecs="vorbis, opus"',
flashCanPlay: false,
media: 'audio'
},
flac: { // FLAC
codec: 'audio/x-flac',
flashCanPlay: false,
media: 'audio'
},
wav: { // PCM
codec: 'audio/wav; codecs="1"',
flashCanPlay: false,
media: 'audio'
},
webma: { // WEBM
codec: 'audio/webm; codecs="vorbis"',
flashCanPlay: false,
media: 'audio'
},
fla: { // FLV / F4A
codec: 'audio/x-flv',
flashCanPlay: true,
media: 'audio'
},
rtmpa: { // RTMP AUDIO
codec: 'audio/rtmp; codecs="rtmp"',
flashCanPlay: true,
media: 'audio'
},
m4v: { // H.264 / MP4
codec: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',
flashCanPlay: true,
media: 'video'
},
m3u8v: { // H.264 / AAC / MP4 / Apple HLS
codec: 'application/vnd.apple.mpegurl; codecs="avc1.42E01E, mp4a.40.2"',
flashCanPlay: false,
media: 'video'
},
m3uv: { // M3U
codec: 'audio/mpegurl',
flashCanPlay: false,
media: 'video'
},
ogv: { // OGG
codec: 'video/ogg; codecs="theora, vorbis"',
flashCanPlay: false,
media: 'video'
},
webmv: { // WEBM
codec: 'video/webm; codecs="vorbis, vp8"',
flashCanPlay: false,
media: 'video'
},
flv: { // FLV / F4V
codec: 'video/x-flv',
flashCanPlay: true,
media: 'video'
},
rtmpv: { // RTMP VIDEO
codec: 'video/rtmp; codecs="rtmp"',
flashCanPlay: true,
media: 'video'
}
},
isObject = function(val) { // Basic check for Object
if(val && typeof val === 'object' && val.hasOwnProperty) {
return true;
} else {
return false;
}
},
getMediaType = function(url) { // Function to gleam the media type from the URL
var mediaType = false;
if(/\.mp3$/i.test(url)) {
mediaType = 'mp3';
} else if(/\.mp4$/i.test(url) || /\.m4v$/i.test(url)) {
mediaType = 'm4v';
} else if(/\.m4a$/i.test(url)) {
mediaType = 'm4a';
} else if(/\.ogg$/i.test(url) || /\.oga$/i.test(url)) {
mediaType = 'oga';
} else if(/\.ogv$/i.test(url)) {
mediaType = 'ogv';
} else if(/\.webm$/i.test(url)) {
mediaType = 'webmv';
}
return mediaType;
},
getSupplied = function(url) { // Function to generate a supplied option from an src object. ie., When supplied not specified.
var supplied = '',
separator = '';
if(isObject(url)) {
// Generate supplied option from object's properties. Non-format properties would be ignored by jPlayer. Order is unpredictable.
for(var prop in url) {
if(url.hasOwnProperty(prop)) {
supplied += separator + prop;
separator = ',';
}
}
}
if(DEBUG) console.log('getSupplied(): Generated: supplied = "' + supplied + '"');
return supplied;
};
Popcorn.player( 'jplayer', {
_canPlayType: function( containerType, url ) {
// url : Either a String or an Object structured similar a jPlayer media object. ie., As used by setMedia in jPlayer.
// The url object may also contain a solution and supplied property.
// Define the src object structure here!
var cType = containerType.toLowerCase(),
srcObj = {
media:{},
options:{}
},
rVal = false, // Only a boolean false means it is not supported.
mediaType;
if(cType !== 'video' && cType !== 'audio') {
if(typeof url === 'string') {
// Check it starts with http, so the URL is absolute... Well, it is not a perfect check.
if(/^http.*/i.test(url)) {
mediaType = getMediaType(url);
if(mediaType) {
srcObj.media[mediaType] = url;
srcObj.options.solution = SOLUTION;
srcObj.options.supplied = mediaType;
}
}
} else {
srcObj = url; // Assume the url is an src object.
}
// Check for Object and appropriate minimum data structure.
if(isObject(srcObj) && isObject(srcObj.media)) {
if(!isObject(srcObj.options)) {
srcObj.options = {};
}
if(!srcObj.options.solution) {
srcObj.options.solution = SOLUTION;
}
if(!srcObj.options.supplied) {
srcObj.options.supplied = getSupplied(srcObj.media);
}
// Figure out how jPlayer will play it.
// This may not work properly when both audio and video is supplied. ie., A media player. But it should return truethy and jPlayer can figure it out.
var solution = srcObj.options.solution.toLowerCase().split(","), // Create the solution array, with prority based on the order of the solution string.
supplied = srcObj.options.supplied.toLowerCase().split(","); // Create the supplied formats array, with prority based on the order of the supplied formats string.
for(var sol = 0; sol < solution.length; sol++) {
var solutionType = solution[sol].replace(/^\s+|\s+$/g, ""), //trim
checkingHtml = solutionType === 'html',
checkingFlash = solutionType === 'flash',
mediaElem;
for(var fmt = 0; fmt < supplied.length; fmt++) {
mediaType = supplied[fmt].replace(/^\s+|\s+$/g, ""); //trim
if(format[mediaType]) { // Check format is valid.
// Create an HTML5 media element for the type of media.
if(!mediaElem && checkingHtml) {
mediaElem = document.createElement(format[mediaType].media);
}
// See if the HTML5 media element can play the MIME / Codec type.
// Flash also returns the object if the format is playable, so it is truethy, but that html property is false.
// This assumes Flash is available, but that should be dealt with by jPlayer if that happens.
var htmlCanPlay = !!(mediaElem && mediaElem.canPlayType && mediaElem.canPlayType(format[mediaType].codec)),
htmlWillPlay = htmlCanPlay && checkingHtml,
flashWillPlay = format[mediaType].flashCanPlay && checkingFlash;
// The first one found will match what jPlayer uses.
if(htmlWillPlay || flashWillPlay) {
rVal = {
html: htmlWillPlay,
type: mediaType
};
sol = solution.length; // Exit solution loop
fmt = supplied.length; // Exit supplied loop
}
}
}
}
}
}
return rVal;
},
// _setup: function( options ) { // Warning: options is deprecated.
_setup: function() {
var media = this,
myPlayer, // The jQuery selector of the jPlayer element. Usually a <div>
jPlayerObj, // The jPlayer data instance. For performance and DRY code.
mediaType = 'unknown',
jpMedia = {},
jpOptions = {},
ready = false, // Used during init to override the annoying duration dependance in the track event padding during Popcorn's isReady(). ie., We is ready after loadeddata and duration can then be set real value at leisure.
duration = 0, // For the durationchange event with both HTML5 and Flash solutions. Used with 'ready' to keep control during the Popcorn isReady() via loadeddata event. (Duration=0 is bad.)
durationchangeId = null, // A timeout ID used with delayed durationchange event. (Because of the duration=NaN fudge to avoid Popcorn track event corruption.)
canplaythrough = false,
error = null, // The MediaError object.
dispatchDurationChange = function() {
if(ready) {
if(DEBUG) console.log('Dispatched event : durationchange : ' + duration);
media.dispatchEvent('durationchange');
} else {
if(DEBUG) console.log('DELAYED EVENT (!ready) : durationchange : ' + duration);
clearTimeout(durationchangeId); // Stop multiple triggers causing multiple timeouts running in parallel.
durationchangeId = setTimeout(dispatchDurationChange, 250);
}
},
jPlayerFlashEventsPatch = function() {
/* Events already supported by jPlayer Flash:
* loadstart
* loadedmetadata (M4A, M4V)
* progress
* play
* pause
* seeking
* seeked
* timeupdate
* ended
* volumechange
* error <- See the custom handler in jPlayerInit()
*/
/* Events patched:
* loadeddata
* durationchange
* canplaythrough
* playing
*/
/* Events NOT patched:
* suspend
* abort
* emptied
* stalled
* loadedmetadata (MP3)
* waiting
* canplay
* ratechange
*/
// Triggering patched events through the jPlayer Object so the events are homogeneous. ie., The contain the event.jPlayer data structure.
var checkDuration = function(event) {
if(event.jPlayer.status.duration !== duration) {
duration = event.jPlayer.status.duration;
dispatchDurationChange();
}
},
checkCanPlayThrough = function(event) {
if(!canplaythrough && event.jPlayer.status.seekPercent === 100) {
canplaythrough = true;
setTimeout(function() {
if(DEBUG) console.log('Trigger : canplaythrough');
jPlayerObj._trigger($.jPlayer.event.canplaythrough);
}, 0);
}
};
myPlayer.bind($.jPlayer.event.loadstart, function() {
setTimeout(function() {
if(DEBUG) console.log('Trigger : loadeddata');
jPlayerObj._trigger($.jPlayer.event.loadeddata);
}, 0);
})
.bind($.jPlayer.event.progress, function(event) {
checkDuration(event);
checkCanPlayThrough(event);
})
.bind($.jPlayer.event.timeupdate, function(event) {
checkDuration(event);
checkCanPlayThrough(event);
})
.bind($.jPlayer.event.play, function() {
setTimeout(function() {
if(DEBUG) console.log('Trigger : playing');
jPlayerObj._trigger($.jPlayer.event.playing);
}, 0);
});
if(DEBUG) console.log('Created CUSTOM event handlers for FLASH');
},
jPlayerInit = function() {
(function($) {
myPlayer = $('#' + media.id);
if(typeof media.src === 'string') {
mediaType = getMediaType(media.src);
jpMedia[mediaType] = media.src;
jpOptions.supplied = mediaType;
jpOptions.solution = SOLUTION;
} else if(isObject(media.src)) {
jpMedia = isObject(media.src.media) ? media.src.media : {};
jpOptions = isObject(media.src.options) ? media.src.options : {};
jpOptions.solution = jpOptions.solution || SOLUTION;
jpOptions.supplied = jpOptions.supplied || getSupplied(media.src.media);
}
// Allow the swfPath to be set to local server. ie., If the jPlayer Plugin is local and already on the page, then you can also use the local SWF.
jpOptions.swfPath = jpOptions.swfPath || JPLAYER_SWFPATH;
myPlayer.bind($.jPlayer.event.ready, function(event) {
if(event.jPlayer.flash.used) {
jPlayerFlashEventsPatch();
}
// Set the media andd load it, so that the Flash solution behaves similar to HTML5 solution.
// This also allows the loadstart event to be used to know jPlayer is ready.
$(this).jPlayer('setMedia', jpMedia).jPlayer('load');
});
// Do not auto-bubble the reserved events, nor the loadeddata and durationchange event, since the duration must be carefully handled when loadeddata event occurs.
// See the duration property code for more details. (Ranting.)
var reservedEvents = $.jPlayer.reservedEvent + ' loadeddata durationchange',
reservedEvent = reservedEvents.split(/\s+/g);
// Generate event handlers for all the standard HTML5 media events. (Except durationchange)
var bindEvent = function(name) {
myPlayer.bind($.jPlayer.event[name], function(event) {
if(DEBUG) console.log('Dispatched event: ' + name + (event && event.jPlayer ? ' (' + event.jPlayer.status.currentTime + 's)' : '')); // Must be after dispatch for some reason on Firefox/Opera
media.dispatchEvent(name);
});
if(DEBUG) console.log('Created event handler for: ' + name);
};
for(var eventName in $.jPlayer.event) {
if($.jPlayer.event.hasOwnProperty(eventName)) {
var nativeEvent = true;
for(var iRes in reservedEvent) {
if(reservedEvent.hasOwnProperty(iRes)) {
if(reservedEvent[iRes] === eventName) {
nativeEvent = false;
break;
}
}
}
if(nativeEvent) {
bindEvent(eventName);
} else {
if(DEBUG) console.log('Skipped auto event handler creation for: ' + eventName);
}
}
}
myPlayer.bind($.jPlayer.event.loadeddata, function(event) {
if(DEBUG) console.log('Dispatched event: loadeddata' + (event && event.jPlayer ? ' (' + event.jPlayer.status.currentTime + 's)' : ''));
media.dispatchEvent('loadeddata');
ready = true;
});
if(DEBUG) console.log('Created CUSTOM event handler for: loadeddata');
myPlayer.bind($.jPlayer.event.durationchange, function(event) {
duration = event.jPlayer.status.duration;
dispatchDurationChange();
});
if(DEBUG) console.log('Created CUSTOM event handler for: durationchange');
// The error event is a special case. Plus jPlayer error event assumes it is a broken URL. (It could also be a decoder error... Or aborted or a Network error.)
myPlayer.bind($.jPlayer.event.error, function(event) {
// Not sure how to handle the error situation. Popcorn does not appear to have the error or error.code property documented here: http://popcornjs.org/popcorn-docs/media-methods/
// If any error event happens, then something has gone pear shaped.
error = event.jPlayer.error; // Saving object pointer, not a copy of the object. Possible garbage collection issue... But the player is dead anyway, so don't care.
if(error.type === $.jPlayer.error.URL) {
error.code = 4; // MEDIA_ERR_SRC_NOT_SUPPORTED since jPlayer makes this assumption. It is the most common error, then the decode error. Never seen either of the other 2 error types occur.
} else {
error.code = 0; // It was a jPlayer error, not an HTML5 media error.
}
if(DEBUG) console.log('Dispatched event: error');
if(DEBUG) console.dir(error);
media.dispatchEvent('error');
});
if(DEBUG) console.log('Created CUSTOM event handler for: error');
Popcorn.player.defineProperty( media, 'error', {
set: function() {
// Read-only property
return error;
},
get: function() {
return error;
}
});
Popcorn.player.defineProperty( media, 'currentTime', {
set: function( val ) {
if(jPlayerObj.status.paused) {
myPlayer.jPlayer('pause', val);
} else {
myPlayer.jPlayer('play', val);
}
return val;
},
get: function() {
return jPlayerObj.status.currentTime;
}
});
/* The joy of duration and the loadeddata event isReady() handler
* The duration is assumed to be a NaN or a valid duration.
* jPlayer uses zero instead of a NaN and this screws up the Popcorn track event start/end arrays padding.
* This line here:
* videoDurationPlus = duration != duration ? Number.MAX_VALUE : duration + 1;
* Not sure why it is not simply:
* videoDurationPlus = Number.MAX_VALUE; // Who cares if the padding is close to the real duration?
* So if you trigger loadeddata before the duration is correct, the track event padding is screwed up. (It pads the start, not the end... Well, duration+1 = 0+1 = 1s)
* That line makes the MP3 Flash fallback difficult to setup. The whole MP3 will need to load before the duration is known.
* Planning on using a NaN for duration until a >0 value is found... Except with MP3, where seekPercent must be 100% before setting the duration.
* Why not just use a NaN during init... And then correct the duration later?
*/
Popcorn.player.defineProperty( media, 'duration', {
set: function() {
// Read-only property
if(ready) {
return duration;
} else {
return NaN;
}
},
get: function() {
if(ready) {
return duration; // Popcorn has initialized, we can now use duration zero or whatever without fear.
} else {
return NaN; // Keep the duration a NaN until after loadeddata event has occurred. Otherwise Popcorn track event padding is corrupted.
}
}
});
Popcorn.player.defineProperty( media, 'muted', {
set: function( val ) {
myPlayer.jPlayer('mute', val);
return jPlayerObj.options.muted;
},
get: function() {
return jPlayerObj.options.muted;
}
});
Popcorn.player.defineProperty( media, 'volume', {
set: function( val ) {
myPlayer.jPlayer('volume', val);
return jPlayerObj.options.volume;
},
get: function() {
return jPlayerObj.options.volume;
}
});
Popcorn.player.defineProperty( media, 'paused', {
set: function() {
// Read-only property
return jPlayerObj.status.paused;
},
get: function() {
return jPlayerObj.status.paused;
}
});
media.play = function() {
myPlayer.jPlayer('play');
};
media.pause = function() {
myPlayer.jPlayer('pause');
};
myPlayer.jPlayer(jpOptions); // Instance jPlayer. Note that the options should not have a ready event defined... Kill it by default?
jPlayerObj = myPlayer.data('jPlayer');
}(jQuery));
},
jPlayerCheck = function() {
if (!jQuery.jPlayer) {
if (!jPlayerDownloading) {
jPlayerDownloading = true;
Popcorn.getScript(JPLAYER_SCRIPT, function() {
jPlayerDownloading = false;
jPlayerInit();
});
} else {
setTimeout(jPlayerCheck, 250);
}
} else {
jPlayerInit();
}
},
jQueryCheck = function() {
if (!window.jQuery) {
if (!jQueryDownloading) {
jQueryDownloading = true;
Popcorn.getScript(JQUERY_SCRIPT, function() {
jQueryDownloading = false;
jPlayerCheck();
});
} else {
setTimeout(jQueryCheck, 250);
}
} else {
jPlayerCheck();
}
};
jQueryCheck();
},
_teardown: function() {
jQuery('#' + this.id).jPlayer('destroy');
}
});
}(Popcorn));

File diff suppressed because one or more lines are too long

View File

@ -1,551 +0,0 @@
/*! Blue Monday Skin for jPlayer 2.9.2 ~ (c) 2009-2014 Happyworm Ltd ~ MIT License */
/*
* Skin for jPlayer Plugin (jQuery JavaScript Library)
* http://www.jplayer.org
*
* Skin Name: Blue Monday
*
* Copyright (c) 2010 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* - http://www.opensource.org/licenses/mit-license.php
*
* Author: Silvia Benvenuti
* Skin Version: 5.1 (jPlayer 2.8.0)
* Date: 13th November 2014
*/
.jp-audio *:focus,
.jp-audio-stream *:focus,
.jp-video *:focus {
/* Disable the browser focus highlighting. */
outline: none; }
.jp-audio button::-moz-focus-inner,
.jp-audio-stream button::-moz-focus-inner,
.jp-video button::-moz-focus-inner {
/* Disable the browser CSS3 focus highlighting. */
border: 0; }
.jp-audio,
.jp-audio-stream,
.jp-video {
font-size: 16px;
font-family: Verdana, Arial, sans-serif;
line-height: 1.6;
color: #666;
border: 1px solid #009be3;
background-color: #eee; }
.jp-audio {
width: 420px; }
.jp-audio-stream {
width: 182px; }
.jp-video-270p {
width: 480px; }
.jp-video-360p {
width: 640px; }
.jp-video-full {
/* Rules for IE6 (full-screen) */
width: 480px;
height: 270px;
/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
position: static !important;
position: relative; }
/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
.jp-video-full div div {
z-index: 1000; }
.jp-video-full .jp-jplayer {
top: 0;
left: 0;
position: fixed !important;
position: relative;
/* Rules for IE6 (full-screen) */
overflow: hidden; }
.jp-video-full .jp-gui {
position: fixed !important;
position: static;
/* Rules for IE6 (full-screen) */
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1001;
/* 1 layer above the others. */ }
.jp-video-full .jp-interface {
position: absolute !important;
position: relative;
/* Rules for IE6 (full-screen) */
bottom: 0;
left: 0; }
.jp-interface {
position: relative;
background-color: #eee;
width: 100%; }
.jp-audio .jp-interface {
height: 80px; }
.jp-audio-stream .jp-interface {
height: 80px; }
.jp-video .jp-interface {
border-top: 1px solid #009be3; }
/* @group CONTROLS */
.jp-controls-holder {
clear: both;
width: 440px;
margin: 0 auto;
position: relative;
overflow: hidden;
top: -8px;
/* This negative value depends on the size of the text in jp-currentTime and jp-duration */ }
.jp-interface .jp-controls {
margin: 0;
padding: 0;
overflow: hidden; }
.jp-audio .jp-controls {
width: 380px;
padding: 20px 20px 0 20px; }
.jp-audio-stream .jp-controls {
position: absolute;
top: 20px;
left: 20px;
width: 142px; }
.jp-video .jp-type-single .jp-controls {
width: 78px;
margin-left: 200px; }
.jp-video .jp-type-playlist .jp-controls {
width: 134px;
margin-left: 172px; }
.jp-video .jp-controls {
float: left; }
.jp-controls button {
display: block;
float: left;
overflow: hidden;
text-indent: -9999px;
border: none;
cursor: pointer; }
.jp-play {
width: 40px;
height: 40px; }
.jp-play {
background: url("../image/jplayer.blue.monday.jpg") 0 0 no-repeat; }
.jp-play:focus {
background: url("../image/jplayer.blue.monday.jpg") -41px 0 no-repeat; }
.jp-state-playing .jp-play {
background: url("../image/jplayer.blue.monday.jpg") 0 -42px no-repeat; }
.jp-state-playing .jp-play:focus {
background: url("../image/jplayer.blue.monday.jpg") -41px -42px no-repeat; }
.jp-stop, .jp-previous, .jp-next {
width: 28px;
height: 28px;
margin-top: 6px; }
.jp-stop {
background: url("../image/jplayer.blue.monday.jpg") 0 -83px no-repeat;
margin-left: 10px; }
.jp-stop:focus {
background: url("../image/jplayer.blue.monday.jpg") -29px -83px no-repeat; }
.jp-previous {
background: url("../image/jplayer.blue.monday.jpg") 0 -112px no-repeat; }
.jp-previous:focus {
background: url("../image/jplayer.blue.monday.jpg") -29px -112px no-repeat; }
.jp-next {
background: url("../image/jplayer.blue.monday.jpg") 0 -141px no-repeat; }
.jp-next:focus {
background: url("../image/jplayer.blue.monday.jpg") -29px -141px no-repeat; }
/* @end */
/* @group progress bar */
.jp-progress {
overflow: hidden;
background-color: #ddd; }
.jp-audio .jp-progress {
position: absolute;
top: 32px;
height: 15px; }
.jp-audio .jp-type-single .jp-progress {
left: 110px;
width: 186px; }
.jp-audio .jp-type-playlist .jp-progress {
left: 166px;
width: 130px; }
.jp-video .jp-progress {
top: 0px;
left: 0px;
width: 100%;
height: 10px; }
.jp-seek-bar {
background: url("../image/jplayer.blue.monday.jpg") 0 -202px repeat-x;
width: 0px;
height: 100%;
cursor: pointer; }
.jp-play-bar {
background: url("../image/jplayer.blue.monday.jpg") 0 -218px repeat-x;
width: 0px;
height: 100%; }
/* The seeking class is added/removed inside jPlayer */
.jp-seeking-bg {
background: url("../image/jplayer.blue.monday.seeking.gif"); }
/* @end */
/* @group volume controls */
.jp-state-no-volume .jp-volume-controls {
display: none; }
.jp-volume-controls {
position: absolute;
top: 32px;
left: 308px;
width: 200px; }
.jp-audio-stream .jp-volume-controls {
left: 70px; }
.jp-video .jp-volume-controls {
top: 12px;
left: 50px; }
.jp-volume-controls button {
display: block;
position: absolute;
overflow: hidden;
text-indent: -9999px;
border: none;
cursor: pointer; }
.jp-mute,
.jp-volume-max {
width: 18px;
height: 15px; }
.jp-volume-max {
left: 74px; }
.jp-mute {
background: url("../image/jplayer.blue.monday.jpg") 0 -170px no-repeat; }
.jp-mute:focus {
background: url("../image/jplayer.blue.monday.jpg") -19px -170px no-repeat; }
.jp-state-muted .jp-mute {
background: url("../image/jplayer.blue.monday.jpg") -60px -170px no-repeat; }
.jp-state-muted .jp-mute:focus {
background: url("../image/jplayer.blue.monday.jpg") -79px -170px no-repeat; }
.jp-volume-max {
background: url("../image/jplayer.blue.monday.jpg") 0 -186px no-repeat; }
.jp-volume-max:focus {
background: url("../image/jplayer.blue.monday.jpg") -19px -186px no-repeat; }
.jp-volume-bar {
position: absolute;
overflow: hidden;
background: url("../image/jplayer.blue.monday.jpg") 0 -250px repeat-x;
top: 5px;
left: 22px;
width: 46px;
height: 5px;
cursor: pointer; }
.jp-volume-bar-value {
background: url("../image/jplayer.blue.monday.jpg") 0 -256px repeat-x;
width: 0px;
height: 5px; }
/* @end */
/* @group current time and duration */
.jp-audio .jp-time-holder {
position: absolute;
top: 50px; }
.jp-audio .jp-type-single .jp-time-holder {
left: 110px;
width: 186px; }
.jp-audio .jp-type-playlist .jp-time-holder {
left: 166px;
width: 130px; }
.jp-current-time,
.jp-duration {
width: 60px;
font-size: .64em;
font-style: oblique; }
.jp-current-time {
float: left;
display: inline;
cursor: default; }
.jp-duration {
float: right;
display: inline;
text-align: right;
cursor: pointer; }
.jp-video .jp-current-time {
margin-left: 20px; }
.jp-video .jp-duration {
margin-right: 20px; }
/* @end */
/* @group playlist */
.jp-details {
font-weight: bold;
text-align: center;
cursor: default; }
.jp-details,
.jp-playlist {
width: 100%;
background-color: #ccc;
border-top: 1px solid #009be3; }
.jp-type-single .jp-details,
.jp-type-playlist .jp-details {
border-top: none; }
.jp-details .jp-title {
margin: 0;
padding: 5px 20px;
font-size: .72em;
font-weight: bold; }
.jp-playlist ul {
list-style-type: none;
margin: 0;
padding: 0 20px;
font-size: .72em; }
.jp-playlist li {
padding: 5px 0 4px 20px;
border-bottom: 1px solid #eee; }
.jp-playlist li div {
display: inline; }
/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
div.jp-type-playlist div.jp-playlist li:last-child {
padding: 5px 0 5px 20px;
border-bottom: none; }
div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
list-style-type: square;
list-style-position: inside;
padding-left: 7px; }
div.jp-type-playlist div.jp-playlist a {
color: #333;
text-decoration: none; }
div.jp-type-playlist div.jp-playlist a:hover {
color: #0d88c1; }
div.jp-type-playlist div.jp-playlist a.jp-playlist-current {
color: #0d88c1; }
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
float: right;
display: inline;
text-align: right;
margin-right: 10px;
font-weight: bold;
color: #666; }
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
color: #0d88c1; }
div.jp-type-playlist div.jp-playlist span.jp-free-media {
float: right;
display: inline;
text-align: right;
margin-right: 10px; }
div.jp-type-playlist div.jp-playlist span.jp-free-media a {
color: #666; }
div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover {
color: #0d88c1; }
span.jp-artist {
font-size: .8em;
color: #666; }
/* @end */
.jp-video-play {
width: 100%;
overflow: hidden;
/* Important for nested negative margins to work in modern browsers */
cursor: pointer;
background-color: transparent;
/* Makes IE9 work with the active area over the whole video area. IE6/7/8 only have the button as active area. */ }
.jp-video-270p .jp-video-play {
margin-top: -270px;
height: 270px; }
.jp-video-360p .jp-video-play {
margin-top: -360px;
height: 360px; }
.jp-video-full .jp-video-play {
height: 100%; }
.jp-video-play-icon {
position: relative;
display: block;
width: 112px;
height: 100px;
margin-left: -56px;
margin-top: -50px;
left: 50%;
top: 50%;
background: url("../image/jplayer.blue.monday.video.play.png") 0 0 no-repeat;
text-indent: -9999px;
border: none;
cursor: pointer; }
.jp-video-play-icon:focus {
background: url("../image/jplayer.blue.monday.video.play.png") 0 -100px no-repeat; }
.jp-jplayer audio,
.jp-jplayer {
width: 0px;
height: 0px; }
.jp-jplayer {
background-color: #000000; }
/* @group TOGGLES */
/* The audio toggles are nested inside jp-time-holder */
.jp-toggles {
padding: 0;
margin: 0 auto;
overflow: hidden; }
.jp-audio .jp-type-single .jp-toggles {
width: 25px; }
.jp-audio .jp-type-playlist .jp-toggles {
width: 55px;
margin: 0;
position: absolute;
left: 325px;
top: 50px; }
.jp-video .jp-toggles {
position: absolute;
right: 16px;
margin: 0;
margin-top: 10px;
width: 100px; }
.jp-toggles button {
display: block;
float: left;
width: 25px;
height: 18px;
text-indent: -9999px;
line-height: 100%;
/* need this for IE6 */
border: none;
cursor: pointer; }
.jp-full-screen {
background: url("../image/jplayer.blue.monday.jpg") 0 -310px no-repeat;
margin-left: 20px; }
.jp-full-screen:focus {
background: url("../image/jplayer.blue.monday.jpg") -30px -310px no-repeat; }
.jp-state-full-screen .jp-full-screen {
background: url("../image/jplayer.blue.monday.jpg") -60px -310px no-repeat; }
.jp-state-full-screen .jp-full-screen:focus {
background: url("../image/jplayer.blue.monday.jpg") -90px -310px no-repeat; }
.jp-repeat {
background: url("../image/jplayer.blue.monday.jpg") 0 -290px no-repeat; }
.jp-repeat:focus {
background: url("../image/jplayer.blue.monday.jpg") -30px -290px no-repeat; }
.jp-state-looped .jp-repeat {
background: url("../image/jplayer.blue.monday.jpg") -60px -290px no-repeat; }
.jp-state-looped .jp-repeat:focus {
background: url("../image/jplayer.blue.monday.jpg") -90px -290px no-repeat; }
.jp-shuffle {
background: url("../image/jplayer.blue.monday.jpg") 0 -270px no-repeat;
margin-left: 5px; }
.jp-shuffle:focus {
background: url("../image/jplayer.blue.monday.jpg") -30px -270px no-repeat; }
.jp-state-shuffled .jp-shuffle {
background: url("../image/jplayer.blue.monday.jpg") -60px -270px no-repeat; }
.jp-state-shuffled .jp-shuffle:focus {
background: url("../image/jplayer.blue.monday.jpg") -90px -270px no-repeat; }
/* @end */
/* @group NO SOLUTION error feedback */
.jp-no-solution {
padding: 5px;
font-size: .8em;
background-color: #eee;
border: 2px solid #009be3;
color: #000;
display: none; }
.jp-no-solution a {
color: #000; }
.jp-no-solution span {
font-size: 1em;
display: block;
text-align: center;
font-weight: bold; }
/* @end */

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,640 +0,0 @@
/*
* Skin for jPlayer Plugin (jQuery JavaScript Library)
* http://www.jplayer.org
*
* Skin Name: Blue Monday
*
* Copyright (c) 2010-2012 Happyworm Ltd
* Dual licensed under the MIT and GPL licenses.
* - http://www.opensource.org/licenses/mit-license.php
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Silvia Benvenuti
* Skin Version: 4.3 (jPlayer 2.2.0)
* Date: 19th November 2012
*/
div.jp-audio,
div.jp-audio-stream,
div.jp-video {
/* Edit the font-size to counteract inherited font sizing.
* Eg. 1.25em = 1 / 0.8em
*/
font-size:1.25em; /* 1.25em for testing in site pages */ /* No parent CSS that can effect the size in the demos ZIP */
font-family:Verdana, Arial, sans-serif;
line-height:1.6;
color: #666;
border:1px solid #009be3;
background-color:#eee;
}
div.jp-audio {
width:420px;
}
div.jp-audio-stream {
width:182px;
}
div.jp-video-270p {
width:480px;
}
div.jp-video-360p {
width:640px;
}
div.jp-video-full {
/* Rules for IE6 (full-screen) */
width:480px;
height:270px;
/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
position:static !important; position:relative;
}
/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
div.jp-video-full div div {
z-index:1000;
}
div.jp-video-full div.jp-jplayer {
top: 0;
left: 0;
position: fixed !important; position: relative; /* Rules for IE6 (full-screen) */
overflow: hidden;
}
div.jp-video-full div.jp-gui {
position: fixed !important; position: static; /* Rules for IE6 (full-screen) */
top: 0;
left: 0;
width:100%;
height:100%;
z-index:1001; /* 1 layer above the others. */
}
div.jp-video-full div.jp-interface {
position: absolute !important; position: relative; /* Rules for IE6 (full-screen) */
bottom: 0;
left: 0;
}
div.jp-interface {
position: relative;
background-color:#eee;
width:100%;
}
div.jp-audio div.jp-type-single div.jp-interface {
height:80px;
}
div.jp-audio div.jp-type-playlist div.jp-interface {
height:80px;
}
div.jp-audio-stream div.jp-type-single div.jp-interface {
height:80px;
}
div.jp-video div.jp-interface {
border-top:1px solid #009be3;
}
/* @group CONTROLS */
div.jp-controls-holder {
clear: both;
width:440px;
margin:0 auto;
position: relative;
overflow:hidden;
top:-8px; /* This negative value depends on the size of the text in jp-currentTime and jp-duration */
}
div.jp-interface ul.jp-controls {
list-style-type:none;
margin:0;
padding: 0;
overflow:hidden;
}
div.jp-audio ul.jp-controls {
width: 380px;
padding:20px 20px 0 20px;
}
div.jp-audio-stream ul.jp-controls {
width: 142px;
padding:20px 20px 0 20px;
}
div.jp-video div.jp-type-single ul.jp-controls {
width: 78px;
margin-left: 200px;
}
div.jp-video div.jp-type-playlist ul.jp-controls {
width: 134px;
margin-left: 172px;
}
div.jp-video ul.jp-controls,
div.jp-interface ul.jp-controls li {
display:inline;
float: left;
}
div.jp-interface ul.jp-controls a {
display:block;
overflow:hidden;
text-indent:-9999px;
}
a.jp-play,
a.jp-pause {
width:40px;
height:40px;
}
a.jp-play {
background: url("jplayer.blue.monday.jpg") 0 0 no-repeat;
}
a.jp-play:hover {
background: url("jplayer.blue.monday.jpg") -41px 0 no-repeat;
}
a.jp-pause {
background: url("jplayer.blue.monday.jpg") 0 -42px no-repeat;
display: none;
}
a.jp-pause:hover {
background: url("jplayer.blue.monday.jpg") -41px -42px no-repeat;
}
a.jp-stop, a.jp-previous, a.jp-next {
width:28px;
height:28px;
margin-top:6px;
}
a.jp-stop {
background: url("jplayer.blue.monday.jpg") 0 -83px no-repeat;
margin-left:10px;
}
a.jp-stop:hover {
background: url("jplayer.blue.monday.jpg") -29px -83px no-repeat;
}
a.jp-previous {
background: url("jplayer.blue.monday.jpg") 0 -112px no-repeat;
}
a.jp-previous:hover {
background: url("jplayer.blue.monday.jpg") -29px -112px no-repeat;
}
a.jp-next {
background: url("jplayer.blue.monday.jpg") 0 -141px no-repeat;
}
a.jp-next:hover {
background: url("jplayer.blue.monday.jpg") -29px -141px no-repeat;
}
/* @end */
/* @group progress bar */
div.jp-progress {
overflow:hidden;
background-color: #ddd;
}
div.jp-audio div.jp-progress {
position: absolute;
top:32px;
height:15px;
}
div.jp-audio div.jp-type-single div.jp-progress {
left:110px;
width:186px;
}
div.jp-audio div.jp-type-playlist div.jp-progress {
left:166px;
width:130px;
}
div.jp-video div.jp-progress {
top:0px;
left:0px;
width:100%;
height:10px;
}
div.jp-seek-bar {
background: url("jplayer.blue.monday.jpg") 0 -202px repeat-x;
width:0px;
height:100%;
cursor: pointer;
}
div.jp-play-bar {
background: url("jplayer.blue.monday.jpg") 0 -218px repeat-x ;
width:0px;
height:100%;
}
/* The seeking class is added/removed inside jPlayer */
div.jp-seeking-bg {
background: url("jplayer.blue.monday.seeking.gif");
}
/* @end */
/* @group volume controls */
a.jp-mute,
a.jp-unmute,
a.jp-volume-max {
width:18px;
height:15px;
margin-top:12px;
}
div.jp-audio div.jp-type-single a.jp-mute,
div.jp-audio div.jp-type-single a.jp-unmute {
margin-left: 210px;
}
div.jp-audio div.jp-type-playlist a.jp-mute,
div.jp-audio div.jp-type-playlist a.jp-unmute {
margin-left: 154px;
}
div.jp-audio-stream div.jp-type-single a.jp-mute,
div.jp-audio-stream div.jp-type-single a.jp-unmute {
margin-left:10px;
}
div.jp-audio a.jp-volume-max,
div.jp-audio-stream a.jp-volume-max {
margin-left: 56px;
}
div.jp-video a.jp-mute,
div.jp-video a.jp-unmute,
div.jp-video a.jp-volume-max {
position: absolute;
top:12px;
margin-top:0;
}
div.jp-video a.jp-mute,
div.jp-video a.jp-unmute {
left: 50px;
}
div.jp-video a.jp-volume-max {
left: 134px;
}
a.jp-mute {
background: url("jplayer.blue.monday.jpg") 0 -170px no-repeat;
}
a.jp-mute:hover {
background: url("jplayer.blue.monday.jpg") -19px -170px no-repeat;
}
a.jp-unmute {
background: url("jplayer.blue.monday.jpg") -60px -170px no-repeat;
display: none;
}
a.jp-unmute:hover {
background: url("jplayer.blue.monday.jpg") -79px -170px no-repeat;
}
a.jp-volume-max {
background: url("jplayer.blue.monday.jpg") 0 -186px no-repeat;
}
a.jp-volume-max:hover {
background: url("jplayer.blue.monday.jpg") -19px -186px no-repeat;
}
div.jp-volume-bar {
position: absolute;
overflow:hidden;
background: url("jplayer.blue.monday.jpg") 0 -250px repeat-x;
width:46px;
height:5px;
cursor: pointer;
}
div.jp-audio div.jp-volume-bar {
top:37px;
left:330px;
}
div.jp-audio-stream div.jp-volume-bar {
top:37px;
left:92px;
}
div.jp-video div.jp-volume-bar {
top:17px;
left:72px;
}
div.jp-volume-bar-value {
background: url("jplayer.blue.monday.jpg") 0 -256px repeat-x;
width:0px;
height:5px;
}
/* @end */
/* @group current time and duration */
div.jp-audio div.jp-time-holder {
position:absolute;
top:50px;
}
div.jp-audio div.jp-type-single div.jp-time-holder {
left:110px;
width:186px;
}
div.jp-audio div.jp-type-playlist div.jp-time-holder {
left:166px;
width:130px;
}
div.jp-current-time,
div.jp-duration {
width:60px;
font-size:.64em;
font-style:oblique;
}
div.jp-current-time {
float: left;
display:inline;
}
div.jp-duration {
float: right;
display:inline;
text-align: right;
}
div.jp-video div.jp-current-time {
margin-left:20px;
}
div.jp-video div.jp-duration {
margin-right:20px;
}
/* @end */
/* @group playlist */
div.jp-title {
font-weight:bold;
text-align:center;
}
div.jp-title,
div.jp-playlist {
width:100%;
background-color:#ccc;
border-top:1px solid #009be3;
}
div.jp-type-single div.jp-title,
div.jp-type-playlist div.jp-title,
div.jp-type-single div.jp-playlist {
border-top:none;
}
div.jp-title ul,
div.jp-playlist ul {
list-style-type:none;
margin:0;
padding:0 20px;
font-size:.72em;
}
div.jp-title li {
padding:5px 0;
font-weight:bold;
}
div.jp-playlist li {
padding:5px 0 4px 20px;
border-bottom:1px solid #eee;
}
div.jp-playlist li div {
display:inline;
}
/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
div.jp-type-playlist div.jp-playlist li:last-child {
padding:5px 0 5px 20px;
border-bottom:none;
}
div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
list-style-type:square;
list-style-position:inside;
padding-left:7px;
}
div.jp-type-playlist div.jp-playlist a {
color: #333;
text-decoration: none;
}
div.jp-type-playlist div.jp-playlist a:hover {
color:#0d88c1;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-current {
color:#0d88c1;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
float:right;
display:inline;
text-align:right;
margin-right:10px;
font-weight:bold;
color:#666;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
color:#0d88c1;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media {
float:right;
display:inline;
text-align:right;
margin-right:10px;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media a{
color:#666;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{
color:#0d88c1;
}
span.jp-artist {
font-size:.8em;
color:#666;
}
/* @end */
div.jp-video-play {
width:100%;
overflow:hidden; /* Important for nested negative margins to work in modern browsers */
cursor:pointer;
background-color:rgba(0,0,0,0); /* Makes IE9 work with the active area over the whole video area. IE6/7/8 only have the button as active area. */
}
div.jp-video-270p div.jp-video-play {
margin-top:-270px;
height:270px;
}
div.jp-video-360p div.jp-video-play {
margin-top:-360px;
height:360px;
}
div.jp-video-full div.jp-video-play {
height:100%;
}
a.jp-video-play-icon {
position:relative;
display:block;
width: 112px;
height: 100px;
margin-left:-56px;
margin-top:-50px;
left:50%;
top:50%;
background: url("jplayer.blue.monday.video.play.png") 0 0 no-repeat;
text-indent:-9999px;
}
div.jp-video-play:hover a.jp-video-play-icon {
background: url("jplayer.blue.monday.video.play.png") 0 -100px no-repeat;
}
div.jp-jplayer audio,
div.jp-jplayer {
width:0px;
height:0px;
}
div.jp-jplayer {
background-color: #000000;
}
/* @group TOGGLES */
/* The audio toggles are nested inside jp-time-holder */
ul.jp-toggles {
list-style-type:none;
padding:0;
margin:0 auto;
overflow:hidden;
}
div.jp-audio .jp-type-single ul.jp-toggles {
width:25px;
}
div.jp-audio .jp-type-playlist ul.jp-toggles {
width:55px;
margin: 0;
position: absolute;
left: 325px;
top: 50px;
}
div.jp-video ul.jp-toggles {
margin-top:10px;
width:100px;
}
ul.jp-toggles li {
display:block;
float:right;
}
ul.jp-toggles li a {
display:block;
width:25px;
height:18px;
text-indent:-9999px;
line-height:100%; /* need this for IE6 */
}
a.jp-full-screen {
background: url("jplayer.blue.monday.jpg") 0 -310px no-repeat;
margin-left: 20px;
}
a.jp-full-screen:hover {
background: url("jplayer.blue.monday.jpg") -30px -310px no-repeat;
}
a.jp-restore-screen {
background: url("jplayer.blue.monday.jpg") -60px -310px no-repeat;
margin-left: 20px;
}
a.jp-restore-screen:hover {
background: url("jplayer.blue.monday.jpg") -90px -310px no-repeat;
}
a.jp-repeat {
background: url("jplayer.blue.monday.jpg") 0 -290px no-repeat;
}
a.jp-repeat:hover {
background: url("jplayer.blue.monday.jpg") -30px -290px no-repeat;
}
a.jp-repeat-off {
background: url("jplayer.blue.monday.jpg") -60px -290px no-repeat;
}
a.jp-repeat-off:hover {
background: url("jplayer.blue.monday.jpg") -90px -290px no-repeat;
}
a.jp-shuffle {
background: url("jplayer.blue.monday.jpg") 0 -270px no-repeat;
margin-left: 5px;
}
a.jp-shuffle:hover {
background: url("jplayer.blue.monday.jpg") -30px -270px no-repeat;
}
a.jp-shuffle-off {
background: url("jplayer.blue.monday.jpg") -60px -270px no-repeat;
margin-left: 5px;
}
a.jp-shuffle-off:hover {
background: url("jplayer.blue.monday.jpg") -90px -270px no-repeat;
}
/* @end */
/* @group NO SOLUTION error feedback */
.jp-no-solution {
padding:5px;
font-size:.8em;
background-color:#eee;
border:2px solid #009be3;
color:#000;
display:none;
}
.jp-no-solution a {
color:#000;
}
.jp-no-solution span {
font-size:1em;
display:block;
text-align:center;
font-weight:bold;
}
/* @end */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,42 +0,0 @@
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div id="{{WRAPPER}}" class="jp-audio" role="application" aria-label="media player">
<div class="jp-type-playlist">
<div class="jp-gui jp-interface">
<div class="jp-controls">
<button class="jp-previous" role="button" tabindex="0">previous</button>
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-next" role="button" tabindex="0">next</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
</div>
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-time-holder">
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
<button class="jp-shuffle" role="button" tabindex="0">shuffle</button>
</div>
</div>
<div class="jp-playlist">
<ul>
<li>&nbsp;</li>
</ul>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,37 +0,0 @@
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div id="{{WRAPPER}}" class="jp-audio" role="application" aria-label="media player">
<div class="jp-type-single">
<div class="jp-gui jp-interface">
<div class="jp-controls">
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
</div>
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-time-holder">
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
</div>
</div>
</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,24 +0,0 @@
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div id="{{WRAPPER}}" class="jp-audio-stream" role="application" aria-label="media player">
<div class="jp-type-single">
<div class="jp-gui jp-interface">
<div class="jp-controls">
<button class="jp-play" role="button" tabindex="0">play</button>
</div>
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,52 +0,0 @@
<div id="{{WRAPPER}}" class="jp-video " role="application" aria-label="media player">
<div class="jp-type-playlist">
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div class="jp-gui">
<div class="jp-video-play">
<button class="jp-video-play-icon" role="button" tabindex="0">play</button>
</div>
<div class="jp-interface">
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-controls-holder">
<div class="jp-controls">
<button class="jp-previous" role="button" tabindex="0">previous</button>
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-next" role="button" tabindex="0">next</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
</div>
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
<button class="jp-shuffle" role="button" tabindex="0">shuffle</button>
<button class="jp-full-screen" role="button" tabindex="0">full screen</button>
</div>
</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
</div>
</div>
<div class="jp-playlist">
<ul>
<!-- The method Playlist.displayPlaylist() uses this unordered list -->
<li>&nbsp;</li>
</ul>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,43 +0,0 @@
<div id="{{WRAPPER}}" class="jp-video " role="application" aria-label="media player">
<div class="jp-type-single">
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div class="jp-gui">
<div class="jp-video-play">
<button class="jp-video-play-icon" role="button" tabindex="0">play</button>
</div>
<div class="jp-interface">
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-controls-holder">
<div class="jp-controls">
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
</div>
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
<button class="jp-full-screen" role="button" tabindex="0">full screen</button>
</div>
</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
</div>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,40 +0,0 @@
<div id="{{jquery_jplayer_id}}" class="jp-jplayer"></div>
<div id="{{jp_container_id}}" class="jp-audio">
<div class="jp-type-single">
<div class="jp-gui jp-interface">
<ul class="jp-controls">
<li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
<li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
<li><a href="javascript:;" class="jp-stop" tabindex="1">stop</a></li>
<li><a href="javascript:;" class="jp-mute" tabindex="1" title="mute">mute</a></li>
<li><a href="javascript:;" class="jp-unmute" tabindex="1" title="unmute">unmute</a></li>
<li><a href="javascript:;" class="jp-volume-max" tabindex="1" title="max volume">max volume</a></li>
</ul>
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
<div class="jp-time-holder">
<div class="jp-current-time"></div>
<div class="jp-duration"></div>
<ul class="jp-toggles">
<li><a href="javascript:;" class="jp-repeat" tabindex="1" title="repeat">repeat</a></li>
<li><a href="javascript:;" class="jp-repeat-off" tabindex="1" title="repeat off">repeat off</a></li>
</ul>
</div>
</div>
<div class="jp-title">
<ul>
<li>{{title}}</li>
</ul>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,572 +0,0 @@
/*! Pink Flag Skin for jPlayer 2.9.2 ~ (c) 2009-2014 Happyworm Ltd ~ MIT License */
/*
* Skin for jPlayer Plugin (jQuery JavaScript Library)
* http://www.jplayer.org
*
* Skin Name: Pink Flag
*
* Copyright (c) 2012 - 2014 Happyworm Ltd
* Licensed under the MIT license.
* - http://www.opensource.org/licenses/mit-license.php
*
* Author: Silvia Benvenuti
* Skin Version: 2.1 (jPlayer 2.8.0)
* Date: 13th November 2014
*/
.jp-audio *:focus,
.jp-audio-stream *:focus,
.jp-video *:focus {
/* Disable the browser focus highlighting. */
outline: none; }
.jp-audio button::-moz-focus-inner,
.jp-audio-stream button::-moz-focus-inner,
.jp-video button::-moz-focus-inner {
/* Disable the browser CSS3 focus highlighting. */
border: 0; }
.jp-audio,
.jp-audio-stream,
.jp-video {
font-size: 16px;
font-family: Verdana, Arial, sans-serif;
line-height: 1.6;
color: #fff;
border-top: 1px solid #554461;
border-left: 1px solid #554461;
border-right: 1px solid #180a1f;
border-bottom: 1px solid #180a1f;
background-color: #3a2a45; }
.jp-audio {
width: 201px;
padding: 20px; }
.jp-audio-stream {
width: 101px;
padding: 20px 20px 10px 20px; }
.jp-video-270p {
width: 480px; }
.jp-video-360p {
width: 640px; }
.jp-video-full {
/* Rules for IE6 (full-screen) */
width: 480px;
height: 270px;
/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
position: static !important;
position: relative; }
/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
.jp-video-full div div {
z-index: 1000; }
.jp-video-full .jp-jplayer {
top: 0;
left: 0;
position: fixed !important;
position: relative;
/* Rules for IE6 (full-screen) */
overflow: hidden; }
.jp-video-full .jp-gui {
position: fixed !important;
position: static;
/* Rules for IE6 (full-screen) */
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1001;
/* 1 layer above the others. */ }
.jp-video-full .jp-interface {
position: absolute !important;
position: relative;
/* Rules for IE6 (full-screen) */
bottom: 0;
left: 0; }
.jp-interface {
position: relative;
width: 100%;
background-color: #3a2a45;
/* Required for the full screen */ }
/* @group CONTROLS */
.jp-video .jp-controls-holder {
clear: both;
width: 440px;
margin: 0 auto 10px auto;
position: relative;
overflow: hidden; }
.jp-audio .jp-controls-holder {
height: 80px; }
.jp-audio-stream .jp-controls-holder {
height: 50px; }
.jp-controls {
background: url("../image/jplayer.pink.flag.jpg") 0 0 no-repeat;
padding: 1px 0 2px 1px;
overflow: hidden;
width: 201px;
height: 34px; }
.jp-audio .jp-controls,
.jp-audio-stream .jp-controls {
margin: 0 auto; }
.jp-audio-stream .jp-controls {
width: 100px; }
.jp-video .jp-controls {
margin: 0 0 0 115px;
float: left;
display: inline;
/* need this to fix IE6 double margin */ }
.jp-controls button {
display: block;
float: left;
overflow: hidden;
text-indent: -9999px;
height: 34px;
margin: 0 1px 2px 0;
padding: 0;
border: none;
cursor: pointer; }
/* @group single player controls */
.jp-type-single .jp-controls button {
width: 99px; }
.jp-type-single .jp-play {
background: url("../image/jplayer.pink.flag.jpg") 0px -40px no-repeat; }
.jp-type-single .jp-play:focus {
background: url("../image/jplayer.pink.flag.jpg") -100px -40px no-repeat; }
.jp-state-playing .jp-type-single .jp-play {
background: url("../image/jplayer.pink.flag.jpg") 0px -120px no-repeat; }
.jp-state-playing .jp-type-single .jp-play:focus {
background: url("../image/jplayer.pink.flag.jpg") -100px -120px no-repeat; }
/* The right border is normally in the ul background image. */
.jp-audio-stream .jp-play,
.jp-audio-stream .jp-pause {
border-right: 1px solid #180920; }
.jp-type-single .jp-stop {
background: url("../image/jplayer.pink.flag.jpg") 0px -80px no-repeat; }
.jp-type-single .jp-stop:focus {
background: url("../image/jplayer.pink.flag.jpg") -100px -80px no-repeat; }
/* @end */
/* @group playlist player controls */
.jp-type-playlist .jp-controls button {
width: 49px; }
.jp-type-playlist .jp-play {
background: url("../image/jplayer.pink.flag.jpg") -24px -40px no-repeat; }
.jp-type-playlist .jp-play:focus {
background: url("../image/jplayer.pink.flag.jpg") -124px -40px no-repeat; }
.jp-state-playing div.jp-type-playlist .jp-play {
background: url("../image/jplayer.pink.flag.jpg") -24px -120px no-repeat; }
.jp-state-playing div.jp-type-playlist .jp-play:focus {
background: url("../image/jplayer.pink.flag.jpg") -124px -120px no-repeat; }
.jp-type-playlist .jp-stop {
background: url("../image/jplayer.pink.flag.jpg") -24px -80px no-repeat; }
.jp-type-playlist .jp-stop:focus {
background: url("../image/jplayer.pink.flag.jpg") -124px -80px no-repeat; }
.jp-type-playlist .jp-previous {
background: url("../image/jplayer.pink.flag.jpg") -24px -200px no-repeat; }
.jp-type-playlist .jp-previous:focus {
background: url("../image/jplayer.pink.flag.jpg") -124px -200px no-repeat; }
.jp-type-playlist .jp-next {
background: url("../image/jplayer.pink.flag.jpg") -24px -160px no-repeat; }
.jp-type-playlist .jp-next:focus {
background: url("../image/jplayer.pink.flag.jpg") -124px -160px no-repeat; }
/* @end */
/* @group TOGGLES */
.jp-toggles {
padding: 0;
margin: 0 auto;
overflow: hidden; }
.jp-audio .jp-toggles {
width: 55px; }
.jp-audio .jp-type-single .jp-toggles {
width: 25px; }
.jp-video .jp-toggles {
float: left;
width: 105px;
margin: 10px 0 0 15px; }
.jp-toggles button {
display: block;
float: left;
width: 25px;
height: 18px;
text-indent: -9999px;
line-height: 100%;
/* need this for IE6 */
border: none;
cursor: pointer; }
.jp-full-screen {
background: url("../image/jplayer.pink.flag.jpg") 0 -420px no-repeat;
margin-left: 15px; }
.jp-full-screen:focus {
background: url("../image/jplayer.pink.flag.jpg") -30px -420px no-repeat; }
.jp-state-full-screen .jp-full-screen {
background: url("../image/jplayer.pink.flag.jpg") -60px -420px no-repeat; }
.jp-state-full-screen .jp-full-screen:focus {
background: url("../image/jplayer.pink.flag.jpg") -90px -420px no-repeat; }
.jp-repeat {
background: url("../image/jplayer.pink.flag.jpg") 0 -440px no-repeat;
margin-left: 0; }
.jp-repeat:focus {
background: url("../image/jplayer.pink.flag.jpg") -30px -440px no-repeat; }
.jp-state-looped .jp-repeat {
background: url("../image/jplayer.pink.flag.jpg") -60px -440px no-repeat; }
.jp-state-looped .jp-repeat:focus {
background: url("../image/jplayer.pink.flag.jpg") -90px -440px no-repeat; }
.jp-shuffle {
background: url("../image/jplayer.pink.flag.jpg") 0 -460px no-repeat;
margin-left: 15px; }
.jp-shuffle:focus {
background: url("../image/jplayer.pink.flag.jpg") -30px -460px no-repeat; }
.jp-state-shuffled .jp-shuffle {
background: url("../image/jplayer.pink.flag.jpg") -60px -460px no-repeat; }
.jp-state-shuffled .jp-shuffle:focus {
background: url("../image/jplayer.pink.flag.jpg") -90px -460px no-repeat; }
.jp-audio .jp-shuffle {
margin-left: 5px; }
/* @end */
/* @group progress bar */
/* The seeking class is added/removed inside jPlayer */
div.jp-seeking-bg {
background: url("../image/jplayer.pink.flag.seeking.gif"); }
.jp-progress {
background: url("../image/jplayer.pink.flag.jpg") 0px -240px no-repeat;
width: 197px;
height: 13px;
padding: 0 2px 2px 2px;
margin-bottom: 4px;
overflow: hidden; }
div.jp-video .jp-progress {
border-top: 1px solid #180a1f;
border-bottom: 1px solid #554560;
width: 100%;
background-image: none;
padding: 0; }
.jp-seek-bar {
background: url("../image/jplayer.pink.flag.jpg") 0px -260px repeat-x;
width: 0px;
height: 100%;
overflow: hidden;
cursor: pointer; }
.jp-play-bar {
background: url("../image/jplayer.pink.flag.jpg") 0px -280px repeat-x;
width: 0px;
height: 100%;
overflow: hidden; }
/* @end */
/* @group volume controls */
.jp-state-no-volume .jp-volume-controls {
display: none; }
.jp-audio .jp-volume-controls,
.jp-audio-stream .jp-volume-controls {
height: 30px; }
.jp-volume-controls button {
position: absolute;
display: block;
overflow: hidden;
text-indent: -9999px;
margin: 0;
padding: 0;
width: 16px;
height: 11px;
border: none;
cursor: pointer; }
.jp-audio .jp-volume-controls .jp-mute,
.jp-audio-stream .jp-volume-controls .jp-mute {
top: -6px;
left: 0; }
.jp-audio .jp-volume-controls .jp-volume-max,
.jp-audio-stream .jp-volume-controls .jp-volume-max {
top: -6px;
right: 0; }
.jp-video .jp-volume-controls .jp-mute,
.jp-video .jp-volume-controls .jp-unmute {
left: 0;
top: 14px; }
.jp-video .jp-volume-controls .jp-volume-max {
left: 84px;
top: 14px; }
.jp-volume-controls .jp-mute {
background: url("../image/jplayer.pink.flag.jpg") 0px -330px no-repeat; }
.jp-volume-controls .jp-mute:focus {
background: url("../image/jplayer.pink.flag.jpg") -25px -330px no-repeat; }
.jp-state-muted .jp-volume-controls .jp-mute {
background: url("../image/jplayer.pink.flag.jpg") -60px -330px no-repeat; }
.jp-state-muted .jp-volume-controls .jp-mute:focus {
background: url("../image/jplayer.pink.flag.jpg") -85px -330px no-repeat; }
.jp-volume-controls .jp-volume-max {
background: url("../image/jplayer.pink.flag.jpg") 0px -350px no-repeat; }
.jp-volume-controls .jp-volume-max:focus {
background: url("../image/jplayer.pink.flag.jpg") -25px -350px no-repeat; }
.jp-volume-bar {
background: url("../image/jplayer.pink.flag.jpg") 0px -300px repeat-x;
position: absolute;
width: 197px;
height: 4px;
padding: 2px 2px 1px 2px;
overflow: hidden;
cursor: pointer; }
.jp-audio .jp-interface .jp-volume-bar,
.jp-audio-stream .jp-interface .jp-volume-bar {
top: 10px;
left: 0; }
.jp-audio-stream .jp-interface .jp-volume-bar {
width: 97px;
border-right: 1px solid #180920;
padding-right: 1px; }
.jp-video .jp-volume-bar {
top: 0;
left: 0;
width: 95px;
border-right: 1px solid #180920;
padding-right: 1px;
margin-top: 30px; }
.jp-volume-bar-value {
background: url("../image/jplayer.pink.flag.jpg") 0px -320px repeat-x;
height: 4px; }
/* @end */
/* @group current time and duration */
.jp-current-time, .jp-duration {
width: 70px;
font-size: .5em;
color: #8c7a99; }
.jp-current-time {
float: left;
cursor: default; }
.jp-duration {
float: right;
text-align: right;
cursor: pointer; }
.jp-video .jp-current-time {
padding-left: 20px; }
.jp-video .jp-duration {
padding-right: 20px; }
/* @end */
/* @group playlist */
.jp-details {
font-size: .7em;
margin: 0;
padding: 0; }
.jp-details .jp-title {
padding: 0;
margin: 0;
overflow: hidden;
text-align: center;
cursor: default; }
.jp-video .jp-details {
margin: 0 90px 10px; }
.jp-playlist ul {
list-style-type: none;
font-size: .7em;
margin: 0;
padding: 0; }
.jp-video .jp-playlist ul {
margin: 0 20px; }
.jp-playlist li {
position: relative;
padding: 2px 0;
border-top: 1px solid #554461;
border-bottom: 1px solid #180a1f;
overflow: hidden; }
/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
div.jp-type-playlist div.jp-playlist li:first-child {
border-top: none;
padding-top: 3px; }
div.jp-type-playlist div.jp-playlist li:last-child {
border-bottom: none;
padding-bottom: 3px; }
div.jp-type-playlist div.jp-playlist a {
color: #fff;
text-decoration: none; }
div.jp-type-playlist div.jp-playlist a:hover {
color: #e892e9; }
div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
background-color: #26102e;
margin: 0 -20px;
padding: 2px 20px;
border-top: 1px solid #26102e;
border-bottom: 1px solid #26102e; }
div.jp-type-playlist div.jp-playlist li.jp-playlist-current a {
color: #e892e9; }
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
float: right;
display: inline;
text-align: right;
margin-left: 10px;
font-weight: bold;
color: #8C7A99; }
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
color: #E892E9; }
div.jp-type-playlist div.jp-playlist span.jp-free-media {
float: right;
display: inline;
text-align: right;
color: #8C7A99; }
div.jp-type-playlist div.jp-playlist span.jp-free-media a {
color: #8C7A99; }
div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover {
color: #E892E9; }
span.jp-artist {
font-size: .8em;
color: #8C7A99; }
/* @end */
.jp-video .jp-video-play {
width: 100%;
overflow: hidden;
/* Important for nested negative margins to work in modern browsers */ }
.jp-video-270p .jp-video-play {
margin-top: -270px;
height: 270px; }
.jp-video-360p .jp-video-play {
margin-top: -360px;
height: 360px; }
.jp-video-full .jp-video-play {
height: 100%; }
.jp-video-play-icon {
position: relative;
display: block;
width: 112px;
height: 100px;
margin-left: -56px;
margin-top: -50px;
left: 50%;
top: 50%;
border: none;
cursor: pointer;
background: url("../image/jplayer.pink.flag.video.play.png") 0 0 no-repeat;
text-indent: -9999px; }
.jp-video-play-icon:focus {
background: url("../image/jplayer.pink.flag.video.play.png") 0 -100px no-repeat; }
.jp-jplayer audio,
.jp-jplayer {
width: 0px;
height: 0px; }
.jp-jplayer {
background-color: #000000; }
/* @group NO SOLUTION error feedback */
.jp-no-solution {
padding: 5px;
font-size: .8em;
background-color: #3a2a45;
border-top: 2px solid #554461;
border-left: 2px solid #554461;
border-right: 2px solid #180a1f;
border-bottom: 2px solid #180a1f;
color: #FFF;
display: none; }
.jp-no-solution a {
color: #FFF; }
.jp-no-solution span {
font-size: 1em;
display: block;
text-align: center;
font-weight: bold; }
/* @end */

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,42 +0,0 @@
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div id="{{WRAPPER}}" class="jp-audio" role="application" aria-label="media player">
<div class="jp-type-playlist">
<div class="jp-gui jp-interface">
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-controls-holder">
<div class="jp-controls">
<button class="jp-previous" role="button" tabindex="0">previous</button>
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
<button class="jp-next" role="button" tabindex="0">next</button>
</div>
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
<button class="jp-shuffle" role="button" tabindex="0">shuffle</button>
</div>
</div>
</div>
<div class="jp-playlist">
<ul>
<li>&nbsp;</li>
</ul>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,37 +0,0 @@
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div id="{{WRAPPER}}" class="jp-audio" role="application" aria-label="media player">
<div class="jp-type-single">
<div class="jp-gui jp-interface">
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-controls-holder">
<div class="jp-controls">
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
</div>
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
</div>
</div>
</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,24 +0,0 @@
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div id="{{WRAPPER}}" class="jp-audio-stream" role="application" aria-label="media player">
<div class="jp-type-single">
<div class="jp-gui jp-interface">
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-controls">
<button class="jp-play" role="button" tabindex="0">play</button>
</div>
</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,52 +0,0 @@
<div id="{{WRAPPER}}" class="jp-video " role="application" aria-label="media player">
<div class="jp-type-playlist">
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div class="jp-gui">
<div class="jp-video-play">
<button class="jp-video-play-icon" role="button" tabindex="0">play</button>
</div>
<div class="jp-interface">
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
<div class="jp-controls-holder">
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-controls">
<button class="jp-previous" role="button" tabindex="0">previous</button>
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
<button class="jp-next" role="button" tabindex="0">next</button>
</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
<button class="jp-shuffle" role="button" tabindex="0">shuffle</button>
<button class="jp-full-screen" role="button" tabindex="0">full screen</button>
</div>
</div>
</div>
</div>
<div class="jp-playlist">
<ul>
<!-- The method Playlist.displayPlaylist() uses this unordered list -->
<li></li>
</ul>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,43 +0,0 @@
<div id="{{WRAPPER}}" class="jp-video " role="application" aria-label="media player">
<div class="jp-type-single">
<div id="{{JPLAYER}}" class="jp-jplayer"></div>
<div class="jp-gui">
<div class="jp-video-play">
<button class="jp-video-play-icon" role="button" tabindex="0">play</button>
</div>
<div class="jp-interface">
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-current-time" role="timer" aria-label="time">&nbsp;</div>
<div class="jp-duration" role="timer" aria-label="duration">&nbsp;</div>
<div class="jp-details">
<div class="jp-title" aria-label="title">&nbsp;</div>
</div>
<div class="jp-controls-holder">
<div class="jp-volume-controls">
<button class="jp-mute" role="button" tabindex="0">mute</button>
<button class="jp-volume-max" role="button" tabindex="0">max volume</button>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
</div>
<div class="jp-controls">
<button class="jp-play" role="button" tabindex="0">play</button>
<button class="jp-stop" role="button" tabindex="0">stop</button>
</div>
<div class="jp-toggles">
<button class="jp-repeat" role="button" tabindex="0">repeat</button>
<button class="jp-full-screen" role="button" tabindex="0">full screen</button>
</div>
</div>
</div>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,640 +0,0 @@
/*
* Skin for jPlayer Plugin (jQuery JavaScript Library)
* http://www.jplayer.org
*
* Skin Name: Blue Monday
*
* Copyright (c) 2010-2012 Happyworm Ltd
* Dual licensed under the MIT and GPL licenses.
* - http://www.opensource.org/licenses/mit-license.php
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Silvia Benvenuti
* Skin Version: 4.3 (jPlayer 2.2.0)
* Date: 19th November 2012
*/
div.jp-audio,
div.jp-audio-stream,
div.jp-video {
/* Edit the font-size to counteract inherited font sizing.
* Eg. 1.25em = 1 / 0.8em
*/
font-size:1.25em; /* 1.25em for testing in site pages */ /* No parent CSS that can effect the size in the demos ZIP */
font-family:Verdana, Arial, sans-serif;
line-height:1.6;
color: #666;
border:1px solid #009be3;
background-color:#eee;
}
div.jp-audio {
width:420px;
}
div.jp-audio-stream {
width:182px;
}
div.jp-video-270p {
width:480px;
}
div.jp-video-360p {
width:640px;
}
div.jp-video-full {
/* Rules for IE6 (full-screen) */
width:480px;
height:270px;
/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
position:static !important; position:relative;
}
/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
div.jp-video-full div div {
z-index:1000;
}
div.jp-video-full div.jp-jplayer {
top: 0;
left: 0;
position: fixed !important; position: relative; /* Rules for IE6 (full-screen) */
overflow: hidden;
}
div.jp-video-full div.jp-gui {
position: fixed !important; position: static; /* Rules for IE6 (full-screen) */
top: 0;
left: 0;
width:100%;
height:100%;
z-index:1001; /* 1 layer above the others. */
}
div.jp-video-full div.jp-interface {
position: absolute !important; position: relative; /* Rules for IE6 (full-screen) */
bottom: 0;
left: 0;
}
div.jp-interface {
position: relative;
background-color:#eee;
width:100%;
}
div.jp-audio div.jp-type-single div.jp-interface {
height:80px;
}
div.jp-audio div.jp-type-playlist div.jp-interface {
height:80px;
}
div.jp-audio-stream div.jp-type-single div.jp-interface {
height:80px;
}
div.jp-video div.jp-interface {
border-top:1px solid #009be3;
}
/* @group CONTROLS */
div.jp-controls-holder {
clear: both;
width:440px;
margin:0 auto;
position: relative;
overflow:hidden;
top:-8px; /* This negative value depends on the size of the text in jp-currentTime and jp-duration */
}
div.jp-interface ul.jp-controls {
list-style-type:none;
margin:0;
padding: 0;
overflow:hidden;
}
div.jp-audio ul.jp-controls {
width: 380px;
padding:20px 20px 0 20px;
}
div.jp-audio-stream ul.jp-controls {
width: 142px;
padding:20px 20px 0 20px;
}
div.jp-video div.jp-type-single ul.jp-controls {
width: 78px;
margin-left: 200px;
}
div.jp-video div.jp-type-playlist ul.jp-controls {
width: 134px;
margin-left: 172px;
}
div.jp-video ul.jp-controls,
div.jp-interface ul.jp-controls li {
display:inline;
float: left;
}
div.jp-interface ul.jp-controls a {
display:block;
overflow:hidden;
text-indent:-9999px;
}
a.jp-play,
a.jp-pause {
width:40px;
height:40px;
}
a.jp-play {
background: url("jplayer.blue.monday.jpg") 0 0 no-repeat;
}
a.jp-play:hover {
background: url("jplayer.blue.monday.jpg") -41px 0 no-repeat;
}
a.jp-pause {
background: url("jplayer.blue.monday.jpg") 0 -42px no-repeat;
display: none;
}
a.jp-pause:hover {
background: url("jplayer.blue.monday.jpg") -41px -42px no-repeat;
}
a.jp-stop, a.jp-previous, a.jp-next {
width:28px;
height:28px;
margin-top:6px;
}
a.jp-stop {
background: url("jplayer.blue.monday.jpg") 0 -83px no-repeat;
margin-left:10px;
}
a.jp-stop:hover {
background: url("jplayer.blue.monday.jpg") -29px -83px no-repeat;
}
a.jp-previous {
background: url("jplayer.blue.monday.jpg") 0 -112px no-repeat;
}
a.jp-previous:hover {
background: url("jplayer.blue.monday.jpg") -29px -112px no-repeat;
}
a.jp-next {
background: url("jplayer.blue.monday.jpg") 0 -141px no-repeat;
}
a.jp-next:hover {
background: url("jplayer.blue.monday.jpg") -29px -141px no-repeat;
}
/* @end */
/* @group progress bar */
div.jp-progress {
overflow:hidden;
background-color: #ddd;
}
div.jp-audio div.jp-progress {
position: absolute;
top:32px;
height:15px;
}
div.jp-audio div.jp-type-single div.jp-progress {
left:110px;
width:186px;
}
div.jp-audio div.jp-type-playlist div.jp-progress {
left:166px;
width:130px;
}
div.jp-video div.jp-progress {
top:0px;
left:0px;
width:100%;
height:10px;
}
div.jp-seek-bar {
background: url("jplayer.blue.monday.jpg") 0 -202px repeat-x;
width:0px;
height:100%;
cursor: pointer;
}
div.jp-play-bar {
background: url("jplayer.blue.monday.jpg") 0 -218px repeat-x ;
width:0px;
height:100%;
}
/* The seeking class is added/removed inside jPlayer */
div.jp-seeking-bg {
background: url("jplayer.blue.monday.seeking.gif");
}
/* @end */
/* @group volume controls */
a.jp-mute,
a.jp-unmute,
a.jp-volume-max {
width:18px;
height:15px;
margin-top:12px;
}
div.jp-audio div.jp-type-single a.jp-mute,
div.jp-audio div.jp-type-single a.jp-unmute {
margin-left: 210px;
}
div.jp-audio div.jp-type-playlist a.jp-mute,
div.jp-audio div.jp-type-playlist a.jp-unmute {
margin-left: 154px;
}
div.jp-audio-stream div.jp-type-single a.jp-mute,
div.jp-audio-stream div.jp-type-single a.jp-unmute {
margin-left:10px;
}
div.jp-audio a.jp-volume-max,
div.jp-audio-stream a.jp-volume-max {
margin-left: 56px;
}
div.jp-video a.jp-mute,
div.jp-video a.jp-unmute,
div.jp-video a.jp-volume-max {
position: absolute;
top:12px;
margin-top:0;
}
div.jp-video a.jp-mute,
div.jp-video a.jp-unmute {
left: 50px;
}
div.jp-video a.jp-volume-max {
left: 134px;
}
a.jp-mute {
background: url("jplayer.blue.monday.jpg") 0 -170px no-repeat;
}
a.jp-mute:hover {
background: url("jplayer.blue.monday.jpg") -19px -170px no-repeat;
}
a.jp-unmute {
background: url("jplayer.blue.monday.jpg") -60px -170px no-repeat;
display: none;
}
a.jp-unmute:hover {
background: url("jplayer.blue.monday.jpg") -79px -170px no-repeat;
}
a.jp-volume-max {
background: url("jplayer.blue.monday.jpg") 0 -186px no-repeat;
}
a.jp-volume-max:hover {
background: url("jplayer.blue.monday.jpg") -19px -186px no-repeat;
}
div.jp-volume-bar {
position: absolute;
overflow:hidden;
background: url("jplayer.blue.monday.jpg") 0 -250px repeat-x;
width:46px;
height:5px;
cursor: pointer;
}
div.jp-audio div.jp-volume-bar {
top:37px;
left:330px;
}
div.jp-audio-stream div.jp-volume-bar {
top:37px;
left:92px;
}
div.jp-video div.jp-volume-bar {
top:17px;
left:72px;
}
div.jp-volume-bar-value {
background: url("jplayer.blue.monday.jpg") 0 -256px repeat-x;
width:0px;
height:5px;
}
/* @end */
/* @group current time and duration */
div.jp-audio div.jp-time-holder {
position:absolute;
top:50px;
}
div.jp-audio div.jp-type-single div.jp-time-holder {
left:110px;
width:186px;
}
div.jp-audio div.jp-type-playlist div.jp-time-holder {
left:166px;
width:130px;
}
div.jp-current-time,
div.jp-duration {
width:60px;
font-size:.64em;
font-style:oblique;
}
div.jp-current-time {
float: left;
display:inline;
}
div.jp-duration {
float: right;
display:inline;
text-align: right;
}
div.jp-video div.jp-current-time {
margin-left:20px;
}
div.jp-video div.jp-duration {
margin-right:20px;
}
/* @end */
/* @group playlist */
div.jp-title {
font-weight:bold;
text-align:center;
}
div.jp-title,
div.jp-playlist {
width:100%;
background-color:#ccc;
border-top:1px solid #009be3;
}
div.jp-type-single div.jp-title,
div.jp-type-playlist div.jp-title,
div.jp-type-single div.jp-playlist {
border-top:none;
}
div.jp-title ul,
div.jp-playlist ul {
list-style-type:none;
margin:0;
padding:0 20px;
font-size:.72em;
}
div.jp-title li {
padding:5px 0;
font-weight:bold;
}
div.jp-playlist li {
padding:5px 0 4px 20px;
border-bottom:1px solid #eee;
}
div.jp-playlist li div {
display:inline;
}
/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
div.jp-type-playlist div.jp-playlist li:last-child {
padding:5px 0 5px 20px;
border-bottom:none;
}
div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
list-style-type:square;
list-style-position:inside;
padding-left:7px;
}
div.jp-type-playlist div.jp-playlist a {
color: #333;
text-decoration: none;
}
div.jp-type-playlist div.jp-playlist a:hover {
color:#0d88c1;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-current {
color:#0d88c1;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
float:right;
display:inline;
text-align:right;
margin-right:10px;
font-weight:bold;
color:#666;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
color:#0d88c1;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media {
float:right;
display:inline;
text-align:right;
margin-right:10px;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media a{
color:#666;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{
color:#0d88c1;
}
span.jp-artist {
font-size:.8em;
color:#666;
}
/* @end */
div.jp-video-play {
width:100%;
overflow:hidden; /* Important for nested negative margins to work in modern browsers */
cursor:pointer;
background-color:rgba(0,0,0,0); /* Makes IE9 work with the active area over the whole video area. IE6/7/8 only have the button as active area. */
}
div.jp-video-270p div.jp-video-play {
margin-top:-270px;
height:270px;
}
div.jp-video-360p div.jp-video-play {
margin-top:-360px;
height:360px;
}
div.jp-video-full div.jp-video-play {
height:100%;
}
a.jp-video-play-icon {
position:relative;
display:block;
width: 112px;
height: 100px;
margin-left:-56px;
margin-top:-50px;
left:50%;
top:50%;
background: url("jplayer.blue.monday.video.play.png") 0 0 no-repeat;
text-indent:-9999px;
}
div.jp-video-play:hover a.jp-video-play-icon {
background: url("jplayer.blue.monday.video.play.png") 0 -100px no-repeat;
}
div.jp-jplayer audio,
div.jp-jplayer {
width:0px;
height:0px;
}
div.jp-jplayer {
background-color: #000000;
}
/* @group TOGGLES */
/* The audio toggles are nested inside jp-time-holder */
ul.jp-toggles {
list-style-type:none;
padding:0;
margin:0 auto;
overflow:hidden;
}
div.jp-audio .jp-type-single ul.jp-toggles {
width:25px;
}
div.jp-audio .jp-type-playlist ul.jp-toggles {
width:55px;
margin: 0;
position: absolute;
left: 325px;
top: 50px;
}
div.jp-video ul.jp-toggles {
margin-top:10px;
width:100px;
}
ul.jp-toggles li {
display:block;
float:right;
}
ul.jp-toggles li a {
display:block;
width:25px;
height:18px;
text-indent:-9999px;
line-height:100%; /* need this for IE6 */
}
a.jp-full-screen {
background: url("jplayer.blue.monday.jpg") 0 -310px no-repeat;
margin-left: 20px;
}
a.jp-full-screen:hover {
background: url("jplayer.blue.monday.jpg") -30px -310px no-repeat;
}
a.jp-restore-screen {
background: url("jplayer.blue.monday.jpg") -60px -310px no-repeat;
margin-left: 20px;
}
a.jp-restore-screen:hover {
background: url("jplayer.blue.monday.jpg") -90px -310px no-repeat;
}
a.jp-repeat {
background: url("jplayer.blue.monday.jpg") 0 -290px no-repeat;
}
a.jp-repeat:hover {
background: url("jplayer.blue.monday.jpg") -30px -290px no-repeat;
}
a.jp-repeat-off {
background: url("jplayer.blue.monday.jpg") -60px -290px no-repeat;
}
a.jp-repeat-off:hover {
background: url("jplayer.blue.monday.jpg") -90px -290px no-repeat;
}
a.jp-shuffle {
background: url("jplayer.blue.monday.jpg") 0 -270px no-repeat;
margin-left: 5px;
}
a.jp-shuffle:hover {
background: url("jplayer.blue.monday.jpg") -30px -270px no-repeat;
}
a.jp-shuffle-off {
background: url("jplayer.blue.monday.jpg") -60px -270px no-repeat;
margin-left: 5px;
}
a.jp-shuffle-off:hover {
background: url("jplayer.blue.monday.jpg") -90px -270px no-repeat;
}
/* @end */
/* @group NO SOLUTION error feedback */
.jp-no-solution {
padding:5px;
font-size:.8em;
background-color:#eee;
border:2px solid #009be3;
color:#000;
display:none;
}
.jp-no-solution a {
color:#000;
}
.jp-no-solution span {
font-size:1em;
display:block;
text-align:center;
font-weight:bold;
}
/* @end */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,40 +0,0 @@
<div id="{{jquery_jplayer_id}}" class="jp-jplayer"></div>
<div id="{{jp_container_id}}" class="jp-audio">
<div class="jp-type-single">
<div class="jp-gui jp-interface">
<ul class="jp-controls">
<li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
<li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
<li><a href="javascript:;" class="jp-stop" tabindex="1">stop</a></li>
<li><a href="javascript:;" class="jp-mute" tabindex="1" title="mute">mute</a></li>
<li><a href="javascript:;" class="jp-unmute" tabindex="1" title="unmute">unmute</a></li>
<li><a href="javascript:;" class="jp-volume-max" tabindex="1" title="max volume">max volume</a></li>
</ul>
<div class="jp-progress">
<div class="jp-seek-bar">
<div class="jp-play-bar"></div>
</div>
</div>
<div class="jp-volume-bar">
<div class="jp-volume-bar-value"></div>
</div>
<div class="jp-time-holder">
<div class="jp-current-time"></div>
<div class="jp-duration"></div>
<ul class="jp-toggles">
<li><a href="javascript:;" class="jp-repeat" tabindex="1" title="repeat">repeat</a></li>
<li><a href="javascript:;" class="jp-repeat-off" tabindex="1" title="repeat off">repeat off</a></li>
</ul>
</div>
</div>
<div class="jp-title">
<ul>
<li>{{title}}</li>
</ul>
</div>
<div class="jp-no-solution">
<span>Update Required</span>
To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
</div>
</div>
</div>

View File

@ -1,670 +0,0 @@
/*
* Skin for jPlayer Plugin (jQuery JavaScript Library)
* http://www.jplayer.org
*
* Skin Name: Pink Flag
*
* Copyright (c) 2012 Happyworm Ltd
* Dual licensed under the MIT and GPL licenses.
* - http://www.opensource.org/licenses/mit-license.php
* - http://www.gnu.org/copyleft/gpl.html
*
* Author: Silvia Benvenuti
* Skin Version: 1.2 (jPlayer 2.2.0)
* Date: 22nd October 2012
*/
div.jp-audio,
div.jp-audio-stream,
div.jp-video {
/* Edit the font-size to counteract inherited font sizing.
* Eg. 1.25em = 1 / 0.8em
*/
font-size:1.25em; /* 1.25em for testing in site pages */ /* No parent CSS that can effect the size in the demos ZIP */
font-family:Verdana, Arial, sans-serif;
line-height:1.6;
color: #fff;
border-top:1px solid #554461;
border-left:1px solid #554461;
border-right:1px solid #180a1f;
border-bottom:1px solid #180a1f;
background-color:#3a2a45;
}
div.jp-audio {
width:201px;
padding:20px;
}
div.jp-audio-stream {
width:101px;
padding:20px 20px 10px 20px;
}
div.jp-video-270p {
width:480px;
}
div.jp-video-360p {
width:640px;
}
div.jp-video-full {
/* Rules for IE6 (full-screen) */
width:480px;
height:270px;
/* Rules for IE7 (full-screen) - Otherwise the relative container causes other page items that are not position:static (default) to appear over the video/gui. */
position:static !important; position:relative;
}
/* The z-index rule is defined in this manner to enable Popcorn plugins that add overlays to video area. EG. Subtitles. */
div.jp-video-full div div {
z-index:1000;
}
div.jp-video-full div.jp-jplayer {
top: 0;
left: 0;
position: fixed !important; position: relative; /* Rules for IE6 (full-screen) */
overflow: hidden;
}
div.jp-video-full div.jp-gui {
position: fixed !important; position: static; /* Rules for IE6 (full-screen) */
top: 0;
left: 0;
width:100%;
height:100%;
z-index:1001; /* 1 layer above the others. */
}
div.jp-video-full div.jp-interface {
position: absolute !important; position: relative; /* Rules for IE6 (full-screen) */
bottom: 0;
left: 0;
}
div.jp-interface {
position: relative;
width:100%;
background-color:#3a2a45; /* Required for the full screen */
}
div.jp-audio .jp-interface {
height: 80px;
padding-top:30px;
}
div.jp-audio-stream .jp-interface {
height: 50px;
padding-top:30px;
}
/* @group CONTROLS */
div.jp-controls-holder {
clear: both;
width:440px;
margin:0 auto 10px auto;
position: relative;
overflow:hidden;
}
div.jp-interface ul.jp-controls {
background: url("jplayer.pink.flag.jpg") 0 0 no-repeat;
list-style-type:none;
padding: 1px 0 2px 1px;
overflow:hidden;
width: 201px;
height: 34px;
}
div.jp-audio ul.jp-controls,
div.jp-audio-stream ul.jp-controls {
margin:0 auto;
}
div.jp-audio-stream ul.jp-controls {
width: 100px;
}
div.jp-video ul.jp-controls {
margin:0 0 0 115px;
float:left;
display:inline; /* need this to fix IE6 double margin */
}
div.jp-interface ul.jp-controls li {
display:inline;
float: left;
}
div.jp-interface ul.jp-controls a {
display:block;
overflow:hidden;
text-indent:-9999px;
height: 34px;
margin: 0 1px 2px 0;
padding: 0;
}
/* @group single player controls */
div.jp-type-single .jp-controls li a{
width: 99px;
}
div.jp-type-single .jp-play {
background: url("jplayer.pink.flag.jpg") 0px -40px no-repeat;
}
div.jp-type-single .jp-play:hover {
background: url("jplayer.pink.flag.jpg") -100px -40px no-repeat;
}
div.jp-type-single .jp-pause {
background: url("jplayer.pink.flag.jpg") 0px -120px no-repeat;
}
div.jp-type-single .jp-pause:hover {
background: url("jplayer.pink.flag.jpg") -100px -120px no-repeat;
}
/* The right border is normally in the ul background image. */
div.jp-audio-stream .jp-play,
div.jp-audio-stream .jp-pause {
border-right:1px solid #180920;
}
div.jp-type-single .jp-stop {
background: url("jplayer.pink.flag.jpg") 0px -80px no-repeat;
}
div.jp-type-single .jp-stop:hover {
background: url("jplayer.pink.flag.jpg") -100px -80px no-repeat;
}
/* @end */
/* @group playlist player controls */
div.jp-type-playlist .jp-controls li a{
width: 49px;
}
div.jp-type-playlist .jp-play {
background: url("jplayer.pink.flag.jpg") -24px -40px no-repeat;
}
div.jp-type-playlist .jp-play:hover {
background: url("jplayer.pink.flag.jpg") -124px -40px no-repeat;
}
div.jp-type-playlist .jp-pause {
background: url("jplayer.pink.flag.jpg") -24px -120px no-repeat;
}
div.jp-type-playlist .jp-pause:hover {
background: url("jplayer.pink.flag.jpg") -124px -120px no-repeat;
}
div.jp-type-playlist .jp-stop {
background: url("jplayer.pink.flag.jpg") -24px -80px no-repeat;
}
div.jp-type-playlist .jp-stop:hover {
background: url("jplayer.pink.flag.jpg") -124px -80px no-repeat;
}
div.jp-type-playlist .jp-previous {
background: url("jplayer.pink.flag.jpg") -24px -200px no-repeat;
}
div.jp-type-playlist .jp-previous:hover {
background: url("jplayer.pink.flag.jpg") -124px -200px no-repeat;
}
div.jp-type-playlist .jp-next {
background: url("jplayer.pink.flag.jpg") -24px -160px no-repeat;
}
div.jp-type-playlist .jp-next:hover {
background: url("jplayer.pink.flag.jpg") -124px -160px no-repeat;
}
/* @end */
/* @end */
/* @group TOGGLES */
ul.jp-toggles {
list-style-type:none;
padding:0;
margin:0 auto;
overflow:hidden;
}
div.jp-audio ul.jp-toggles {
width:55px;
}
div.jp-audio .jp-type-single ul.jp-toggles {
width:25px;
}
div.jp-video ul.jp-toggles {
width:100px;
margin-top: 10px;
}
ul.jp-toggles li{
display:block;
float:right;
}
ul.jp-toggles li a{
display:block;
width:25px;
height:18px;
text-indent:-9999px;
line-height:100%; /* need this for IE6 */
}
.jp-full-screen {
background: url("jplayer.pink.flag.jpg") 0 -420px no-repeat;
margin-left: 20px;
}
.jp-full-screen:hover {
background: url("jplayer.pink.flag.jpg") -30px -420px no-repeat;
}
.jp-restore-screen {
background: url("jplayer.pink.flag.jpg") -60px -420px no-repeat;
margin-left: 20px;
}
.jp-restore-screen:hover {
background: url("jplayer.pink.flag.jpg") -90px -420px no-repeat;
}
.jp-repeat {
background: url("jplayer.pink.flag.jpg") 0 -440px no-repeat;
}
.jp-repeat:hover {
background: url("jplayer.pink.flag.jpg") -30px -440px no-repeat;
}
.jp-repeat-off {
background: url("jplayer.pink.flag.jpg") -60px -440px no-repeat;
}
.jp-repeat-off:hover {
background: url("jplayer.pink.flag.jpg") -90px -440px no-repeat;
}
.jp-shuffle {
background: url("jplayer.pink.flag.jpg") 0 -460px no-repeat;
margin-left: 5px;
}
.jp-shuffle:hover {
background: url("jplayer.pink.flag.jpg") -30px -460px no-repeat;
}
.jp-shuffle-off {
background: url("jplayer.pink.flag.jpg") -60px -460px no-repeat;
margin-left: 5px;
}
.jp-shuffle-off:hover {
background: url("jplayer.pink.flag.jpg") -90px -460px no-repeat;
}
/* @end */
/* @group progress bar */
/* The seeking class is added/removed inside jPlayer */
div.jp-seeking-bg {
background: url("jplayer.pink.flag.seeking.gif");
}
.jp-progress {
background: url("jplayer.pink.flag.jpg") 0px -240px no-repeat;
width: 197px;
height: 13px;
padding: 0 2px 2px 2px;
margin-bottom: 4px;
overflow:hidden;
}
div.jp-video .jp-progress {
border-top:1px solid #180a1f;
border-bottom: 1px solid #554560;
width:100%;
background-image: none;
padding: 0;
}
.jp-seek-bar {
background: url("jplayer.pink.flag.jpg") 0px -260px repeat-x;
width:0px;
height: 100%;
overflow:hidden;
cursor:pointer;
}
.jp-play-bar {
background: url("jplayer.pink.flag.jpg") 0px -280px repeat-x;
width:0px;
height: 100%;
overflow:hidden;
}
/* @end */
/* @group volume controls */
div.jp-interface ul.jp-controls a.jp-mute,
div.jp-interface ul.jp-controls a.jp-unmute,
div.jp-interface ul.jp-controls a.jp-volume-max {
background: url("jplayer.pink.flag.jpg") 0px -330px no-repeat;
position: absolute;
width: 16px;
height: 11px;
}
div.jp-audio ul.jp-controls a.jp-mute,
div.jp-audio ul.jp-controls a.jp-unmute,
div.jp-audio-stream ul.jp-controls a.jp-mute,
div.jp-audio-stream ul.jp-controls a.jp-unmute {
top:-6px;
left: 0;
}
div.jp-audio ul.jp-controls a.jp-volume-max,
div.jp-audio-stream ul.jp-controls a.jp-volume-max {
top:-6px;
right: 0;
}
div.jp-video ul.jp-controls a.jp-mute,
div.jp-video ul.jp-controls a.jp-unmute {
left: 0;
top:14px;
}
div.jp-video ul.jp-controls a.jp-volume-max {
left: 84px;
top:14px;
}
div.jp-interface ul.jp-controls a.jp-mute:hover {
background: url("jplayer.pink.flag.jpg") -25px -330px no-repeat;
}
div.jp-interface ul.jp-controls a.jp-unmute {
background: url("jplayer.pink.flag.jpg") -60px -330px no-repeat;
}
div.jp-interface ul.jp-controls a.jp-unmute:hover {
background: url("jplayer.pink.flag.jpg") -85px -330px no-repeat;
}
div.jp-interface ul.jp-controls a.jp-volume-max {
background: url("jplayer.pink.flag.jpg") 0px -350px no-repeat;
}
div.jp-interface ul.jp-controls a.jp-volume-max:hover {
background: url("jplayer.pink.flag.jpg") -25px -350px no-repeat;
}
.jp-volume-bar {
background: url("jplayer.pink.flag.jpg") 0px -300px repeat-x;
position: absolute;
width: 197px;
height: 4px;
padding: 2px 2px 1px 2px;
overflow: hidden;
}
.jp-volume-bar:hover {
cursor: pointer;
}
div.jp-audio .jp-interface .jp-volume-bar,
div.jp-audio-stream .jp-interface .jp-volume-bar {
top:10px;
left: 0;
}
div.jp-audio-stream .jp-interface .jp-volume-bar {
width: 97px;
border-right:1px solid #180920;
padding-right:1px;
}
div.jp-video .jp-volume-bar {
top: 0;
left: 0;
width:95px;
border-right:1px solid #180920;
padding-right:1px;
margin-top: 30px;
}
.jp-volume-bar-value {
background: url("jplayer.pink.flag.jpg") 0px -320px repeat-x;
height: 4px;
}
/* @end */
/* @group current time and duration */
.jp-current-time, .jp-duration {
width:70px;
font-size:.5em;
color: #8c7a99;
}
.jp-current-time {
float: left;
}
.jp-duration {
float: right;
text-align:right;
}
.jp-video .jp-current-time {
padding-left:20px;
}
.jp-video .jp-duration {
padding-right:20px;
}
/* @end */
/* @group playlist */
.jp-title ul,
.jp-playlist ul {
list-style-type:none;
font-size:.7em;
margin: 0;
padding: 0;
}
.jp-video .jp-title ul {
margin: 0 20px 10px;
}
.jp-video .jp-playlist ul {
margin: 0 20px;
}
.jp-title li,
.jp-playlist li {
position: relative;
padding: 2px 0;
border-top:1px solid #554461;
border-bottom:1px solid #180a1f;
overflow: hidden;
}
.jp-title li{
border-bottom:none;
border-top:none;
padding:0;
text-align:center;
}
/* Note that the first-child (IE6) and last-child (IE6/7/8) selectors do not work on IE */
div.jp-type-playlist div.jp-playlist li:first-child {
border-top:none;
padding-top:3px;
}
div.jp-type-playlist div.jp-playlist li:last-child {
border-bottom:none;
padding-bottom:3px;
}
div.jp-type-playlist div.jp-playlist a {
color: #fff;
text-decoration:none;
}
div.jp-type-playlist div.jp-playlist a:hover {
color: #e892e9;
}
div.jp-type-playlist div.jp-playlist li.jp-playlist-current {
background-color: #26102e;
margin: 0 -20px;
padding: 2px 20px;
border-top: 1px solid #26102e;
border-bottom: 1px solid #26102e;
}
div.jp-type-playlist div.jp-playlist li.jp-playlist-current a{
color: #e892e9;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove {
float:right;
display:inline;
text-align:right;
margin-left:10px;
font-weight:bold;
color:#8C7A99;
}
div.jp-type-playlist div.jp-playlist a.jp-playlist-item-remove:hover {
color:#E892E9;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media {
float: right;
display:inline;
text-align:right;
color:#8C7A99;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media a{
color:#8C7A99;
}
div.jp-type-playlist div.jp-playlist span.jp-free-media a:hover{
color:#E892E9;
}
span.jp-artist {
font-size:.8em;
color:#8C7A99;
}
/* @end */
div.jp-video div.jp-video-play {
width:100%;
overflow:hidden; /* Important for nested negative margins to work in modern browsers */
cursor:pointer;
}
div.jp-video-270p div.jp-video-play {
margin-top:-270px;
height:270px;
}
div.jp-video-360p div.jp-video-play {
margin-top:-360px;
height:360px;
}
div.jp-video-full div.jp-video-play {
height:100%;
}
a.jp-video-play-icon {
position:relative;
display:block;
width: 112px;
height: 100px;
margin-left:-56px;
margin-top:-50px;
left:50%;
top:50%;
background: url("jplayer.pink.flag.video.play.png") 0 0 no-repeat;
text-indent:-9999px;
}
div.jp-video-play:hover a.jp-video-play-icon {
background: url("jplayer.pink.flag.video.play.png") 0 -100px no-repeat;
}
div.jp-jplayer audio,
div.jp-jplayer {
width:0px;
height:0px;
}
div.jp-jplayer {
background-color: #000000;
}
/* @group NO SOLUTION error feedback */
.jp-no-solution {
padding:5px;
font-size:.8em;
background-color:#3a2a45;
border-top:2px solid #554461;
border-left:2px solid #554461;
border-right:2px solid #180a1f;
border-bottom:2px solid #180a1f;
color:#FFF;
display:none;
}
.jp-no-solution a {
color:#FFF;
}
.jp-no-solution span {
font-size:1em;
display:block;
text-align:center;
font-weight:bold;
}
/* @end */

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@ -136,9 +136,9 @@
// Disable the resize image functionality by default: // Disable the resize image functionality by default:
disableImageResize: true, disableImageResize: true,
// The maximum width of the preview images: // The maximum width of the preview images:
previewMaxWidth: 50, previewMaxWidth: 80,
// The maximum height of the preview images: // The maximum height of the preview images:
previewMaxHeight: 50, previewMaxHeight: 80,
// Defines the preview orientation (1-8) or takes the orientation // Defines the preview orientation (1-8) or takes the orientation
// value from Exif data if set to true: // value from Exif data if set to true:
previewOrientation: true, previewOrientation: true,

View File

@ -43,7 +43,7 @@
'|(Kindle/(1\\.0|2\\.[05]|3\\.0))' '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
).test(window.navigator.userAgent) || ).test(window.navigator.userAgent) ||
// Feature detection for all other devices: // Feature detection for all other devices:
$('<input type="file">').prop('disabled')); $('<input type="file"/>').prop('disabled'));
// The FileReader API is not actually used, but works as feature detection, // The FileReader API is not actually used, but works as feature detection,
// as some Safari versions (5?) support XHR file uploads via the FormData API, // as some Safari versions (5?) support XHR file uploads via the FormData API,
@ -453,7 +453,7 @@
} }
if (!multipart || options.blob || !this._isInstanceOf('File', file)) { if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
options.headers['Content-Disposition'] = 'attachment; filename="' + options.headers['Content-Disposition'] = 'attachment; filename="' +
encodeURI(file.name) + '"'; encodeURI(file.uploadName || file.name) + '"';
} }
if (!multipart) { if (!multipart) {
options.contentType = file.type || 'application/octet-stream'; options.contentType = file.type || 'application/octet-stream';
@ -489,7 +489,11 @@
}); });
} }
if (options.blob) { if (options.blob) {
formData.append(paramName, options.blob, file.name); formData.append(
paramName,
options.blob,
file.uploadName || file.name
);
} else { } else {
$.each(options.files, function (index, file) { $.each(options.files, function (index, file) {
// This check allows the tests to run with // This check allows the tests to run with
@ -1126,7 +1130,7 @@
dirReader = entry.createReader(); dirReader = entry.createReader();
readEntries(); readEntries();
} else { } else {
// Return an empy list for file system items // Return an empty list for file system items
// other than files or directories: // other than files or directories:
dfd.resolve([]); dfd.resolve([]);
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -3,8 +3,8 @@
return array( return array(
'Select' => 'Vybrat', 'Select' => 'Vybrat',
'Deselect_All' => 'Deselect All', 'Deselect_All' => 'Zrušit vše',
'Select_All' => 'Select All', 'Select_All' => 'Vybrat vše',
'Erase' => 'Smazat', 'Erase' => 'Smazat',
'Open' => 'Otevřít', 'Open' => 'Otevřít',
'Confirm_del' => 'Opravdu chcete smazat tento soubor?', 'Confirm_del' => 'Opravdu chcete smazat tento soubor?',
@ -41,30 +41,30 @@ return array(
'Text_filter' => 'textový filtr', 'Text_filter' => 'textový filtr',
'Swipe_help' => 'Pro zobrazení možností klikněte na název souboru/složky.', 'Swipe_help' => 'Pro zobrazení možností klikněte na název souboru/složky.',
'Upload_base' => 'Základní nahrávání', 'Upload_base' => 'Základní nahrávání',
'Upload_base_help' => "Drag & Drop files(modern browsers) or click in upper button to Add the file(s) and click on Start upload. When the upload is complete, click the 'Return to files list' button.", 'Upload_base_help' => "Soubory přetáhněte (pouze moderní prohlížeče) nebo klikněte na horní tlačítko 'Přidat soubor(y)' a poté na tlačítko 'Sputit nahrávání'. Až bude nahrávání dokončeno, klikněte na 'Zpět k seznamu souborů'.",
'Upload_add_files' => 'Add file(s)', 'Upload_add_files' => 'Přidat soubor(y)',
'Upload_start' => 'Start upload', 'Upload_start' => 'Sputit nahrávání',
'Upload_error_messages' =>array( 'Upload_error_messages' =>array(
1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini', 1 => 'Nahrávaný soubor má větší velikost, než co povoluje direktiva upload_max_filesize v php.ini',
2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', 2 => 'Nahrávaný soubor má větší velikost, než co povoluje direktiva MAX_FILE_SIZE uvedená v HTML formuláři',
3 => 'The uploaded file was only partially uploaded', 3 => 'Soubor byl nahrán pouze z části',
4 => 'No file was uploaded', 4 => 'Nebyl nahrán žádný soubor',
6 => 'Missing a temporary folder', 6 => 'Chybí dočasná složka',
7 => 'Failed to write file to disk', 7 => 'Při zapisování souboru na disk došlo k chybě',
8 => 'A PHP extension stopped the file upload', 8 => 'Nahrávání souborů zastavilo rozšížení PHP',
'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', 'post_max_size' => 'Nahrávaný soubor má větší velikost, než co povoluje direktiva post_max_size v php.ini',
'max_file_size' => 'File is too big', 'max_file_size' => 'Příliš velký soubor',
'min_file_size' => 'File is too small', 'min_file_size' => 'Příliš malý soubor',
'accept_file_types' => 'Filetype not allowed', 'accept_file_types' => 'Není povolen tento typ souboru (přípona)',
'max_number_of_files' => 'Maximum number of files exceeded', 'max_number_of_files' => 'Překročen maximální počet souborů',
'max_width' => 'Image exceeds maximum width', 'max_width' => 'Obrázek přesahuje maximální šířku',
'min_width' => 'Image requires a minimum width', 'min_width' => 'Obrázek vyžaduje minimální šířku',
'max_height' => 'Image exceeds maximum height', 'max_height' => 'Obrázek přesahuje maximální výšku',
'min_height' => 'Image requires a minimum height', 'min_height' => 'Obrázek vyžaduje minimální výšku',
'abort' => 'File upload aborted', 'abort' => 'Nahrávání souboru bylo přerušeno',
'image_resize' => 'Failed to resize image' 'image_resize' => 'Nepodařilo se změnit velikost obrázku'
), ),
'Upload_url' => 'From url', 'Upload_url' => 'Z url adresy',
'Type_dir' => 'složka', 'Type_dir' => 'složka',
'Type' => 'Typ', 'Type' => 'Typ',
'Dimension' => 'Rozměr', 'Dimension' => 'Rozměr',

View File

@ -3,8 +3,8 @@
return array( return array(
'Select' => 'Ausw&auml;hlen', 'Select' => 'Ausw&auml;hlen',
'Deselect_All' => 'Deselect All', 'Deselect_All' => 'Alle abw&auml;hlen',
'Select_All' => 'Select All', 'Select_All' => 'Alle anw&auml;hlen',
'Erase' => 'L&ouml;schen', 'Erase' => 'L&ouml;schen',
'Open' => '&Ouml;ffnen', 'Open' => '&Ouml;ffnen',
'Confirm_del' => 'Sind Sie sicher das Sie die Datei l&ouml;schen wollen?', 'Confirm_del' => 'Sind Sie sicher das Sie die Datei l&ouml;schen wollen?',
@ -44,7 +44,7 @@ return array(
'Upload_base_help' => "Ziehen Sie die Dateien per Drag & Drop (moderne Browser) oder klicken Sie auf die obere Schaltfl&auml;che, um die Datei (en) hinzuzuf&uuml;gen und klicken Sie auf Hochladen beginnen. Wenn das Hochladen abgeschlossen ist, klicken Sie auf die Schaltfl&auml;che \"Zur Dateiliste zur&uuml;ckkehren\".", 'Upload_base_help' => "Ziehen Sie die Dateien per Drag & Drop (moderne Browser) oder klicken Sie auf die obere Schaltfl&auml;che, um die Datei (en) hinzuzuf&uuml;gen und klicken Sie auf Hochladen beginnen. Wenn das Hochladen abgeschlossen ist, klicken Sie auf die Schaltfl&auml;che \"Zur Dateiliste zur&uuml;ckkehren\".",
'Upload_add_files' => 'Dateien hinzuf&uuml;gen', 'Upload_add_files' => 'Dateien hinzuf&uuml;gen',
'Upload_start' => 'Hochladen beginnen', 'Upload_start' => 'Hochladen beginnen',
'Upload_error_messages' =>array( 'Upload_error_messages' => array(
1 => 'Die hochgeladene Datei &uuml;berschreitet die Direktive upload_max_filesize in php.ini', 1 => 'Die hochgeladene Datei &uuml;berschreitet die Direktive upload_max_filesize in php.ini',
2 => 'Die hochgeladene Datei &uuml;berschreitet die Anweisung MAX_FILE_SIZE, die im HTML-Formular angegeben wurde', 2 => 'Die hochgeladene Datei &uuml;berschreitet die Anweisung MAX_FILE_SIZE, die im HTML-Formular angegeben wurde',
3 => 'Die hochgeladene Datei wurde nur teilweise hochgeladen', 3 => 'Die hochgeladene Datei wurde nur teilweise hochgeladen',

View File

@ -3,13 +3,13 @@
return array( return array(
'Select' => 'Tallózás', 'Select' => 'Tallózás',
'Deselect_All' => 'Deselect All', 'Deselect_All' => 'Kijelölés törlése',
'Select_All' => 'Select All', 'Select_All' => 'Összes kijelölése',
'Erase' => 'Törlés', 'Erase' => 'Törlés',
'Open' => 'Megnyitás', 'Open' => 'Megnyitás',
'Confirm_del' => 'Biztos vagy benne, hogy törlöd ezt a fájlt?', 'Confirm_del' => 'Biztosan törlöd ezt a fájlt?',
'All' => 'Összes', 'All' => 'Összes',
'Files' => 'Fájlok', 'Files' => 'fájl',
'Images' => 'Képek', 'Images' => 'Képek',
'Archives' => 'Tömörített', 'Archives' => 'Tömörített',
'Error_Upload' => 'A kiválasztott fájl mérete túl nagy!', 'Error_Upload' => 'A kiválasztott fájl mérete túl nagy!',
@ -21,7 +21,7 @@ return array(
'New_Folder' => 'Új mappa', 'New_Folder' => 'Új mappa',
'Folder_Created' => 'Mappa létrehozva', 'Folder_Created' => 'Mappa létrehozva',
'Existing_Folder' => 'Mappa már létezik', 'Existing_Folder' => 'Mappa már létezik',
'Confirm_Folder_del' => 'Biztos, hogy törlöd a könyvtárat és annak tartalmát?', 'Confirm_Folder_del' => 'Biztosan törlöd a könyvtárat és annak tartalmát?',
'Return_Files_List' => 'Vissza a fájllistához', 'Return_Files_List' => 'Vissza a fájllistához',
'Preview' => 'Előnézet', 'Preview' => 'Előnézet',
'Download' => 'Letöltés', 'Download' => 'Letöltés',
@ -40,10 +40,10 @@ return array(
'Empty_name' => 'A név nincs megadva', 'Empty_name' => 'A név nincs megadva',
'Text_filter' => 'szűrés', 'Text_filter' => 'szűrés',
'Swipe_help' => 'Húzd az egered a fájl/mappa nevére, hogy lásd az opciókat.', 'Swipe_help' => 'Húzd az egered a fájl/mappa nevére, hogy lásd az opciókat.',
'Upload_base' => 'Alapértelmezett feltöltő', 'Upload_base' => 'Féltöltés a számítógépről',
'Upload_base_help' => "Drag & Drop files(modern browsers) or click in upper button to Add the file(s) and click on Start upload. When the upload is complete, click the 'Return to files list' button.", 'Upload_base_help' => "Húzza ide a feltölteni kívánt fájlokat, vagy kattintson a 'Fájl(ok) hozzáadása gombra. Ha kiválasztotta a fájlokat kattintson a 'Feltöltés indítása' gomba. Miután elkészült a feltöltés kattintson a fenti 'Vissza a fájllistához' gombra.",
'Upload_add_files' => 'Add file(s)', 'Upload_add_files' => 'Fájl(ok) hozzáadása',
'Upload_start' => 'Start upload', 'Upload_start' => 'Feltöltés elindítása',
'Upload_error_messages' =>array( 'Upload_error_messages' =>array(
1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini', 1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini',
2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',
@ -53,18 +53,18 @@ return array(
7 => 'Failed to write file to disk', 7 => 'Failed to write file to disk',
8 => 'A PHP extension stopped the file upload', 8 => 'A PHP extension stopped the file upload',
'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini',
'max_file_size' => 'File is too big', 'max_file_size' => 'A fájl mérete túl nagy!',
'min_file_size' => 'File is too small', 'min_file_size' => 'A fájl mérete túl kicsi!',
'accept_file_types' => 'Filetype not allowed', 'accept_file_types' => 'Filetype not allowed',
'max_number_of_files' => 'Maximum number of files exceeded', 'max_number_of_files' => 'Maximum number of files exceeded',
'max_width' => 'Image exceeds maximum width', 'max_width' => 'A kép mérete elérte a maximális szélességet!',
'min_width' => 'Image requires a minimum width', 'min_width' => 'A kép mérete nem éri el a minimális szélességet!',
'max_height' => 'Image exceeds maximum height', 'max_height' => 'A kép mérete elérte a maximális magasságot!',
'min_height' => 'Image requires a minimum height', 'min_height' => 'A kép mérete nem éri el a minimális magasságot!',
'abort' => 'File upload aborted', 'abort' => 'File upload aborted',
'image_resize' => 'Failed to resize image' 'image_resize' => 'A kép átméretézése sikertelen!'
), ),
'Upload_url' => 'From url', 'Upload_url' => 'Feltöltés URL-ről',
'Type_dir' => 'Mappa', 'Type_dir' => 'Mappa',
'Type' => 'Típus', 'Type' => 'Típus',
'Dimension' => 'Felbontás', 'Dimension' => 'Felbontás',
@ -75,13 +75,13 @@ return array(
'Date_type' => 'y-m-d', 'Date_type' => 'y-m-d',
'OK' => 'OK', 'OK' => 'OK',
'Cancel' => 'Mégse', 'Cancel' => 'Mégse',
'Sorting' => 'rendezés', 'Sorting' => 'Rendezés',
'Show_url' => 'URL mutatása', 'Show_url' => 'URL megjelenítése',
'Extract' => 'kibontás ide', 'Extract' => 'Kibontás ide',
'File_info' => 'fájl info', 'File_info' => 'Fájl info',
'Edit_image' => 'kép szerkesztése', 'Edit_image' => 'Kép szerkesztése',
'Duplicate' => 'Klónozás', 'Duplicate' => 'Klónozás',
'Folders' => 'Mappák', 'Folders' => 'mappa',
'Copy' => 'Másolás', 'Copy' => 'Másolás',
'Cut' => 'Kivágás', 'Cut' => 'Kivágás',
'Paste' => 'Beillesztés', 'Paste' => 'Beillesztés',
@ -90,7 +90,7 @@ return array(
'Paste_Confirm' => 'Biztos vagy benne, hogy ebbe a mappába szeretnéd beilleszteni a fájlokat? A létező fájlok/mappák felül lesznek írva.', 'Paste_Confirm' => 'Biztos vagy benne, hogy ebbe a mappába szeretnéd beilleszteni a fájlokat? A létező fájlok/mappák felül lesznek írva.',
'Paste_Failed' => 'A beillesztés sikertelen!', 'Paste_Failed' => 'A beillesztés sikertelen!',
'Clear_Clipboard' => 'Vágólap törlése', 'Clear_Clipboard' => 'Vágólap törlése',
'Clear_Clipboard_Confirm' => 'Biztos törlöd a vágólap tartalmát?', 'Clear_Clipboard_Confirm' => 'Biztosan törlöd a vágólap tartalmát?',
'Files_ON_Clipboard' => 'Fájlok találhatóak a vágólapon.', 'Files_ON_Clipboard' => 'Fájlok találhatóak a vágólapon.',
'Copy_Cut_Size_Limit' => 'A kiválasztott fájlok/mappák túl nagyok a %shoz. Limit: %d MB/művelet', // %s = cut or copy 'Copy_Cut_Size_Limit' => 'A kiválasztott fájlok/mappák túl nagyok a %shoz. Limit: %d MB/művelet', // %s = cut or copy
'Copy_Cut_Count_Limit' => 'Túl sok fájlt választottál ki a %shoz. Limit: %d fájl/művelet', // %s = cut or copy 'Copy_Cut_Count_Limit' => 'Túl sok fájlt választottál ki a %shoz. Limit: %d fájl/művelet', // %s = cut or copy

View File

@ -32,6 +32,7 @@ return array(
'sk' => 'Slovenčina', 'sk' => 'Slovenčina',
'sl' => 'Slovenski jezik', 'sl' => 'Slovenski jezik',
'sv_SE' => 'Svenska', 'sv_SE' => 'Svenska',
'th_TH' => 'ไทย',
'tr_TR' => 'Türkçe', 'tr_TR' => 'Türkçe',
'uk_UA' => 'Yкраїнська мова', 'uk_UA' => 'Yкраїнська мова',
'vi' => 'Tiếng Việt', 'vi' => 'Tiếng Việt',

View File

@ -42,30 +42,30 @@ return array(
'Text_filter' => 'Zoeken...', 'Text_filter' => 'Zoeken...',
'Swipe_help' => 'Swipe over de naam van een bestand of map om opties te zien', 'Swipe_help' => 'Swipe over de naam van een bestand of map om opties te zien',
'Upload_base' => 'Standaard uploader', 'Upload_base' => 'Standaard uploader',
'Upload_base_help' => "Drag & Drop files(modern browsers) or click in upper button to Add the file(s) and click on Start upload. When the upload is complete, click the 'Return to files list' button.", 'Upload_base_help' => "Drag & Drop bestanden (moderne browsers) of klik op de bovenste knop om het bestand (en) toe te voegen en klik op Begin uploaden. Wanneer het uploaden is voltooid, klikt u op de knop 'Terug naar bestanden'.",
'Upload_add_files' => 'Add file(s)', 'Upload_add_files' => 'Voeg bestanden toe',
'Upload_start' => 'Start upload', 'Upload_start' => 'Begin uploaden',
'Upload_error_messages' =>array( 'Upload_error_messages' =>array(
1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini', 1 => 'Bestandsgrootte is te groot.',
2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', 2 => 'Bestandsgrootte is te groot.',
3 => 'The uploaded file was only partially uploaded', 3 => 'Bestand is slechts gedeeltelijk geupload.',
4 => 'No file was uploaded', 4 => 'Het bestand is niet uploaded.',
6 => 'Missing a temporary folder', 6 => 'Er ontbreekt een folder.',
7 => 'Failed to write file to disk', 7 => 'Kan bestand niet wegschrijven.',
8 => 'A PHP extension stopped the file upload', 8 => 'Een extentie heeft het uploaden gestopt.',
'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini', 'post_max_size' => 'Bestandsgrootte is te groot.',
'max_file_size' => 'File is too big', 'max_file_size' => 'Bestandsgrootte is te groot.',
'min_file_size' => 'File is too small', 'min_file_size' => 'Bestandsgrootte is te klein.',
'accept_file_types' => 'Filetype not allowed', 'accept_file_types' => 'Bestandstype niet ondersteund.',
'max_number_of_files' => 'Maximum number of files exceeded', 'max_number_of_files' => 'Maximum aantal bestanden bereikt.',
'max_width' => 'Image exceeds maximum width', 'max_width' => 'Afbeelding te breed.',
'min_width' => 'Image requires a minimum width', 'min_width' => 'Afbeelding niet breed genoeg.',
'max_height' => 'Image exceeds maximum height', 'max_height' => 'Afbeelding te hoog.',
'min_height' => 'Image requires a minimum height', 'min_height' => 'Afbeelding niet hoog genoeg.',
'abort' => 'File upload aborted', 'abort' => 'Uploaden onderbroken.',
'image_resize' => 'Failed to resize image' 'image_resize' => 'Resizen is mislukt.'
), ),
'Upload_url' => 'From url', 'Upload_url' => 'Van url',
'Type_dir' => 'map', 'Type_dir' => 'map',
'Type' => 'Type', 'Type' => 'Type',
'Dimension' => 'Afmetingen', 'Dimension' => 'Afmetingen',
@ -119,7 +119,7 @@ return array(
'File_Save_Error' => "Er is een fout opgetreden tijdens het opslaan van het bestand.", 'File_Save_Error' => "Er is een fout opgetreden tijdens het opslaan van het bestand.",
'No_Extension' => 'Je moet een bestands-extensie toevoegen.', 'No_Extension' => 'Je moet een bestands-extensie toevoegen.',
'Valid_Extensions' => 'Geldige extensies: %s', // %s = txt,log etc. 'Valid_Extensions' => 'Geldige extensies: %s', // %s = txt,log etc.
'Upload_message' => "Drop file here to upload", 'Upload_message' => "Sleep hier bestanden om te uploaden",
'SERVER ERROR' => "SERVER ERROR", 'SERVER ERROR' => "SERVER ERROR",
'forbiden' => "Forbiden", 'forbiden' => "Forbiden",

View File

@ -49,9 +49,9 @@ return array(
'Swipe_help' => 'Swipe the name of file/folder to show options', 'Swipe_help' => 'Swipe the name of file/folder to show options',
'Upload_base' => 'อัพโหลดแบบธรรมดา', 'Upload_base' => 'อัพโหลดแบบธรรมดา',
'Upload_url' => 'อัพโหลดจาก URL', 'Upload_url' => 'อัพโหลดจาก URL',
'Upload_base_help' => "Drag & Drop files(modern browsers) or click in upper button to Add the file(s) and click on Start upload. When the upload is complete, click the 'Return to files list' button.", 'Upload_base_help' => "สามารถอัพโหลดไฟล์แบบลากวางได้ หรือคลิกที่ปุ่มด้านบนเพื่อเพิ่มไฟล์และคลิกอัพโหลด เมื่อการอัปโหลดเสร็จสมบูรณ์คลิกปุ่ม \"กลับสู่หน้ารายการ\"",
'Upload_add_files' => 'Add file(s)', 'Upload_add_files' => 'เลือกไฟล์ (สามารเลือกได้หลายไฟล์)',
'Upload_start' => 'Start upload', 'Upload_start' => 'อัพโหลด',
'Upload_error_messages' =>array( 'Upload_error_messages' =>array(
1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini', 1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini',
2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',
@ -72,7 +72,7 @@ return array(
'abort' => 'File upload aborted', 'abort' => 'File upload aborted',
'image_resize' => 'Failed to resize image' 'image_resize' => 'Failed to resize image'
), ),
'Upload_url' => 'From url', 'Upload_url' => 'อัพโหลดจาก url',
'Type_dir' => 'dir', 'Type_dir' => 'dir',
'Type' => 'ชนิด', 'Type' => 'ชนิด',
'Dimension' => 'Dimension', 'Dimension' => 'Dimension',
@ -94,10 +94,10 @@ return array(
'Cut' => 'ตัด', 'Cut' => 'ตัด',
'Paste' => 'วาง', 'Paste' => 'วาง',
'CB' => 'CB', // clipboard 'CB' => 'CB', // clipboard
'Paste_Here' => 'Paste to this directory', 'Paste_Here' => 'วางในโพลเดอร์นี้',
'Paste_Confirm' => 'Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.', 'Paste_Confirm' => 'Are you sure you want to paste to this directory? This will overwrite existing files/folders if encountered any.',
'Paste_Failed' => 'Failed to paste file(s)', 'Paste_Failed' => 'Failed to paste file(s)',
'Clear_Clipboard' => 'Clear clipboard', 'Clear_Clipboard' => 'ลบที่ก็อปปี้ไว้',
'Clear_Clipboard_Confirm' => 'Are you sure you want to clear the clipboard?', 'Clear_Clipboard_Confirm' => 'Are you sure you want to clear the clipboard?',
'Files_ON_Clipboard' => 'There are files on the clipboard.', 'Files_ON_Clipboard' => 'There are files on the clipboard.',
'Copy_Cut_Size_Limit' => 'The selected files/folders are too big to %1$s. Limit: %2$d MB/operation', // %1$s = cut or copy, %2$d = max size 'Copy_Cut_Size_Limit' => 'The selected files/folders are too big to %1$s. Limit: %2$d MB/operation', // %1$s = cut or copy, %2$d = max size

View File

@ -1 +1,99 @@
tinymce.PluginManager.add("filemanager",function(e){function n(t){0===e.settings.external_filemanager_path.toLowerCase().indexOf(t.origin.toLowerCase())&&"responsivefilemanager"===t.data.sender&&(tinymce.activeEditor.windowManager.getParams().setUrl(t.data.url),tinymce.activeEditor.windowManager.close(),window.removeEventListener?window.removeEventListener("message",n,!1):window.detachEvent("onmessage",n))}function t(t,i,a,s){var r=window.innerWidth-30,g=window.innerHeight-60;if(r>1800&&(r=1800),g>1200&&(g=1200),r>600){var d=(r-20)%138;r=r-d+10}urltype=2,"image"==a&&(urltype=1),"media"==a&&(urltype=3);var o="RESPONSIVE FileManager";"undefined"!=typeof e.settings.filemanager_title&&e.settings.filemanager_title&&(o=e.settings.filemanager_title);var l="key";"undefined"!=typeof e.settings.filemanager_access_key&&e.settings.filemanager_access_key&&(l=e.settings.filemanager_access_key);var f="";"undefined"!=typeof e.settings.filemanager_sort_by&&e.settings.filemanager_sort_by&&(f="&sort_by="+e.settings.filemanager_sort_by);var m=0;"undefined"!=typeof e.settings.filemanager_descending&&e.settings.filemanager_descending&&(m=e.settings.filemanager_descending);var c="";"undefined"!=typeof e.settings.filemanager_subfolder&&e.settings.filemanager_subfolder&&(c="&fldr="+e.settings.filemanager_subfolder);var v="";"undefined"!=typeof e.settings.filemanager_crossdomain&&e.settings.filemanager_crossdomain&&(v="&crossdomain=1",window.addEventListener?window.addEventListener("message",n,!1):window.attachEvent("onmessage",n)),tinymce.activeEditor.windowManager.open({title:o,file:e.settings.external_filemanager_path+"dialog.php?type="+urltype+"&descending="+m+f+c+v+"&lang="+e.settings.language+"&akey="+l,width:r,height:g,resizable:!0,maximizable:!0,inline:1},{setUrl:function(n){var i=s.document.getElementById(t);if(i.value=e.convertURL(n),"createEvent"in document){var a=document.createEvent("HTMLEvents");a.initEvent("change",!1,!0),i.dispatchEvent(a)}else i.fireEvent("onchange")}})}return e.settings.file_browser_callback=t,!1}); /**
* plugin.js
*
* Copyright, Alberto Peripolli
* Released under Creative Commons Attribution-NonCommercial 3.0 Unported License.
*
* Contributing: https://github.com/trippo/ResponsiveFilemanager
*/
tinymce.PluginManager.add('filemanager', function(editor) {
editor.settings.file_browser_callback = filemanager;
function filemanager_onMessage(event){
if(editor.settings.external_filemanager_path.toLowerCase().indexOf(event.origin.toLowerCase()) === 0){
if(event.data.sender === 'responsivefilemanager'){
tinymce.activeEditor.windowManager.getParams().setUrl(event.data.url);
tinymce.activeEditor.windowManager.close();
// Remove event listener for a message from ResponsiveFilemanager
if(window.removeEventListener){
window.removeEventListener('message', filemanager_onMessage, false);
} else {
window.detachEvent('onmessage', filemanager_onMessage);
}
}
}
}
function filemanager (id, value, type, win) {
var width = window.innerWidth-30;
var height = window.innerHeight-60;
if(width > 1800) width=1800;
if(height > 1200) height=1200;
if(width>600){
var width_reduce = (width - 20) % 138;
width = width - width_reduce + 10;
}
// DEFAULT AS FILE
urltype=2;
if (type=='image') { urltype=1; }
if (type=='media') { urltype=3; }
var title="RESPONSIVE FileManager";
if (typeof editor.settings.filemanager_title !== "undefined" && editor.settings.filemanager_title) {
title=editor.settings.filemanager_title;
}
var akey="key";
if (typeof editor.settings.filemanager_access_key !== "undefined" && editor.settings.filemanager_access_key) {
akey=editor.settings.filemanager_access_key;
}
var sort_by="";
if (typeof editor.settings.filemanager_sort_by !== "undefined" && editor.settings.filemanager_sort_by) {
sort_by="&sort_by="+editor.settings.filemanager_sort_by;
}
var descending=0;
if (typeof editor.settings.filemanager_descending !== "undefined" && editor.settings.filemanager_descending) {
descending=editor.settings.filemanager_descending;
}
var fldr="";
if (typeof editor.settings.filemanager_subfolder !== "undefined" && editor.settings.filemanager_subfolder) {
fldr="&fldr="+editor.settings.filemanager_subfolder;
}
var crossdomain="";
if (typeof editor.settings.filemanager_crossdomain !== "undefined" && editor.settings.filemanager_crossdomain) {
crossdomain="&crossdomain=1";
// Add handler for a message from ResponsiveFilemanager
if(window.addEventListener){
window.addEventListener('message', filemanager_onMessage, false);
} else {
window.attachEvent('onmessage', filemanager_onMessage);
}
}
tinymce.activeEditor.windowManager.open({
title: title,
file: editor.settings.external_filemanager_path+'dialog.php?type='+urltype+'&descending='+descending+sort_by+fldr+crossdomain+'&lang='+editor.settings.language+'&akey='+akey,
width: width,
height: height,
resizable: true,
maximizable: true,
inline: 1
}, {
setUrl: function (url) {
var fieldElm = win.document.getElementById(id);
fieldElm.value = editor.convertURL(url);
if ("createEvent" in document) {
var evt = document.createEvent("HTMLEvents");
evt.initEvent("change", false, true);
fieldElm.dispatchEvent(evt)
} else {
fieldElm.fireEvent("onchange")
}
}
});
};
return false;
});

View File

@ -1,80 +1,86 @@
<?php <?php
try{
if (!isset($config)){ try {
if (!isset($config)) {
$config = include 'config/config.php'; $config = include 'config/config.php';
} }
include 'include/utils.php'; include 'include/utils.php';
if ($_SESSION['RF']["verify"] != "RESPONSIVEfilemanager") if ($_SESSION['RF']["verify"] != "RESPONSIVEfilemanager") {
{ response(trans('forbiden') . AddErrorLocation(), 403)->send();
response(trans('forbiden').AddErrorLocation(), 403)->send();
exit; exit;
} }
include 'include/mime_type_lib.php'; include 'include/mime_type_lib.php';
$ftp = ftp_con($config);
$ftp=ftp_con($config); if ($ftp) {
if($ftp){ $source_base = $config['ftp_base_folder'] . $config['upload_dir'];
$source_base = $config['ftp_base_folder'].$config['upload_dir']; $thumb_base = $config['ftp_base_folder'] . $config['ftp_thumbs_dir'];
$thumb_base = $config['ftp_base_folder'].$config['ftp_thumbs_dir']; } else {
}else{
$source_base = $config['current_path']; $source_base = $config['current_path'];
$thumb_base = $config['thumbs_base_path']; $thumb_base = $config['thumbs_base_path'];
} }
if(isset($_POST["fldr"])){
$_POST['fldr'] = str_replace('undefined','',$_POST['fldr']); if (isset($_POST["fldr"])) {
$storeFolder = $source_base.$_POST["fldr"]; $_POST['fldr'] = str_replace('undefined', '', $_POST['fldr']);
$storeFolderThumb = $thumb_base.$_POST["fldr"]; $storeFolder = $source_base . $_POST["fldr"];
}else{ $storeFolderThumb = $thumb_base . $_POST["fldr"];
} else {
return; return;
} }
$fldr = rawurldecode(trim(strip_tags($_POST['fldr']),"/") ."/"); $fldr = rawurldecode(trim(strip_tags($_POST['fldr']), "/") . "/");
if (strpos($fldr,'../') !== FALSE if (!checkRelativePath($fldr)) {
|| strpos($fldr,'./') !== FALSE response(trans('wrong path').AddErrorLocation())->send();
|| strpos($fldr,'..\\') !== FALSE
|| strpos($fldr,'.\\') !== FALSE )
{
response(trans('wrong path'.AddErrorLocation()))->send();
exit; exit;
} }
$path = $storeFolder; $path = $storeFolder;
$cycle = TRUE; $cycle = true;
$max_cycles = 50; $max_cycles = 50;
$i = 0; $i = 0;
//GET config //GET config
while ($cycle && $i < $max_cycles) while ($cycle && $i < $max_cycles) {
{
$i++; $i++;
if ($path == $config['current_path']) $cycle = FALSE; if ($path == $config['current_path']) {
if (file_exists($path."config.php")) $cycle = false;
{
$configTemp = include $path.'config.php';
$config = array_merge($config,$configTemp);
//TODO switch to array
$cycle = FALSE;
} }
$path = fix_dirname($path).'/'; if (file_exists($path . "config.php")) {
$configTemp = include $path . 'config.php';
$config = array_merge($config, $configTemp);
//TODO switch to array
$cycle = false;
}
$path = fix_dirname($path) . '/';
} }
require('UploadHandler.php'); require('UploadHandler.php');
$messages = null; $messages = null;
if(trans("Upload_error_messages")!=="Upload_error_messages"){ if (trans("Upload_error_messages") !== "Upload_error_messages") {
$messages = trans("Upload_error_messages"); $messages = trans("Upload_error_messages");
} }
if(isset($_POST['url'])){ // make sure the length is limited to avoid DOS attacks
$temp = tempnam('/tmp','RF'); if (isset($_POST['url']) && strlen($_POST['url']) < 2000) {
$ch = curl_init($_POST['url']); $url = $_POST['url'];
$urlPattern = '/^(https?:\/\/)?([\da-z\.-]+\.[a-z\.]{2,6}|[\d\.]+)([\/?=&#]{1}[\da-z\.-]+)*[\/\?]?$/i';
if (preg_match($urlPattern, $url)) {
$temp = tempnam('/tmp', 'RF');
$ch = curl_init($url);
$fp = fopen($temp, 'wb'); $fp = fopen($temp, 'wb');
curl_setopt($ch, CURLOPT_FILE, $fp); curl_setopt($ch, CURLOPT_FILE, $fp);
curl_setopt($ch, CURLOPT_HEADER, 0); curl_setopt($ch, CURLOPT_HEADER, 0);
curl_exec($ch); curl_exec($ch);
if (curl_errno($ch)) {
curl_close($ch);
throw new Exception('Invalid URL');
}
curl_close($ch); curl_close($ch);
fclose($fp); fclose($fp);
@ -84,38 +90,46 @@ try{
'size' => array(filesize($temp)), 'size' => array(filesize($temp)),
'type' => null 'type' => null
); );
} else {
throw new Exception('Is not a valid URL.');
}
} }
if($config['mime_extension_rename']){
if ($config['mime_extension_rename']) {
$info = pathinfo($_FILES['files']['name'][0]); $info = pathinfo($_FILES['files']['name'][0]);
$mime_type = $_FILES['files']['type'][0]; $mime_type = $_FILES['files']['type'][0];
if (function_exists('mime_content_type')){ if (function_exists('mime_content_type')) {
$mime_type = mime_content_type($_FILES['files']['tmp_name'][0]); $mime_type = mime_content_type($_FILES['files']['tmp_name'][0]);
}elseif(function_exists('finfo_open')){ } elseif (function_exists('finfo_open')) {
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$mime_type = finfo_file($finfo, $_FILES['files']['tmp_name'][0]); $mime_type = finfo_file($finfo, $_FILES['files']['tmp_name'][0]);
}else{ } else {
include 'include/mime_type_lib.php';
$mime_type = get_file_mime_type($_FILES['files']['tmp_name'][0]); $mime_type = get_file_mime_type($_FILES['files']['tmp_name'][0]);
} }
$extension = get_extension_from_mime($mime_type); $extension = get_extension_from_mime($mime_type);
if($extension=='so' || $extension=='' || $mime_type == "text/troff"){ if ($extension == 'so' || $extension == '' || $mime_type == "text/troff") {
$extension = $info['extension']; $extension = $info['extension'];
} }
$filename = $info['filename'].".".$extension; $filename = $info['filename'] . "." . $extension;
}else{ } else {
$filename = $_FILES['files']['name'][0]; $filename = $_FILES['files']['name'][0];
} }
$_FILES['files']['name'][0] = fix_filename($filename,$config); $_FILES['files']['name'][0] = fix_filename($filename, $config);
// LowerCase // LowerCase
if ($config['lower_case']) if ($config['lower_case']) {
{
$_FILES['files']['name'][0] = fix_strtolower($_FILES['files']['name'][0]); $_FILES['files']['name'][0] = fix_strtolower($_FILES['files']['name'][0]);
} }
if (!checkresultingsize($_FILES['files']['size'][0])) { if (!checkresultingsize($_FILES['files']['size'][0])) {
$upload_handler->response['files'][0]->error = sprintf(trans('max_size_reached'),$MaxSizeTotal).AddErrorLocation(); if ( !isset($upload_handler->response['files'][0]) ) {
// Avoid " Warning: Creating default object from empty value ... "
$upload_handler->response['files'][0] = new stdClass();
}
$upload_handler->response['files'][0]->error = sprintf(trans('max_size_reached'), $config['MaxSizeTotal']) . AddErrorLocation();
echo json_encode($upload_handler->response); echo json_encode($upload_handler->response);
exit(); exit();
} }
@ -125,35 +139,40 @@ try{
'storeFolder' => $storeFolder, 'storeFolder' => $storeFolder,
'storeFolderThumb' => $storeFolderThumb, 'storeFolderThumb' => $storeFolderThumb,
'ftp' => $ftp, 'ftp' => $ftp,
'upload_dir'=> dirname($_SERVER['SCRIPT_FILENAME']).'/'.$storeFolder, 'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']) . '/' . $storeFolder,
'upload_url' => $config['base_url'].$config['upload_dir'].$_POST['fldr'], 'upload_url' => $config['base_url'] . $config['upload_dir'] . $_POST['fldr'],
'mkdir_mode' => $config['folderPermission'], 'mkdir_mode' => $config['folderPermission'],
'max_file_size' => $config['MaxSizeUpload']*1024*1024, 'max_file_size' => $config['MaxSizeUpload'] * 1024 * 1024,
'correct_image_extensions' => true, 'correct_image_extensions' => true,
'print_response' => false 'print_response' => false
); );
if(!$config['ext_blacklist']){ if (!$config['ext_blacklist']) {
$uploadConfig['accept_file_types'] = '/\.('.implode('|',$config['ext']).')$/i'; $uploadConfig['accept_file_types'] = '/\.(' . implode('|', $config['ext']) . ')$/i';
}else{ if($config['files_without_extension']){
$uploadConfig['accept_file_types'] = '/\.(?!('.implode('|',$config['ext_blacklist']).')$)/i'; $uploadConfig['accept_file_types'] = '/((\.(' . implode('|', $config['ext']) . ')$)|(^[^.]+$))$/i';
}
} else {
$uploadConfig['accept_file_types'] = '/\.(?!' . implode('|', $config['ext_blacklist']) . '$)/i';
if($config['files_without_extension']){
$uploadConfig['accept_file_types'] = '/((\.(?!' . implode('|', $config['ext_blacklist']) . '$))|(^[^.]+$))/i';
}
} }
if ($ftp) {
if($ftp){
if (!is_dir($config['ftp_temp_folder'])) { if (!is_dir($config['ftp_temp_folder'])) {
mkdir($config['ftp_temp_folder'], $config['folderPermission'], true); mkdir($config['ftp_temp_folder'], $config['folderPermission'], true);
} }
if (!is_dir($config['ftp_temp_folder']."thumbs")) { if (!is_dir($config['ftp_temp_folder'] . "thumbs")) {
mkdir($config['ftp_temp_folder']."thumbs", $config['folderPermission'], true); mkdir($config['ftp_temp_folder'] . "thumbs", $config['folderPermission'], true);
} }
$uploadConfig['upload_dir'] = $config['ftp_temp_folder']; $uploadConfig['upload_dir'] = $config['ftp_temp_folder'];
} }
$upload_handler = new UploadHandler($uploadConfig,true, $messages); $upload_handler = new UploadHandler($uploadConfig, true, $messages);
} catch (Exception $e) {
}catch(Exception $e){
$return = array(); $return = array();
foreach($_FILES['files']['name'] as $i => $name){ if ($_FILES['files']) {
foreach ($_FILES['files']['name'] as $i => $name) {
$return[] = array( $return[] = array(
'name' => $name, 'name' => $name,
'error' => $e->getMessage(), 'error' => $e->getMessage(),
@ -161,6 +180,10 @@ try{
'type' => $_FILES['files']['type'][$i] 'type' => $_FILES['files']['type'][$i]
); );
} }
echo json_encode(array("files"=>$return));
}
echo json_encode(array("files" => $return));
return;
}
echo json_encode(array("error" =>$e->getMessage()));
}

View File

@ -174,7 +174,7 @@ class blog extends common {
]), ]),
template::button('blogConfigDelete' . $articleIds[$i], [ template::button('blogConfigDelete' . $articleIds[$i], [
'class' => 'blogConfigDelete buttonRed', 'class' => 'blogConfigDelete buttonRed',
'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i], 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $articleIds[$i] . '&csrf=' . $_SESSION['csrf'],
'value' => template::ico('cancel') 'value' => template::ico('cancel')
]) ])
]; ];
@ -190,16 +190,33 @@ class blog extends common {
* Suppression * Suppression
*/ */
public function delete() { public function delete() {
// $url prend l'adresse sans le token
$url = explode('&',$this->getUrl(2));
// L'article n'existe pas // L'article n'existe pas
if($this->getData(['module', $this->getUrl(0), $this->getUrl(2)]) === null) { if($this->getData(['module', $this->getUrl(0), $url[0]]) === null) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'access' => false 'access' => false
]); ]);
} }
// Jeton incorrect
elseif(!isset($_GET['csrf'])) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl(). $this->getUrl(0) . '/config',
'notification' => 'Jeton invalide'
]);
}
elseif ($_GET['csrf'] !== $_SESSION['csrf']) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
'notification' => 'Suppression non autorisée'
]);
}
// Suppression // Suppression
else { else {
$this->deleteData(['module', $this->getUrl(0), $this->getUrl(2)]); $this->deleteData(['module', $this->getUrl(0), $url[0]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',

View File

@ -59,7 +59,7 @@ class gallery extends common {
]), ]),
template::button('galleryConfigDelete' . $galleryId, [ template::button('galleryConfigDelete' . $galleryId, [
'class' => 'galleryConfigDelete buttonRed', 'class' => 'galleryConfigDelete buttonRed',
'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $galleryId, 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $galleryId . '&csrf=' . $_SESSION['csrf'],
'value' => template::ico('cancel') 'value' => template::ico('cancel')
]) ])
]; ];
@ -93,16 +93,33 @@ class gallery extends common {
* Suppression * Suppression
*/ */
public function delete() { public function delete() {
// $url prend l'adresse sans le token
$url = explode('&',$this->getUrl(2));
// La galerie n'existe pas // La galerie n'existe pas
if($this->getData(['module', $this->getUrl(0), $this->getUrl(2)]) === null) { if($this->getData(['module', $this->getUrl(0), $url[0]]) === null) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'access' => false 'access' => false
]); ]);
} }
// Jeton incorrect
elseif(!isset($_GET['csrf'])) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'config',
'notification' => 'Jeton invalide'
]);
}
elseif ($_GET['csrf'] !== $_SESSION['csrf']) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . 'config',
'notification' => 'Suppression non autorisée'
]);
}
// Suppression // Suppression
else { else {
$this->deleteData(['module', $this->getUrl(0), $this->getUrl(2)]); $this->deleteData(['module', $this->getUrl(0), $url[0]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',

View File

@ -100,7 +100,7 @@ class news extends common {
]), ]),
template::button('newsConfigDelete' . $newsIds[$i], [ template::button('newsConfigDelete' . $newsIds[$i], [
'class' => 'newsConfigDelete buttonRed', 'class' => 'newsConfigDelete buttonRed',
'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $newsIds[$i], 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $newsIds[$i] . '&csrf=' . $_SESSION['csrf'],
'value' => template::ico('cancel') 'value' => template::ico('cancel')
]) ])
]; ];
@ -116,16 +116,33 @@ class news extends common {
* Suppression * Suppression
*/ */
public function delete() { public function delete() {
// $url prend l'adresse sans le token
$url = explode('&',$this->getUrl(2));
// La news n'existe pas // La news n'existe pas
if($this->getData(['module', $this->getUrl(0), $this->getUrl(2)]) === null) { if($this->getData(['module', $this->getUrl(0), $url[0]]) === null) {
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'access' => false 'access' => false
]); ]);
} }
// Jeton incorrect
elseif(!isset($_GET['csrf'])) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl(). $this->getUrl(0) . '/config',
'notification' => 'Jeton invalide'
]);
}
elseif ($_GET['csrf'] !== $_SESSION['csrf']) {
// Valeurs en sortie
$this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
'notification' => 'Suppression non autorisée'
]);
}
// Suppression // Suppression
else { else {
$this->deleteData(['module', $this->getUrl(0), $this->getUrl(2)]); $this->deleteData(['module', $this->getUrl(0), $url[0]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config', 'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',

Some files were not shown because too many files have changed in this diff Show More