fixed link in main.tpl.htm

redray

2008-11-30 e6636313f5e1431795bffd567cd243708244d88f

fixed link in main.tpl.htm

 install/tpl/config.inc.php.master

@@ -41,7 +41,6 @@
//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.8 beta');
define('ISPC_APP_LINK', 'http://www.howtoforge.com/forums/showthread.php?t=26988');


//** Database
@@ -84,6 +83,7 @@
//** Server
$conf['app_title'] = ISPC_APP_TITLE;
$conf['app_version'] = ISPC_APP_VERSION;
$conf['app_link'] = 'http://www.howtoforge.com/forums/showthread.php?t=26988';
$conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
$conf["server_id"] = "{server_id}";


 interface/lib/app.inc.php

@@ -1,197 +1,197 @@
<?php
/**
 * Application Class
 * 
 * @author Till Brehm
 * @copyright  2005, Till Brehm, projektfarm Gmbh
 * @version 0.1
 * @package ISPConfig
 */

/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
    * Neither the name of ISPConfig nor the names of its contributors
      may be used to endorse or promote products derived from this software without
      specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

ob_start('ob_gzhandler');

class app {

    private $_language_inc = 0;
    private $_wb;
    private $_loaded_classes = array();
    private $_conf;

    public function __construct()
    {
        global $conf;
        $this->_conf = $conf;
        if($this->_conf['start_db'] == true) {
                $this->load('db_'.$this->_conf['db_type']);
                $this->db = new db;
        }
		
        //* Start the session
        if($this->_conf['start_session'] == true) {
            session_start();
			
            //* Initialize session variables
            if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();
            if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];
            if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];
        }
		
        $this->uses('auth');
    }

    public function uses($classes)
    {	
        $cl = explode(',', $classes);
        if(is_array($cl)) {
            foreach($cl as $classname){
                $classname = trim($classname);
                //* Class is not loaded so load it
                if(!array_key_exists($classname, $this->_loaded_classes)){
                    include_once(ISPC_CLASS_PATH."/$classname.inc.php");
                    $this->$classname = new $classname();
                    $this->_loaded_classes[$classname] = true;
                }
            }
        }
    }

    public function load($files)
    {	
        $fl = explode(',', $files);
        if(is_array($fl)) {
            foreach($fl as $file){
                $file = trim($file);
                include_once(ISPC_CLASS_PATH."/$file.inc.php");
            }
        }
    }

    /** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */
    public function log($msg, $priority = 0)
    {	
        if($priority >= $this->_conf['log_priority']) {
            if (is_writable($this->_conf['log_file'])) {
                if (!$fp = fopen ($this->_conf['log_file'], 'a')) {
                    $this->error('Unable to open logfile.');
                }
                if (!fwrite($fp, date('d.m.Y-H:i').' - '. $msg."\r\n")) {
                    $this->error('Unable to write to logfile.');
                }
                fclose($fp);
            } else {
                $this->error('Unable to write to logfile.');
            }
        } 
    } 

    /** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */
    public function error($msg, $next_link = '', $stop = true, $priority = 1)
    {
        //$this->uses("error");
        //$this->error->message($msg, $priority);
        if($stop == true){
            $msg = '<html>
<head>
<title>Error</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="../themes/default/style.css" rel="stylesheet" type="text/css">
</head>
<body>
<br><br><br>
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr>
<td class="error"><b>Error:</b><br>'.$msg;
        if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br>';
        $msg .= '</td>
</tr>
</table>
</body>
</html>';
            die($msg);
        } else {
            echo $msg;
            if($next_link != '') echo "<a href='$next_link'>Next</a>";
        }
    }

    /** Loads language */
    public function lng($text)
    {
        if($this->_language_inc != 1) {
            //* loading global and module Wordbook
            // TODO: this need to be made clearer somehow - pedro
            @include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
            @include_once(ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');
            $this->_wb = $wb;
            $this->_language_inc = 1;
        }		
        if(!empty($this->_wb[$text])) {
            $text = $this->_wb[$text];
        }
        return $text;
    }

    public function tpl_defaults()
    {	
        $this->tpl->setVar('app_title', $this->_conf['app_title']);
        $this->tpl->setVar('app_version', $this->_conf['app_version']);
        $this->tpl->setVar('app_link', $this->_conf['app_link']);

        $this->tpl->setVar('phpsessid', session_id());

        $this->tpl->setVar('theme', $_SESSION['s']['theme']);
        $this->tpl->setVar('html_content_encoding', $this->_conf['html_content_encoding']);
        if(isset($this->_conf['logo']) && $this->_conf['logo'] != '' && @is_file($this->_conf['logo'])){
            $this->tpl->setVar('logo', '<img src="'.$this->_conf['logo'].'" border="0" alt="">');
        } else {
            $this->tpl->setVar('logo', '&nbsp;');
        }

        $this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));
        //print_r($_SESSION);
        if(isset($_SESSION['s']['module']['name'])) {
            $this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);
        }
        if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {
            $this->tpl->setVar('is_admin', 1);
        }
        if(isset($_SESSION['s']['user']) && $this->auth->has_clients($_SESSION['s']['user']['userid'])) {
            $this->tpl->setVar('is_reseller', 1);
        }
    }
    
} // end class

