Changeset 1648065
- Timestamp:
- 04/29/2017 01:33:44 PM (9 years ago)
- Location:
- eve-shipinfo/trunk
- Files:
-
- 1 deleted
- 4 edited
-
classes/EVEShipInfo.php (modified) (1 diff)
-
classes/EVEShipInfo/Admin/Page/Main/Dashboard.php (modified) (3 diffs)
-
data/data.zip (deleted)
-
eve-shipinfo.php (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
eve-shipinfo/trunk/classes/EVEShipInfo.php
r1643015 r1648065 1206 1206 } 1207 1207 1208 public function hasDataArchive() 1209 { 1210 $file = $this->getDataArchivePath(); 1211 return file_exists($file); 1212 } 1213 1214 public function getDataArchivePath() 1215 { 1216 return $this->getDataFilePath('data.zip'); 1217 } 1218 1208 1219 /** 1209 1220 * Retrieves the version of the currently installed data files -
eve-shipinfo/trunk/classes/EVEShipInfo/Admin/Page/Main/Dashboard.php
r1643015 r1648065 223 223 } 224 224 225 $dataFilePath = $this->plugin->getData FilePath('data.zip');225 $dataFilePath = $this->plugin->getDataArchivePath(); 226 226 if(file_exists($dataFilePath) && !unlink($dataFilePath)) { 227 227 throw new EVEShipInfo_Exception( … … 278 278 { 279 279 $installedVersion = $this->plugin->getDataVersion(); 280 if( empty($installedVersion))280 if(!$this->plugin->hasDataArchive() || empty($installedVersion)) 281 281 { 282 282 $html = 283 283 '<p class="text-error">'. 284 __('No database installed.', 'eve-shipinfo'). 285 '</p>'. 286 $this->ui->button(__('Set up database', 'eve-shipinfo')) 287 ->link($this->getURL(array('action' => 'setUpDatabase'))) 288 ->setIcon($this->ui->icon()->yes()) 289 ->makePrimary() . 290 ' '. 284 '<b>'.__('No database installed.', 'eve-shipinfo').'</b>'. 285 '</p>'. 291 286 $this->ui->button(__('Upload data file...', 'eve-shipinfo')) 292 287 ->link($this->getURL(array('action' => 'updateDatafile'))) 288 ->makePrimary() 293 289 ->setIcon($this->ui->icon()->upload()); 294 290 } … … 388 384 protected function checkSystem() 389 385 { 390 if(!$this->plugin->isDatabaseUpToDate()) { 386 if(!$this->plugin->hasDataArchive()) { 387 $this->messages[] = '<b>'.__('No data files found.', 'eve-shipinfo').'</b> '. 388 __('Due to WordPress\'s policies, the data files cannot be bundled with the plugin.', 'eve-shipinfo').' '. 389 __('Please use the data file upload below to install the data files. ', 'eve-shipinfo').' '. 390 __('You will find all necessary instructions there.', 'eve-shipinfo'); 391 392 } 393 else if(!$this->plugin->isDatabaseUpToDate()) 394 { 391 395 $this->messages[] = 392 396 '<b>'.__('The database needs to be updated.', 'eve-shipinfo') . '</b> ' . -
eve-shipinfo/trunk/eve-shipinfo.php
r1643018 r1648065 4 4 * Plugin URI: http://aeonoftime.com/EVE_Online_Tools/EVE-ShipInfo-WordPress-Plugin 5 5 * Description: Puts an EVE Online ships database and ship fittings manager in your WordPress website, along with high quality screenshots and specialized shortcodes. 6 * Version: 2. 56 * Version: 2.6 7 7 * Author: Sebastian Mordziol 8 8 * Author URI: http://www.aeonoftime.com -
eve-shipinfo/trunk/readme.txt
r1643018 r1648065 4 4 Requires at least: 3.5 5 5 Tested up to: 4.7.4 6 Stable tag: 2. 56 Stable tag: 2.6 7 7 License: GPLv3 8 8 License URI: https://www.gnu.org/licenses/gpl-3.0.txt … … 48 48 1. Activate the plugin 49 49 1. Go to your permalink settings, and save the settings without changing anything (to refresh the permalinks) 50 1. From the dashboard of the plugin, install a data file 50 51 1. Optional: Install the [screenshots pack](http://aeonoftime.com/EVE_Online_Tools/EVE-ShipInfo-WordPress-Plugin/download.php) (separate download) 51 52 52 53 53 54 == Changelog == 55 56 = 2.6 = 57 * Removed the bundled data files, wordpress.org does not allow including ZIP files 58 * Modified the database version check to reflect the missing data files 54 59 55 60 = 2.5 =
Note: See TracChangeset
for help on using the changeset viewer.