Changeset 6515 for extensions/rightClick

Timestamp:

Jun 10, 2010, 9:43:05 PM (14 years ago)

Author:

vdigital

Message:

2.1.b fixes first release bugs:

• Default user level is fixed
• Default selectors review ( photoWidget could not be supported )
• Lightbox, HD Shadowbox and akBookStyle are supported
• Merge of selectors ( default and customized ) is fixed
• jQuery generated has been reviewed and simplified

Location:

extensions/rightClick

Files:

• language/en_UK/description.txt (modified) (1 diff)
• language/fr_FR/description.txt (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• rightClick_protect.php (modified) (1 diff)
• template/rightClick_protect.tpl (modified) (1 diff)

extensions/rightClick/language/en_UK/description.txt

@@ -1 +1 @@
 rightClick deactivates the context menu on websized pictures and more.
-Picture page, akBookStyle, Lightbox, HD Shadowbox and photoWidget are protected by default.
-Other valid jQuery selectors could be added to the default list.
+Picture page, akBookStyle, Lightbox and HD Shadowbox are protected by default.
 By default, webmaster and administors keep the right-click available.
 
-Context menus are disable on main browsers. 
-Please, remind that rightClick is not a full secured solution against image copy. 
+Please, remind that rightClick is not a full secured solution against image copy.

extensions/rightClick/language/fr_FR/description.txt

@@ -1 +1 @@
 rightClick désactive le menu contextuel sur les images de taille web et plus encore.
-La page Picture, akBookStyle, Lightbox, HD Shadowbox et photoWidget sont protégés par défaut.
-Tout autre selecteur jQuery valide pourrait être ajouté à cette liste par défaut.
+La page Picture, akBookStyle, Lightbox et HD Shadowbox sont protégés par défaut.
 Par défaut encore, le webmaster et les administeurs conservent l'usage du clic-droit.
 
-Les menus contextuels sont désactivés sur les principaux navigateurs. 
 Merci de garder à l'esprit que rightClick n'est pas une sécurité totale contre la copie des images. 

extensions/rightClick/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: rightClick
-Version: 2.1.a
+Version: 2.1.b
 Description: rightClick deactivates the context menu on websized pictures and more. 
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=401
@@ -12 +12 @@
 define('RIGHTCK_DIR' , basename(dirname(__FILE__)));
 define('RIGHTCK_PATH' , PHPWG_PLUGINS_PATH . RIGHTCK_DIR . '/');
-define('RIGHTCK_VER' , '2.1.a');
+define('RIGHTCK_VER' , '2.1.b');
 include_once( RIGHTCK_PATH . 'rightClick_protect.php');
 ?>

extensions/rightClick/rightClick_protect.php

@@ -9 +9 @@
         function  rightClick_protect() {
                 global $template, $user, $conf;
-                if (!isset($conf['rightClick_level'])) list ($Maxlvl) = array_slice($conf['available_permission_levels'],-1);
+                if (!isset($conf['rightClick_level'])) $Maxlvl = max($conf['available_permission_levels']);
                 else $Maxlvl = $conf['rightClick_level'];
                 if ($user['level'] >= $Maxlvl) return;
-                $default = array( '#theImage img', '#photoWidget', 'img#akPicture', 'img#cboxPhoto', 'img#sb-body-inner', );
+                $default = array( '#theImage img', '#akPicture', '#colorbox', '#sb-container', );
                 if (!isset($conf['rightClick_selectors'])) $conf['rightClick_selectors'] = array();
-                $conf['rightClick_selectors'] = array_unique( $default + $conf['rightClick_selectors'] );
+                $conf['rightClick_selectors'] = array_unique( array_merge($default, $conf['rightClick_selectors']) );
                 
                 $template->set_filenames(array(

extensions/rightClick/template/rightClick_protect.tpl

@@ -1 +1 @@
 {known_script id="jquery" src=$ROOT_URL|cat:"themes/default/js/jquery.packed.js"}
 {html_head}
-<!-- Provided information by the "rightClick" plugin (version {$RIGHTCK.Version}): {$RIGHTCK.Dir}/template/rightClick_protect.tpl -->
+<!-- Protected images by the "rightClick" plugin (version {$RIGHTCK.Version}): {$RIGHTCK.Dir}/template/rightClick_protect.tpl -->
 <script type="text/javascript">
-jQuery.noConflict();
-jQuery(document).ready(function($) {*Smarty*}{ldelim}
-{*Smarty*}{foreach item=selector from=$RIGHTCK.Selectors name=select}
-        $({*Smarty*}'{$selector}').addClass('rightClick');
-{*Smarty*}{/foreach}
-        $(".rightClick").each( function() {*Smarty*}{ldelim}
-                $(this)[0].oncontextmenu = function() {*Smarty*}{ldelim}
+jQuery(document).ready(function($) {ldelim}
+{foreach item=selector from=$RIGHTCK.Selectors name=select}
+        $('{$selector}').each( function() {ldelim}
+                $(this)[0].oncontextmenu = function() {ldelim}
                         return false;
                 }
-        });
+        });     
+{/foreach}
 });
 </script>