Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 449

Show
Ignore:
Timestamp:
04/02/07 00:04:30 (1 year ago)
Author:
rats
Message:

- CONFIGS:

  • fixed bug in awstats Makefile (Jan Porath)

- ENGINE:

  • fixed: variable parsing in uninstal (Jan Porath)
  • fixed bug #141: compression for SQL Backup
  • fixed bug #138: htaccess status not changed (Jan Porath)

- GUI:

  • fixed: bug on language upload
  • fixed: protected areas templates (Jan Porath)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r445 r449  
    1010|               * gui: disable stats-alias in client menu         | 
    1111\_________________________________________________________________/ 
     12 
     132007-04-01 Benedikt Heintel 
     14        - CONFIGS: 
     15                * fixed bug in awstats Makefile (Jan Porath) 
     16        - ENGINE: 
     17                * fixed: variable parsing in uninstal (Jan Porath) 
     18                * fixed bug #141: compression for SQL Backup 
     19                * fixed bug #138: htaccess status not changed (Jan Porath) 
     20        - GUI: 
     21                * fixed: bug on language upload 
     22                * fixed: protected areas templates (Jan Porath) 
    1223 
    13242007-03-31 Benedikt Heintel 

  • trunk/configs/awstats/Makefile

    r383 r449  
    44 
    55        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/awstats 
    6         cp -R ./ $(SYSTEM_CONF)/awstats/awstats.vhcs_tpl.conf 
     6        cp -R ./awstats.vhcs_tpl.conf $(SYSTEM_CONF)/awstats 
    77 
    88uninstall: 

  • trunk/configs/vhcs2.conf

    r445 r449  
    3030 
    3131CMD_AWK = /usr/bin/awk 
     32 
     33CMD_BZIP = /bin/bzip2 
    3234 
    3335CMD_CHOWN = /bin/chown 

  • trunk/engine/backup/vhcs2-backup-all

    r440 r449  
    285285                                        my $db_backup_file = "$dmn_backup_dir/$db_name.sql"; 
    286286                                        my $db_backupcmd = "mysqldump --add-drop-table -u\'$dbuser\' -p\'$dbpass\' \'$db_name\' >\'$db_backup_file\'"; 
     287                                        my $db_compresscmd = "$main::cfg{'CMD_BZIP'} --force $db_backup_file"; 
    287288                                        $rs = sys_command($db_backupcmd); 
    288289 
    …… 
    299300                                                unlink($db_backup_file); 
    300301                                        } 
     302                                                $rs = sys_command($db_compresscmd); 
     303                                                return $rs if ($rs != 0); 
    301304                                } 
    302305                        } 

  • trunk/engine/setup/vhcs2-uninstall

    r441 r449  
    465465    sys_command_rs("a2dissite vhcs2.conf &> /tmp/vhcs2-uninstall-services.log"); 
    466466 
    467     $rs = del_file($main::cfg{'APACHE_SITES_DIR'}/vhcs2.conf); 
     467    $rs = del_file("$main::cfg{'APACHE_SITES_DIR'}/vhcs2.conf"); 
    468468 
    469469    return $rs if ($rs != 0); 
    …… 
    471471    sys_command_rs("a2dissite master.conf &> /tmp/vhcs2-uninstall-services.log"); 
    472472 
    473     $rs = del_file($main::cfg{'APACHE_SITES_DIR'}/master.conf); 
     473    $rs = del_file("$main::cfg{'APACHE_SITES_DIR'}/master.conf"); 
    474474 
    475475    return $rs if ($rs != 0); 
    …… 
    477477    sys_command_rs("a2dismod fastcgi &> /tmp/vhcs2-uninstall-services.log"); 
    478478 
    479     $rs = del_file($main::cfg{'APACHE_MODS_DIR'}/fastcgi.conf); 
     479    $rs = del_file("$main::cfg{'APACHE_MODS_DIR'}/fastcgi.conf"); 
    480480 
    481481    return $rs if ($rs != 0); 

  • trunk/engine/vhcs2-rqst-mngr

    r231 r449  
    535535                } 
    536536 
     537        } else { 
     538 
     539                $sql = "delete from htaccess_users where status = 'delete'"; 
     540                ($rs, $rdata) = doSQL($sql); 
     541 
     542                $sql = "delete from htaccess_groups where status = 'delete'"; 
     543                ($rs, $rdata) = doSQL($sql); 
     544 
     545                $sql = "update htaccess_users set status = 'ok' where status = 'toadd' or status = 'change'"; 
     546                ($rs, $rdata) = doSQL($sql); 
     547 
     548                $sql = "update htaccess_groups set status = 'ok' where status = 'toadd' or status = 'change'"; 
     549                ($rs, $rdata) = doSQL($sql); 
     550 
    537551        } 
    538552 

  • trunk/gui/admin/multilanguage.php

    r426 r449  
    116116                } 
    117117 
    118                 if (!($file_type === "application/octet-stream")){ 
     118                if (if (!($file_type === "text/plain") && !($file_type === "application/octet-stream")){ 
    119119                        set_page_message(tr('You can upload only text files!')); 
    120120                        return; 

  • trunk/gui/themes/omega_original/client/puser_assign.tpl

    r371 r449  
    2424    </table> 
    2525        <!-- EDP: logged_from --> 
    26 <table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
     26        <form name="puser_assign" method="post" action="puser_assign.php?uname={UNAME}"> 
     27    <table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;"> 
    2728        <tr> 
    2829                <td align="left" valign="top" style="vertical-align: top; width: 195px; height: 56px;"><img src="{THEME_COLOR_PATH}/images/top/top_left.jpg" border="0"></td> 
    …… 
    102103                <td>&nbsp;</td> 
    103104              </tr> 
    104             </table></td> 
     105              </table> 
     106             </form> 
     107            </td> 
     108           </tr> 
    105109          </tr> 
    106110        </table> 

  • trunk/gui/themes/omega_original/client/puser_gadd.tpl

    r440 r449  
    8383                <td>&nbsp;</td> 
    8484              </tr> 
    85             </table></td> 
     85            </table> 
     86                        </form> 
     87                        </td> 
    8688          </tr> 
    8789        </table> 

  • trunk/tools/daemon/lr_syntax.c

    r434 r449  
    33#include <sys/stat.h> 
    44#include <fcntl.h> 
     5#include <sys/param.h> 
    56 
    67#if defined(__OpenBSD__) || defined(__FreeBSD__) 
    …… 
    1112 
    1213#include <unistd.h> 
    13 #include <sys/param.h> 
    1414#include "lr_syntax.h" 
    1515