SOURCES: postnuke-config.patch - up to 0.764

[rotom]

Author: rotom                        Date: Sat Feb 24 15:40:17 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.764

---- Files affected:
SOURCES:
   postnuke-config.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/postnuke-config.patch
diff -u SOURCES/postnuke-config.patch:1.5 SOURCES/postnuke-config.patch:1.6
--- SOURCES/postnuke-config.patch:1.5	Fri Mar 10 00:28:58 2006
+++ SOURCES/postnuke-config.patch	Sat Feb 24 16:40:12 2007
@@ -1,6 +1,5 @@
-diff -ur PostNuke-0.762/html/includes/pnAPI.php PostNuke-0.762.config/html/includes/pnAPI.php
---- PostNuke-0.762/html/includes/pnAPI.php	2006-03-10 01:28:05.000000000 +0200
-+++ PostNuke-0.762.config/html/includes/pnAPI.php	2006-03-10 01:27:23.000000000 +0200
+--- html/includes/pnAPI.php.orig	2007-02-24 15:50:28.000000000 +0100
++++ html/includes/pnAPI.php	2007-02-24 15:51:21.000000000 +0100
 @@ -176,7 +176,7 @@
      // Initialise and load configuration
      $pnconfig = array();
@@ -10,19 +9,18 @@
      $GLOBALS['pnconfig'] = $pnconfig;
      $GLOBALS['pndebug'] = $pndebug;
  
-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:28:08.000000000 +0200
-+++ PostNuke-0.762.config/html/install/check.php	2006-03-10 01:27:23.000000000 +0200
-@@ -50,7 +50,7 @@
+--- html/install/check.php.orig	2007-02-24 15:51:48.000000000 +0100
++++ html/install/check.php	2007-02-24 15:54:48.000000000 +0100
+@@ -57,7 +57,7 @@
  
-     echo "<font class=\"pn-title\">" . _CHMOD_CHECK_1 . "</font><br><br>
-          <font class=\"pn-normal\">" . _CHMOD_CHECK_2 . "</font>";
+     echo "<p class=\"pn-title\">" . _CHMOD_CHECK_1 . "</p><br />
+          <p class=\"pn-normal\">" . _CHMOD_CHECK_2 . "</p>";
 -    $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 @@
+@@ -70,7 +70,7 @@
          $chmod = 1;
      } 
  
@@ -31,9 +29,8 @@
      // $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:28:06.000000000 +0200
-+++ PostNuke-0.762.config/html/install/modify_config.php	2006-03-10 01:27:23.000000000 +0200
+--- html/install/modify_config.php.orig	2007-02-24 15:55:23.000000000 +0100
++++ html/install/modify_config.php	2007-02-24 15:56:19.000000000 +0100
 @@ -144,7 +144,7 @@
          add_src_rep("adminmail", $email);
      }
@@ -43,9 +40,8 @@
  
      if (preg_match("/Error/", $ret)) {
          show_error_info();
-diff -ur PostNuke-0.762/html/install/upgrade.php PostNuke-0.762.config/html/install/upgrade.php
---- PostNuke-0.762/html/install/upgrade.php	2006-03-10 01:28:06.000000000 +0200
-+++ PostNuke-0.762.config/html/install/upgrade.php	2006-03-10 01:27:23.000000000 +0200
+--- html/install/upgrade.php.orig	2007-02-24 15:57:01.000000000 +0100
++++ html/install/upgrade.php	2007-02-24 15:57:45.000000000 +0100
 @@ -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>");
@@ -55,10 +51,9 @@
  } 
  
  /**
-diff -ur PostNuke-0.762/html/install.php PostNuke-0.762.config/html/install.php
---- PostNuke-0.762/html/install.php	2006-03-10 01:28:00.000000000 +0200
-+++ PostNuke-0.762.config/html/install.php	2006-03-10 01:27:23.000000000 +0200
-@@ -100,7 +100,7 @@
+--- html/install.php.orig	2007-02-24 15:58:03.000000000 +0100
++++ html/install.php	2007-02-24 15:58:58.000000000 +0100
+@@ -101,7 +101,7 @@
  
  
  if(!isset($prefix)) {
@@ -67,9 +62,17 @@
      $prefix = $pnconfig['prefix'];
      $dbtype = $pnconfig['dbtype'];
      $dbtabletype = $pnconfig['dbtabletype'];
-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:28:08.000000000 +0200
-+++ PostNuke-0.762.config/html/modules/Admin/pnadmin.php	2006-03-10 01:27:23.000000000 +0200
+@@ -175,7 +175,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);
+--- html/modules/Admin/pnadmin.php.orig	2007-02-24 15:59:33.000000000 +0100
++++ html/modules/Admin/pnadmin.php	2007-02-24 16:00:35.000000000 +0100
 @@ -945,11 +945,11 @@
      $pnRender->assign('register_globals', $register_globals);
  
@@ -78,9 +81,8 @@
 +    $config_php = (bool) is_writable('/etc/webapps/postnuke/config.php');
      $pnRender->assign('config_php', $config_php);
  
--    // check for config-old.php beeing writable
+     // 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);
  
================================================================

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