[php-blog-cvs] serendipity serendipity_admin_upgrader.inc.php,1.13,1.14 serendipity_functions_installer.inc.php,1.17,1.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18488

Modified Files:
	serendipity_admin_upgrader.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
Upgrader script checks $serendipity['UpgraderShowAbort'] setting (can be
stored inside serendipity_config_local.inc.php). If this is set to FALSE,
the upgrade won't show a 'IGNORE' button.
This is useful for shared blogs, where you don't want anyone to screw up
their system by ignoring the updates, so only allowing users to update their
blog and nothing else. So we shouldn't ever screw up the updater. ;-)


Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_functions_installer.inc.php	28 Jun 2004 01:10:36 -0000	1.17
+++ serendipity_functions_installer.inc.php	29 Jun 2004 10:48:57 -0000	1.18
@@ -1,5 +1,5 @@
 <?php # $Id$
-function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file='serendipity_config_local.inc.php', $path = null) {
+function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file = 'serendipity_config_local.inc.php', $path = null, $privateVariables = null) {
     global $serendipity;
     umask(0000);
     if (is_null($path)) {
@@ -34,6 +34,13 @@
     fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
     fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
     fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");
+
+    if (is_array($privateVariables) && count($privateVariables) > 0) {
+        foreach($privateVariables AS $p_idx => $p_val) {
+            fwrite($configfp, "\t\$serendipity['{$p_idx}']  = '{$p_val}';\n");
+        }
+    }
+
     fwrite($configfp, "?>\n");
 
     fclose($configfp);

Index: serendipity_admin_upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_upgrader.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_admin_upgrader.inc.php	18 Jun 2004 15:32:22 -0000	1.13
+++ serendipity_admin_upgrader.inc.php	29 Jun 2004 10:48:57 -0000	1.14
@@ -1,6 +1,12 @@
 <?php
 require_once(S9Y_INCLUDE_PATH . 'serendipity_functions_installer.inc.php');
 
+// Setting this value to 'FALSE' is recommended only for SHARED BLOG INSTALLATIONS. This enforces all shared blogs with a common
+// codebase to only allow upgrading, no bypassing and thus causing instabilities.
+// This variable can also be set as $serendipity['UpgraderShowAbort'] inside serendipity_config_local.inc.php to prevent
+// your setting being changed when updating serendipity in first place.
+$showAbort  = (isset($serendipity['UpgraderShowAbort']) ? $serendipity['UpgraderShowAbort'] : true);
+
 $abortLoc   = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=ignore';
 $upgradeLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php?serendipity[action]=upgrade';
 
@@ -64,8 +70,24 @@
 
 }
 
-if ($serendipity['GET']['action'] == 'ignore' || $serendipity['GET']['action'] == 'upgrade') {
-    $r = serendipity_updateLocalConfig($serendipity['dbName'], $serendipity['dbPrefix'], $serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass'], $serendipity['dbType']);
+if (($showAbort && $serendipity['GET']['action'] == 'ignore') || $serendipity['GET']['action'] == 'upgrade') {
+    $privateVariables = array();
+    if (isset($serendipity['UpgraderShowAbort'])) {
+        $privateVariables['UpgraderShowAbort'] = $serendipity['UpgraderShowAbort'];
+    }
+
+    $r = serendipity_updateLocalConfig(
+           $serendipity['dbName'],
+           $serendipity['dbPrefix'],
+           $serendipity['dbHost'],
+           $serendipity['dbUser'],
+           $serendipity['dbPass'],
+           $serendipity['dbType'],
+           'serendipity_config_local.inc.php',
+           null,
+           $privateVariables
+    );
+
     if ($serendipity['GET']['action'] == 'ignore') {
         echo SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED;
     } elseif ($serendipity['GET']['action'] == 'upgrade') {
@@ -162,7 +184,7 @@
 <hr noshade="noshade">
 <?php if ($taskCount > 0 || sizeof($sqlfiles) > 0) { ?>
     <strong><?php echo SERENDIPITY_UPGRADER_PROCEED_QUESTION ?></strong>
-    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onClick="location.href='<?php echo $abortLoc ?>'"> <input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onClick="location.href='<?php echo $upgradeLoc ?>'">
+    <br /><?php if ($showAbort) { ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onClick="location.href='<?php echo $abortLoc ?>'"> <?php } ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onClick="location.href='<?php echo $upgradeLoc ?>'">
 <?php } else { ?>
     <strong><?php echo SERENDIPITY_UPGRADER_NO_UPGRADES ?></strong>
     <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?>" onClick="location.href='<?php echo $abortLoc ?>'">