Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1009

Show
Ignore:
Timestamp:
02/19/08 00:48:14 (8 months ago)
Author:
rats
Message:

* Fixed #942: ERROR: Undefined intput data, bt: |{PHP_VERSION}|, et: |{PHP_VERSION}|, src !
* Fixed #961: Split OpenBSD and FreeBSD Makefile so it can be compile
* Fixed #1054: Set the PHP temporary directory in filemanager

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BSDmakefile

    r656 r1009  
    11#!/usr/bin/make -f 
    22 
     3.ifdef $(OSTYPE)==FreeBSD 
     4.include <Makefile.fbsd> 
     5.else 
    36.include <Makefile.inc> 
     7.endif 
    48 
    59install: 

  • trunk/CHANGELOG

    r1008 r1009  
    99                * Fixed #1035: Hide "Manage Domains"-icon 
    1010                * Fixed #1053: awstats path doesnt work 
     11                * Fixed #1055: Wrong titles in the GUI 
    1112                * Refactored menus for admin, reseller, client 
    1213        - SETUP: 
    1314                * Fixed #970: The uninstaller should not remove /var/www/virtual ... 
    1415                * Fixed #982: Problem with autogenerated password 
     16        - TOOLS: 
     17                * Fixed #1054: Set the PHP temporary directory in filemanager 
    1518        - DISTS: 
     19                * Fixed #942: ERROR: Undefined intput data, bt: |{PHP_VERSION}|, et: |{PHP_VERSION}|, src ! 
     20                * Fixed #961: Split OpenBSD and FreeBSD Makefile so it can be compile 
    1621                * Dropped support for SLES (9) 
    1722                * Updated CentOS, Fedora, FreeBSD, Gentoo, OpenBSD, OpenSUSE, RedHat, SuSE, ubuntu 

  • trunk/configs/BSDmakefile

    r154 r1009  
     1.ifdef $(OSTYPE)==FreeBSD 
     2.include <../Makefile.fbsd> 
     3.else 
    14.include <../Makefile.inc> 
     5.endif 
    26 
    37install: 
    4         cd dists/openbsd && $(MAKE) install 
     8        cd dists/$(HOST_OS) && $(MAKE) install 
    59 
    610uninstall: 
    7         cd dists/openbsd && $(MAKE) uninstall 
    8  
     11        cd dists/$(HOST_OS) && $(MAKE) uninstall 

  • trunk/configs/dists/freebsd/BSDmakefile

    r1001 r1009  
    1 .include <../../../Makefile.inc> 
     1.include <../../../Makefile.fbsd> 
    22 
    33install: 

  • trunk/configs/dists/freebsd/apache/BSDmakefile

    r969 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    3 APACHE_EXT_CONF=$(INST_PREF)/var/www/conf 
     3APACHE_EXT_CONF=$(INST_PREF)/usr/local/etc/apache22/Includes 
    44APACHE_MOD_CONF=$(INST_PREF)/usr/local/etc/apache22/extra/ 
    55install: 
    66 
    7         $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache 
     7        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/apache22 
    88        $(SYSTEM_MAKE_DIRS) $(APACHE_EXT_CONF) 
    99        $(SYSTEM_MAKE_DIRS) $(APACHE_MOD_CONF) 
    …… 
    1313        cp ./fastcgi.conf ./working/fastcgi_ispcp.conf 
    1414        cp ./00_master.conf $(SYSTEM_CONF)/apache 
    15         cp ./httpd.conf $(SYSTEM_CONF)/apache 
    16         cp -R ./backup $(SYSTEM_CONF)/apache 
    17         cp -R ./parts $(SYSTEM_CONF)/apache 
    18         cp -R ./working $(SYSTEM_CONF)/apache 
     15        cp ./00_master.conf $(SYSTEM_CONF)/apache22 
     16        cp ./httpd.conf $(SYSTEM_CONF)/apache22 
     17        cp -R ./backup $(SYSTEM_CONF)/apache22 
     18        cp -R ./parts $(SYSTEM_CONF)/apache22 
     19        cp -R ./working $(SYSTEM_CONF)/apache22 
    1920        cp -R ./httpd.conf $(APACHE_EXT_CONF)/ispcp.conf 
    2021        cp -R ./fastcgi.conf $(APACHE_MOD_CONF)/fastcgi_ispcp.conf 
    …… 
    2223uninstall: 
    2324 
    24         rm -rf $(SYSTEM_CONF)/apache 
     25        rm -rf $(SYSTEM_CONF)/apache22 
    2526        rm -rf $(ROOT_APACHE_CONF)/ispcp.conf 
    2627        rm -rf $(APACHE_MOD_CONF)/fastcgi_ispcp.conf 

  • trunk/configs/dists/freebsd/awstats/BSDmakefile

    r473 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 

  • trunk/configs/dists/freebsd/bind/BSDmakefile

    r154 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 
     4 
    45        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/bind 
    56        cp ./named.conf ./working 
    …… 
    89        cp -R ./parts $(SYSTEM_CONF)/bind 
    910        cp -R ./working $(SYSTEM_CONF)/bind 
    10         cp ./named.rc $(ROOT_CONF)/named.rc 
    11         chmod 700 $(ROOT_CONF)/named.rc 
    12         chown root:wheel $(ROOT_CONF)/named.rc 
    1311 
    1412uninstall: 
     13 
    1514        rm -rf $(SYSTEM_CONF)/bind 
    16  

  • trunk/configs/dists/freebsd/courier/BSDmakefile

    r154 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33ROOT_COURIER_CONF=$(ROOT_CONF)/courier-imap 
    44 
    55install: 
     6 
    67        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/courier 
    78        $(SYSTEM_MAKE_DIRS) $(ROOT_COURIER_CONF) 
    …… 
    1415        cp ./pop3d $(SYSTEM_CONF)/courier 
    1516        cp ./userdb $(SYSTEM_CONF)/courier 
    16 #       cp -p -R ./courier-cfg-setup.sh $(SYSTEM_CONF)/courier 
    1717# 
    1818#       MTA Configuration Directories; 
    …… 
    3131 
    3232uninstall: 
     33 
    3334        rm -rf $(SYSTEM_CONF)/courier 
    34  
    35  

  • trunk/configs/dists/freebsd/cron.d/BSDmakefile

    r473 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 
    …… 
    55        $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/cron.d 
    66        cp ./ispcp.phptemp $(ROOT_CONF)/cron.d 
    7          
     7 
    88uninstall: 
    99 

  • trunk/configs/dists/freebsd/database/BSDmakefile

    r972 r1009  
    1  
    2 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    32 
    43install: 
     4 
    55        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/database 
    66        cp ./database.sql $(SYSTEM_CONF)/database 
    …… 
    88 
    99uninstall: 
     10 
    1011        rm -rf $(SYSTEM_CONF)/database 
    11          

  • trunk/configs/dists/freebsd/fcgi/BSDmakefile

    r523 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 
    …… 
    1111 
    1212        rm -rf $(SYSTEM_CONF)/fcgi 
    13  

  • trunk/configs/dists/freebsd/init.d/BSDmakefile

    r876 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 
    44 
    5         $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/init.d 
     5        $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/rc.d 
    66 
    7         cp ispcp_daemon $(ROOT_CONF)/ispcp_daemon.rc 
    8         cp ispcp_network $(ROOT_CONF)/ispcp_network.rc 
     7        cp ispcp_daemon $(ROOT_CONF)/rc.d/ispcp_daemon.sh 
     8        cp ispcp_network $(ROOT_CONF)/rc.d/ispcp_network.sh 
    99 
    10         chown root:wheel $(ROOT_CONF)/ispcp_network.rc $(ROOT_CONF)/ispcp_daemon.rc 
    11         chmod 0755 $(ROOT_CONF)/ispcp_network.rc $(ROOT_CONF)/ispcp_daemon.rc 
     10        chown root:wheel $(ROOT_CONF)/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh 
     11        chmod 0755 $(ROOT_CONF)/ispcp_network.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh 
    1212 
    1313uninstall: 
    1414 
    15         rm -f $(ROOT_CONF)/ispcp_daemon.rc 
    16         rm -f $(ROOT_CONF)/ispcp_network.rc 
     15        rm -f $(ROOT_CONF)/rc.d/ispcp_daemon.sh 
     16        rm -f $(ROOT_CONF)/rc.d/ispcp_network.sh 

  • trunk/configs/dists/freebsd/logrotate/BSDmakefile

    r473 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 
    4         $(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/logrotate.d 
    5         cp ./ispcp $(ROOT_CONF)/logrotate.d 
     4 
     5        cp ./ispcp $(ROOT_CONF)/logrotate.conf 
    66 
    77uninstall: 
    8         rm -rf $(ROOT_CONF)/logrotate.d/ispcp 
    98 
     9        rm -rf $(ROOT_CONF)/logrotate.conf 

  • trunk/configs/dists/freebsd/postfix/BSDmakefile

    r653 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33ROOT_POSTFIX_CONF=$(ROOT_CONF)/postfix 
    …… 
    77        $(SYSTEM_MAKE_DIRS) $(ROOT_POSTFIX_CONF) 
    88# 
    9 #       MTA Configuration Files; 
     9#      MTA Configuration Files; 
    1010# 
    1111        cp ./main.cf $(SYSTEM_CONF)/postfix/main.cf 
    1212        cp ./master.cf $(SYSTEM_CONF)/postfix/master.cf 
    13 #       cp ./mta-cfg-setup.sh $(SYSTEM_CONF)/postfix 
    1413# 
    15 #       MTA Configuration Directories; 
     14#      MTA Configuration Directories; 
    1615# 
    1716        cp -R ./backup $(SYSTEM_CONF)/postfix 
    …… 
    2019        cp -R ./ispcp $(SYSTEM_CONF)/postfix 
    2120        cp -R ./ispcp $(ROOT_POSTFIX_CONF) 
    22 #       cp ./main.cf $(ROOT_POSTFIX_CONF) 
    23 #       cp ./master.cf $(ROOT_POSTFIX_CONF) 
     21 
    2422        cp ./postfix.rc $(ROOT_CONF)/postfix.rc 
    2523        chmod 700 $(ROOT_CONF)/postfix.rc 
    …… 
    2927        rm -rf $(SYSTEM_CONF)/postfix 
    3028        rm -rf $(ROOT_POSTFIX_CONF)/ispcp 
    31  

  • trunk/configs/dists/freebsd/proftpd/BSDmakefile

    r154 r1009  
    1 .include <../../../../Makefile.inc> 
     1.include <../../../../Makefile.fbsd> 
    22 
    33install: 
     4 
    45        $(SYSTEM_MAKE_DIRS) $(ROOT_CONF) 
    56        $(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/proftpd 
    …… 
    1213 
    1314uninstall: 
     15 
    1416        rm -rf $(SYSTEM_CONF)/proftpd 

  • trunk/configs/postfix/main.cf

    r1007 r1009  
    3838virtual_transport   = virtual 
    3939transport_maps      = hash:{MTA_TRANSPORT_HASH} 
    40 alias_maps                      = hash:/etc/aliases 
     40alias_maps                      = hash:{MTA_LOCAL_ALIAS_HASH} 
    4141 
    4242# 

  • trunk/engine/BSDmakefile

    r871 r1009  
    1 .include <../Makefile.inc> 
     1.ifdef $(OSTYPE)==FreeBSD 
     2.include <../Makefile.fbsd> 
     3.else 
     4 .include <../Makefile.inc> 
     5.endif 
    26 
    37SYSTEM_ENGINE_ROOT=$(SYSTEM_ROOT)/engine 

  • trunk/engine/traffic/BSDmakefile

    r154 r1009  
    1  
    2 .include <../../Makefile.inc> 
     1.ifdef $(OSTYPE)==FreeBSD 
     2.include <../../Makefile.fbsd> 
     3.else 
     4 .include <../../Makefile.inc> 
     5.endif 
    36 
    47SYSTEM_ENGINE_ROOT=$(SYSTEM_ROOT)/engine 
    …… 
    1013install: 
    1114 
    12         $(SYSTEM_MAKE_DIRS) $(INST_PREF)/usr/sbin 
    13         $(CMD_INSTALL) ./maillogconvert/maillogconvert.pl $(INST_PREF)/usr/sbin 
     15        $(SYSTEM_MAKE_DIRS) $(INST_PREF)/usr/local/sbin 
     16        $(CMD_INSTALL) ./maillogconvert/maillogconvert.pl $(INST_PREF)/usr/local/sbin 
    1417 
    1518uninstall: 
    1619 
    17         rm -rf $(INST_PREF)/usr/sbin/maillogconvert.pl 
     20        rm -rf $(INST_PREF)/usr/local/sbin/maillogconvert.pl 

  • trunk/gui/BSDmakefile

    r687 r1009  
    1 # ISPCP(tm) - Virtual Hosting Control System 
    2 # Copyright (c) 2001-2004 by moleSoftware GmbH 
     1# ispCP ω (OMEGA) a Virtual Hosting Control Panel 
     2# Copyright (c) 2001-2006 by moleSoftware GmbH 
    33# http://www.molesoftware.com 
     4# Copyright (c) 2006-2008 by isp Control Panel 
     5# http://isp-control.net 
    46# 
    57# 
    …… 
    2224# 
    2325# 
    24 # The ISPCP Home Page is at: 
     26# The ISPCP ω Home Page is at: 
    2527# 
    26 #    http://www.isp-control.net 
     28#    http://isp-control.net 
     29# 
    2730 
     31.ifdef $(OSTYPE)==FreeBSD 
     32.include <../Makefile.fbsd> 
     33.else 
    2834.include <../Makefile.inc> 
     35.endif 
    2936 
    3037SYSTEM_GUI_ROOT=$(SYSTEM_ROOT)/gui 

  • trunk/gui/themes/omega_original/admin/menu_manage_users.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_MANAGE_USERS}</span></td> 
    88    </tr> 
    99   </table> 
    …… 
    1111 </tr> 
    1212 <tr height="*"> 
    13                                  <td style="width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/menu_bg.jpg); vertical-align: top;"> 
     13  <td style="width: 100%; background-image: url({THEME_COLOR_PATH}/images/top/menu_bg.jpg); vertical-align: top;"> 
    1414<table width="100%" border="0" cellspacing="0" cellpadding="0"> 
    1515  <tr> 

  • trunk/gui/themes/omega_original/admin/menu_settings.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_SETTINGS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/admin/menu_statistics.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_STATISTICS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/admin/menu_support_system.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_QUESTIONS_AND_COMMENTS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/admin/menu_system_tools.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_SYSTEM_TOOLS}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_EMAIL_ACCOUNTS}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_FTP_ACCOUNTS}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_MANAGE_DOMAINS}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_MANAGE_SQL}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_DOMAIN_STATISTICS}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_QUESTIONS_AND_COMMENTS}</span></td> 
    88    </tr> 
    99   </table> 

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

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_WEBTOOLS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/reseller/menu_hp.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_HOSTING_PLANS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/reseller/menu_manage_users.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_MANAGE_USERS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/reseller/menu_orders.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MANAGE_ORDERS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/reseller/menu_statistics.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_DOMAIN_STATISTICS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/themes/omega_original/reseller/menu_support_system.tpl

    r1008 r1009  
    55    <tr> 
    66     <td><img src="{THEME_COLOR_PATH}/images/icons/general_big.gif" width="32" height="33"></td> 
    7      <td><span class="titlemenu">{TR_MENU_GENERAL_INFORMATION}</span></td> 
     7     <td><span class="titlemenu">{TR_MENU_QUESTIONS_AND_COMMENTS}</span></td> 
    88    </tr> 
    99   </table> 

  • trunk/gui/tools/filemanager/main.inc.php

    r910 r1009  
    125125// Run the script to the end, even if the user hits the stop button 
    126126                ignore_user_abort(); 
    127          
     127 
    128128// Execute function shutdown() if the script reaches the maximum execution time (usually 30 seconds) 
    129129// DON'T REGISTER IT HERE YET, as this causes errors on newer versions of PHP; first include the function libraries 
    130130//              register_shutdown_function("net2ftp_shutdown"); 
    131          
     131 
    132132// Set the error reporting level 
    133133                if     ($net2ftp_settings["error_reporting"] == "ALL")  { error_reporting(E_ALL); } 
    134134                elseif ($net2ftp_settings["error_reporting"] == "NONE") { error_reporting(0); } 
    135135                else                                                    { error_reporting(E_ERROR | E_WARNING | E_PARSE); } 
    136          
     136 
    137137// Timer: start 
    138138                $net2ftp_globals["starttime"] = microtime(); 
    …… 
    141141 
    142142// Set the PHP temporary directory 
    143 //    putenv("TMPDIR=" . $net2ftp_globals["application_tempdir"]); 
     143      putenv("TMPDIR=" . $net2ftp_globals["application_tempdir"]); 
    144144 
    145145// ------------------------------------------------------------------------- 
    …… 
    147147// 1. Libraries which are always needed 
    148148// 2. Register global variables 
    149 // 3. Function libraries which are needed depending on certain variables  
     149// 3. Function libraries which are needed depending on certain variables 
    150150// // --> Do this only once, when $action == "sendHttpHeaders" 
    151151// ------------------------------------------------------------------------- 
    …… 
    166166                if (version_compare(phpversion(), "4.3.0", "<")) { 
    167167                        require_once($net2ftp_globals["application_includesdir"] . "/before430.inc.php"); 
    168                 }  
     168                } 
    169169 
    170170// 2. Register global variables (POST, GET, GLOBAL, ...) 
    …… 
    179179                } 
    180180                if ($net2ftp_globals["state"] == "advanced_ftpserver"   || $net2ftp_globals["state"] == "advanced_parsing" || 
    181                         $net2ftp_globals["state"] == "advanced_webserver" || $net2ftp_globals["state"] == "browse"           ||  
    182                         $net2ftp_globals["state"] == "copymovedelete"     || $net2ftp_globals["state"] == "chmod"            ||  
    183                         $net2ftp_globals["state"] == "calculatesize"      || $net2ftp_globals["state"] == "downloadzip"      ||  
     181                        $net2ftp_globals["state"] == "advanced_webserver" || $net2ftp_globals["state"] == "browse"           || 
     182                        $net2ftp_globals["state"] == "copymovedelete"     || $net2ftp_globals["state"] == "chmod"            || 
     183                        $net2ftp_globals["state"] == "calculatesize"      || $net2ftp_globals["state"] == "downloadzip"      || 
    184184                        $net2ftp_globals["state"] == "findstring"         || $net2ftp_globals["state"] == "followsymlink"    || 
    185185                        $net2ftp_globals["state"] == "install"            || $net2ftp_globals["state"] == "zip") { 
    …… 
    215215 
    216216                checkAuthorization($net2ftp_globals["ftpserver"], $net2ftp_globals["ftpserverport"], $net2ftp_globals["directory"], $net2ftp_globals["username"]); 
    217                 if ($net2ftp_result["success"] == false) {  
     217                if ($net2ftp_result["success"] == false) { 
    218218                        logError(); 
    219                         return false;  
     219                        return false; 
    220220                } 
    221221 
    …… 
    228228        if ($action == "sendHttpHeaders") { 
    229229                logAccess(); 
    230                 if ($net2ftp_result["success"] == false) {  
     230                if ($net2ftp_result["success"] == false) { 
    231231                        logError(); 
    232                         return false;  
     232                        return false; 
    233233                } 
    234234        } 
    …… 
    236236// ------------------------------------------------------------------------- 
    237237// Get the consumption counter values from the database 
    238 // This retrieves the consumption of network and server resources for the  
    239 // current IP address and FTP server from the database, and stores these  
     238// This retrieves the consumption of network and server resources for the 
     239// current IP address and FTP server from the database, and stores these 
    240240// values in global variables. See /includes/consumption.inc.php for the details. 
    241241// --> Do this only once, when $action == "sendHttpHeaders" 
    …… 
    243243        if ($action == "sendHttpHeaders") { 
    244244                getConsumption(); 
    245                 if ($net2ftp_result["success"] == false) {  
     245                if ($net2ftp_result["success"] == false) { 
    246246                        logError(); 
    247                         return false;  
     247                        return false; 
    248248                } 
    249249        } 
    …… 
    256256// For most modules, everything must be done: send headers, print body, etc 
    257257// ------------------------------------ 
    258         if ($net2ftp_globals["state"] == "admin" ||  
    259           $net2ftp_globals["state"] == "admin_createtables" ||  
    260           $net2ftp_globals["state"] == "admin_emptylogs" ||  
    261           $net2ftp_globals["state"] == "admin_viewlogs"  ||  
    262           $net2ftp_globals["state"] == "advanced" ||  
    263           $net2ftp_globals["state"] == "advanced_ftpserver" ||  
    264           $net2ftp_globals["state"] == "advanced_parsing" ||  
    265           $net2ftp_globals["state"] == "advanced_webserver" ||  
    266           $net2ftp_globals["state"] == "bookmark" ||  
    267           $net2ftp_globals["state"] == "browse" ||  
     258        if ($net2ftp_globals["state"] == "admin" || 
     259          $net2ftp_globals["state"] == "admin_createtables" || 
     260          $net2ftp_globals["state"] == "admin_emptylogs" || 
     261          $net2ftp_globals["state"] == "admin_viewlogs"  || 
     262          $net2ftp_globals["state"] == "advanced" || 
     263          $net2ftp_globals["state"] == "advanced_ftpserver" || 
     264          $net2ftp_globals["state"] == "advanced_parsing" || 
     265          $net2ftp_globals["state"] == "advanced_webserver" || 
     266          $net2ftp_globals["state"] == "bookmark" || 
     267          $net2ftp_globals["state"] == "browse" || 
    268268          $net2ftp_globals["state"] == "calculatesize" || 
    269           $net2ftp_globals["state"] == "chmod" ||  
    270           $net2ftp_globals["state"] == "copymovedelete" ||  
    271           $net2ftp_globals["state"] == "edit" ||  
    272           $net2ftp_globals["state"] == "findstring" ||  
    273           $net2ftp_globals["state"] == "install" ||  
    274           ($net2ftp_globals["state"] == "jupload" && $net2ftp_globals["screen"] == 1) ||  
    275           $net2ftp_globals["state"] == "login" ||  
    276           $net2ftp_globals["state"] == "login_small" ||  
    277           $net2ftp_globals["state"] == "logout" ||  
    278           $net2ftp_globals["state"] == "newdir" ||  
    279           $net2ftp_globals["state"] == "raw" ||   
    280           $net2ftp_globals["state"] == "rename" ||   
    281           $net2ftp_globals["state"] == "unzip" ||  
    282           $net2ftp_globals["state"] == "upload" ||  
    283           ($net2ftp_globals["state"] == "view" && $net2ftp_globals["state2"] == "") ||  
     269          $net2ftp_globals["state"] == "chmod" || 
     270          $net2ftp_globals["state"] == "copymovedelete" || 
     271          $net2ftp_globals["state"] == "edit" || 
     272          $net2ftp_globals["state"] == "findstring" || 
     273          $net2ftp_globals["state"] == "install" || 
     274          ($net2ftp_globals["state"] == "jupload" && $net2ftp_globals["screen"] == 1) || 
     275          $net2ftp_globals["state"] == "login" || 
     276          $net2ftp_globals["state"] == "login_small" || 
     277          $net2ftp_globals["state"] == "logout" || 
     278          $net2ftp_globals["state"] == "newdir" || 
     279          $net2ftp_globals["state"] == "raw" || 
     280          $net2ftp_globals["state"] == "rename" || 
     281          $net2ftp_globals["state"] == "unzip" || 
     282          $net2ftp_globals["state"] == "upload" || 
     283          ($net2ftp_globals["state"] == "view" && $net2ftp_globals["state2"] == "") || 
    284284          $net2ftp_globals["state"] == "zip") { 
    285285 
    286286                require_once($net2ftp_globals["application_modulesdir"] . "/" . $net2ftp_globals["state"] . "/" . $net2ftp_globals["state"] . ".inc.php"); 
    287287 
    288                 if     ($action == "sendHttpHeaders") {  
    289                         net2ftp_module_sendHttpHeaders();  
     288                if     ($action == "sendHttpHeaders") { 
     289                        net2ftp_module_sendHttpHeaders(); 
    290290 
    291291                        // If needed, exit to avoid sending non-header output (by net2ftp or other application) 
    …… 
    294294 
    295295                } 
    296 &n