//** Initialize application (app) object
//* possible future =  new app($conf);
$app = new app();

<?php

/**

 * Application Class

 * 
 * @author Till Brehm

 * @copyright  2005, Till Brehm, projektfarm Gmbh

 * @version 0.1

 * @package ISPConfig

 */



/*

Copyright (c) 2005, Till Brehm, projektfarm Gmbh

All rights reserved.



Redistribution and use in source and binary forms, with or without modification,

are permitted provided that the following conditions are met:



    * Redistributions of source code must retain the above copyright notice,

      this list of conditions and the following disclaimer.

    * Redistributions in binary form must reproduce the above copyright notice,

      this list of conditions and the following disclaimer in the documentation

      and/or other materials provided with the distribution.

    * Neither the name of ISPConfig nor the names of its contributors

      may be used to endorse or promote products derived from this software without

      specific prior written permission.



THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,

EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

*/



ob_start('ob_gzhandler');



class app {



    private $_language_inc = 0;

    private $_wb;

    private $_loaded_classes = array();

    private $_conf;



    public function __construct()

    {

        global $conf;

        $this->_conf = $conf;

        if($this->_conf['start_db'] == true) {

                $this->load('db_'.$this->_conf['db_type']);

                $this->db = new db;

        }

		
        //* Start the session

        if($this->_conf['start_session'] == true) {

            session_start();

			
            //* Initialize session variables

            if(!isset($_SESSION['s']['id']) ) $_SESSION['s']['id'] = session_id();

            if(empty($_SESSION['s']['theme'])) $_SESSION['s']['theme'] = $conf['theme'];

            if(empty($_SESSION['s']['language'])) $_SESSION['s']['language'] = $conf['language'];

        }

		
        $this->uses('auth');

    }



    public function uses($classes)

    {	
        $cl = explode(',', $classes);

        if(is_array($cl)) {

            foreach($cl as $classname){

                $classname = trim($classname);

                //* Class is not loaded so load it

                if(!array_key_exists($classname, $this->_loaded_classes)){

                    include_once(ISPC_CLASS_PATH."/$classname.inc.php");

                    $this->$classname = new $classname();

                    $this->_loaded_classes[$classname] = true;

                }

            }

        }

    }



    public function load($files)

    {	
        $fl = explode(',', $files);

        if(is_array($fl)) {

            foreach($fl as $file){

                $file = trim($file);

                include_once(ISPC_CLASS_PATH."/$file.inc.php");

            }

        }

    }



    /** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */

    public function log($msg, $priority = 0)

    {	
        if($priority >= $this->_conf['log_priority']) {

            if (is_writable($this->_conf['log_file'])) {

                if (!$fp = fopen ($this->_conf['log_file'], 'a')) {

                    $this->error('Unable to open logfile.');

                }

                if (!fwrite($fp, date('d.m.Y-H:i').' - '. $msg."\r\n")) {

                    $this->error('Unable to write to logfile.');

                }

                fclose($fp);

            } else {

                $this->error('Unable to write to logfile.');

            }

        } 
    } 


    /** Priority values are: 0 = DEBUG, 1 = WARNING,  2 = ERROR */

    public function error($msg, $next_link = '', $stop = true, $priority = 1)

    {

        //$this->uses("error");

        //$this->error->message($msg, $priority);

        if($stop == true){

            $msg = '<html>

<head>

<title>Error</title>

<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

<link href="../themes/default/style.css" rel="stylesheet" type="text/css">

</head>

<body>

<br /><br /><br />

<table width="100%" border="0" cellspacing="0" cellpadding="2">

<tr>

<td class="error"><b>Error:</b><br>'.$msg;

        if($next_link != '') $msg .= '<a href="'.$next_link.'">Next</a><br>';

        $msg .= '</td>

</tr>

</table>

</body>

</html>';

            die($msg);

        } else {

            echo $msg;

            if($next_link != '') echo "<a href='$next_link'>Next</a>";

        }

    }



    /** Loads language */

    public function lng($text)

    {

        if($this->_language_inc != 1) {

            //* loading global and module Wordbook

            // TODO: this need to be made clearer somehow - pedro

            @include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');

            @include_once(ISPC_ROOT_PATH.'/web/'.$_SESSION['s']['module']['name'].'/lib/lang/'.$_SESSION['s']['language'].'.lng');

            $this->_wb = $wb;

            $this->_language_inc = 1;

        }		
        if(!empty($this->_wb[$text])) {

            $text = $this->_wb[$text];

        }

        return $text;

    }



    public function tpl_defaults()

