Changeset 15342
- Timestamp:
- May 27, 2012, 10:09:14 AM (12 years ago)
- Location:
- extensions/AStat
- Files:
-
- 1 added
- 1 deleted
- 4 edited
-
admin.php (added)
-
admin/astat_tools.tpl (modified) (1 diff)
-
admin/plugin_admin.php (deleted)
-
astat_aip.class.inc.php (modified) (18 diffs)
-
astat_version.inc.php (modified) (1 diff)
-
main.inc.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
extensions/AStat/admin/astat_tools.tpl
r10614 r15342 1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 2 {combine_script id="jquery.ui.datepicker" path="themes/default/js/ui/minified/jquery.ui.datepicker.min.js"} 1 {* 2 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.js"} 3 {combine_script id="jquery.ui.datepicker" path="themes/default/js/ui/minified/jquery.ui.datepicker.js"} 3 4 {assign var="datepicker_language" value="themes/default/js/ui/minified/i18n/jquery.ui.datepicker-"|@cat:$lang_info.code|@cat:".js"} 5 *} 4 6 5 7 {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists} -
extensions/AStat/astat_aip.class.inc.php
r10264 r15342 41 41 $this->tabsheet->add('stats_by_period', 42 42 l10n('AStat_by_period'), 43 $this->getAdminLink().' &fAStat_tabsheet=stats_by_period');43 $this->getAdminLink().'-stats_by_period'); 44 44 $this->tabsheet->add('stats_by_ip', 45 45 l10n('AStat_by_ip'), 46 $this->getAdminLink().' &fAStat_tabsheet=stats_by_ip');46 $this->getAdminLink().'-stats_by_ip'); 47 47 $this->tabsheet->add('stats_by_category', 48 48 l10n('AStat_by_category'), 49 $this->getAdminLink().' &fAStat_tabsheet=stats_by_category');49 $this->getAdminLink().'-stats_by_category'); 50 50 $this->tabsheet->add('stats_by_image', 51 51 l10n('AStat_by_image'), 52 $this->getAdminLink().' &fAStat_tabsheet=stats_by_image');52 $this->getAdminLink().'-stats_by_image'); 53 53 $this->tabsheet->add('config', 54 54 l10n('AStat_config'), 55 $this->getAdminLink().' &fAStat_tabsheet=config');55 $this->getAdminLink().'-config'); 56 56 $this->tabsheet->add('tools', 57 57 l10n('AStat_tools'), 58 $this->getAdminLink().' &fAStat_tabsheet=tools');58 $this->getAdminLink().'-tools'); 59 59 60 60 } … … 100 100 } 101 101 102 if($_ REQUEST['fAStat_tabsheet']=='stats_by_period')102 if($_GET['tab']=='stats_by_period') 103 103 { 104 104 $this->display_stats_by_period( … … 111 111 ); 112 112 } 113 elseif($_ REQUEST['fAStat_tabsheet']=='stats_by_ip')113 elseif($_GET['tab']=='stats_by_ip') 114 114 { 115 115 if(isset($_REQUEST['fAStat_IP_BL'])) … … 129 129 ); 130 130 } 131 elseif($_ REQUEST['fAStat_tabsheet']=='stats_by_category')131 elseif($_GET['tab']=='stats_by_category') 132 132 { 133 133 $this->display_stats_by_category( … … 143 143 ); 144 144 } 145 elseif($_ REQUEST['fAStat_tabsheet']=='stats_by_image')145 elseif($_GET['tab']=='stats_by_image') 146 146 { 147 147 $this->display_stats_by_image( … … 158 158 ); 159 159 } 160 elseif($_ REQUEST['fAStat_tabsheet']=='config')160 elseif($_GET['tab']=='config') 161 161 { 162 162 $this->display_config(); 163 163 } 164 elseif($_ REQUEST['fAStat_tabsheet']=='tools')164 elseif($_GET['tab']=='tools') 165 165 { 166 166 $this->display_tools(); 167 167 } 168 168 169 $this->tabsheet->select($_ REQUEST['fAStat_tabsheet']);169 $this->tabsheet->select($_GET['tab']); 170 170 $this->tabsheet->assign(); 171 171 $selected_tab=$this->tabsheet->get_selected(); … … 173 173 174 174 $template_plugin["ASTAT_VERSION"] = "<i>AStat</i> ".l10n('AStat_version').ASTAT_VERSION; 175 $template_plugin["ASTAT_PAGE"] = $_ REQUEST['fAStat_tabsheet'];175 $template_plugin["ASTAT_PAGE"] = $_GET['tab']; 176 176 177 177 $template->assign('plugin', $template_plugin); … … 217 217 218 218 //initialise $REQUEST values if not defined 219 if(!array_key_exists(' fAStat_tabsheet', $_REQUEST))220 { 221 $_ REQUEST['fAStat_tabsheet']='stats_by_period';219 if(!array_key_exists('tab', $_GET)) 220 { 221 $_GET['tab']='stats_by_period'; 222 222 } 223 223 if(!array_key_exists('fAStat_defper', $_REQUEST)) … … 254 254 } 255 255 256 if(($_ REQUEST['fAStat_tabsheet']=='stats_by_period')&&($_REQUEST['fAStat_defper']=='Y'))256 if(($_GET['tab']=='stats_by_period')&&($_REQUEST['fAStat_defper']=='Y')) 257 257 { 258 258 if($this->config['AStat_default_period']!='global') … … 584 584 if($show_thumb=='true') 585 585 { 586 $sql_thumb = ', '.IMAGES_TABLE.'.path as ThumbPath, '.IMAGES_TABLE.'.file as ThumbFile, '.IMAGES_TABLE.'.tn_ext as Extension';586 $sql_thumb = ', '.IMAGES_TABLE.'.path as ImgPath, '.IMAGES_TABLE.'.file as ThumbFile, '.IMAGES_TABLE.'.id as ImgId'; 587 587 $sql_fromthumb = "LEFT JOIN ".IMAGES_TABLE." ON ic2.representative_picture_id = ".IMAGES_TABLE.".id "; 588 588 } … … 686 686 ".HISTORY_TABLE.".category_id as IdCat, count(".HISTORY_TABLE.".image_id) as NbVues, 687 687 MaxImg.somme, 100*(count(".HISTORY_TABLE.".image_id)/MaxImg.somme) as PctImg, 688 ".IMAGES_TABLE.".path as ThumbPath, ".IMAGES_TABLE.".file as ThumbFile,689 MaxImg2.somme as NbVuesMax , ".IMAGES_TABLE.".tn_ext as Extension";688 ".IMAGES_TABLE.".path as ImgPath, ".IMAGES_TABLE.".file as ThumbFile, 689 MaxImg2.somme as NbVuesMax "; 690 690 691 691 $sql_from = " from ((".HISTORY_TABLE." LEFT JOIN ".IMAGES_TABLE." ON … … 793 793 "day" => $this->getAdminLink()."&fAStat_defper=N&fAStat_all=N&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 794 794 795 $ip_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip",796 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip&fAStat_year=",797 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip&fAStat_year=$year&fAStat_month=",798 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip&fAStat_year=$year&fAStat_month=$month&fAStat_day=");799 800 $cat_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category",801 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category&fAStat_year=",802 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category&fAStat_year=$year&fAStat_month=",803 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category&fAStat_year=$year&fAStat_month=$month&fAStat_day=");804 805 $img_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image",806 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=",807 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year&fAStat_month=",808 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year&fAStat_month=$month&fAStat_day=");795 $ip_links=array("all" => $this->getAdminLink()."-stats_by_ip", 796 "year" => $this->getAdminLink()."-stats_by_ip&fAStat_year=", 797 "month" => $this->getAdminLink()."-stats_by_ip&fAStat_year=$year&fAStat_month=", 798 "day" => $this->getAdminLink()."-stats_by_ip&fAStat_year=$year&fAStat_month=$month&fAStat_day="); 799 800 $cat_links=array("all" => $this->getAdminLink()."-stats_by_category", 801 "year" => $this->getAdminLink()."-stats_by_category&fAStat_year=", 802 "month" => $this->getAdminLink()."-stats_by_category&fAStat_year=$year&fAStat_month=", 803 "day" => $this->getAdminLink()."-stats_by_category&fAStat_year=$year&fAStat_month=$month&fAStat_day="); 804 805 $img_links=array("all" => $this->getAdminLink()."-stats_by_image", 806 "year" => $this->getAdminLink()."-stats_by_image&fAStat_year=", 807 "month" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year&fAStat_month=", 808 "day" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year&fAStat_month=$month&fAStat_day="); 809 809 810 810 … … 976 976 "day" => $this->getAdminLink()."&fAStat_defper=N&fAStat_all=N&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 977 977 978 $ip_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip",979 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip&fAStat_year=$year",980 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip&fAStat_year=$year&fAStat_month=$month",981 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_ip&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day");982 983 $img_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image",984 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year",985 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year&fAStat_month=$month",986 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day");978 $ip_links=array("all" => $this->getAdminLink()."-stats_by_ip", 979 "year" => $this->getAdminLink()."-stats_by_ip&fAStat_year=$year", 980 "month" => $this->getAdminLink()."-stats_by_ip&fAStat_year=$year&fAStat_month=$month", 981 "day" => $this->getAdminLink()."-stats_by_ip&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 982 983 $img_links=array("all" => $this->getAdminLink()."-stats_by_image", 984 "year" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year", 985 "month" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year&fAStat_month=$month", 986 "day" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 987 987 988 988 … … 1140 1140 "day" => $this->getAdminLink()."&fAStat_defper=N&fAStat_all=N&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 1141 1141 1142 $cat_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category",1143 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category&fAStat_year=$year",1144 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category&fAStat_year=$year&fAStat_month=$month",1145 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_category&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day");1142 $cat_links=array("all" => $this->getAdminLink()."-stats_by_category", 1143 "year" => $this->getAdminLink()."-stats_by_category&fAStat_year=$year", 1144 "month" => $this->getAdminLink()."-stats_by_category&fAStat_year=$year&fAStat_month=$month", 1145 "day" => $this->getAdminLink()."-stats_by_category&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 1146 1146 1147 1147 /* make navigation links */ … … 1215 1215 if($showthumb=='true') 1216 1216 { 1217 $filethumb= $this->change_file_ext($stats[$i]["ThumbFile"], $stats[$i]["Extension"]);1218 $filethumb=str_replace($stats[$i]["ThumbFile"],"thumbnail/".$conf['prefix_thumbnail'].$filethumb,$stats[$i]["ThumbPath"]);}1217 $filethumb=DerivativeImage::thumb_url(array('id'=>$stats[$i]["ImgId"], 'path'=>$stats[$i]["ImgPath"])); 1218 } 1219 1219 else 1220 1220 { … … 1286 1286 "day" => $this->getAdminLink()."&fAStat_defper=N&fAStat_all=N&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 1287 1287 1288 $img_links=array("all" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image",1289 "year" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year",1290 "month" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year&fAStat_month=$month",1291 "day" => $this->getAdminLink()." &fAStat_tabsheet=stats_by_image&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day");1288 $img_links=array("all" => $this->getAdminLink()."-stats_by_image", 1289 "year" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year", 1290 "month" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year&fAStat_month=$month", 1291 "day" => $this->getAdminLink()."-stats_by_image&fAStat_year=$year&fAStat_month=$month&fAStat_day=$day"); 1292 1292 1293 1293 /* navigation links */ … … 1357 1357 if($showthumb=='true') 1358 1358 { 1359 $filethumb=$this->change_file_ext($stats[$i]["ThumbFile"], $stats[$i]["Extension"]); 1360 $filethumb=str_replace($stats[$i]["ThumbFile"],"thumbnail/".$conf['prefix_thumbnail'].$filethumb,$stats[$i]["ThumbPath"]); 1359 $filethumb=DerivativeImage::thumb_url(array('id'=>$stats[$i]["ImgId"], 'path'=>$stats[$i]["ImgPath"])); 1361 1360 } 1362 1361 else … … 2380 2379 2381 2380 /* 2382 change filename extension2383 */2384 private function change_file_ext($file, $newext)2385 { //filename can be <filename.truc.jpeg> for example2386 $tmp = explode('.', $file);2387 if(count($tmp)>1) { $tmp[count($tmp)-1] = $newext; }2388 return implode('.', $tmp);2389 }2390 2391 /*2392 2381 format number $octets with unit 2393 2382 $format = "A" : auto -
extensions/AStat/astat_version.inc.php
r10264 r15342 15 15 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 16 16 17 define('ASTAT_VERSION', '2. 3.0');18 define('ASTAT_VERSION2', '02.0 3.00');19 define('ASTAT_GPC_NEEDED', '3.5. 0');17 define('ASTAT_VERSION', '2.4.0'); 18 define('ASTAT_VERSION2', '02.04.00'); 19 define('ASTAT_GPC_NEEDED', '3.5.2'); 20 20 ?> -
extensions/AStat/main.inc.php
r10264 r15342 66 66 | | | . compatibility with piwigo 2.2 67 67 | | | 68 | | | 68 | 2.4.0 | 2011/04/10 | * mantis: bug 2636 69 | | | . compatibility with piwigo 2.4 69 70 | | | 70 71 | | |
Note: See TracChangeset
for help on using the changeset viewer.
