SOURCES: postnuke-config.patch - add install portion

[glen]

Author: glen                         Date: Thu Mar  9 23:23:30 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add install portion

---- Files affected:
SOURCES:
   postnuke-config.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/postnuke-config.patch
diff -u SOURCES/postnuke-config.patch:1.2 SOURCES/postnuke-config.patch:1.3
--- SOURCES/postnuke-config.patch:1.2	Fri Mar 10 00:20:35 2006
+++ SOURCES/postnuke-config.patch	Fri Mar 10 00:23:25 2006
@@ -1,20 +1,27 @@
-diff -ur PostNuke-0.762/html/modules/Admin/pnadmin.php PostNuke-0.762.config/html/modules/Admin/pnadmin.php
---- PostNuke-0.762/html/modules/Admin/pnadmin.php	2006-03-10 01:09:47.000000000 +0200
-+++ PostNuke-0.762.config/html/modules/Admin/pnadmin.php	2006-03-10 01:09:02.000000000 +0200
-@@ -948,8 +948,8 @@
-     $config_php = (bool) is_writable('config.php');
-     $pnRender->assign('config_php', $config_php);
- 
--    // check for config-old.php beeing writable
--    $config_old_php = (bool) is_writable('config-old.php');
-+    // check for /etc/webapps/postnuke/config.php.bak beeing writable
-+    $config_old_php = (bool) is_writable('/etc/webapps/postnuke/config.php.bak');
-     $pnRender->assign('config_old_php', $config_old_php);
+unchanged:
+--- PostNuke-0.762/html/includes/pnAPI.php	2006-03-10 01:13:58.000000000 +0200
++++ PostNuke-0.762.config/html/includes/pnAPI.php	2006-03-10 01:13:38.000000000 +0200
+@@ -176,7 +176,7 @@
+     // Initialise and load configuration
+     $pnconfig = array();
+     $pndebug = array();
+-    include 'config.php';
++    include '/etc/webapps/postnuke/config.php';
+     $GLOBALS['pnconfig'] = $pnconfig;
+     $GLOBALS['pndebug'] = $pndebug;
  
-     // check for .htaccess in /var/lib/postnuke/pnTemp
-diff -ur PostNuke-0.762/html/install/check.php PostNuke-0.762.config/html/install/check.php
---- PostNuke-0.762/html/install/check.php	2006-03-10 01:12:07.000000000 +0200
+diff -u PostNuke-0.762.config/html/install/check.php PostNuke-0.762.config/html/install/check.php
+--- PostNuke-0.762.config/html/install/check.php	2006-03-10 01:13:38.000000000 +0200
 +++ PostNuke-0.762.config/html/install/check.php	2006-03-10 01:11:34.000000000 +0200
+@@ -50,7 +50,7 @@
+ 
+     echo "<font class=\"pn-title\">" . _CHMOD_CHECK_1 . "</font><br><br>
+          <font class=\"pn-normal\">" . _CHMOD_CHECK_2 . "</font>";
+-    $file = 'config.php';
++    $file = '/etc/webapps/postnuke/config.php';
+     $sideblock = "chmod"; 
+     // $mode = fileperms($file);
+     // $mode &= 0x1ff; # Remove the bits we don't need
 @@ -63,7 +63,7 @@
          $chmod = 1;
      } 
@@ -24,15 +31,74 @@
      // $mode = fileperms($file);
      // $mode &= 0x1ff; # Remove the bits we don't need
      // $chmod = sprintf("%o", $mode);
-diff -ur PostNuke-0.762/html/install/modify_config.php PostNuke-0.762.config/html/install/modify_config.php
---- PostNuke-0.762/html/install/modify_config.php	2006-03-10 01:12:06.000000000 +0200
+diff -u PostNuke-0.762.config/html/install/modify_config.php PostNuke-0.762.config/html/install/modify_config.php
+--- PostNuke-0.762.config/html/install/modify_config.php	2006-03-10 01:13:38.000000000 +0200
 +++ PostNuke-0.762.config/html/install/modify_config.php	2006-03-10 01:11:34.000000000 +0200
 @@ -144,7 +144,7 @@
          add_src_rep("adminmail", $email);
      }
  
