Changeset 676

Timestamp:

06/25/07 01:31:21 (18 months ago)

Author:

raphael

Message:

Fixed #430: Error in sql query of vhcs2ispcp.sql
Fixed #419: Error 500: segfault

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• engine/setup/vhcs2ispcp.pl (modified) (6 diffs)
• engine/setup/vhcs2ispcp.sql (modified) (2 diffs)
• gui/include/i18n.php (modified) (3 diffs)
• gui/include/ispcp-config.php (modified) (1 diff)
• gui/include/ispcp-lib.php (modified) (4 diffs)
• gui/include/sql.php (modified) (2 diffs)

trunk/CHANGELOG

@@ -15 +15 @@
                 * Fixed #425: WARNING: KEY or IV has invalid length
         - SETUP:
-                * Fixed #428: ERROR: External command '/usr/bin/mysql --host=localhost --user=root --pass= < /tmp/db.sql 1>/tmp/db.sql.stdout 2>/tmp/db.sql.stderr' returned '1' 
+                * Fixed #428: ERROR: External command '/usr/bin/mysql --host=localhost --user=root --pass= < /tmp/db.sql 1>/tmp/db.sql.stdout 2>/tmp/db.sql.stderr' returned '1'
+                * Fixed #430: Error in sql query of vhcs2ispcp.sql
+        - GUI:
+                * Fixed #419: Error 500: segfault
 
 2007-06-21 Benedikt Heintel

trunk/engine/setup/vhcs2ispcp.pl

@@ -2 +2 @@
 
 # VHCS 2.4.7.1 to ispCP Omega migration script
-# Copyright (c) 2007 by Raphael Geissert <atomo64@gmail.com>
-#
+# Copyright (c) 2007 by Raphael Geissert <atomo64@gmail.com> (original author)
+# Copyright (c) 2007 by isp Control Panel
+# http://isp-control.net
 #
 # License:
@@ -106 +107 @@
     sys_command("$main::cfg{'CMD_FTPD'} restart");
     sleep(2);
-    sys_command("$main::cfg{'CMD_AUTHD'} restart");    
+    sys_command("$main::cfg{'CMD_AUTHD'} restart");
     
     return 0;
@@ -193 +194 @@
     return 0;
 }
-
-my $rs = undef;
 
 my $welcome_message = <<MSG;
@@ -229 +228 @@
 require $main::cfg{'ROOT_DIR'} . '/ispcp-db-keys.pl';
 
-# This time we connect to the database
-get_conf();
+# Let's connect to the database
+setup_main_vars();
 
 print STDOUT "\nVHCS2's services will now be stopped:\n";
 
-$rs = stop_services("/tmp/vhcs2-backup-all.lock");
+stop_services("/tmp/vhcs2-backup-all.lock");
 
 print STDOUT "\nVHCS2's database will now be converted:\n";
@@ -245 +244 @@
 $main::cfg_file = '/etc/ispcp/ispcp.conf';
 
-# Load new config and connect to the database as the new user
+# Load new config
 get_conf();
 
+require $main::cfg{'ROOT_DIR'} . '/ispcp-db-keys.pl';
+
+# Now we connect
+setup_main_vars();
+
 install_language();
 
 if($main::cfg{'DATABASE_NAME'} ne 'ispcp') {
 
-    print STDOUT "\nIMPORTANT: you have installed ispCP in a non-default directory";
+    print STDOUT "\nIMPORTANT: you have installed ispCP in a non-default database";
     print STDOUT "\n\tThe migration script has converted your old VHCS database";
     print STDOUT "\n\tin the new database called 'ispcp'; please rename this database";
-    print STDOUT "\n\twith the one you choose at install time: $main::cfg{'DATABASE_NAME'}\n";
+    print STDOUT "\n\twith the one you choose at ispCP install time: $main::cfg{'DATABASE_NAME'}\n";
 
 } else {
 
-    print STDOUT "\nispCP's requests manager will now be executed...";
+    print STDOUT "\nRunning ispCP's requests manager...";
 
     sys_command("$main::db{'ROOT_DIR'}/engine/ispcp-rqst-mngr");
@@ -267 +271 @@
 }
 
-print STDOUT "\nispCP's services will now be started:\n";
+print STDOUT "\nStarting ispCP's services:\n";
 
 start_services();

trunk/engine/setup/vhcs2ispcp.sql

@@ -19 +19 @@
 ALTER TABLE `htaccess_groups` ADD `status` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL ;
 
