Changeset 252 for wp-slimstat-ex/tags
- Timestamp:
- 09/09/07 06:07:02 (16 months ago)
- Location:
- wp-slimstat-ex/tags/1.6
- Files:
-
- 4 modified
-
lib/ss-admin/_functions.php (modified) (2 diffs)
-
lib/upgrade.php (modified) (7 diffs)
-
wp-slimstat-ex-config.php (modified) (2 diffs)
-
wp-slimstat-ex.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
wp-slimstat-ex/tags/1.6/lib/ss-admin/_functions.php
r250 r252 590 590 } 591 591 $do_indexing = $wpdb->query($query); 592 if(!$do_indexing)593 echo $query;594 592 if($echo) { 595 593 if($do_indexing === false) { … … 657 655 $_table = $this->string2table($table); 658 656 if(false === $wpdb->query("ALTER TABLE {$_table} PACK_KEYS = {$val} ")) 657 return false; 659 658 return true; 660 659 } -
wp-slimstat-ex/tags/1.6/lib/upgrade.php
r246 r252 32 32 </script> 33 33 <h3><?php printf(__('Sub-Step %s', 'slimstat-admin'), $substep); ?></h3> 34 <form name="slimupgrade_substep"method="post" action="<?php echo $action; ?>">34 <form method="post" action="<?php echo $action; ?>"> 35 35 <ul><li><?php echo $message; ?></li></ul> 36 36 <p class="submit"><input type="submit" name="substep_submit" onclick="disable_substep_submit(this);" value="<?php echo $buttontext; ?>" /></p> … … 39 39 } 40 40 41 function remove_unuesed_indexkeys_before_16 () {41 function remove_unuesed_indexkeys_before_16_1() { 42 42 global $ssAdmin; 43 43 $upgrade = $ssAdmin->maybe_remove_indexkey('dt_total', 'common'); … … 46 46 if(!$upgrade) return false; 47 47 $upgrade = $ssAdmin->maybe_remove_indexkey('resource_total', 'common'); 48 if(!$upgrade) return false; 48 return $upgrade; 49 } 50 51 function remove_unuesed_indexkeys_before_16_2() { 52 global $ssAdmin; 49 53 $upgrade = $ssAdmin->maybe_remove_indexkey('resource_total', 'feed'); 50 54 if(!$upgrade) return false; … … 55 59 } 56 60 57 function add_new_indexkey_before_16() { 58 global $ssAdmin, $wpdb; 59 $upgrade = $ssAdmin->maybe_add_indexkey('dt','common'); 60 if(!$upgrade) return false; 61 $upgrade = $ssAdmin->maybe_add_indexkey('dt','feed'); 62 if(!$upgrade) return false; 63 $upgrade = $ssAdmin->maybe_add_indexkey('remote_ip', 'common'); 64 if(!$upgrade) return false; 65 $upgrade = $ssAdmin->maybe_add_indexkey('remote_ip', 'feed'); 66 if(!$upgrade) return false; 67 $upgrade = $ssAdmin->maybe_add_indexkey('referer', 'common'); 68 if(!$upgrade) return false; 69 $upgrade = $ssAdmin->maybe_add_indexkey('referer', 'feed'); 70 if(!$upgrade) return false; 71 $upgrade = $ssAdmin->maybe_add_indexkey('searchterms', 'common'); 72 if(!$upgrade) return false; 73 $upgrade = $ssAdmin->maybe_add_indexkey('searchterms', 'feed'); 74 if(!$upgrade) return false; 75 $upgrade = $ssAdmin->maybe_add_indexkey('country', 'common'); 76 if(!$upgrade) return false; 77 $upgrade = $ssAdmin->maybe_add_indexkey('country', 'feed'); 78 if(!$upgrade) return false; 79 $upgrade = $ssAdmin->maybe_add_indexkey('ip_to', 'country'); 80 if(!$upgrade) return false; 81 $upgrade = $ssAdmin->pack_indexkey('country', '1'); 61 function add_indexkey_to_stat_table($key) { 62 global $ssAdmin; 63 $upgrade = $ssAdmin->maybe_add_indexkey($key,'common'); 64 if(!$upgrade) return false; 65 $upgrade = $ssAdmin->maybe_add_indexkey($key,'feed'); 82 66 return $upgrade; 83 67 } … … 152 136 } 153 137 154 function removeResource () {138 function removeResource_1() { 155 139 global $SlimCfg, $wpdb, $ssAdmin; 156 140 $query1 = "ALTER TABLE $SlimCfg->table_stats DROP COLUMN resource"; 141 $column1 = $ssAdmin->maybe_add_column($SlimCfg->table_stats, 'resource', '', true); 142 if($column1 && $wpdb->query($query1) === false) 143 return false; 144 return true; 145 } 146 147 function removeResource_2() { 148 global $SlimCfg, $wpdb, $ssAdmin; 157 149 $query2 = "ALTER TABLE $SlimCfg->table_feed DROP COLUMN resource"; 158 $column1 = $ssAdmin->maybe_add_column($SlimCfg->table_stats, 'resource', '', true);159 150 $column2 = $ssAdmin->maybe_add_column($SlimCfg->table_feed, 'resource', '', true); 160 if($column1 && $wpdb->query($query1) === false)161 return false;162 151 if($column2 && $wpdb->query($query2) === false) 163 152 return false; … … 173 162 return false; 174 163 return true; 175 }176 177 function addIndexToResource() {178 global $ssAdmin;179 $upgrade = $ssAdmin->maybe_add_indexkey('resource', 'common');180 if(!$upgrade) return false;181 $upgrade = $ssAdmin->maybe_add_indexkey('resource', 'feed');182 return $upgrade;183 164 } 184 165 … … 228 209 break; 229 210 case 1: 230 $done = SSUpgrade::remove_unuesed_indexkeys_before_16 ();211 $done = SSUpgrade::remove_unuesed_indexkeys_before_16_1(); 231 212 break; 232 213 case 2: 214 $done = SSUpgrade::remove_unuesed_indexkeys_before_16_2(); 215 break; 216 case 3: 233 217 $done = SSUpgrade::createResourceTable(); 234 218 break; 235 case 3:219 case 4: 236 220 $query = "ALTER TABLE $SlimCfg->table_stats ADD `rs_id` INT(11) NOT NULL DEFAULT 0 AFTER `resource`"; 237 221 $done = $ssAdmin->maybe_add_column($SlimCfg->table_stats, 'rs_id', $query); 238 222 break; 239 case 4:223 case 5: 240 224 $query = "ALTER TABLE $SlimCfg->table_feed ADD `rs_id` INT(11) NOT NULL DEFAULT 0 AFTER `resource`"; 241 225 $done = $ssAdmin->maybe_add_column($SlimCfg->table_feed, 'rs_id', $query); 242 226 break; 243 case 5:227 case 6: 244 228 $done = SSUpgrade::insertLocalSearchResource(); 245 229 break; 246 case 6:230 case 7: 247 231 $done = SSUpgrade::insertOldResources(); 248 232 break; 249 case 7:233 case 8: 250 234 $done = SSUpgrade::updateResourceData(); 251 235 break; 252 case 8:236 case 9: 253 237 $done = SSUpgrade::updatePostTitleData(); 254 238 break; 255 case 9:256 $done = SSUpgrade::removeResource();257 break;258 239 case 10: 240 $done = SSUpgrade::removeResource_1(); 241 break; 242 case 11: 243 $done = SSUpgrade::removeResource_2(); 244 break; 245 case 12: 259 246 $done = SSUpgrade::renameRS_ID('common'); 260 247 break; 261 case 1 1:248 case 13: 262 249 $done = SSUpgrade::renameRS_ID('feed'); 263 250 break; 264 case 12:265 $done = SSUpgrade::addIndexToResource();266 break;267 case 13:268 $done = SSUpgrade::add_new_indexkey_before_16();269 break;270 251 case 14: 252 $done = $ssAdmin->maybe_add_indexkey('resource', 'common'); 253 break; 254 case 15: 255 $done = $ssAdmin->maybe_add_indexkey('resource', 'feed'); 256 break; 257 case 16: 258 $done = SSUpgrade::add_indexkey_to_stat_table('dt'); 259 break; 260 case 17: 261 $done = SSUpgrade::add_indexkey_to_stat_table('remote_ip'); 262 break; 263 case 18: 264 $done = SSUpgrade::add_indexkey_to_stat_table('referer'); 265 break; 266 case 19: 267 $done = SSUpgrade::add_indexkey_to_stat_table('searchterms'); 268 break; 269 case 20: 270 $done = SSUpgrade::add_indexkey_to_stat_table('country'); 271 break; 272 case 21: 273 $done = $ssAdmin->maybe_add_indexkey('ip_to', 'country'); 274 break; 275 case 22: 276 $done = $ssAdmin->pack_indexkey('country', '1'); 277 break; 278 case 23: 271 279 $done = SSUpgrade::fix_domain_referer('common'); 272 280 break; 273 case 15:281 case 24: 274 282 $done = SSUpgrade::fix_domain_referer('feed'); 275 283 break; 276 case 16:284 case 25: 277 285 $done = $ssAdmin->OptimizeTables(array('common', 'feed', 'resource')); 278 286 break; 279 case 17:287 case 26: 280 288 $done = SSUpgrade::delete_uncompatible_pins_before16(); 281 289 break; 282 case 18:290 case 27: 283 291 return true; 284 292 break; -
wp-slimstat-ex/tags/1.6/wp-slimstat-ex-config.php
r250 r252 2 2 3 3 class SlimCfg { 4 var $version = '1.60 1'; // Current SlimStat-Ex version4 var $version = '1.602'; // Current SlimStat-Ex version 5 5 var $external_iptc = 'internal'; // set this 'external' to use external ip-to-country database 6 6 var $uaOption = false; // Personal use... please forget about this ;) … … 63 63 $cur_len = array(); 64 64 $key_array = array('dt_total', 'resource_total', 'resource', 'searchterms', 'domain', 'referer', 'platform', 'browser', 'language', 'visit', 'country', 'remote_ip', 'dt', 'ip_to', 'ip_from_to_idx', 'ip_from_idx'); 65 $myIndexStructure = $wpdb->get_results("SHOW INDEX FROM $_table", 'ARRAY_A'); 66 foreach ( $myIndexStructure as $index_details ) { 67 $key = $index_details['Key_name']; 68 $col = $index_details['Column_name']; 69 $len = $index_details['Cardinality']; 70 $len = isset($pre_len[$key]) ? max($pre_len[$key], $len) : $len; 71 $pre_len[$key] = $len; 72 if(in_array($key, $key_array)) { 73 if($deep) { 74 $current_keys[$key]['column'][] = $col; 75 $current_keys[$key]['length'] = $len; 76 } else 77 $current_keys[] = $key; 65 if($myIndexStructure = $wpdb->get_results("SHOW INDEX FROM $_table", ARRAY_A)){ 66 foreach ( $myIndexStructure as $index_details ) { 67 $key = $index_details['Key_name']; 68 $col = $index_details['Column_name']; 69 $len = $index_details['Cardinality']; 70 $len = isset($pre_len[$key]) ? max($pre_len[$key], $len) : $len; 71 $pre_len[$key] = $len; 72 if(in_array($key, $key_array)) { 73 if($deep) { 74 $current_keys[$key]['column'][] = $col; 75 $current_keys[$key]['length'] = $len; 76 } else 77 $current_keys[] = $key; 78 } 78 79 } 79 } 80 return $current_keys; 80 return $current_keys; 81 } 82 return array(); 81 83 } 82 84 -
wp-slimstat-ex/tags/1.6/wp-slimstat-ex.php
r250 r252 4 4 Plugin URI: http://082net.com/tag/wp-slimstat-ex/ 5 5 Description: Track your blog stats. Based on <a href="http://www.duechiacchiere.it/">Mr. Coolmann</a>'s <a href="http://www.duechiacchiere.it/wp-slimstat/">Wp-SlimStat</a>. 6 Version: 1.60 16 Version: 1.602 7 7 Author: Cheon, Young-Min 8 8 Author URI: http://082net.com/
