Version Notes
3.0.0 release
Download this release
Release Info
| Developer | Kristof Ringleff |
| Extension | Fooman_Speedster |
| Version | 3.0.15 |
| Comparing to | |
| See all releases | |
Code changes from version 3.0.14 to 3.0.15
- app/code/community/Fooman/Common/Helper/Data.php +6 -4
- app/code/community/Fooman/Common/Model/Selftester.php +41 -13
- app/code/community/Fooman/Common/Model/Selftester/Abstract.php +11 -1
- app/code/community/Fooman/Common/Model/Selftester/Db.php +158 -1
- app/code/community/Fooman/Common/controllers/Adminhtml/SelftesterController.php +4 -2
- app/code/community/Fooman/Common/etc/adminhtml.xml +36 -0
- app/code/community/Fooman/Common/etc/config.xml +10 -36
- app/code/community/Fooman/Common/modman +4 -1
- package.xml +6 -6
app/code/community/Fooman/Common/Helper/Data.php
CHANGED
|
@@ -8,9 +8,11 @@
|
|
| 8 |
* For the full copyright and license information, please view the LICENSE
|
| 9 |
* file that was distributed with this source code.
|
| 10 |
*/
|
| 11 |
-
|
| 12 |
class Fooman_Common_Helper_Data extends Mage_Core_Helper_Abstract
|
| 13 |
{
|
|
|
|
|
|
|
|
|
|
| 14 |
/**
|
| 15 |
* Helper function to create a hash from a base64 Fooman serial number
|
| 16 |
*
|
|
@@ -31,9 +33,9 @@ class Fooman_Common_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 31 |
public function getOverlayFileName()
|
| 32 |
{
|
| 33 |
if (file_exists($this->_getNewOverlayFileLocation())) {
|
| 34 |
-
return
|
| 35 |
} else {
|
| 36 |
-
return
|
| 37 |
}
|
| 38 |
}
|
| 39 |
|
|
@@ -61,4 +63,4 @@ class Fooman_Common_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 61 |
return BP . DS . 'skin' . DS . 'adminhtml' . DS . 'default' . DS . 'default'
|
| 62 |
. DS . 'lib' . DS . 'prototype' . DS . 'windows' . DS . 'themes' . DS . 'magento.css';
|
| 63 |
}
|
| 64 |
-
}
|
| 8 |
* For the full copyright and license information, please view the LICENSE
|
| 9 |
* file that was distributed with this source code.
|
| 10 |
*/
|
|
|
|
| 11 |
class Fooman_Common_Helper_Data extends Mage_Core_Helper_Abstract
|
| 12 |
{
|
| 13 |
+
const NEW_MAGENTO_CSS_LOCATION = 'lib/prototype/windows/themes/magento.css';
|
| 14 |
+
const OLD_MAGENTO_CSS_LOCATION = 'prototype/windows/themes/magento.css';
|
| 15 |
+
|
| 16 |
/**
|
| 17 |
* Helper function to create a hash from a base64 Fooman serial number
|
| 18 |
*
|
| 33 |
public function getOverlayFileName()
|
| 34 |
{
|
| 35 |
if (file_exists($this->_getNewOverlayFileLocation())) {
|
| 36 |
+
return self::NEW_MAGENTO_CSS_LOCATION;
|
| 37 |
} else {
|
| 38 |
+
return self::OLD_MAGENTO_CSS_LOCATION;
|
| 39 |
}
|
| 40 |
}
|
| 41 |
|
| 63 |
return BP . DS . 'skin' . DS . 'adminhtml' . DS . 'default' . DS . 'default'
|
| 64 |
. DS . 'lib' . DS . 'prototype' . DS . 'windows' . DS . 'themes' . DS . 'magento.css';
|
| 65 |
}
|
| 66 |
+
}
|
app/code/community/Fooman/Common/Model/Selftester.php
CHANGED
|
@@ -19,25 +19,28 @@ class Fooman_Common_Model_Selftester extends Fooman_Common_Model_Selftester_Abst
|
|
| 19 |
/**
|
| 20 |
* Start the selftest
|
| 21 |
*
|
|
|
|
|
|
|
| 22 |
* @return $this
|
| 23 |
*/
|
| 24 |
-
public function main ()
|
| 25 |
{
|
| 26 |
$this->messages[] = 'Starting ' . get_class($this);
|
| 27 |
$failed = false;
|
|
|
|
| 28 |
try {
|
| 29 |
if (!$this->selfCheckLocation()) {
|
| 30 |
$failed = true;
|
| 31 |
}
|
| 32 |
-
if (Mage::app()->getRequest()->getParam('fix') == 'true') {
|
| 33 |
-
$this->_fix = true;
|
| 34 |
-
}
|
| 35 |
if (!$this->checkFileLocations()) {
|
| 36 |
$failed = true;
|
| 37 |
}
|
| 38 |
if (!$this->magentoRewrites()) {
|
| 39 |
$failed = true;
|
| 40 |
}
|
|
|
|
|
|
|
|
|
|
| 41 |
if (!$this->dbCheck()) {
|
| 42 |
$failed = true;
|
| 43 |
}
|
|
@@ -66,15 +69,9 @@ class Fooman_Common_Model_Selftester extends Fooman_Common_Model_Selftester_Abst
|
|
| 66 |
*/
|
| 67 |
public function selfCheckLocation()
|
| 68 |
{
|
| 69 |
-
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
$this->messages[] = "Default store loaded";
|
| 73 |
-
$this->_getVersions();
|
| 74 |
-
} else {
|
| 75 |
-
$this->messages[] = 'Can\'t instantiate Magento. Is the file uploaded to your root Magento folder?';
|
| 76 |
-
throw new Exception();
|
| 77 |
-
}
|
| 78 |
return true;
|
| 79 |
}
|
| 80 |
|
|
@@ -120,6 +117,13 @@ class Fooman_Common_Model_Selftester extends Fooman_Common_Model_Selftester_Abst
|
|
| 120 |
);
|
| 121 |
}
|
| 122 |
fclose($handleExtFile);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 123 |
} catch (Exception $e) {
|
| 124 |
$this->messages[] = $e->getMessage();
|
| 125 |
$returnVal = false;
|
|
@@ -165,6 +169,30 @@ class Fooman_Common_Model_Selftester extends Fooman_Common_Model_Selftester_Abst
|
|
| 165 |
return $dbCheckModel->dbCheck($this);
|
| 166 |
}
|
| 167 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 168 |
/**
|
| 169 |
* retrieve current database info relevant for debugging
|
| 170 |
*
|
| 19 |
/**
|
| 20 |
* Start the selftest
|
| 21 |
*
|
| 22 |
+
* @param bool $fix
|
| 23 |
+
*
|
| 24 |
* @return $this
|
| 25 |
*/
|
| 26 |
+
public function main ($fix = false)
|
| 27 |
{
|
| 28 |
$this->messages[] = 'Starting ' . get_class($this);
|
| 29 |
$failed = false;
|
| 30 |
+
$this->_fix = $fix;
|
| 31 |
try {
|
| 32 |
if (!$this->selfCheckLocation()) {
|
| 33 |
$failed = true;
|
| 34 |
}
|
|
|
|
|
|
|
|
|
|
| 35 |
if (!$this->checkFileLocations()) {
|
| 36 |
$failed = true;
|
| 37 |
}
|
| 38 |
if (!$this->magentoRewrites()) {
|
| 39 |
$failed = true;
|
| 40 |
}
|
| 41 |
+
if (!$this->cronCheck()) {
|
| 42 |
+
$failed = true;
|
| 43 |
+
}
|
| 44 |
if (!$this->dbCheck()) {
|
| 45 |
$failed = true;
|
| 46 |
}
|
| 69 |
*/
|
| 70 |
public function selfCheckLocation()
|
| 71 |
{
|
| 72 |
+
Mage::app();
|
| 73 |
+
$this->messages[] = "Default store loaded";
|
| 74 |
+
$this->_getVersions();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 75 |
return true;
|
| 76 |
}
|
| 77 |
|
| 117 |
);
|
| 118 |
}
|
| 119 |
fclose($handleExtFile);
|
| 120 |
+
|
| 121 |
+
if (!filesize($currentRow)) {
|
| 122 |
+
throw new Exception(
|
| 123 |
+
'Can\'t read file contents ' . $currentRow
|
| 124 |
+
. ' - please check if the file got corrupted in the upload process.'
|
| 125 |
+
);
|
| 126 |
+
}
|
| 127 |
} catch (Exception $e) {
|
| 128 |
$this->messages[] = $e->getMessage();
|
| 129 |
$returnVal = false;
|
| 169 |
return $dbCheckModel->dbCheck($this);
|
| 170 |
}
|
| 171 |
|
| 172 |
+
public function cronCheck()
|
| 173 |
+
{
|
| 174 |
+
|
| 175 |
+
if ($this->_needsCron()) {
|
| 176 |
+
$schedulesPending = Mage::getModel('cron/schedule')->getCollection()
|
| 177 |
+
->addFieldToFilter('status', Mage_Cron_Model_Schedule::STATUS_PENDING)
|
| 178 |
+
->addFieldToFilter('created_at', array('from' => strtotime('-1 day', time())))
|
| 179 |
+
->load();
|
| 180 |
+
$schedulesComplete = Mage::getModel('cron/schedule')->getCollection()
|
| 181 |
+
->addFieldToFilter('status', Mage_Cron_Model_Schedule::STATUS_SUCCESS)
|
| 182 |
+
->addFieldToFilter('created_at', array('from' => strtotime('-1 day', time())))
|
| 183 |
+
->load();
|
| 184 |
+
|
| 185 |
+
if (sizeof($schedulesPending) == 0
|
| 186 |
+
|| sizeof($schedulesComplete) == 0
|
| 187 |
+
) {
|
| 188 |
+
$this->messages[] = 'No cron job was run in the last 24 hours';
|
| 189 |
+
return false;
|
| 190 |
+
}
|
| 191 |
+
}
|
| 192 |
+
|
| 193 |
+
return true;
|
| 194 |
+
}
|
| 195 |
+
|
| 196 |
/**
|
| 197 |
* retrieve current database info relevant for debugging
|
| 198 |
*
|
app/code/community/Fooman/Common/Model/Selftester/Abstract.php
CHANGED
|
@@ -29,7 +29,7 @@ class Fooman_Common_Model_Selftester_Abstract extends Mage_Core_Model_Abstract
|
|
| 29 |
$model = Mage::getResourceModel($currentRow[1]);
|
| 30 |
if (get_class($model) != $currentRow[2]) {
|
| 31 |
throw new Exception(
|
| 32 |
-
'Trying to load class ' . $currentRow[2] . 'returns ' . get_class($model)
|
| 33 |
. '. Please refresh your Magento configuration cache and check
|
| 34 |
if you have any conflicting extensions installed.'
|
| 35 |
);
|
|
@@ -121,4 +121,14 @@ class Fooman_Common_Model_Selftester_Abstract extends Mage_Core_Model_Abstract
|
|
| 121 |
return array();
|
| 122 |
}
|
| 123 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 124 |
}
|
| 29 |
$model = Mage::getResourceModel($currentRow[1]);
|
| 30 |
if (get_class($model) != $currentRow[2]) {
|
| 31 |
throw new Exception(
|
| 32 |
+
'Trying to load class ' . $currentRow[2] . ' returns ' . get_class($model)
|
| 33 |
. '. Please refresh your Magento configuration cache and check
|
| 34 |
if you have any conflicting extensions installed.'
|
| 35 |
);
|
| 121 |
return array();
|
| 122 |
}
|
| 123 |
|
| 124 |
+
/**
|
| 125 |
+
* determine if cron is needed for functionality
|
| 126 |
+
*
|
| 127 |
+
* @return bool
|
| 128 |
+
*/
|
| 129 |
+
public function _needsCron()
|
| 130 |
+
{
|
| 131 |
+
return false;
|
| 132 |
+
}
|
| 133 |
+
|
| 134 |
}
|
app/code/community/Fooman/Common/Model/Selftester/Db.php
CHANGED
|
@@ -39,6 +39,15 @@ class Fooman_Common_Model_Selftester_Db extends Mage_Core_Model_Abstract
|
|
| 39 |
case 'sql-column':
|
| 40 |
$localError = $this->_dbCheckSqlColumn($selftester, $field, $installer, $localError);
|
| 41 |
break;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 42 |
}
|
| 43 |
}
|
| 44 |
$installer->endSetup();
|
|
@@ -72,7 +81,6 @@ class Fooman_Common_Model_Selftester_Db extends Mage_Core_Model_Abstract
|
|
| 72 |
try {
|
| 73 |
$attribute = Mage::getModel('eav/entity_attribute')->loadByCode($field[1], $field[2]);
|
| 74 |
if (!$attribute->getId() > 0) {
|
| 75 |
-
$localError = true;
|
| 76 |
throw new Exception('eav attribute ' . $field[2] . ' is not installed');
|
| 77 |
}
|
| 78 |
$selftester->messages[] = "[OK] eav attribute " . $field[2]." with id ".$attribute->getId()."";
|
|
@@ -145,4 +153,153 @@ class Fooman_Common_Model_Selftester_Db extends Mage_Core_Model_Abstract
|
|
| 145 |
|
| 146 |
}
|
| 147 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 148 |
}
|
| 39 |
case 'sql-column':
|
| 40 |
$localError = $this->_dbCheckSqlColumn($selftester, $field, $installer, $localError);
|
| 41 |
break;
|
| 42 |
+
case 'table':
|
| 43 |
+
$localError = $this->_dbCheckSqlTable($selftester, $field, $installer, $localError);
|
| 44 |
+
break;
|
| 45 |
+
case 'constraint':
|
| 46 |
+
$localError = $this->_dbCheckForeignKeyConstraint($selftester, $field, $installer, $localError);
|
| 47 |
+
break;
|
| 48 |
+
case 'row-data':
|
| 49 |
+
$localError = $this->_dbCheckDbRow($selftester, $field, $installer, $localError);
|
| 50 |
+
break;
|
| 51 |
}
|
| 52 |
}
|
| 53 |
$installer->endSetup();
|
| 81 |
try {
|
| 82 |
$attribute = Mage::getModel('eav/entity_attribute')->loadByCode($field[1], $field[2]);
|
| 83 |
if (!$attribute->getId() > 0) {
|
|
|
|
| 84 |
throw new Exception('eav attribute ' . $field[2] . ' is not installed');
|
| 85 |
}
|
| 86 |
$selftester->messages[] = "[OK] eav attribute " . $field[2]." with id ".$attribute->getId()."";
|
| 153 |
|
| 154 |
}
|
| 155 |
|
| 156 |
+
/**
|
| 157 |
+
* check the DB for an expected table
|
| 158 |
+
*
|
| 159 |
+
* @param Fooman_Common_Model_Selftester $selftester
|
| 160 |
+
* @param $fields
|
| 161 |
+
* @param $installer
|
| 162 |
+
* @param $localError
|
| 163 |
+
*
|
| 164 |
+
* @return bool
|
| 165 |
+
*/
|
| 166 |
+
protected function _dbCheckSqlTable(Fooman_Common_Model_Selftester $selftester, $fields, $installer, $localError)
|
| 167 |
+
{
|
| 168 |
+
try {
|
| 169 |
+
$tables = $installer->getConnection()->listTables();
|
| 170 |
+
|
| 171 |
+
if (!(array_search($installer->getTable($fields[1]), $tables))) {
|
| 172 |
+
throw new Exception(
|
| 173 |
+
sprintf('Did not find table %s', $installer->getTable($fields[1]))
|
| 174 |
+
);
|
| 175 |
+
}
|
| 176 |
+
$selftester->messages[] = "[OK] Table " . $fields[1]."";
|
| 177 |
+
} catch (Exception $e) {
|
| 178 |
+
if ($selftester->shouldFix()) {
|
| 179 |
+
$table = $installer->getConnection() ->newTable($installer->getTable($fields[1]));
|
| 180 |
+
|
| 181 |
+
foreach ($fields[2] as $item) {
|
| 182 |
+
$table->addColumn($item[0], $item[1], $item[2], $item[3], $item[4]);
|
| 183 |
+
}
|
| 184 |
+
try {
|
| 185 |
+
$selftester->messages[] = "Attempting fix for table " . $fields[1]."";
|
| 186 |
+
$installer->getConnection()->createTable($table);
|
| 187 |
+
$selftester->messages[] = "[FIX OK] table " . $fields[1]." fixed";
|
| 188 |
+
} catch (Exception $e) {
|
| 189 |
+
$selftester->messages[] = "[FAILED] fixing table " . $fields[1]."";
|
| 190 |
+
$this->_dbOkay = false;
|
| 191 |
+
$selftester->messages[] = $e->getMessage();
|
| 192 |
+
$localError = true;
|
| 193 |
+
}
|
| 194 |
+
} else {
|
| 195 |
+
$selftester->messages[] = "[FAILED] table " . $fields[1]."";
|
| 196 |
+
$this->_dbOkay = false;
|
| 197 |
+
$selftester->messages[] = "[ERR] ".$e->getMessage();
|
| 198 |
+
$localError = true;
|
| 199 |
+
}
|
| 200 |
+
}
|
| 201 |
+
return $localError;
|
| 202 |
+
|
| 203 |
+
}
|
| 204 |
+
|
| 205 |
+
/**
|
| 206 |
+
* check the DB for an expected constraint
|
| 207 |
+
*
|
| 208 |
+
* @param Fooman_Common_Model_Selftester $selftester
|
| 209 |
+
* @param $fields
|
| 210 |
+
* @param $installer
|
| 211 |
+
* @param $localError
|
| 212 |
+
*
|
| 213 |
+
* @return bool
|
| 214 |
+
*/
|
| 215 |
+
protected function _dbCheckForeignKeyConstraint(Fooman_Common_Model_Selftester $selftester, $fields, $installer, $localError)
|
| 216 |
+
{
|
| 217 |
+
try {
|
| 218 |
+
$constraints = $installer->getConnection()->getForeignKeys($installer->getTable($fields[2]));
|
| 219 |
+
if (!(isset($constraints[$fields[1]]))) {
|
| 220 |
+
throw new Exception(
|
| 221 |
+
sprintf('Did not find constraint %s', $installer->getTable($fields[1]))
|
| 222 |
+
);
|
| 223 |
+
}
|
| 224 |
+
$selftester->messages[] = "[OK] Constraint " . $fields[1]."";
|
| 225 |
+
} catch (Exception $e) {
|
| 226 |
+
if ($selftester->shouldFix()) {
|
| 227 |
+
$selftester->messages[] = "Attempting fix for constraint " . $fields[1]."";
|
| 228 |
+
try {
|
| 229 |
+
$installer->getConnection()->addConstraint(
|
| 230 |
+
$fields[1],
|
| 231 |
+
$installer->getTable($fields[2]), $fields[3],
|
| 232 |
+
$installer->getTable($fields[4]), $fields[5],
|
| 233 |
+
$fields[6], $fields[7], $fields[8]
|
| 234 |
+
);
|
| 235 |
+
$selftester->messages[] = "[FIX OK] constraint " . $fields[1]." fixed";
|
| 236 |
+
} catch (Exception $e) {
|
| 237 |
+
$selftester->messages[] = "[FAILED] fixing constraint " . $fields[1]."";
|
| 238 |
+
$this->_dbOkay = false;
|
| 239 |
+
$selftester->messages[] = $e->getMessage();
|
| 240 |
+
$localError = true;
|
| 241 |
+
}
|
| 242 |
+
} else {
|
| 243 |
+
$selftester->messages[] = "[FAILED] constraint " . $fields[1]."";
|
| 244 |
+
$this->_dbOkay = false;
|
| 245 |
+
$selftester->messages[] = "[ERR] ".$e->getMessage();
|
| 246 |
+
$localError = true;
|
| 247 |
+
}
|
| 248 |
+
}
|
| 249 |
+
return $localError;
|
| 250 |
+
}
|
| 251 |
+
|
| 252 |
+
/**
|
| 253 |
+
* check the DB for expected content
|
| 254 |
+
*
|
| 255 |
+
* @param Fooman_Common_Model_Selftester $selftester
|
| 256 |
+
* @param $fields
|
| 257 |
+
* @param $installer
|
| 258 |
+
* @param $localError
|
| 259 |
+
*
|
| 260 |
+
* @return bool
|
| 261 |
+
*/
|
| 262 |
+
protected function _dbCheckDbRow(Fooman_Common_Model_Selftester $selftester, $fields, $installer, $localError)
|
| 263 |
+
{
|
| 264 |
+
try {
|
| 265 |
+
$select = $installer->getConnection()->select()
|
| 266 |
+
->from($installer->getTable($fields[1]));
|
| 267 |
+
$bind = array();
|
| 268 |
+
foreach ($fields[2] as $key => $value) {
|
| 269 |
+
$bind[$key] = $value;
|
| 270 |
+
$select->where($installer->getConnection()->quoteIdentifier($key) . '= :' . $key);
|
| 271 |
+
}
|
| 272 |
+
|
| 273 |
+
$result = $installer->getConnection()->fetchRow($select, $bind);
|
| 274 |
+
if (!$result) {
|
| 275 |
+
throw new Exception(
|
| 276 |
+
sprintf('Did not find content in %s', $installer->getTable($fields[1]))
|
| 277 |
+
);
|
| 278 |
+
}
|
| 279 |
+
|
| 280 |
+
$selftester->messages[] = "[OK] Content " . $fields[1]."";
|
| 281 |
+
} catch (Exception $e) {
|
| 282 |
+
if ($selftester->shouldFix()) {
|
| 283 |
+
$selftester->messages[] = "Attempting fix for content in " . $fields[1]."";
|
| 284 |
+
try {
|
| 285 |
+
$installer->getConnection()->insert(
|
| 286 |
+
$installer->getTable($fields[1]),
|
| 287 |
+
$fields[2]
|
| 288 |
+
);
|
| 289 |
+
$selftester->messages[] = "[FIX OK] content in " . $fields[1]." fixed";
|
| 290 |
+
} catch (Exception $e) {
|
| 291 |
+
$selftester->messages[] = "[FAILED] fixing content in " . $fields[1]."";
|
| 292 |
+
$this->_dbOkay = false;
|
| 293 |
+
$selftester->messages[] = $e->getMessage();
|
| 294 |
+
$localError = true;
|
| 295 |
+
}
|
| 296 |
+
} else {
|
| 297 |
+
$selftester->messages[] = "[FAILED] content in " . $fields[1]."";
|
| 298 |
+
$this->_dbOkay = false;
|
| 299 |
+
$selftester->messages[] = "[ERR] ".$e->getMessage();
|
| 300 |
+
$localError = true;
|
| 301 |
+
}
|
| 302 |
+
}
|
| 303 |
+
return $localError;
|
| 304 |
+
}
|
| 305 |
}
|
app/code/community/Fooman/Common/controllers/Adminhtml/SelftesterController.php
CHANGED
|
@@ -22,7 +22,9 @@ class Fooman_Common_Adminhtml_SelftesterController extends Mage_Adminhtml_Contro
|
|
| 22 |
{
|
| 23 |
|
| 24 |
$module = $this->getRequest()->getParam('module');
|
| 25 |
-
$selftester = Mage::getModel($module . '/selftester')->main(
|
|
|
|
|
|
|
| 26 |
//Here we get db version of the given module code
|
| 27 |
if (Mage::getModel('core/mysql4_resource')->getDbVersion($module . '_setup')) {
|
| 28 |
$dbVersion = Mage::getModel('core/mysql4_resource')->getDbVersion($module . '_setup');
|
|
@@ -64,4 +66,4 @@ class Fooman_Common_Adminhtml_SelftesterController extends Mage_Adminhtml_Contro
|
|
| 64 |
//of duplicates from the previous page loads.
|
| 65 |
Mage::getSingleton('core/session')->getMesssages(true);
|
| 66 |
}
|
| 67 |
-
}
|
| 22 |
{
|
| 23 |
|
| 24 |
$module = $this->getRequest()->getParam('module');
|
| 25 |
+
$selftester = Mage::getModel($module . '/selftester')->main(
|
| 26 |
+
$this->getRequest()->getParam('fix') == 'true'
|
| 27 |
+
);
|
| 28 |
//Here we get db version of the given module code
|
| 29 |
if (Mage::getModel('core/mysql4_resource')->getDbVersion($module . '_setup')) {
|
| 30 |
$dbVersion = Mage::getModel('core/mysql4_resource')->getDbVersion($module . '_setup');
|
| 66 |
//of duplicates from the previous page loads.
|
| 67 |
Mage::getSingleton('core/session')->getMesssages(true);
|
| 68 |
}
|
| 69 |
+
}
|
app/code/community/Fooman/Common/etc/adminhtml.xml
ADDED
|
@@ -0,0 +1,36 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?xml version="1.0"?>
|
| 2 |
+
<config>
|
| 3 |
+
<adminhtml>
|
| 4 |
+
<layout>
|
| 5 |
+
<updates>
|
| 6 |
+
<foomancommon>
|
| 7 |
+
<file>fooman_common.xml</file>
|
| 8 |
+
</foomancommon>
|
| 9 |
+
</updates>
|
| 10 |
+
</layout>
|
| 11 |
+
<acl>
|
| 12 |
+
<resources>
|
| 13 |
+
<admin>
|
| 14 |
+
<children>
|
| 15 |
+
<foomancommon translate="title" module="foomancommon">
|
| 16 |
+
<title>Fooman Selftests</title>
|
| 17 |
+
<sort_order>-100</sort_order>
|
| 18 |
+
</foomancommon>
|
| 19 |
+
<system>
|
| 20 |
+
<children>
|
| 21 |
+
<config>
|
| 22 |
+
<children>
|
| 23 |
+
<foomancommon translate="title" module="foomancommon">
|
| 24 |
+
<title>Fooman</title>
|
| 25 |
+
<sort_order>50</sort_order>
|
| 26 |
+
</foomancommon>
|
| 27 |
+
</children>
|
| 28 |
+
</config>
|
| 29 |
+
</children>
|
| 30 |
+
</system>
|
| 31 |
+
</children>
|
| 32 |
+
</admin>
|
| 33 |
+
</resources>
|
| 34 |
+
</acl>
|
| 35 |
+
</adminhtml>
|
| 36 |
+
</config>
|
app/code/community/Fooman/Common/etc/config.xml
CHANGED
|
@@ -9,7 +9,7 @@
|
|
| 9 |
<config>
|
| 10 |
<modules>
|
| 11 |
<Fooman_Common>
|
| 12 |
-
<version>1.
|
| 13 |
</Fooman_Common>
|
| 14 |
</modules>
|
| 15 |
<global>
|
|
@@ -39,38 +39,12 @@
|
|
| 39 |
</args>
|
| 40 |
</adminhtml>
|
| 41 |
</routers>
|
| 42 |
-
</admin>
|
| 43 |
-
<
|
| 44 |
-
<
|
| 45 |
-
<
|
| 46 |
-
<
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
<acl>
|
| 52 |
-
<resources>
|
| 53 |
-
<admin>
|
| 54 |
-
<children>
|
| 55 |
-
<foomancommon translate="title" module="foomancommon">
|
| 56 |
-
<title>Fooman Selftests</title>
|
| 57 |
-
<sort_order>-100</sort_order>
|
| 58 |
-
</foomancommon>
|
| 59 |
-
<system>
|
| 60 |
-
<children>
|
| 61 |
-
<config>
|
| 62 |
-
<children>
|
| 63 |
-
<foomancommon translate="title" module="foomancommon">
|
| 64 |
-
<title>Fooman</title>
|
| 65 |
-
<sort_order>50</sort_order>
|
| 66 |
-
</foomancommon>
|
| 67 |
-
</children>
|
| 68 |
-
</config>
|
| 69 |
-
</children>
|
| 70 |
-
</system>
|
| 71 |
-
</children>
|
| 72 |
-
</admin>
|
| 73 |
-
</resources>
|
| 74 |
-
</acl>
|
| 75 |
-
</adminhtml>
|
| 76 |
-
</config>
|
| 9 |
<config>
|
| 10 |
<modules>
|
| 11 |
<Fooman_Common>
|
| 12 |
+
<version>1.2.4</version>
|
| 13 |
</Fooman_Common>
|
| 14 |
</modules>
|
| 15 |
<global>
|
| 39 |
</args>
|
| 40 |
</adminhtml>
|
| 41 |
</routers>
|
| 42 |
+
</admin>
|
| 43 |
+
<phpunit>
|
| 44 |
+
<suite>
|
| 45 |
+
<modules>
|
| 46 |
+
<Fooman_Common/>
|
| 47 |
+
</modules>
|
| 48 |
+
</suite>
|
| 49 |
+
</phpunit>
|
| 50 |
+
</config>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/Fooman/Common/modman
CHANGED
|
@@ -1,4 +1,7 @@
|
|
| 1 |
../../../../../app/code/community/Fooman/Common/ /app/code/community/Fooman/Common/
|
| 2 |
../../../../../app/design/adminhtml/default/default/layout/fooman_common.xml /app/design/adminhtml/default/default/layout/fooman_common.xml
|
| 3 |
../../../../../app/design/adminhtml/default/default/template/fooman/common/ /app/design/adminhtml/default/default/template/fooman/common/
|
| 4 |
-
../../../../../app/etc/modules/Fooman_Common.xml /app/etc/modules/Fooman_Common.xml
|
|
|
|
|
|
|
|
|
| 1 |
../../../../../app/code/community/Fooman/Common/ /app/code/community/Fooman/Common/
|
| 2 |
../../../../../app/design/adminhtml/default/default/layout/fooman_common.xml /app/design/adminhtml/default/default/layout/fooman_common.xml
|
| 3 |
../../../../../app/design/adminhtml/default/default/template/fooman/common/ /app/design/adminhtml/default/default/template/fooman/common/
|
| 4 |
+
../../../../../app/etc/modules/Fooman_Common.xml /app/etc/modules/Fooman_Common.xml
|
| 5 |
+
../../../../../app/locale/de_De/Fooman_Common.csv /app/locale/de_De/Fooman_Common.csv
|
| 6 |
+
../../../../../app/locale/en_US/Fooman_Common.csv /app/locale/en_US/Fooman_Common.csv
|
| 7 |
+
../../../../../app/locale/it_IT/Fooman_Common.csv /app/locale/it_IT/Fooman_Common.csv
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fooman_Speedster</name>
|
| 4 |
-
<version>3.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0 / BSD see files</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,10 +10,10 @@
|
|
| 10 |
<description><p>Fooman Speedster 3.0</p>
|
| 11 |
<p>Speed up your store by combining, compressing and caching JS and CSS.</p><p>Please read the installation instructions and latest changes <a href="http://www.magentocommerce.com/extension/457/fooman-speedster">here.</a></p></description>
|
| 12 |
<notes>3.0.0 release</notes>
|
| 13 |
-
<authors><author><name>Kristof Ringleff</name><user>
|
| 14 |
-
<date>2014-
|
| 15 |
-
<time>
|
| 16 |
-
<contents><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="Fooman_Speedster.xml" hash="dfe240236e87da64e55c5f0abc72efba"/><file name="Fooman_Common.xml" hash="2555b2dd668865790df287b5cca61e35"/></dir></dir></dir><dir name="lib"><dir name="minify"><file name=".htaccess" hash="4d6b8833e4ccae2d2393dfeba369b894"/></dir></dir></target><target name="magecommunity"><dir name="Fooman"><dir name="Speedster"><dir name="Block"><dir name="Adminhtml"><
|
| 17 |
<compatible/>
|
| 18 |
-
<dependencies
|
| 19 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fooman_Speedster</name>
|
| 4 |
+
<version>3.0.15</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0 / BSD see files</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description><p>Fooman Speedster 3.0</p>
|
| 11 |
<p>Speed up your store by combining, compressing and caching JS and CSS.</p><p>Please read the installation instructions and latest changes <a href="http://www.magentocommerce.com/extension/457/fooman-speedster">here.</a></p></description>
|
| 12 |
<notes>3.0.0 release</notes>
|
| 13 |
+
<authors><author><name>Kristof Ringleff</name><user>FOOMAN</user><email>kristof@fooman.co.nz</email></author><author><name>Kristof Ringleff</name><user>FOOMAN</user><email>kristof@fooman.co.nz</email></author></authors>
|
| 14 |
+
<date>2014-10-15</date>
|
| 15 |
+
<time>22:13:25</time>
|
| 16 |
+
<contents><target name="mage"><dir name="app"><dir name="etc"><dir name="modules"><file name="Fooman_Speedster.xml" hash="dfe240236e87da64e55c5f0abc72efba"/><file name="Fooman_Common.xml" hash="2555b2dd668865790df287b5cca61e35"/></dir></dir></dir><dir name="lib"><dir name="minify"><file name=".htaccess" hash="4d6b8833e4ccae2d2393dfeba369b894"/></dir></dir></target><target name="magecommunity"><dir name="Fooman"><dir name="Speedster"><dir name="Block"><dir name="Adminhtml"><file name="Extensioninfo.php" hash="319567aa629443f8db37910e72b25836"/><dir name="Page"><file name="Head.php" hash="aea908a68fb6cf2547dc03679a8f3f36"/></dir></dir><dir name="Page"><dir name="Html"><file name="Head.php" hash="fc5343f3926b171c142e6cd098013e05"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="80f1d3bc964eacbb727c5cc9a5e825dd"/></dir><file name="LICENSE.txt" hash="b1439ec6a896ec1e549bd0a31ce83a23"/><dir name="Model"><file name="BuildSpeedster.php" hash="9f2f38fa662a19b7a0c9325bf9ca09d3"/><file name="Check.php" hash="e2457175d0e97ae7fa2877d8852b2429"/><file name="Selftester.php" hash="33b779d9ddb07924aa9a26abe9fad89e"/></dir><dir name="etc"><file name="adminhtml.xml" hash="58022b9593df5387f067790b1a4cbdbb"/><file name="config.xml" hash="21cb2177945294039832679e79f16203"/><file name="system.xml" hash="2737291d88a8cbbda2f9bd745c59c4ce"/></dir><file name="modman" hash="19236d249817cecc97d70a22428c963f"/><dir name="sql"><dir name="speedster_setup"><file name="mysql4-install-3.0.0.php" hash="270723f57b4e0d266102f66c6cff9c3a"/><file name="mysql4-upgrade-2.9.9-3.0.0.php" hash="13dec36a49b3bd9f750c229b5ae8883a"/></dir></dir></dir><dir name="Common"><dir name="Block"><dir name="Adminhtml"><file name="Extensioninfo.php" hash="48a6de0af77c57b5c1a4f62a7b8c717c"/></dir></dir><dir name="Helper"><file name="Data.php" hash="e6d3700e8926d50abdc0d590b66d3aea"/></dir><file name="LICENSE.txt" hash="34410d4f566fdc33f094525a2d9865fa"/><dir name="Model"><dir name="Selftester"><file name="Abstract.php" hash="9c733a5af8f6f7068761beb5ae4a2955"/><file name="Db.php" hash="af64ea0aebc09ce3f8f72aebe3679514"/></dir><file name="Selftester.php" hash="f716efea116bb949895f3f783f023c65"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SelftesterController.php" hash="10ab323884db2d9215eae703c3d1ca50"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="f8d8e76a8e8f9a20be6e8d8dae8043f1"/><file name="config.xml" hash="ae40b1ff299f7188f7c07b261fbfb252"/><file name="system.xml" hash="062afadb28b77803a0cf5fbdb472f23b"/></dir><file name="modman" hash="d0df72f800327ae8436bbb6bf76bde5a"/></dir></dir></target><target name="magelib"><dir name="minify"><file name="CSSmin.php" hash="d3948af8f596faf3f5e18bfccf18e654"/><file name="DooDigestAuth.php" hash="9d66abc8cfa37b5f593fc09c734f0269"/><file name="FirePHP.php" hash="f619b5a77fee4b21e4397e98d858fbf4"/><dir name="HTTP"><file name="ConditionalGet.php" hash="84d5f4e0b97e37228310a31a4bdc1240"/><file name="Encoder.php" hash="d697f04651d6363d1dd5dd8c2ce94cbd"/></dir><file name="JSMin.php" hash="da47a12a17e5e62a3995367a13197861"/><file name="JSMinPlus.php" hash="13d47b54dd73ef825e5d86e6cc633e32"/><dir name="Minify"><file name="Build.php" hash="99800ab664e1fb0ff46a7133ab13bb1b"/><dir name="CSS"><file name="Compressor.php" hash="e504bf68a90d63ec70169be95ed69a91"/><file name="UriRewriter.php" hash="1ab219a53409eb4ea9c026f8e555717b"/></dir><file name="CSS.php" hash="c585f82e0a6f8af12da2d3337aa7e901"/><dir name="Cache"><file name="APC.php" hash="f83c096f1ea3eb712bf020371b7d3755"/><file name="File.php" hash="a1c30a447db03624a990d6b0843fb0b3"/><file name="Memcache.php" hash="a572e300270f5cdb535de67eb1d9ce3b"/><file name="XCache.php" hash="a3239040e672955a8a520eef6e251d68"/><file name="ZendPlatform.php" hash="a20755bc554cfef6733ac64574c4f90e"/></dir><file name="ClosureCompiler.php" hash="8aa080b1831114560e17cff3292aed3a"/><file name="CommentPreserver.php" hash="f9fbae74aea3125d25f375942846d9c0"/><dir name="Controller"><file name="Base.php" hash="ec667737c7db5edd68bd81fc2444b8a9"/><file name="Files.php" hash="a0bc419aa48d256e19a64596dee53991"/><file name="Groups.php" hash="bf35ccd3d384c40033b978a402eaf917"/><file name="MinApp.php" hash="2ab3f9c88d9340b684a88ca16132d804"/><file name="Page.php" hash="c54a4b19474f9d0e9beb8ccb4e3678b3"/><file name="Version1.php" hash="0e4bce53a0b66c79aa6d15e52cf8ec50"/></dir><file name="DebugDetector.php" hash="d1bee7f6ab4dcf7be5d36dbcd1b81354"/><dir name="HTML"><file name="Helper.php" hash="af89e2e30f70dd935dd86d31649159e6"/></dir><file name="HTML.php" hash="7d7fecce501567ac7c580a5cf0fad201"/><file name="ImportProcessor.php" hash="075c561afa4825021fa44c3cac68ab94"/><dir name="JS"><file name="ClosureCompiler.php" hash="75cea0ae7e0b2d06ac1002123413f567"/></dir><file name="Lines.php" hash="526499d43d682432dac9483da4509179"/><file name="Loader.php" hash="5e84b0e739587d8df742f47953f135d5"/><file name="Logger.php" hash="ee493543ebb47aa06f976f23a0f3d86a"/><file name="Packer.php" hash="25e6f213205f060853db918c2d67ef06"/><file name="Source.php" hash="f7055f963f00e5ae9f5b0005d5e4a5ec"/><dir name="YUI"><file name="CssCompressor.java" hash="cb15a586f2dcc4fead535bc982e3f91e"/><file name="CssCompressor.php" hash="12d5b4e38488c68bc84cc0efba6eb338"/></dir><file name="YUICompressor.php" hash="29f676de4e367479d4e5665a0af052d8"/></dir><file name="Minify.php" hash="1446a1184342a31e9bf205c79879ff4c"/><dir name="MrClay"><dir name="Cli"><file name="Arg.php" hash="ce47e5043444c8753fbe36c64f59dc57"/></dir><file name="Cli.php" hash="ccce996e0124affcb0c49b4d08d7d2b4"/></dir><file name="SpeedsterMinify.php" hash="e6476c529ef7822245b64cec8977c858"/><file name="m.php" hash="7b3911995c33e611ffad33fa77b20d14"/><file name=".htaccess" hash="4d6b8833e4ccae2d2393dfeba369b894"/></dir></target><target name="mageskin"><dir name="m"><file name=".htaccess" hash="c1814ef21a60158bab01e91bfa5be19b"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="fooman_common.xml" hash="a7e4ac18fcfcac0080b1aef960fe9c94"/></dir><dir name="template"><dir name="fooman"><dir name="common"><file name="selftester.phtml" hash="12c4225cfb71490f2b297f50650d1185"/></dir></dir></dir></dir></dir></dir></target></contents>
|
| 17 |
<compatible/>
|
| 18 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 19 |
</package>
|
