Changeset 6208 for extensions/GrumPluginClasses
- Timestamp:
- May 17, 2010, 7:46:39 PM (14 years ago)
- Location:
- extensions/GrumPluginClasses
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php
r6174 r6208 366 366 if($clearAll) 367 367 { 368 $sql="DELETE FROM ". $this->tables['result_cache'];368 $sql="DELETE FROM ".self::$tables['result_cache']; 369 369 } 370 370 else 371 371 { 372 $sql="DELETE FROM ".$this->tables['result_cache']." pgrc, ".$this->tables['request']." pgr 373 WHERE pgrc.id = pgr.id 374 AND pgr.date < '".date('Y-m-d H:i:s', strtotime("-2 hour"))."'"; 372 $sql="DELETE pgrc FROM ".self::$tables['result_cache']." pgrc 373 LEFT JOIN ".self::$tables['request']." pgr 374 ON pgrc.id = pgr.id 375 WHERE pgr.date < '".date('Y-m-d H:i:s', strtotime("-2 hour"))."'"; 375 376 } 376 377 pwg_query($sql); … … 386 387 { 387 388 global $user; 389 390 self::clearCache(); 388 391 389 392 $registeredPlugin=self::getRegistered(); … … 428 431 { 429 432 $pluginNeeded[$val['owner']][$key]=$_REQUEST['extraData'][$key]['param']; 430 $pluginList[ ]=$val['owner'];433 $pluginList[$val['owner']]=$val['owner']; 431 434 } 432 435 … … 512 515 self::updateRequest($requestNumber, $numberItems, 0, implode(',', $pluginList)); 513 516 517 514 518 return("$requestNumber;".$numberItems); 515 519 } 516 520 517 self::clearCache(); 518 519 return($sql); 521 return("0;0"); 520 522 } 521 523 … … 538 540 } 539 541 540 $limitFrom=$numPerPage*($pageNumber-1)+1; 541 $limitTo=$numPerPage*$pageNumber; 542 $limitFrom=$numPerPage*($pageNumber-1); 542 543 543 544 $pluginNeeded=explode(',', $request['connected_plugin']); … … 554 555 'RB_PIT' => "pit.id AS imageId, pit.name AS imageName, pit.path AS imagePath", // from the piwigo's image table 555 556 'RB_PIC' => "GROUP_CONCAT(pic.category_id SEPARATOR ',') AS imageCategoriesId", // from the piwigo's image_category table 556 'RB_PCT' => "GROUP_CONCAT(pct.name SEPARATOR '#sep#') AS imageCategoriesNames", //from the piwigo's categories table 557 'RB_PCT' => "GROUP_CONCAT(CASE WHEN pct.name IS NULL THEN '' ELSE pct.name END SEPARATOR '#sep#') AS imageCategoriesNames, 558 GROUP_CONCAT(CASE WHEN pct.permalink IS NULL THEN '' ELSE pct.permalink END SEPARATOR '#sep#') AS imageCategoriesPLink, 559 GROUP_CONCAT(CASE WHEN pct.dir IS NULL THEN 'V' ELSE 'P' END) AS imageCategoriesDir", //from the piwigo's categories table 557 560 ), 558 561 'FROM' => Array( … … 635 638 .' GROUP BY '.$build['GROUPBY'] 636 639 .' ORDER BY pit.id ' 637 .' LIMIT '.$limitFrom.', '.$ limitTo;640 .' LIMIT '.$limitFrom.', '.$numPerPage; 638 641 639 642 $result=pwg_query($sql); … … 647 650 $datas['imagePath']=$row['imagePath']; 648 651 $datas['imageName']=$row['imageName']; 652 649 653 $datas['imageCategoriesId']=explode(',', $row['imageCategoriesId']); 650 654 $datas['imageCategoriesNames']=explode('#sep#', $row['imageCategoriesNames']); 655 $datas['imageCategoriesPLink']=explode('#sep#', $row['imageCategoriesPLink']); 656 $datas['imageCategoriesDir']=explode(',', $row['imageCategoriesDir']); 657 658 659 $datas['imageCategories']=Array(); 660 for($i=0;$i<count($datas['imageCategoriesId']);$i++) 661 { 662 $datas['imageCategories'][]=array( 663 'id' => $datas['imageCategoriesId'][$i], 664 'name' => $datas['imageCategoriesNames'][$i], 665 'dirType' => $datas['imageCategoriesDir'][$i], 666 'pLinks' => $datas['imageCategoriesPLink'][$i], 667 'link'=> make_index_url( 668 array( 669 'category' => array( 670 'id' => $datas['imageCategoriesId'][$i], 671 'name' => $datas['imageCategoriesNames'][$i], 672 'permalink' => $datas['imageCategoriesPLink'][$i]) 673 ) 674 ) 675 ); 676 } 651 677 652 678 /* affect datas for each plugin -
extensions/GrumPluginClasses/js/criteriaBuilder.js
r6106 r6208 305 305 { 306 306 $('#'+itemId).remove(); 307 re=/[0-9]*$/; 308 extraData[eval(re.exec(itemId)[0])]=null; 307 309 manage(); 308 310 } -
extensions/GrumPluginClasses/templates/GPCRequestBuilder_result.tpl
r6106 r6208 5 5 <tr> 6 6 <td> 7 <img src='{$row.imageThumbnail}'>7 <img class="thumbnail" src='{$row.imageThumbnail}'> 8 8 </td> 9 9 10 10 <td class="rbResultItemDetail"> 11 { $row.imageId}<br>12 { $row.imageName}<br>13 {$row.imagePath}<br> 14 { $row.imageCategories}<br>11 {if $row.imageName!=''}{$row.imageName}<br>{/if} 12 {foreach from=$row.imageCategories key=catname item=catdata name=catlist} 13 <a href="{$catdata.link}">{$catdata.name}</a>{if $smarty.foreach.catlist.last}<br/>{else}, {/if} 14 {/foreach} 15 15 <hr> 16 16 {foreach from=$row.plugin item=plugin} -
extensions/GrumPluginClasses/templates/GPCRequestBuilder_search.tpl
r6174 r6208 149 149 { 150 150 $('#iResultQueryContent').html(nfo); 151 $('.tiptip').tipTip( 152 { 153 'delay' : 0, 154 'fadeIn' : 0, 155 'fadeOut' : 0, 156 'edgeOffset' : 5, 157 } 158 ); 151 159 } 152 160 else -
extensions/GrumPluginClasses/templates/GPCTabSheet.tpl
r6174 r6208 2 2 <ul {if isset($tabsheet_classes)}class="{$tabsheet_classes}"{/if} {if isset($tabsheet_id)}id="{$tabsheet_id}"{/if} > 3 3 {foreach from=$tabsheet key=name item=sheet name=tabs} 4 <li {if isset($tabsheet_id)}id="{$tabsheet_id}{$smarty.foreach.tabs.index}"{/if}class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if}">4 <li class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if}"> 5 5 <a {if $sheet.url!=''}href="{$sheet.url}"{/if} {if $sheet.onClick!=''}onclick="{$sheet.onClick}"{/if} ><span>{$sheet.caption}</span></a> 6 6 </li> … … 11 11 {literal} 12 12 <script type="text/javascript"> 13 $('#{/literal}{$tabsheet_id}{literal} li ').bind('click',13 $('#{/literal}{$tabsheet_id}{literal} li a').bind('click', 14 14 function () 15 15 { 16 16 $('#{/literal}{$tabsheet_id}{literal} li').removeClass('selected_tab').addClass('normal_tab'); 17 $(this ).removeClass('normal_tab').addClass('selected_tab');17 $(this.parentNode).removeClass('normal_tab').addClass('selected_tab'); 18 18 } 19 19 );
Note: See TracChangeset
for help on using the changeset viewer.