-ALTER TABLE `htaccess_users` ADD `status` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci iNULL ;
+ALTER TABLE `htaccess_users` ADD `status` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL ;
+
+ALTER TABLE `login` ADD `ipaddr` VARCHAR( 15 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL ;
+ALTER TABLE `login` ADD `user_name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL ;
+ALTER TABLE `login` ADD `login_count` TINYINT( 1 ) NULL;
+
+-- Drop existing languages (they are outdated anyways)
 
 DROP TABLE IF EXISTS `lang_English`;
@@ -32 +38 @@
 DROP TABLE IF EXISTS `lang_Spanish`;
 DROP TABLE IF EXISTS `lang_French`;
-
-ALTER TABLE `login` ADD `ipaddr` VARCHAR( 15 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL ;
-ALTER TABLE `login` ADD `user_name` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL ;
-ALTER TABLE `login` ADD `login_count` TINYINT( 1 ) NULL;
 
 -- Add Primary and possibly an index to login table!

trunk/gui/include/i18n.php

@@ -31 +31 @@
  **/
 function tr($msgid, $as_is = false) {
-    global $sql, $default_lang, $cfg;
-    static $cache;
+    global $sql, $cfg;
+    static $cache = array();
 
     $lang = (isset($_SESSION['user_def_lang'])) ? $_SESSION['user_def_lang'] : $cfg['USER_INITIAL_LANG'];
@@ -43 +43 @@
 
         if ($sql) {
-            if (!$as_is) {
+            if (!$as_is && 'encoding' != $msgid) {
                 $encoding = tr('encoding');
             }
@@ -64 +64 @@
 
     // Replace values
-    if (func_num_args() > 2) {
+    if (func_num_args() > 1) {
         $argv = func_get_args();
         unset($argv[0]); //msgid
-        unset($argv[1]); //as_is
+
+        if (is_bool($argv[1])) {
+            unset($argv[1]); //as_is
+        }
         $msgstr = vsprintf($msgstr, $argv);
     }

trunk/gui/include/ispcp-config.php

@@ -37 +37 @@
     function parseFile(){
         /* open file ... parse it and put it in $cfg_values */
-        @@$fd = fopen($this->config_file,'r');
+        @$fd = fopen($this->config_file,'r');
         if ($fd == FALSE) {
             /* ooops error */

trunk/gui/include/ispcp-lib.php

@@ -19 +19 @@
  **/
 
-define(INCLUDEPATH, realpath(dirname(__FILE__)));
-
-session_name("ISPCP");
+define('INCLUDEPATH', realpath(dirname(__FILE__)));
+
+session_name('ispCP');
 
 if (!isset($_SESSION))
@@ -60 +60 @@
 $cfg['LOGIN_TEMPLATE_PATH'] = $cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'];
 
-$cfg['ADMIN_TEMPLATE_PATH'] = "../".$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/admin';
-
-$cfg['RESELLER_TEMPLATE_PATH'] = "../".$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/reseller';
-
-$cfg['CLIENT_TEMPLATE_PATH'] = "../".$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/client';
-
-$cfg['IPS_LOGO_PATH'] = "../themes/user_logos";
-
-$cfg['PURCHASE_TEMPLATE_PATH'] = "../".$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/orderpanel';
+$cfg['ADMIN_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/admin';
+
+$cfg['RESELLER_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/reseller';
+
+$cfg['CLIENT_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/client';
+
+$cfg['IPS_LOGO_PATH'] = '../themes/user_logos';
+
+$cfg['PURCHASE_TEMPLATE_PATH'] = '../'.$cfg['ROOT_TEMPLATE_PATH'].$cfg['USER_INITIAL_THEME'].'/orderpanel';
 
 $cfg['DOMAIN_ROWS_PER_PAGE'] = 10;
@@ -164 +164 @@
 
 // The virtual host file from Apache which contains our virtual host entries
-$cfg['SERVER_VHOST_FILE'] = "/etc/apache2/sites-available/ispcp.conf";
+$cfg['SERVER_VHOST_FILE'] = '/etc/apache2/sites-available/ispcp.conf';
 
 require_once(INCLUDEPATH.'/spGzip.php');
@@ -222 +222 @@
 if(!$res = exec_query($sql, $query, array())) {
         system_message(tr('Could not get config from database'));
-        die();
 }
 else {

trunk/gui/include/sql.php

@@ -18 +18 @@
  *
  **/
-$include_path = realpath(dirname(__FILE__));
 
-require ($include_path.'/adodb/adodb.inc.php');
+require (INCLUDEPATH.'/adodb/adodb.inc.php');
 
-//require ($include_path.'/adodb/tohtml.inc.php');
+//require (INCLUDEPATH.'/adodb/tohtml.inc.php');
 
-require ($include_path.'/adodb/adodb-pager.inc.php');
+require (INCLUDEPATH.'/adodb/adodb-pager.inc.php');
 
 $cfg['DB_TYPE'] = $cfg['DATABASE_TYPE'];
@@ -35 +34 @@
 
 $cfg['DB_NAME'] = $cfg['DATABASE_NAME'];
-
 
 if ($cfg['DB_TYPE'] === 'pgsql') {