Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1307

Show
Ignore:
Timestamp:
08/06/08 23:47:15 (4 months ago)
Author:
rats
Message:

fixed a lot of issues found in RC6 release

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1301 r1307  
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    33 
     42008-08-06 Benedikt Heintel 
     5        - RELEASE ispCP ω Omega 1.0.0 RC6 
     6        - SETUP: 
     7                * Fixed: MySQL root password containing " or ` update ends up with an error 
     8 
    492008-08-05 Benedikt Heintel 
    5         - RELEASE ispCP ω Omega 1.0.0 RC6 
    610        - SETUP: 
    711                * Fixed #1447: proftpd.conf missing replacements 

  • trunk/configs/centos/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/centos/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/debian/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 

  • trunk/configs/debian/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/fedora/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/fedora/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/freebsd/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/gentoo/database/database.sql

    r1206 r1307  
    7575('PORT_DNS', '53;tcp;DNS;1;0'), 
    7676('PORT_HTTP', '80;tcp;HTTP;1;0'), 
    77 ('PORT_HTTPS', '443;tcp;HTTPS;1;0'), 
     77('PORT_HTTPS', '443;tcp;HTTPS;0;0'), 
    7878('PORT_POP3', '110;tcp;POP3;1;0'), 
    7979('PORT_POP3-SSL', '995;tcp;POP3-SSL;1;0'), 
    8080('PORT_IMAP', '143;tcp;IMAP;1;0'), 
    81 ('PORT_IMAP-SSL', '993;tcp;IMAP-SSL;1;0'), 
    82 ('PORT_POSTGREY', '10030;tcp;POSTGREY;1;1'), 
     81('PORT_IMAP-SSL', '993;tcp;IMAP-SSL;0;0'), 
     82('PORT_POSTGREY', '60000;tcp;POSTGREY;1;1'), 
    8383('PORT_AMAVIS', '10024;tcp;AMaVis;1;1'), 
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/gentoo/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/openbsd/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/openbsd/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/opensuse/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/opensuse/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/redhat/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/redhat/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/ubuntu/database/database.sql

    r1206 r1307  
    8484('PORT_SPAMASSASSIN', '783;tcp;SPAMASSASSIN;1;1'), 
    8585('PORT_POLICYD-WEIGHT', '12525;tcp;POLICYD-WEIGHT;1;1'), 
    86 ('DATABASE_REVISION', '4'); 
     86('DATABASE_REVISION', '6'); 
    8787 
    8888-- -------------------------------------------------------- 
    …… 
    261261  `id` int(10) unsigned NOT NULL auto_increment, 
    262262  `dmn_id` int(10) unsigned NOT NULL DEFAULT '0', 
    263   `user_id` tinyint(4) DEFAULT NULL, 
    264   `group_id` tinyint(4) DEFAULT NULL, 
     263  `user_id` VARCHAR(255) NULL DEFAULT NULL, 
     264  `group_id` VARCHAR(255) NULL DEFAULT NULL, 
    265265  `auth_type` varchar(255) DEFAULT NULL, 
    266266  `auth_name` varchar(255) DEFAULT NULL, 
    …… 
    526526  `sqlu_pass` varchar(64) binary DEFAULT 'n/a', 
    527527  UNIQUE KEY (`sqlu_id`) 
    528 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2 ; 
     528) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=2; 
    529529 
    530530-- -------------------------------------------------------- 

  • trunk/configs/ubuntu/ispcp.conf

    r1301 r1307  
    99# 
    1010 
    11 BuildDate = 20080805 
     11BuildDate = 20080806 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/docs/CentOS/INSTALL

    r1297 r1307  
    69694. Untar or unzip the distribution files to a secure directory: 
    7070        # cd /root 
    71         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     71        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    7272 
    73735. Change to the newly created directory: 
    …… 
    189189need to be running. 
    190190 
    191  
    192  
    193  
    1941911. Untar or unzip the distribution files to a secure directory: 
    195         # cd /root 
    196         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     192    # cd /root 
     193    # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    197194 
    1981952. Change to the newly created directory: 
    199         # cd ./ispcp-omega-1.0.0 
     196    # cd ./ispcp-omega-1.0.0 
    200197 
    2011983. Next, install the software packages we need. A list is conveniently provided 
    202199   and can be used to install by running the following: 
    203         # yum install `cat ./docs/CentOS/centos-packages` 
     200    # yum install `cat ./docs/CentOS/centos-packages` 
    204201   After that, we need to install a few perl modules that aren't packaged. You 
    205202   can run the following command to install them: 
    206         # cat ./docs/CentOS/centos-perl | xargs -I {} perl -MCPAN -e 'install {}' 
     203    # cat ./docs/CentOS/centos-perl | xargs -I {} perl -MCPAN -e 'install {}' 
    207204 
    2082054. (optional) Check the ispcp.conf and adapt it to your requirements. 
    …… 
    211208 
    2122095. Build the System by using make: 
    213         # make -f Makefile.centos install 
    214  
    215 6. Save key files 
    216         # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    217         # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    218         # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     210    # make -f Makefile.centos install 
     211 
     2126. Save files 
     213    # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
     214    # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
     215    # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     216    # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    219217 
    220218   If updating from RC3 or higher: 
    221         # cp -v /var/www/ispcp/gui/tools/pma/config.inc.php /tmp/ispcp/var/www/ispcp/gui/tools/pma/ 
     219    # cp -v /var/www/ispcp/gui/tools/pma/config.inc.php /tmp/ispcp/var/www/ispcp/gui/tools/pma/ 
    222220 
    2232217. Delete old files to avoid security risks: 
    …… 
    2312299. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    232230        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     231 
     232   If updating from RC5: 
     233        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     234 
     235   else: 
    233236        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    234237 

  • trunk/docs/Debian/INSTALL

    r1297 r1307  
    57571. Untar or unzip the distribution files to a secure directory: 
    5858        # cd /root 
    59         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     59        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    6060 
    61612. Change to the newly created directory: 
    …… 
    1331331. Untar or unzip the distribution files to a secure directory: 
    134134        # cd /root 
    135         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     135        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    136136 
    1371372. Change to the newly created directory: 
    …… 
    175175        # make install 
    176176 
    177 6. Save key files 
     1776. Save files 
    178178        # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    179179        # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    180180        # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     181        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    181182 
    182183   If updating from RC3 or higher: 
    …… 
    1931949. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    194195        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     196 
     197   If updating from RC5: 
     198        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     199 
     200   else: 
    195201        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    196202 

  • trunk/docs/Fedora/INSTALL

    r1297 r1307  
    55551. Untar or unzip the distribution files to a secure directory: 
    5656        # cd /root 
    57         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     57        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    5858 
    59592. Change to the newly created directory: 
    …… 
    1571571. Untar or unzip the distribution files to a secure directory: 
    158158        # cd /root 
    159         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     159        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    160160 
    1611612. Change to the newly created directory: 
    …… 
    176176        # make -f Makefile.fedora install 
    177177 
    178 6. Save key files 
     1786. Save files 
    179179        # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    180180        # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    181181        # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     182        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    182183 
    183184   If updating from RC3 or higher: 
    …… 
    1941959. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    195196        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     197 
     198   If updating from RC5: 
     199        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     200 
     201   else: 
    196202        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    197203 

  • trunk/docs/FreeBSD/INSTALL

    r1295 r1307  
    61611. Untar or unzip the distribution files to a secure directory: 
    6262        # cd /root 
    63         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     63        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    6464 
    65652. Change to the newly created directory: 
    …… 
    1041041. Untar or unzip the distribution files to a secure directory: 
    105105        # cd /root 
    106         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     106        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    107107 
    1081082. Change to the newly created directory: 
    …… 
    119119        # make -f Makefile.fbsd install 
    120120 
    121 6. Save key files 
     1216. Save files 
    122122        # cp -v /usr/local/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/usr/local/www/ispcp/engine/ 
    123123        # cp -v /usr/local/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/usr/local/www/ispcp/engine/messager/ 
    124124        # cp -v /usr/local/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/usr/local/www/ispcp/gui/include/ 
     125        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    125126 
    126127   If updating from RC3 or higher: 
    …… 
    1421439. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    143144        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     145 
     146   If updating from RC5: 
     147        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     148 
     149   else: 
    144150        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    145151 

  • trunk/docs/Gentoo/INSTALL

    r1297 r1307  
    55551. Untar or unzip the distribution files to a secure directory: 
    5656        # cd /root 
    57         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     57        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    5858 
    59592. Change to the newly created directory: 
    …… 
    1061061. Untar or unzip the distribution files to a secure directory: 
    107107        # cd /root 
    108         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     108        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    109109 
    1101102. Change to the newly created directory: 
    …… 
    121121        # make -f Makefile.gentoo install 
    122122 
    123 6. Save key files 
     1236. Save files 
    124124        # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    125125        # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    126126        # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     127        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    127128 
    128129   If updating from RC3 or higher: 
    …… 
    1391409. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    140141        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     142 
     143   If updating from RC5: 
     144        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     145 
     146   else: 
    141147        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    142148 

  • trunk/docs/OpenBSD/INSTALL

    r1295 r1307  
    56561. Untar or unzip the distribution files to a secure directory: 
    5757        # cd /root 
    58         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     58        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    5959 
    60602. Change to the newly created directory: 
    …… 
    1781781. Untar or unzip the distribution files to a secure directory: 
    179179        # cd /root 
    180         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     180        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    181181 
    1821822. Change to the newly created directory: 
    …… 
    222222        # make -f Makefile.inc install 
    223223 
    224 6. Save key files 
     2246. Save files 
    225225        # cp -v /usr/local/www/apache22/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/usr/local/www/apache22/ispcp/engine/ 
    226226        # cp -v /usr/local/www/apache22/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/usr/local/www/apache22/ispcp/engine/messager/ 
    227227        # cp -v /usr/local/www/apache22/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/usr/local/www/apache22/ispcp/gui/include/ 
     228        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    228229 
    229230   If updating from RC3 or higher: 
    …… 
    2452469. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    246247        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     248 
     249   If updating from RC5: 
     250        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     251 
     252   else: 
    247253        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    248254 

  • trunk/docs/OpenSuse/INSTALL

    r1297 r1307  
    76761. Untar or unzip the distribution files to a secure directory: 
    7777        # cd /root 
    78         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     78        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    7979 
    80802. Change to the newly created directory: 
    …… 
    1471471. Untar or unzip the distribution files to a secure directory: 
    148148        # cd /root 
    149         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     149        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    150150 
    1511512. Change to the newly created directory: 
    …… 
    165165        # make -f Makefile.opensuse install 
    166166 
    167 6. Save key files 
     1676. Save files 
    168168        # cp -v /srv/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    169169        # cp -v /srv/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    170170        # cp -v /srv/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     171        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    171172 
    172173   If updating from RC3 or higher: 
    …… 
    1831849. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    184185        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     186 
     187   If updating from RC5: 
     188        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     189 
     190   else: 
    185191        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    186192 

  • trunk/docs/RedHat/INSTALL

    r1297 r1307  
    58581. Untar or unzip the distribution files to a secure directory: 
    5959        # cd /root 
    60         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     60        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    6161 
    62622. Change to the newly created directory: 
    …… 
    1071071. Untar or unzip the distribution files to a secure directory: 
    108108        # cd /root 
    109         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     109        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    110110 
    1111112. Change to the newly created directory: 
    …… 
    121121        # make install 
    122122 
    123 6. Save key files 
     1236. Save files 
    124124        # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    125125        # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    126126        # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     127        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    127128 
    128129   If updating from RC3 or higher: 
    …… 
    1391409. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    140141        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     142 
     143   If updating from RC5: 
     144        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     145 
     146   else: 
    141147        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    142148 

  • trunk/docs/Ubuntu/INSTALL

    r1297 r1307  
    58581. Untar or unzip the distribution files to a secure directory: 
    5959        # cd /root 
    60         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     60        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    6161 
    62622. Change to the newly created directory: 
    …… 
    1271271. Untar or unzip the distribution files to a secure directory: 
    128128        # cd /root 
    129         # tar xjvf ispcp-omega-1.0.0-RC6.tar.bz2 
     129        # tar xjvf ispcp-omega-1.0.0-rc6.tar.bz2 
    130130 
    1311312. Change to the newly created directory: 
    …… 
    159159        # make install 
    160160 
    161 6. Save key files 
     1616. Save files 
    162162        # cp -v /var/www/ispcp/engine/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/ 
    163163        # cp -v /var/www/ispcp/engine/messager/ispcp-db-keys.pl /tmp/ispcp/var/www/ispcp/engine/messager/ 
    164164        # cp -v /var/www/ispcp/gui/include/ispcp-db-keys.php /tmp/ispcp/var/www/ispcp/gui/include/ 
     165        # cp -v /var/www/ispcp/gui/themes/user_logos/* /tmp/ispcp/var/www/ispcp/gui/themes/user_logos/ 
    165166 
    166167   If updating from RC3 or higher: 
    …… 
    1771789. Backup ispcp.conf and copy the /etc dircetory into your system (you may make backups): 
    178179        # mv -v /etc/ispcp/ispcp.conf /etc/ispcp/ispcp.old.conf 
     180 
     181   If updating from RC5: 
     182        # cp -Rv /tmp/ispcp/etc/ispcp/* /etc/ispcp 
     183 
     184   else: 
    179185        # cp -Rv /tmp/ispcp/etc/* /etc/ 
    180186 

  • trunk/engine/setup/ispcp-setup

    r1301 r1307  
    687687        return $rs if ($rs != 0); 
    688688 
    689         # Escape " and ` 
     689        # Escape " and ' 
    690690        $main::db_pwd =~ s/([\'\"])/\\$1/g; 
    691691        my $cmd = "$main::cfg{'CMD_MYSQL'} --host=\"$main::db_host\" --user=\"$main::db_user\" --pass=\"$main::db_pwd\" < /tmp/db.sql 1>/tmp/db.sql.stdout 2>/tmp/db.sql.stderr"; 

  • trunk/engine/setup/ispcp-update

    r1297 r1307  
    303303    print STDOUT "\tCreating new database..."; 
    304304 
    305     if (sys_command("mysqladmin -u\'$main::db_user\' -p\'$main::db_pwd\' create ispcp ") != 0) { 
     305        # Escape " and ' 
     306        $main::db_pwd =~ s/([\'\"])/\\$1/g; 
     307    if (sys_command("mysqladmin -u\"$main::db_user\" -p\"$main::db_pwd\" create ispcp ") != 0) { 
    306308        print STDOUT "failed!\n"; 
    307309        exit_werror(); 
    …… 
    312314    print STDOUT "\tCopying database..."; 
    313315 
    314     if (sys_command("mysqldump --opt -u\'$main::db_user\' -p\'$main::db_pwd\' $main::vhcs2{'DATABASE_NAME'} | mysql -u\'$main::db_user\' -p\'$main::db_pwd\' $main::db_name") != 0) { 
     316    if (sys_command("mysqldump --opt -u\"$main::db_user\" -p\"$main::db_pwd\" $main::vhcs2{'DATABASE_NAME'} | mysql -u\"$main::db_user\" -p\"$main::db_pwd\" $main::db_name") != 0) { 
    315317        print STDOUT "failed!\n"; 
    316318        exit_werror(); 
    …… 
    336338        return $rs if ($rs != 0); 
    337339 
    338         $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql"); 
     340        $rs = sys_command("mysql -u\"$main::db_user\" -p\"$main::db_pwd\" < /tmp/db.sql"); 
    339341        if ($rs != 0) { 
    340342        print STDOUT "failed!\n"; 
    …… 
    927929} 
    928930 
     931sub patch_ispcp_rc5 { 
     932        push_el(\@main::el, 'patch_ispcp_rc5()', 'Starting...'); 
     933 
     934        if ($main::cfg{'ISPCP_SUPPORT_SYSTEM_PATH'} == support_system.php) { 
     935                $rs = set_conf_val('ISPCP_SUPPORT_SYSTEM_PATH', ticket_system.php); 
     936                return $rs if ($rs != 0); 
     937        } 
     938 
     939        push_el(\@main::el, 'patch_ispcp_rc5()', 'Ending...'); 
     940} 
     941 
    929942sub prepare_update { 
    930943        my ($rs, $rdata) = (undef, undef); 
    …… 
    10281041                # ispCP 1.0.0 RC5 
    10291042                elsif ($main::ua{'update'} eq RC5) { 
    1030                         push_el(\@main::el, 'patch_ispcp_rc5()', 'Nothing else to patch.'); 
     1043                        $rs = patch_ispcp_rc5(); 
    10311044                } 
    10321045 
    …… 
    10581071        return $rs if ($rs != 0); 
    10591072 
    1060         $rs = sys_command("mysql -u\'$main::db_user\' -p\'$main::db_pwd\' < /tmp/db.sql"); 
     1073        $main::db_pwd =~ s/([\'\"])/\\$1/g; 
     1074        $rs = sys_command("$main::cfg{'CMD_MYSQL'} -u\"$main::db_user\" -p\"$main::db_pwd\" < /tmp/db.sql"); 
    10611075        if ($rs != 0) { 
    10621076                exit_werror("SQL Update failed."); 

  • trunk/gui/include/database-update-functions.php

    r1295 r1307  
    227227 
    228228        $sqlUpd[] = "ALTER IGNORE TABLE `htaccess` 
    229                                 CHANGE `user_id` `user_id` VARCHAR(255) NULL DEFAULT NULL , 
     229                                CHANGE `user_id` `user_id` VARCHAR(255) NULL DEFAULT NULL, 
    230230                                CHANGE `group_id` `group_id` VARCHAR(255) NULL DEFAULT NULL"; 
    231231 

  • trunk/language-files/po/es_ES.po

    r1294 r1307  
    55"Report-Msgid-Bugs-To: \n" 
    66"POT-Creation-Date: 2008-08-04 15:15+0200\n" 
    7 "PO-Revision-Date: 2008-08-02 08:55+0100\n" 
     7"PO-Revision-Date: 2008-08-06 12:50+0100\n" 
    88"Last-Translator: Javier Talens Segui <jtsegui@cistal.com>\n" 
    99"Language-Team: Spanish Spain <es_ES@li.org>\n" 
    …… 
    5050msgstr "No recuerdo mi contraseña" 
    5151 
    52 #, fuzzy 
    5352msgid "Retrieving lost passwords is currently not possible" 
    54 msgstr "La función de recordatorio de contraseña está desactivada" 
     53msgstr "Solicitar la contraseña olvidada actualmente no esta disponible" 
    5554 
    5655msgid "ispCP - Virtual Hosting Control System" 
    …… 
    8180msgstr "Código de seguridad" 
    8281 
    83 msgid "" 
    84 "(To avoid abuse, we ask you to write the combination of letters on the above " 
    85 "picture into the field \"Security code\")" 
    86 msgstr "" 
    87 "(Para evitar abusos, escribe la combinación de letras de la siguiente figura " 
    88 "en el campo \"Código de seguridad\")" 
     82msgid "(To avoid abuse, we ask you to write the combination of letters on the above picture into the field \"Security code\")" 
     83msgstr "(Para evitar abusos, escribe la combinación de letras de la siguiente figura en el campo \"Código de seguridad\")" 
    8984 
    9085msgid "Request password" 
    …… 
    178173msgstr "Añadir" 
    179174 
    180 #, fuzzy 
    181175msgid "ispCP - Admin/Manage users/Edit Administrator" 
    182176msgstr "ispCP - Admin/Administrar usuarios/Editar usuario" 
    …… 
    215209#, php-format 
    216210msgid "%s deleted the admin log older than two weeks!" 
    217 msgstr "" 
    218 "%s ha borrado las entradas más antiguas que 2 semanas del log de " 
    219 "administrador" 
     211msgstr "%s ha borrado las entradas más antiguas que 2 semanas del log de administrador" 
    220212 
    221213#, php-format 
    22