Added a function to merge language files.

tbrehm

2008-09-21 8dd29e227f44e2379a0a72a4f60130b24e54a14b

 interface/lib/app.inc.php

@@ -63,6 +63,8 @@
         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)
@@ -176,6 +178,9 @@
      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