work in progress on checking sys reqs at runtime

Author: Michael Toppa

Admin/ShashinInstall.php

@@ -72,15 +72,22 @@ public function run() {
     }
 
     public function runtimeUpgrade() {
-        // check if an activation error was logged
         if (strpos($_SERVER['REQUEST_URI'], 'plugins.php')) {
-            $cantActivateReason = get_option('shashinCantActivateReason');
+            $status = shashinActivationChecks();
 
-            if ($cantActivateReason) {
-                echo '<div class="error"><p>';
-                echo $cantActivateReason;
-                echo '</p></div>' . PHP_EOL;
+            if (is_string($status)) {
+                shashinCancelActivation($status);
+                return null;
             }
+
+            //$cantActivateReason = get_option('shashinCantActivateReason');
+
+            //if ($cantActivateReason) {
+                //echo '<div class="error"><p>';
+                //echo $cantActivateReason;
+                //echo '</p></div>' . PHP_EOL;
+            //    wp_die($cantActivateReason);
+            //}
         }
 
         // update the version number if needed

readme.txt

@@ -85,6 +85,9 @@ For troubleshooting help, please [post a comment on my latest Shashin post](http
 
 == Changelog ==
 
+= 3.2 =
+* Add albums using Google+ URL and other non-RSS URLs
+
 = 3.1.4 =
 * Update settings even if plugin is not deactivated/reactivated, as WP no longer runs activation hooks during plugin auto-upgrades
 * Bug fix: Fancybox slideshow was not launching in Firefox (just needed to move the setShashinFancyboxCaption function)

start.php

@@ -35,15 +35,14 @@ function shashinActivateForNewNetworkSite($blog_id) {
 }
 
 function shashinActivate() {
-    $autoLoaderPath = dirname(__FILE__) . '/../toppa-plugin-libraries-for-wordpress/ToppaAutoLoaderWp.php';
-    $status = shashinActivationChecks($autoLoaderPath);
+    $status = shashinActivationChecks();
 
     if (is_string($status)) {
         shashinCancelActivation($status);
         return null;
     }
 
-    require_once($autoLoaderPath);
+    require_once dirname(__FILE__) . '/../toppa-plugin-libraries-for-wordpress/ToppaAutoLoaderWp.php';
     $toppaAutoLoader = new ToppaAutoLoaderWp('/toppa-plugin-libraries-for-wordpress');
     $shashinAutoLoader = new ToppaAutoLoaderWp('/shashin');
     $shashin = new ShashinWp($shashinAutoLoader);
@@ -54,11 +53,12 @@ function shashinActivate() {
         return null;
     }
 
-    delete_option('shashinCantActivateReason');
+    //delete_option('shashinCantActivateReason');
     return null;
 }
 
-function shashinActivationChecks($autoLoaderPath) {
+function shashinActivationChecks() {
+    $autoLoaderPath = dirname(__FILE__) . '/../toppa-plugin-libraries-for-wordpress/ToppaAutoLoaderWp.php';
     $toppaLibsVersion = get_option('toppaLibsVersion');
 
     if (!file_exists($autoLoaderPath) || !$toppaLibsVersion || version_compare($toppaLibsVersion, '1.3.2', '<')) {
@@ -79,7 +79,8 @@ function shashinActivationChecks($autoLoaderPath) {
 
 function shashinCancelActivation($message) {
     deactivate_plugins(basename(__FILE__));
-    update_option('shashinCantActivateReason', $message);
+    //update_option('shashinCantActivateReason', $message);
+    wp_die($message);
 }
 
 function shashinDeactivateForNetworkSites() {