    {	
        $this->tpl->setVar('app_title', $this->_conf['app_title']);

        $this->tpl->setVar('app_version', $this->_conf['app_version']);

        $this->tpl->setVar('app_link', $this->_conf['app_link']);

        if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])){

            $this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');

        } else {

            $this->tpl->setVar('app_logo', '&nbsp;');

        }



        $this->tpl->setVar('phpsessid', session_id());



        $this->tpl->setVar('theme', $_SESSION['s']['theme']);

        $this->tpl->setVar('html_content_encoding', $this->_conf['html_content_encoding']);



        $this->tpl->setVar('delete_confirmation', $this->lng('delete_confirmation'));

        //print_r($_SESSION);

        if(isset($_SESSION['s']['module']['name'])) {

            $this->tpl->setVar('app_module', $_SESSION['s']['module']['name']);

        }

        if(isset($_SESSION['s']['user']) && $_SESSION['s']['user']['typ'] == 'admin') {

            $this->tpl->setVar('is_admin', 1);

        }

        if(isset($_SESSION['s']['user']) && $this->auth->has_clients($_SESSION['s']['user']['userid'])) {

            $this->tpl->setVar('is_reseller', 1);

        }

    }

    
} // end class



//** Initialize application (app) object

//* possible future =  new app($conf);

$app = new app();



?>

 interface/web/themes/default/templates/main.tpl.htm

@@ -2,69 +2,68 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
<meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
<!-- (en) Add your meta data here -->
<!-- (de) Fuegen Sie hier ihre Meta-Daten ein -->
<link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
<!--[if lte IE 7]>
<link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
<![endif]-->

<script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
<script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
<script type="text/javascript" src="js/scrigo.js.php"></script>
<!--script src="js/wforms.js"></script-->

    <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
    <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
    <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
    <!--[if lte IE 7]>
    <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
    <![endif]-->
    <script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
    <script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
    <script type="text/javascript" src="js/scrigo.js.php"></script>
    <!--script src="js/wforms.js"></script-->
</head>
<body onload="loadInitContent()">
<div id="page_margins">
    <div id="page">
        <div id="header">
            <div id="topsubnav">
                <!-- start: skip link navigation -->
                <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
                <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                <!-- end: skip link navigation -->
                <span><a href="login/logout.php">Logout</a> | <a href="#" onclick="capp('help')">Help</a><!-- | <a href="#">Imprint</a>--></span>
      </div>
            <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
            <span>hosting control panel</span>
    <div id="page_margins">
        <div id="page">
            <div id="header">
                <div id="topsubnav">
                    <!-- start: skip link navigation -->
                    <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
                    <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                    <!-- end: skip link navigation -->
                    <span><a href="login/logout.php">Logout</a> | <a href="#" onclick="capp('help')">Help</a><!-- | <a href="#">Imprint</a>--></span>
                </div>
                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                <span>hosting control panel</span>
            </div>
            <!-- begin: main navigation #nav -->
            <div id="nav">
                <a id="navigation" name="navigation"></a>
                <!-- skiplink anchor: navigation -->
                <div id="nav_main">
                    <div id="topNav">&nbsp;</div>
                </div>
            </div>
            <!-- end: main navigation -->
            <!-- begin: main content area #main -->
            <div id="main">
                <!-- begin: #col1 - first float column -->
                <div id="col1">
                    <div id="col1_content" class="clearfix">
                        <div id="sideNav">&nbsp;</div>
                    </div>
                </div>
                <!-- end: #col1 -->
                <!-- begin: #col3 static column -->
                <div id="col3">
                    <div id="col3_content" class="clearfix">
                        <a id="content" name="content"></a>
                        <!-- skiplink anchor: Content -->
                        <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data">
                        <div id="pageContent"><!-- AJAX CONTENT --></div>
                        </form>
                    </div>
                    <div id="ie_clearing">&nbsp;</div>
                    <!-- End: IE Column Clearing -->
                </div>
                <!-- end: #col3 -->
            </div>
            <!-- end: #main -->
        <!-- begin: #footer -->
        <div id="footer">
            Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"> <tmpl_var name="app_version"></a></div>
        </div><!-- end: #footer -->
    </div>
        <!-- begin: main navigation #nav -->
        <div id="nav"> <a id="navigation" name="navigation"></a>
            <!-- skiplink anchor: navigation -->
            <div id="nav_main">
        <div id="topNav">&nbsp;</div>
            </div>
        </div>
        <!-- end: main navigation -->
        <!-- begin: main content area #main -->
        <div id="main">
            <!-- begin: #col1 - first float column -->
            <div id="col1">
                <div id="col1_content" class="clearfix">
          <div id="sideNav">&nbsp;</div>
                </div>
            </div>
            <!-- end: #col1 -->
            <!-- begin: #col3 static column -->
            <div id="col3">
                <div id="col3_content" class="clearfix"> <a id="content" name="content"></a>
                    <!-- skiplink anchor: Content -->
          <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data"><div id="pageContent"><!-- AJAX CONTENT --></div></form>
        </div>
                <div id="ie_clearing">&nbsp;</div>
                <!-- End: IE Column Clearing -->
            </div>
            <!-- end: #col3 -->
        </div>
        <!-- end: #main -->
        <!-- begin: #footer -->
        <div id="footer">
      Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"> <tmpl_var name="app_version"></a></div>
    </div>
        <!-- end: #footer -->
    </div>
</body>
</html>