Changeset 16007
- Timestamp:
- Jun 24, 2012, 9:14:35 PM (12 years ago)
- Location:
- extensions/AMetaData
- Files:
-
- 2 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/admin/amd_install_page.tpl
r6977 r16007 22 22 url: "{/literal}{$urlRequest}{literal}", 23 23 async: true, 24 data: { ajaxfct:"admin.install.chooseInterface", interfaceMode:interfaceMode },24 data: { ajaxfct:"admin.install.chooseInterface", token:'{/literal}{$token}{literal}', interfaceMode:interfaceMode }, 25 25 success: 26 26 function(msg) -
extensions/AMetaData/admin/amd_metadata_database.tpl
r15349 r16007 36 36 url: "{/literal}{$datas.urlRequest}{literal}", 37 37 async: true, 38 data: { ajaxfct:"admin.makeStats.getStatus" },38 data: { ajaxfct:"admin.makeStats.getStatus", token:'{/literal}{$token}{literal}' }, 39 39 success: function (msg) { 40 40 list=msg.split(";"); … … 101 101 url: "{/literal}{$datas.urlRequest}{literal}", 102 102 async: true, 103 data: { ajaxfct:"admin.makeStats.getList", selectMode:mode, numOfItems:NumberOfItemsPerRequest },103 data: { ajaxfct:"admin.makeStats.getList", token:'{/literal}{$token}{literal}', selectMode:mode, numOfItems:NumberOfItemsPerRequest }, 104 104 success: function(msg) 105 105 { … … 135 135 url: "{/literal}{$datas.urlRequest}{literal}", 136 136 async: true, 137 data: { ajaxfct:"admin.makeStats.doAnalyze", imagesList:processAnalyze.lists[processAnalyze.step] },137 data: { ajaxfct:"admin.makeStats.doAnalyze", token:'{/literal}{$token}{literal}', imagesList:processAnalyze.lists[processAnalyze.step] }, 138 138 success: function(msg) 139 139 { … … 154 154 url: "{/literal}{$datas.urlRequest}{literal}", 155 155 async: false, 156 data: { ajaxfct:"admin.makeStats.consolidate" }156 data: { ajaxfct:"admin.makeStats.consolidate", token:'{/literal}{$token}{literal}' } 157 157 }).responseText; 158 158 -
extensions/AMetaData/admin/amd_metadata_database_database.tpl
r15343 r16007 119 119 { 120 120 ajaxfct:"admin.makeStats.getList", 121 token:'{/literal}{$token}{literal}', 121 122 selectMode:mode, 122 123 numOfItems:NumberOfItemsPerRequest, … … 157 158 url: "{/literal}{$datas.urlRequest}{literal}", 158 159 async: true, 159 data: { ajaxfct:"admin.makeStats.doAnalyze", imagesList:processAnalyze.lists[processAnalyze.step] },160 data: { ajaxfct:"admin.makeStats.doAnalyze", token:'{/literal}{$token}{literal}', imagesList:processAnalyze.lists[processAnalyze.step] }, 160 161 success: function(msg) 161 162 { … … 176 177 url: "{/literal}{$datas.urlRequest}{literal}", 177 178 async: false, 178 data: { ajaxfct:"admin.makeStats.consolidate" }179 data: { ajaxfct:"admin.makeStats.consolidate", token:'{/literal}{$token}{literal}' } 179 180 }).responseText; 180 181 … … 224 225 url: "{/literal}{$datas.urlRequest}{literal}", 225 226 async: true, 226 data: { ajaxfct:"admin.config.setOption", id:'amd_FillDataBaseContinuously', value:$('#iamd_FillDataBaseContinuously').get(0).checked?'y':'n' },227 data: { ajaxfct:"admin.config.setOption", token:'{/literal}{$token}{literal}', id:'amd_FillDataBaseContinuously', value:$('#iamd_FillDataBaseContinuously').get(0).checked?'y':'n' }, 227 228 } 228 229 ); -
extensions/AMetaData/admin/amd_metadata_display.tpl
r12225 r16007 11 11 url: "{/literal}{$datas.urlRequest}{literal}", 12 12 async: false, 13 data: { ajaxfct:"admin.group.getList" }13 data: { ajaxfct:"admin.group.getList", token:'{/literal}{$token}{literal}' } 14 14 } 15 15 ).responseText … … 43 43 url: "{/literal}{$datas.urlRequest}{literal}", 44 44 async: false, 45 data: { ajaxfct:"admin.group.setOrder", listGroup:list }45 data: { ajaxfct:"admin.group.setOrder", token:'{/literal}{$token}{literal}', listGroup:list } 46 46 } 47 47 ).responseText; … … 83 83 url: "{/literal}{$datas.urlRequest}{literal}", 84 84 async: false, 85 data: { ajaxfct:"admin.group.setOrderedTagList", id:groupId, listTag:list }85 data: { ajaxfct:"admin.group.setOrderedTagList", token:'{/literal}{$token}{literal}', id:groupId, listTag:list } 86 86 } 87 87 ).responseText; … … 100 100 url: "{/literal}{$datas.urlRequest}{literal}", 101 101 async: false, 102 data: { ajaxfct:"admin.group.getOrderedTagList", id:groupId }102 data: { ajaxfct:"admin.group.getOrderedTagList", token:'{/literal}{$token}{literal}', id:groupId } 103 103 } 104 104 ).responseText … … 169 169 url: "{/literal}{$datas.urlRequest}{literal}", 170 170 async: false, 171 data: { ajaxfct:"admin.group.delete", id:groupId }171 data: { ajaxfct:"admin.group.delete", token:'{/literal}{$token}{literal}', id:groupId } 172 172 } 173 173 ).responseText; … … 178 178 url: "{/literal}{$datas.urlRequest}{literal}", 179 179 async: false, 180 data: { ajaxfct:"admin.group.getList" }180 data: { ajaxfct:"admin.group.getList", token:'{/literal}{$token}{literal}' } 181 181 } 182 182 ).responseText … … 237 237 url: "{/literal}{$datas.urlRequest}{literal}", 238 238 async: false, 239 data: { ajaxfct:"admin.group.setNames", id:groupId, listNames:list }239 data: { ajaxfct:"admin.group.setNames", token:'{/literal}{$token}{literal}', id:groupId, listNames:list } 240 240 } 241 241 ).responseText; … … 246 246 url: "{/literal}{$datas.urlRequest}{literal}", 247 247 async: false, 248 data: { ajaxfct:"admin.group.getList" }248 data: { ajaxfct:"admin.group.getList", token:'{/literal}{$token}{literal}' } 249 249 } 250 250 ).responseText … … 266 266 url: "{/literal}{$datas.urlRequest}{literal}", 267 267 async: false, 268 data: { ajaxfct:"admin.group.getNames", id:groupId }268 data: { ajaxfct:"admin.group.getNames", token:'{/literal}{$token}{literal}', id:groupId } 269 269 } 270 270 ).responseText … … 313 313 url: "{/literal}{$datas.urlRequest}{literal}", 314 314 async: false, 315 data: { ajaxfct:"admin.group.setTagList", id:groupId, listTag:list }315 data: { ajaxfct:"admin.group.setTagList", token:'{/literal}{$token}{literal}', id:groupId, listTag:list } 316 316 } 317 317 ).responseText; … … 335 335 url: "{/literal}{$datas.urlRequest}{literal}", 336 336 async: true, 337 data: { ajaxfct:"admin.group.getTagList", id:groupId },337 data: { ajaxfct:"admin.group.getTagList", token:'{/literal}{$token}{literal}', id:groupId }, 338 338 success: 339 339 function(msg) -
extensions/AMetaData/admin/amd_metadata_display_groupList.tpl
r6722 r16007 1 1 {foreach from=$datas.groups key=name item=data} 2 2 <li id="iGroupId{$data.id}" class="groupItems gcBgPage"> 3 < img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}"/>3 <span class='listMove' title="{'Drag to re-order'|@translate}"></span> 4 4 <input type="hidden" id="iGroupName{$data.id}" value="{$data.name}"> 5 5 {$data.name} 6 6 7 7 <a onclick="deleteGroup('{$data.id}');"> 8 <img src="{$themeconf.admin_icon_dir}/delete.png" class="button drag_button" alt="{'g003_click_to_delete_group'|@translate}" title="{'g003_click_to_delete_group'|@translate}" 9 style="float:right;"/> 8 <span class='buttonDelete button' title="{'g003_click_to_delete_group'|@translate}"></span> 10 9 </a> 11 10 12 11 <a onclick="editGroup('{$data.id}');"> 13 <img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button drag_button" alt="{'g003_click_to_edit_group'|@translate}" title="{'g003_click_to_edit_group'|@translate}" 14 style="float:right;"/> 12 <span class='buttonEdit button' title="{'g003_click_to_edit_group'|@translate}"></span> 15 13 </a> 16 14 17 15 <a onclick="manageGroup('{$data.id}', '');"> 18 <img src="{$themeconf.admin_icon_dir}/preferences.png" class="button drag_button" alt="{'g003_click_to_manage_group'|@translate}" title="{'g003_click_to_manage_group'|@translate}" 19 style="float:right;"/> 16 <span class='buttonPreferences button' title="{'g003_click_to_manage_group'|@translate}"></span> 20 17 </a> 21 18 … … 23 20 <div name="fGroupId{$data.id}_content" id="iGroupId{$data.id}_content" style="visibility:hidden;height:0px;" class="groupTags"> 24 21 <a onclick="editGroupList('{$data.id}');" class="button editGroupListButton"> 25 <img src="{$themeconf.admin_icon_dir}/edit_s.png" class="button drag_button" alt="{'g003_click_to_manage_list'|@translate}" title="{'g003_click_to_manage_list'|@translate}"/>22 <span class='buttonEdit' title="{'g003_click_to_manage_list'|@translate}"></span> 26 23 </a> 27 24 <ul id="iGroupId{$data.id}_tags" class="tagListOrder g{$data.id}_connectedSortableTags"> -
extensions/AMetaData/admin/amd_metadata_display_groupListTagOrder.tpl
r6950 r16007 3 3 <table class="tagListOrderItem"> 4 4 <tr> 5 <td style="width:20px;"><img src="{$themeconf.admin_icon_dir}/cat_move.png" class="button drag_button" alt="{'Drag to re-order'|@translate}" title="{'Drag to re-order'|@translate}"/></td> 5 <td style="width:20px;"> 6 <span class='listMove' title="{'Drag to re-order'|@translate}"></span> 7 </td> 6 8 <td style="width:30%;">{$data.tagId}</td> 7 9 <td>{$data.name}</td> -
extensions/AMetaData/admin/amd_metadata_personnal.tpl
r15343 r16007 95 95 url: "{/literal}{$datas.urlRequest}{literal}", 96 96 async: true, 97 data: { ajaxfct:"admin.userDefined.getTag", id:options.numId },97 data: { ajaxfct:"admin.userDefined.getTag", token:'{/literal}{$token}{literal}', id:options.numId }, 98 98 success: 99 99 function(msg) … … 139 139 url: "{/literal}{$datas.urlRequest}{literal}", 140 140 async: true, 141 data: { ajaxfct:"admin.userDefined.deleteTag", id:id },141 data: { ajaxfct:"admin.userDefined.deleteTag", token:'{/literal}{$token}{literal}', id:id }, 142 142 success: 143 143 function(msg) … … 203 203 url: "{/literal}{$datas.urlRequest}{literal}", 204 204 async: true, 205 data: { ajaxfct:"admin.userDefined.getList" },205 data: { ajaxfct:"admin.userDefined.getList", token:'{/literal}{$token}{literal}' }, 206 206 success: 207 207 function(msg) … … 560 560 url: "{/literal}{$datas.urlRequest}{literal}", 561 561 async: true, 562 data: { ajaxfct:"admin.userDefined.setTag", id:options.numId, properties:properties },562 data: { ajaxfct:"admin.userDefined.setTag", token:'{/literal}{$token}{literal}', id:options.numId, properties:properties }, 563 563 success: 564 564 function(msg) … … 604 604 605 605 606 $(window).load ed(606 $(window).load( 607 607 function () 608 608 { … … 684 684 <ul style='display:none' id='iBDModel'> 685 685 <li id='iBDRuleNumZZZZZ' class='groupItems gcBgPage rmSortable rmItem' value='ZZZZZ'> 686 < img onclick='udm.deleteRule("ZZZZZ");' src='{$themeconf.admin_icon_dir}/delete.png' class='button pointer' alt='{"g003_delete"|@translate}' title='{"g003_delete"|@translate}' style='float:right;'/>686 <span onclick='udm.deleteRule("ZZZZZ");' class='buttonDelete button' title='{"g003_delete"|@translate}' /></span> 687 687 <div class='rmContent'> 688 688 689 689 <div class='ruleSelector'> 690 <img src='{$themeconf.admin_icon_dir}/cat_move.png' class='rmSortHandle button drag_button' alt='{"Drag to re-order"|@translate}' title='{"Drag to re-order"|@translate}'/> 691 690 <span class='buttonMove rmSortHandle drag_button' title='{"Drag to re-order"|@translate}'/></span> 692 691 693 692 <select id='iBDRuleTypeZZZZZ' onchange='udm.changeRuleType("ZZZZZ");'> -
extensions/AMetaData/admin/amd_metadata_personnal_iListTags.tpl
r6950 r16007 6 6 <th style="width:15%;">{$data.numOfRules}</th> 7 7 <td width="40px"> 8 <img src="{$themeconf.admin_icon_dir}/edit_s.png" 9 class="button" alt="{'g003_edit'|@translate}" 10 title="{'g003_edit'|@translate}" 11 onclick='udm.editMetadata({$data.numId});'/> 12 <img src="{$themeconf.admin_icon_dir}/delete.png" 13 class="button" 14 alt="{'g003_delete'|@translate}" 15 title="{'g003_delete'|@translate}" 16 onclick='udm.deleteMetadata({$data.numId});'/> 8 <span class="buttonEdit" 9 title="{'g003_edit'|@translate}" 10 onclick='udm.editMetadata({$data.numId});'></span> 11 <span class="buttonDelete" 12 title="{'g003_delete'|@translate}" 13 onclick='udm.deleteMetadata({$data.numId});'></span> 17 14 </td> 18 15 </tr> -
extensions/AMetaData/admin/amd_metadata_select.tpl
r7519 r16007 53 53 url: "{/literal}{$datas.urlRequest}{literal}", 54 54 async: true, 55 data: { ajaxfct:"admin.showStats.getListTags", orderType:order, filterType:filter, excludeUnusedTag:unusedTag, selectedTagOnly:selectedOnly },55 data: { ajaxfct:"admin.showStats.getListTags", token:'{/literal}{$token}{literal}', orderType:order, filterType:filter, excludeUnusedTag:unusedTag, selectedTagOnly:selectedOnly }, 56 56 success: 57 57 function(msg) … … 101 101 url: "{/literal}{$datas.urlRequest}{literal}", 102 102 async: true, 103 data: { ajaxfct:"admin.showStats.getListImages", orderType:order, tagId:tag, },103 data: { ajaxfct:"admin.showStats.getListImages", token:'{/literal}{$token}{literal}', orderType:order, tagId:tag, }, 104 104 success: 105 105 function(msg) … … 129 129 url: "{/literal}{$datas.urlRequest}{literal}", 130 130 async: false, 131 data: { ajaxfct:"admin.updateTag.select", t agSelected:selected, numId:numId.substr(6) }131 data: { ajaxfct:"admin.updateTag.select", token:'{/literal}{$token}{literal}', tagSelected:selected, numId:numId.substr(6) } 132 132 }).responseText 133 133 ); -
extensions/AMetaData/admin/amd_metadata_tags.tpl
r6977 r16007 15 15 url: "{/literal}{$datas.urlRequest}{literal}", 16 16 async: true, 17 data: { ajaxfct:"admin.tags.getKeywords" },17 data: { ajaxfct:"admin.tags.getKeywords", token:'{/literal}{$token}{literal}' }, 18 18 success: function (msg) 19 19 { … … 56 56 url: "{/literal}{$datas.urlRequest}{literal}", 57 57 async: true, 58 data: { ajaxfct:"admin.tags.convertKeywords", keywords:keywords },58 data: { ajaxfct:"admin.tags.convertKeywords", token:'{/literal}{$token}{literal}', keywords:keywords }, 59 59 success: function (msg) 60 60 { -
extensions/AMetaData/amd.css
r6950 r16007 4 4 #iListTagsNb, #iListImagesNb { width:99%; text-align:right; margin-bottom:8px; padding:2px; font-size:80%; } 5 5 #iListTags table, #iListImages table, table.listTags { width:100%; text-align:left; border-collapse: collapse; } 6 #iListTags.roma table tr:hover { cursor:pointer; background:#303030; }7 #iListImages.roma table tr:hover, table.roma tr:hover { background:#303030; cursor:default; }8 #iListTags.clear table tr:hover { cursor:pointer; color: #D54E21; background:#dbe8f3; }9 #iListImages.clear table tr:hover, table.clear tr:hover { color: #D54E21; background:#dbe8f3; cursor:default; }10 6 #iHeaderListImages { width:100%; border-bottom:1px solid; } 11 7 div.addGroup { padding-left:40px; text-align:left; } … … 40 36 img.drag_button { margin-right:8px; } 41 37 li.groupItems input, li.groupItems select { margin-right:4px; } 38 42 39 43 40 #iBDRules ul { list-style-type:none; } … … 140 137 padding:0; 141 138 } 139 140 141 142 span.buttonEdit, span.buttonDelete, span.buttonPreferences,span.buttonMove { 143 display:inline-block; 144 width:15px; 145 height:15px; 146 position:relative; 147 background-color:transparent; 148 background-image:url(./../GrumPluginClasses/icons/buttons.png); 149 background-repeat:no-repeat; 150 cursor:pointer; 151 } 152 span.buttonMove { cursor:move; } 153 154 li.groupItems span.button { 155 float:right; 156 } -
extensions/AMetaData/amd_aip.class.inc.php
r15343 r16007 24 24 include_once('amd_root.class.inc.php'); 25 25 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCTabSheet.class.inc.php'); 26 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCAjax.class.inc.php');27 26 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/genericjs.class.inc.php'); 28 27 … … 81 80 { 82 81 unset($this->tabsheet); 83 unset($this->ajax);84 82 parent::__destruct(); 85 83 } … … 116 114 117 115 $template->assign('plugin', $pluginInfo); 116 GPCCore::setTemplateToken(); 118 117 119 118 switch($_GET['tab']) … … 146 145 public function initEvents() 147 146 { 147 parent::initEvents(); 148 148 149 if(isset($_GET['tab']) and $_GET['tab']=='search') 149 150 { … … 151 152 GPCRequestBuilder::loadJSandCSS(); 152 153 } 153 154 add_event_handler('loc_end_page_header', array(&$this->css, 'applyCSS')); 155 GPCCss::applyGpcCss(); 156 } 154 } 155 157 156 158 157 /** -
extensions/AMetaData/amd_aip_install.class.inc.php
r15343 r16007 48 48 unset($this->tabsheet); 49 49 parent::__destruct(); 50 }51 52 /*53 initialize events call for the plugin54 */55 public function initEvents()56 {57 parent::initEvents();58 add_event_handler('loc_end_page_header', array(&$this->css, 'applyCSS'));59 50 } 60 51 -
extensions/AMetaData/amd_aip_release.class.inc.php
r6977 r16007 35 35 36 36 /* 37 initialize events call for the plugin38 */39 public function initEvents()40 {41 parent::initEvents();42 add_event_handler('loc_end_page_header', array(&$this->css, 'applyCSS'));43 }44 45 /*46 37 display administration page 47 38 */ -
extensions/AMetaData/amd_ajax.php
r15343 r16007 20 20 21 21 define('PHPWG_ROOT_PATH',dirname(dirname(dirname(__FILE__))).'/'); 22 if(!defined('AJAX_CALL')) define('AJAX_CALL', true); 22 23 23 24 /* … … 25 26 */ 26 27 if(!isset($_REQUEST['ajaxfct'])) $_REQUEST['ajaxfct']=''; 27 if(preg_match('/^admin\./i', $_REQUEST['ajaxfct'])) 28 { 29 define('IN_ADMIN', true); 30 } 28 if(preg_match('/^admin\./i', $_REQUEST['ajaxfct'])) define('IN_ADMIN', true); 31 29 32 30 // the common.inc.php file loads all the main.inc.php plugins files … … 64 62 global $user; 65 63 66 if(!isset($_REQUEST['ajaxfct'])) $_REQUEST['ajaxfct']='';64 GPCAjax::checkToken(); 67 65 68 66 // check if asked function is valid 69 67 if(!( 70 $_REQUEST[ 'ajaxfct']=='admin.makeStats.getList' or71 $_REQUEST[ 'ajaxfct']=='admin.makeStats.doAnalyze' or72 $_REQUEST[ 'ajaxfct']=='admin.makeStats.consolidate' or73 $_REQUEST[ 'ajaxfct']=='admin.showStats.getListTags' or74 $_REQUEST[ 'ajaxfct']=='admin.showStats.getListImages' or75 $_REQUEST[ 'ajaxfct']=='admin.updateTag.select' or76 $_REQUEST[ 'ajaxfct']=='admin.config.setOption' or77 $_REQUEST[ 'ajaxfct']=='admin.group.getList' or78 $_REQUEST[ 'ajaxfct']=='admin.group.delete' or79 $_REQUEST[ 'ajaxfct']=='admin.group.getNames' or80 $_REQUEST[ 'ajaxfct']=='admin.group.setNames' or81 $_REQUEST[ 'ajaxfct']=='admin.group.setOrder' or82 $_REQUEST[ 'ajaxfct']=='admin.group.getTagList' or83 $_REQUEST[ 'ajaxfct']=='admin.group.setTagList' or84 $_REQUEST[ 'ajaxfct']=='admin.group.getOrderedTagList' or85 $_REQUEST[ 'ajaxfct']=='admin.group.setOrderedTagList' or86 $_REQUEST[ 'ajaxfct']=='admin.userDefined.getList' or87 $_REQUEST[ 'ajaxfct']=='admin.userDefined.getTag' or88 $_REQUEST[ 'ajaxfct']=='admin.userDefined.setTag' or89 $_REQUEST[ 'ajaxfct']=='admin.userDefined.deleteTag' or90 $_REQUEST[ 'ajaxfct']=='admin.tag.getValues' or91 $_REQUEST[ 'ajaxfct']=='admin.tags.getKeywords' or92 $_REQUEST[ 'ajaxfct']=='admin.tags.convertKeywords' or93 94 $_REQUEST[ 'ajaxfct']=='public.makeStats.doPictureAnalyze')) $_REQUEST['ajaxfct']='';95 96 if(preg_match('/^admin\./i', $_REQUEST[ 'ajaxfct']) and !is_admin()) $_REQUEST['ajaxfct']='';97 98 if($_REQUEST[ 'ajaxfct']!='')68 $_REQUEST[GPC_AJAX]=='admin.makeStats.getList' or 69 $_REQUEST[GPC_AJAX]=='admin.makeStats.doAnalyze' or 70 $_REQUEST[GPC_AJAX]=='admin.makeStats.consolidate' or 71 $_REQUEST[GPC_AJAX]=='admin.showStats.getListTags' or 72 $_REQUEST[GPC_AJAX]=='admin.showStats.getListImages' or 73 $_REQUEST[GPC_AJAX]=='admin.updateTag.select' or 74 $_REQUEST[GPC_AJAX]=='admin.config.setOption' or 75 $_REQUEST[GPC_AJAX]=='admin.group.getList' or 76 $_REQUEST[GPC_AJAX]=='admin.group.delete' or 77 $_REQUEST[GPC_AJAX]=='admin.group.getNames' or 78 $_REQUEST[GPC_AJAX]=='admin.group.setNames' or 79 $_REQUEST[GPC_AJAX]=='admin.group.setOrder' or 80 $_REQUEST[GPC_AJAX]=='admin.group.getTagList' or 81 $_REQUEST[GPC_AJAX]=='admin.group.setTagList' or 82 $_REQUEST[GPC_AJAX]=='admin.group.getOrderedTagList' or 83 $_REQUEST[GPC_AJAX]=='admin.group.setOrderedTagList' or 84 $_REQUEST[GPC_AJAX]=='admin.userDefined.getList' or 85 $_REQUEST[GPC_AJAX]=='admin.userDefined.getTag' or 86 $_REQUEST[GPC_AJAX]=='admin.userDefined.setTag' or 87 $_REQUEST[GPC_AJAX]=='admin.userDefined.deleteTag' or 88 $_REQUEST[GPC_AJAX]=='admin.tag.getValues' or 89 $_REQUEST[GPC_AJAX]=='admin.tags.getKeywords' or 90 $_REQUEST[GPC_AJAX]=='admin.tags.convertKeywords' or 91 92 $_REQUEST[GPC_AJAX]=='public.makeStats.doPictureAnalyze')) $_REQUEST[GPC_AJAX]=''; 93 94 if(preg_match('/^admin\./i', $_REQUEST[GPC_AJAX]) and !is_admin()) $_REQUEST[GPC_AJAX]=''; 95 96 if($_REQUEST[GPC_AJAX]!='') 99 97 { 100 98 /* 101 99 * check admin.makeStats.getList values 102 100 */ 103 if($_REQUEST[ 'ajaxfct']=="admin.makeStats.getList")101 if($_REQUEST[GPC_AJAX]=="admin.makeStats.getList") 104 102 { 105 103 if(!isset($_REQUEST['selectMode'])) $_REQUEST['selectMode']="caddieAdd"; … … 117 115 preg_match('/^\d+$/', $_REQUEST['numOfRandomItems'])==0 118 116 ) 119 ) $_REQUEST[ 'ajaxfct']='';117 ) $_REQUEST[GPC_AJAX]=''; 120 118 121 119 … … 128 126 * check admin.makeStats.doAnalyze values 129 127 */ 130 if($_REQUEST[ 'ajaxfct']=="admin.makeStats.doAnalyze")128 if($_REQUEST[GPC_AJAX]=="admin.makeStats.doAnalyze") 131 129 { 132 130 if(!isset($_REQUEST['imagesList'])) $_REQUEST['imagesList']=""; … … 136 134 * check admin.makeStats.consolidate values 137 135 */ 138 if($_REQUEST[ 'ajaxfct']=="admin.makeStats.consolidate")136 if($_REQUEST[GPC_AJAX]=="admin.makeStats.consolidate") 139 137 { 140 138 if(!isset($_REQUEST['step'])) $_REQUEST['step']="*"; … … 144 142 * check admin.showStats.getListTags values 145 143 */ 146 if($_REQUEST[ 'ajaxfct']=="admin.showStats.getListTags")144 if($_REQUEST[GPC_AJAX]=="admin.showStats.getListTags") 147 145 { 148 146 if(!isset($_REQUEST['orderType'])) $_REQUEST['orderType']="tag"; … … 180 178 * check admin.showStats.getListImages values 181 179 */ 182 if($_REQUEST[ 'ajaxfct']=="admin.showStats.getListImages")180 if($_REQUEST[GPC_AJAX]=="admin.showStats.getListImages") 183 181 { 184 182 if(!isset($_REQUEST['orderType'])) $_REQUEST['orderType']="num"; … … 193 191 * check admin.updateTag.select values 194 192 */ 195 if($_REQUEST[ 'ajaxfct']=="admin.updateTag.select")193 if($_REQUEST[GPC_AJAX]=="admin.updateTag.select") 196 194 { 197 195 if(!isset($_REQUEST['numId'])) $_REQUEST['numId']=""; … … 203 201 * check admin.config.setOption values 204 202 */ 205 if($_REQUEST[ 'ajaxfct']=="admin.config.setOption")206 { 207 if(!isset($_REQUEST['id'])) $_REQUEST[ 'ajaxfct']='';208 if(!isset($_REQUEST['value'])) $_REQUEST[ 'ajaxfct']='';203 if($_REQUEST[GPC_AJAX]=="admin.config.setOption") 204 { 205 if(!isset($_REQUEST['id'])) $_REQUEST[GPC_AJAX]=''; 206 if(!isset($_REQUEST['value'])) $_REQUEST[GPC_AJAX]=''; 209 207 } 210 208 … … 212 210 * check admin.group.delete values 213 211 */ 214 if($_REQUEST[ 'ajaxfct']=="admin.group.delete" and !isset($_REQUEST['id']))212 if($_REQUEST[GPC_AJAX]=="admin.group.delete" and !isset($_REQUEST['id'])) 215 213 { 216 214 $_REQUEST['id']=""; … … 220 218 * check admin.groupSetOrder values 221 219 */ 222 if($_REQUEST[ 'ajaxfct']=="admin.group.setOrder" and !isset($_REQUEST['listGroup']))220 if($_REQUEST[GPC_AJAX]=="admin.group.setOrder" and !isset($_REQUEST['listGroup'])) 223 221 { 224 222 $_REQUEST['listGroup']=""; … … 228 226 * check admin.group.getNames values 229 227 */ 230 if($_REQUEST[ 'ajaxfct']=="admin.group.getNames" and !isset($_REQUEST['id']))228 if($_REQUEST[GPC_AJAX]=="admin.group.getNames" and !isset($_REQUEST['id'])) 231 229 { 232 230 $_REQUEST['id']=""; … … 236 234 * check admin.group.setNames values 237 235 */ 238 if($_REQUEST[ 'ajaxfct']=="admin.group.setNames")236 if($_REQUEST[GPC_AJAX]=="admin.group.setNames") 239 237 { 240 238 if(!isset($_REQUEST['listNames'])) $_REQUEST['listNames']=""; … … 246 244 * check admin.group.getTagList values 247 245 */ 248 if($_REQUEST[ 'ajaxfct']=="admin.group.getTagList" and !isset($_REQUEST['id']))246 if($_REQUEST[GPC_AJAX]=="admin.group.getTagList" and !isset($_REQUEST['id'])) 249 247 { 250 248 $_REQUEST['id']=""; … … 254 252 * check admin.group.setTagList values 255 253 */ 256 if($_REQUEST[ 'ajaxfct']=="admin.group.setTagList")254 if($_REQUEST[GPC_AJAX]=="admin.group.setTagList") 257 255 { 258 256 if(!isset($_REQUEST['id'])) $_REQUEST['id']=""; … … 264 262 * check admin.group.getOrderedTagList values 265 263 */ 266 if($_REQUEST[ 'ajaxfct']=="admin.group.getOrderedTagList" and !isset($_REQUEST['id']))264 if($_REQUEST[GPC_AJAX]=="admin.group.getOrderedTagList" and !isset($_REQUEST['id'])) 267 265 { 268 266 $_REQUEST['id']=""; … … 272 270 * check admin.group.setOrderedTagList values 273 271 */ 274 if($_REQUEST[ 'ajaxfct']=="admin.group.setOrderedTagList")272 if($_REQUEST[GPC_AJAX]=="admin.group.setOrderedTagList") 275 273 { 276 274 if(!isset($_REQUEST['id'])) $_REQUEST['id']=""; … … 282 280 * check admin.userDefined.getTag values 283 281 */ 284 if($_REQUEST[ 'ajaxfct']=="admin.userDefined.getTag" and !isset($_REQUEST['id']))282 if($_REQUEST[GPC_AJAX]=="admin.userDefined.getTag" and !isset($_REQUEST['id'])) 285 283 { 286 284 $_REQUEST['id']=""; … … 290 288 * check admin.userDefined.setTag values 291 289 */ 292 if($_REQUEST[ 'ajaxfct']=="admin.userDefined.setTag")290 if($_REQUEST[GPC_AJAX]=="admin.userDefined.setTag") 293 291 { 294 292 if(!isset($_REQUEST['id'])) $_REQUEST['id']=""; … … 302 300 ) 303 301 ) 304 ) $_REQUEST[ 'ajaxfct']='';302 ) $_REQUEST[GPC_AJAX]=''; 305 303 306 304 if(isset($_REQUEST['properties']['rules'])) … … 312 310 isset($val['parentId']) and 313 311 isset($val['type']) and 314 isset($val['defId']))) $_REQUEST[ 'ajaxfct']='';312 isset($val['defId']))) $_REQUEST[GPC_AJAX]=''; 315 313 } 316 314 } … … 320 318 * check admin.userDefined.deleteTag values 321 319 */ 322 if($_REQUEST[ 'ajaxfct']=="admin.userDefined.deleteTag" and !isset($_REQUEST['id']))320 if($_REQUEST[GPC_AJAX]=="admin.userDefined.deleteTag" and !isset($_REQUEST['id'])) 323 321 { 324 322 $_REQUEST['id']=""; … … 329 327 * check admin.tag.getValues values 330 328 */ 331 if($_REQUEST[ 'ajaxfct']=="admin.tag.getValues" and !isset($_REQUEST['id']))332 { 333 $_REQUEST[ 'ajaxfct']='';329 if($_REQUEST[GPC_AJAX]=="admin.tag.getValues" and !isset($_REQUEST['id'])) 330 { 331 $_REQUEST[GPC_AJAX]=''; 334 332 } 335 333 … … 337 335 * check admin.tags.convertKeywords values 338 336 */ 339 if($_REQUEST[ 'ajaxfct']=="admin.tags.convertKeywords")337 if($_REQUEST[GPC_AJAX]=="admin.tags.convertKeywords") 340 338 { 341 339 if(!isset($_REQUEST['keywords'])) $_REQUEST['keywords']=array(); 342 340 if(!is_array($_REQUEST['keywords'])) $_REQUEST['keywords']=array(); 343 if(count($_REQUEST['keywords'])==0) $_REQUEST[ 'ajaxfct']='';341 if(count($_REQUEST['keywords'])==0) $_REQUEST[GPC_AJAX]=''; 344 342 } 345 343 … … 351 349 * check public.makeStats.doPictureAnalyze values 352 350 */ 353 if($_REQUEST[ 'ajaxfct']=="public.makeStats.doPictureAnalyze")351 if($_REQUEST[GPC_AJAX]=="public.makeStats.doPictureAnalyze") 354 352 { 355 353 if(!isset($_REQUEST['id'])) $_REQUEST['id']="0"; … … 365 363 { 366 364 $result="<p class='errors'>An error has occured</p>"; 367 switch($_REQUEST[ 'ajaxfct'])365 switch($_REQUEST[GPC_AJAX]) 368 366 { 369 367 case 'admin.makeStats.getList': -
extensions/AMetaData/amd_pip.class.inc.php
r15343 r16007 48 48 public function initEvents() 49 49 { 50 parent::initEvents();50 //parent::initEvents(); 51 51 add_event_handler('loc_begin_picture', array(&$this, 'loadMetadata')); 52 52 add_event_handler('loc_end_page_tail', array(&$this, 'applyJS')); … … 209 209 $userDefined=preg_match('/^userDefined\./i', $key); 210 210 211 if(($group!= $tagProperties['gName']) and211 if(($group!='AMD'.$tagProperties['groupId']) and 212 212 ( $keyExist or $userDefined) ) 213 213 { 214 $group= $tagProperties['gName'];214 $group='AMD'.$tagProperties['groupId']; 215 215 if(!isset($metadata[$group])) 216 216 { … … 272 272 ); 273 273 274 GPCCore::setTemplateToken(); 274 275 $template->assign('datas', $datas); 275 276 $template->append('footer_elements', $template->parse('applyJS', true)); -
extensions/AMetaData/amd_rb_callback.class.inc.php
r7399 r16007 22 22 23 23 if(!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 24 if(!defined('JPEG_METADATA_DIR')) define('JPEG_METADATA_DIR', dirname(__FILE__)."/JpegMetaData/"); 24 25 25 26 //include_once('') 26 27 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php'); 28 include_once(PHPWG_PLUGINS_PATH.'AMetaData/JpegMetaData/Common/Const.class.php'); 29 include_once(PHPWG_PLUGINS_PATH.'AMetaData/JpegMetaData/Common/L10n.class.php'); 27 30 28 31 load_language('plugin.lang', AMD_PATH); -
extensions/AMetaData/amd_root.class.inc.php
r15343 r16007 22 22 23 23 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php'); 24 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCCss.class.inc.php');25 24 include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php'); 26 25 … … 31 30 class AMD_root extends CommonPlugin 32 31 { 33 protected $css; //the css object34 32 protected $jpegMD; 35 33 … … 53 51 $this->setTablesList($tableList); 54 52 55 $this->css = new GPCCss(dirname($this->getFileLocation()).'/'.$this->getPluginNameFiles().".css");56 53 $this->jpegMD=new AMD_JpegMetaData(); 57 54 … … 65 62 { 66 63 unset($this->jpegMD); 67 unset($this->css);68 64 //parent::__destruct(); 69 65 } … … 120 116 } 121 117 122 public function loadConfig() 123 { 124 parent::loadConfig(); 125 } 126 127 public function initEvents() 128 { 129 parent::initEvents(); 130 } 118 public function loadCSS() 119 { 120 global $template; 121 122 parent::loadCSS(); 123 124 GPCCore::addUI('gpcCSS'); 125 GPCCore::addHeaderCSS('amm.css', 'plugins/'.$this->getDirectory().'/'.$this->getPluginNameFiles().".css"); 126 GPCCore::addHeaderCSS('amm.cssT', 'plugins/'.$this->getDirectory().'/'.$this->getPluginNameFiles().'_'.$template->get_themeconf('name').".css"); 127 } 128 131 129 132 130 public function getAdminLink($mode='') … … 794 792 } 795 793 794 GPCCore::setTemplateToken(); 796 795 $template->assign('datas', $datas); 797 796 unset($data); -
extensions/AMetaData/main.inc.php
r15343 r16007 282 282 283 283 284 if( defined('IN_ADMIN'))284 if(!defined('AJAX_CALL')) 285 285 { 286 //AMD admin part loaded and active only if in admin page 287 include_once("amd_aim.class.inc.php"); 288 $obj = new AMD_AIM($prefixeTable, __FILE__); 289 $obj->initEvents(); 290 set_plugin_data($plugin['id'], $obj); 291 } 292 else 293 { 294 //AMD public part loaded and active only if in public page and if GPC is up to date 295 if(CommonPlugin::checkGPCRelease(3,3,2)) 286 if(defined('IN_ADMIN')) 296 287 { 297 include_once("amd_pip.class.inc.php"); 298 $obj = new AMD_PIP($prefixeTable, __FILE__); 288 //AMD admin part loaded and active only if in admin page 289 include_once("amd_aim.class.inc.php"); 290 $obj = new AMD_AIM($prefixeTable, __FILE__); 291 $obj->initEvents(); 299 292 set_plugin_data($plugin['id'], $obj); 300 293 } 294 else 295 { 296 //AMD public part loaded and active only if in public page and if GPC is up to date 297 if(CommonPlugin::checkGPCRelease(AMD_GPC_NEEDED) and !mobile_theme()) 298 { 299 include_once("amd_pip.class.inc.php"); 300 $obj = new AMD_PIP($prefixeTable, __FILE__); 301 set_plugin_data($plugin['id'], $obj); 302 } 303 } 301 304 } 302 305 -
extensions/AMetaData/templates/amd_dialog_metadata_choose.tpl
r15349 r16007 554 554 url: "{/literal}{$datas.urlRequest}{literal}", 555 555 async: true, 556 data: { ajaxfct:"admin.tag.getValues", id:metaId },556 data: { ajaxfct:"admin.tag.getValues", token:'{/literal}{$token}{literal}', id:metaId }, 557 557 success: 558 558 function(msg) -
extensions/AMetaData/templates/doAnalyze.tpl
r6731 r16007 6 6 url: "{/literal}{$datas.urlRequest}{literal}", 7 7 async: true, 8 data: { ajaxfct:"public.makeStats.doPictureAnalyze", id:{/literal}{$datas.id}{literal} }8 data: { ajaxfct:"public.makeStats.doPictureAnalyze", token:'{/literal}{$token}{literal}', id:{/literal}{$datas.id}{literal} } 9 9 } 10 10 );
Note: See TracChangeset
for help on using the changeset viewer.