--    $ret = modify_file("config.php", "config-old.php", $reg_src, $reg_rep);
+-    $ret = modify_file("/etc/webapps/postnuke/config.php", "config-old.php", $reg_src, $reg_rep);
 +    $ret = modify_file("config.php", "/etc/webapps/postnuke/config.php.bak", $reg_src, $reg_rep);
  
      if (preg_match("/Error/", $ret)) {
          show_error_info();
+--- PostNuke-0.762/html/install/upgrade.php	2006-03-10 01:14:03.000000000 +0200
++++ PostNuke-0.762.config/html/install/upgrade.php	2006-03-10 01:13:38.000000000 +0200
+@@ -157,7 +157,7 @@
+     mysql_connect($dbhost, $dbuname, $dbpass);
+     mysql_select_db("$dbname") or die ("<br><font class=\"pn-failed\">Nie można wybrać bazy danych.</font>");
+     include("install/pn64.php");
+-    update_config_php(true); // Scott - added
++    update_config.php(true); // Scott - added
+ } 
+ 
+ /**
+unchanged:
+--- PostNuke-0.762/html/install.php	2006-03-10 01:13:53.000000000 +0200
++++ PostNuke-0.762.config/html/install.php	2006-03-10 01:13:38.000000000 +0200
+@@ -100,7 +100,7 @@
+ 
+ 
+ if(!isset($prefix)) {
+-    include_once 'config.php';
++    include_once '/etc/webapps/postnuke/config.php';
+     $prefix = $pnconfig['prefix'];
+     $dbtype = $pnconfig['dbtype'];
+     $dbtabletype = $pnconfig['dbtabletype'];
+@@ -125,7 +125,7 @@
+ 
+ $currentlang = installer_get_language(@$currentlang);
+ 
+-include_once 'install/modify_config.php'; // functions to modify config.php
++include_once 'install/modify_config.php'; // functions to modify config.php
+ include_once 'install/upgrade.php';  // functions for upgrades
+ include_once 'install/newinstall.php'; // functions for new installs
+ include_once 'install/gui.php'; // functions for rendering the gui
+@@ -174,7 +174,7 @@
+ 
+     case "Set Login":
+          $inst_dbconn = dbconnect($dbhost, $dbuname, $dbpass, $dbname, $dbtype);
+-         update_config_php(true); // Scott - added
++         update_config_php(true); // Scott - added
+          input_data($dbhost, $dbuname, $dbpass, $dbname, $prefix, $dbtype, $aid, $name, $pwd, $repeatpwd, $email, $url);
+          if(start_postnuke($aid, $pwd)) {
+             set_config_vars($currentlang);
+diff -u PostNuke-0.762.config/html/modules/Admin/pnadmin.php PostNuke-0.762.config/html/modules/Admin/pnadmin.php
+--- PostNuke-0.762.config/html/modules/Admin/pnadmin.php	2006-03-10 01:13:38.000000000 +0200
++++ PostNuke-0.762.config/html/modules/Admin/pnadmin.php	2006-03-10 01:09:02.000000000 +0200
+@@ -945,11 +945,11 @@
+     $pnRender->assign('register_globals', $register_globals);
+ 
+     // check for config.php beeing writable
+-    $config_php = (bool) is_writable('/etc/webapps/postnuke/config.php');
++    $config_php = (bool) is_writable('config.php');
+     $pnRender->assign('config_php', $config_php);
+ 
+-    // check for config-old.php beeing writable
+-    $config_old_php = (bool) is_writable('config-old.php');
++    // check for /etc/webapps/postnuke/config.php.bak beeing writable
++    $config_old_php = (bool) is_writable('/etc/webapps/postnuke/config.php.bak');
+     $pnRender->assign('config_old_php', $config_old_php);
+ 
+     // check for .htaccess in /var/lib/postnuke/pnTemp
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/postnuke-config.patch?r1=1.2&r2=1.3&f=u