Changeset 15343 for extensions/AMetaData/amd_aip.class.inc.php
- Timestamp:
- May 27, 2012, 1:31:32 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/amd_aip.class.inc.php
r7564 r15343 53 53 $this->tabsheet->add('metadata', 54 54 l10n('g003_metadata'), 55 $this->getAdminLink().' &fAMD_tabsheet=metadata');55 $this->getAdminLink().'-metadata'); 56 56 $this->tabsheet->add('help', 57 57 l10n('g003_help'), 58 $this->getAdminLink().' &fAMD_tabsheet=help');58 $this->getAdminLink().'-help'); 59 59 } 60 60 else … … 62 62 $this->tabsheet->add('database', 63 63 l10n('g003_database'), 64 $this->getAdminLink().' &fAMD_tabsheet=database');64 $this->getAdminLink().'-database'); 65 65 $this->tabsheet->add('metadata', 66 66 l10n('g003_metadata'), 67 $this->getAdminLink().' &fAMD_tabsheet=metadata');67 $this->getAdminLink().'-metadata'); 68 68 $this->tabsheet->add('search', 69 69 l10n('g003_search'), 70 $this->getAdminLink().' &fAMD_tabsheet=search');70 $this->getAdminLink().'-search'); 71 71 $this->tabsheet->add('tags', 72 72 l10n('g003_tags'), 73 $this->getAdminLink().' &fAMD_tabsheet=tags');73 $this->getAdminLink().'-tags'); 74 74 $this->tabsheet->add('help', 75 75 l10n('g003_help'), 76 $this->getAdminLink().' &fAMD_tabsheet=help');76 $this->getAdminLink().'-help'); 77 77 } 78 78 } … … 104 104 $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/amd_admin.tpl"); 105 105 106 $this->tabsheet->select($_ REQUEST['fAMD_tabsheet']);106 $this->tabsheet->select($_GET['tab']); 107 107 $this->tabsheet->assign(); 108 108 $selected_tab=$this->tabsheet->get_selected(); … … 111 111 $pluginInfo=array( 112 112 'AMD_VERSION' => "<i>".$this->getPluginName()."</i> ".l10n('g003_version').AMD_VERSION, 113 'AMD_PAGE' => $_ REQUEST['fAMD_tabsheet'],113 'AMD_PAGE' => $_GET['tab'], 114 114 'PATH' => AMD_PATH 115 115 ); … … 117 117 $template->assign('plugin', $pluginInfo); 118 118 119 switch($_ REQUEST['fAMD_tabsheet'])119 switch($_GET['tab']) 120 120 { 121 121 case 'help': … … 123 123 break; 124 124 case 'database': 125 $this->displayDatabase($_REQUEST[' fAMD_page']);125 $this->displayDatabase($_REQUEST['t']); 126 126 break; 127 127 case 'metadata': 128 $this->displayMetaData($_REQUEST[' fAMD_page']);128 $this->displayMetaData($_REQUEST['t']); 129 129 break; 130 130 case 'search': 131 $this->displaySearch($_REQUEST[' fAMD_page']);131 $this->displaySearch($_REQUEST['t']); 132 132 break; 133 133 case 'tags': … … 146 146 public function initEvents() 147 147 { 148 if(isset($_ REQUEST['fAMD_tabsheet']) and $_REQUEST['fAMD_tabsheet']=='search')148 if(isset($_GET['tab']) and $_GET['tab']=='search') 149 149 { 150 150 // load request builder JS only on the search page … … 172 172 //initialise $REQUEST values if not defined 173 173 174 if(!isset($_ REQUEST['fAMD_tabsheet']))174 if(!isset($_GET['tab'])) 175 175 { 176 176 if($this->getNumOfPictures()==0 and $this->config['amd_InterfaceMode']=='advanced') 177 177 { 178 $_ REQUEST['fAMD_tabsheet']="database";179 $_REQUEST[' fAMD_page']="state";178 $_GET['tab']="database"; 179 $_REQUEST['t']="state"; 180 180 } 181 181 else 182 182 { 183 $_REQUEST['fAMD_tabsheet']="metadata"; 184 $_REQUEST['fAMD_page']="select"; 185 } 186 } 187 188 if(!($_REQUEST['fAMD_tabsheet']=="metadata" or 189 $_REQUEST['fAMD_tabsheet']=="help" or 190 $_REQUEST['fAMD_tabsheet']=="database" or 191 $_REQUEST['fAMD_tabsheet']=="search" or 192 $_REQUEST['fAMD_tabsheet']=="tags") 183 $_GET['tab']="metadata"; 184 $_REQUEST['t']="select"; 185 } 186 } 187 188 $tmp=explode('/', $_GET['tab'].'/'); 189 $_GET['tab']=$tmp[0]; 190 $_REQUEST['t']=$tmp[1]; 191 192 193 if(!($_GET['tab']=="metadata" or 194 $_GET['tab']=="help" or 195 $_GET['tab']=="database" or 196 $_GET['tab']=="search" or 197 $_GET['tab']=="tags") 193 198 or 194 199 $this->config['amd_InterfaceMode']=='basic' and 195 200 ( 196 $_ REQUEST['fAMD_tabsheet']=="database" or197 $_ REQUEST['fAMD_tabsheet']=="search" or198 $_ REQUEST['fAMD_tabsheet']=="tags"201 $_GET['tab']=="database" or 202 $_GET['tab']=="search" or 203 $_GET['tab']=="tags" 199 204 ) 200 205 ) 201 206 { 202 $_ REQUEST['fAMD_tabsheet']="metadata";207 $_GET['tab']="metadata"; 203 208 } 204 209 … … 206 211 * metadata tabsheet 207 212 */ 208 if($_ REQUEST['fAMD_tabsheet']=="metadata")209 { 210 if(!isset($_REQUEST[' fAMD_page']))213 if($_GET['tab']=="metadata") 214 { 215 if(!isset($_REQUEST['t'])) 211 216 { 212 217 if($this->config['amd_InterfaceMode']=='basic') 213 218 { 214 $_REQUEST[' fAMD_page']="display";219 $_REQUEST['t']="display"; 215 220 } 216 221 else 217 222 { 218 $_REQUEST[' fAMD_page']="select";219 } 220 } 221 222 if(!($_REQUEST[' fAMD_page']=="personnal" or223 $_REQUEST[' fAMD_page']=="select" or224 $_REQUEST[' fAMD_page']=="display")223 $_REQUEST['t']="select"; 224 } 225 } 226 227 if(!($_REQUEST['t']=="personnal" or 228 $_REQUEST['t']=="select" or 229 $_REQUEST['t']=="display") 225 230 or 226 231 $this->config['amd_InterfaceMode']=='basic' and 227 232 ( 228 $_REQUEST[' fAMD_page']=="select"233 $_REQUEST['t']=="select" 229 234 ) 230 235 ) … … 232 237 if($this->config['amd_InterfaceMode']=='basic') 233 238 { 234 $_REQUEST[' fAMD_page']="display";239 $_REQUEST['t']="display"; 235 240 } 236 241 else 237 242 { 238 $_REQUEST[' fAMD_page']="select";243 $_REQUEST['t']="select"; 239 244 } 240 245 } … … 244 249 * help tabsheet 245 250 */ 246 if($_ REQUEST['fAMD_tabsheet']=="help")247 { 248 if(!isset($_REQUEST[' fAMD_page'])) $_REQUEST['fAMD_page']="exif";249 250 if(!($_REQUEST[' fAMD_page']=="exif" or251 $_REQUEST[' fAMD_page']=="iptc" or252 $_REQUEST[' fAMD_page']=="xmp" or253 $_REQUEST[' fAMD_page']=="magic")) $_REQUEST['fAMD_page']="exif";251 if($_GET['tab']=="help") 252 { 253 if(!isset($_REQUEST['t'])) $_REQUEST['t']="exif"; 254 255 if(!($_REQUEST['t']=="exif" or 256 $_REQUEST['t']=="iptc" or 257 $_REQUEST['t']=="xmp" or 258 $_REQUEST['t']=="magic")) $_REQUEST['t']="exif"; 254 259 } 255 260 … … 257 262 * search tabsheet 258 263 */ 259 if($_ REQUEST['fAMD_tabsheet']=="search")260 { 261 if(!isset($_REQUEST[' fAMD_page'])) $_REQUEST['fAMD_page']="search";262 263 if(!($_REQUEST[' fAMD_page']=="config" or264 $_REQUEST[' fAMD_page']=="search")) $_REQUEST['fAMD_page']="search";264 if($_GET['tab']=="search") 265 { 266 if(!isset($_REQUEST['t'])) $_REQUEST['t']="search"; 267 268 if(!($_REQUEST['t']=="config" or 269 $_REQUEST['t']=="search")) $_REQUEST['t']="search"; 265 270 } 266 271 … … 268 273 * database tabsheet 269 274 */ 270 if($_ REQUEST['fAMD_tabsheet']=="database")271 { 272 if(!isset($_REQUEST[' fAMD_page'])) $_REQUEST['fAMD_page']="state";273 274 if(!($_REQUEST[' fAMD_page']=="state" or275 $_REQUEST[' fAMD_page']=="update")) $_REQUEST['fAMD_page']="state";275 if($_GET['tab']=="database") 276 { 277 if(!isset($_REQUEST['t'])) $_REQUEST['t']="state"; 278 279 if(!($_REQUEST['t']=="state" or 280 $_REQUEST['t']=="update")) $_REQUEST['t']="state"; 276 281 } 277 282 … … 335 340 $statTabsheet->add('personnal', 336 341 l10n('g003_personnal'), 337 $this->getAdminLink().' &fAMD_tabsheet=metadata&fAMD_page=personnal');342 $this->getAdminLink().'-metadata/personnal'); 338 343 if($this->config['amd_InterfaceMode']=='advanced') 339 344 { 340 345 $statTabsheet->add('select', 341 346 l10n('g003_select'), 342 $this->getAdminLink().' &fAMD_tabsheet=metadata&fAMD_page=select');347 $this->getAdminLink().'-metadata/select'); 343 348 } 344 349 $statTabsheet->add('display', 345 350 l10n('g003_display'), 346 $this->getAdminLink().' &fAMD_tabsheet=metadata&fAMD_page=display');351 $this->getAdminLink().'-metadata/display'); 347 352 $statTabsheet->assign(); 348 353 … … 526 531 $statTabsheet->add('state', 527 532 l10n('g003_state'), 528 $this->getAdminLink().' &fAMD_tabsheet=database&fAMD_page=state');533 $this->getAdminLink().'-database/state'); 529 534 $statTabsheet->add('update', 530 535 l10n('g003_update'), 531 $this->getAdminLink().' &fAMD_tabsheet=database&fAMD_page=update');536 $this->getAdminLink().'-database/update'); 532 537 $statTabsheet->assign(); 533 538
Note: See TracChangeset
for help on using the changeset viewer.