Changeset 6846

Timestamp:

Sep 4, 2010, 9:16:02 PM (14 years ago)

Author:

nikrou

Message:

Fix incorrect use of permissions

Location:

extensions/user_tags

Files:

• CHANGELOG (modified) (1 diff)
• admin.php (modified) (1 diff)
• include/t4u_admin_action.inc.php (modified) (2 diffs)
• include/t4u_config.class.php (modified) (1 diff)
• include/t4u_content.class.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• public.php (modified) (1 diff)
• template/add_tags.tpl (modified) (1 diff)

extensions/user_tags/CHANGELOG

@@ +1 @@
+User Tags 0.3.2 - 2010-09-04
+================================
+* Fix problem of permission check
+
 User Tags 0.3.1 - 2010-08-29
 ================================

extensions/user_tags/admin.php

@@ -28 +28 @@
 $me = get_plugin_data($plugin_id);
 $save_config = false;
-
-if (!empty($_GET['action']) && in_array($_GET['action'], array('add', 'get'))) {
-  include_once T4U_PLUGIN_ROOT . "/include/t4u_admin_action.inc.php";
-}
 
 $status_options[null] = '----------';

extensions/user_tags/include/t4u_admin_action.inc.php

@@ -25 +25 @@
 
 if (!empty($_GET['action']) && ($_GET['action']=='add') 
-    && isset($_POST['tags']) && $me->getPermission('add')) {
+    && isset($_POST['tags']) && $plugin_config->getPermission('add') ) {
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
@@ -39 +39 @@
 
     echo json_encode($message);
-    Log::getInstance()->debug('message envoyé');
     exit();
   } else {
     redirect(get_absolute_root_url().$_POST['referer']);
   }
-} elseif (!empty($_GET['action']) && $_GET['action']=='get' && $me->getPermission('add')) {
+} elseif (!empty($_GET['action']) && $_GET['action']=='get' && $plugin_config->getPermission('add') ) {
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
       

extensions/user_tags/include/t4u_config.class.php

@@ -99 +99 @@
   }
   
-  public function getActionUrl($action, $method='POST') {
-    $url = get_root_url().'admin.php?page=plugin';
-    $file = basename($this->plugin_dir) . '/' .'admin.php';
-    if (strtoupper($method)=='POST') {
-        $url .= '&section='.urlencode($file);      
-        $url .= '&action='.urlencode($action);      
-    } else {
-        $url .= '&section='.$file;           
-        $url .= '&action='.$action;           
-    }
+  public function getActionUrl($base_url, $action) {
+    $url = $base_url;
+    $url .= '&action='.$action;           
 
     return $url;

extensions/user_tags/include/t4u_content.class.php

@@ -42 +42 @@
     $template->assign('T4U_CSS', T4U_CSS);
     $template->assign('T4U_IMGS', T4U_IMGS);
-    $template->assign('T4U_ADD_SCRIPT', $this->plugin_config->getActionUrl('add', 'GET'));
-    $template->assign('T4U_GET_SCRIPT', $this->plugin_config->getActionUrl('get', 'GET'));
+    $template->assign('T4U_ADD_SCRIPT', $this->plugin_config->getActionUrl($picture['url'], 'add'));
+    $template->assign('T4U_GET_SCRIPT', $this->plugin_config->getActionUrl($picture['url'], 'get'));
     $template->assign('T4U_IMAGE_ID', $picture['id']);
     $template->assign('T4U_REFERER', htmlentities($picture['url']));
@@ -60 +60 @@
 
     return $content;
-  }    
+  }
 }
 ?>

extensions/user_tags/main.inc.php

@@ -22 +22 @@
 /*
 Plugin Name: User Tags
-Version: 0.3.1
+Version: 0.3.2
 Description: Allow visitors to add tag to images
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=441

extensions/user_tags/public.php

@@ -24 +24 @@
 }
 
+if (!empty($_GET['action']) && in_array($_GET['action'], array('add', 'get'))) {
+  include_once T4U_PLUGIN_ROOT . "/include/t4u_admin_action.inc.php";
+}
+
 include_once T4U_PLUGIN_ROOT . "/include/t4u_content.class.php";
 

extensions/user_tags/template/add_tags.tpl

@@ -3 +3 @@
 <script type="text/javascript">
 var related_tags = '';
+var class = 'selected';
+{if ($T4U_PERMISSION_DELETE==false)}
+class += ' locked'; 
+{/if}
 {foreach from=$T4U_RELATED_TAGS item=tag key=id}
-related_tags += '<option value="{$id}" class="selected';
-{if ($T4U_PERMISSION_DELETE==false)}
-related_tags += ' locked'; 
-{/if}
-related_tags += '">{$tag}</option>';
+related_tags += '<option value="{$id}" class="'+class+'">{$tag}</option>';
 {/foreach}
 var path = new Array();