common.php:

- merge with scripts/common.php
- don't start/use session in CLI mode
- don't load smarty.inc.php in CLI mode
- hardcode language to 'en' in CLI mode (was done in postfixadmin-cli.php before)

scripts/postfixadmin-cli.php - __bootstrap():
- use common.php instead of scripts/common.php
- don't load languages/language.php and languages/en.lang (already
  done via common.php)
- don't call language_hook (already done via common.php)

scripts/common.php:
- deleted
- dropped helper functions low(), up(), r() and pr() which were just
  shortnames for existing PHP functions


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1214 a1433add-5e2c-0410-b055-b7f2511e0802

scripts/postfixadmin-cli.php

@@ -213,10 +213,8 @@ class PostfixAdmin {
                 }
                 $includes = array(
                         PATH.'/config.inc.php',
-                        PATH.'/languages/language.php',
                         PATH.'/functions.inc.php',
-                        PATH.'/languages/en.lang', # TODO: honor $CONF[default_language] and/or language from $_ENV
-                        CORE_INCLUDE_PATH.'/common.php',
+                        PATH.'/common.php',
                         CORE_INCLUDE_PATH.'/inflector.php',
                 );
 
@@ -226,16 +224,11 @@ class PostfixAdmin {
                                 return false;
                         }
                 }
+
                 Config::getInstance();
                 Config::write($CONF);
                 
                 Lang::getInstance();
-
-                if($CONF['language_hook'] != '' && function_exists($CONF['language_hook'])) {
-                    $hook_func = $CONF['language_hook'];
-                    $PALANG = $hook_func ($PALANG, 'en'); # $includes is also hardcoded to 'en' - see TODO above
-                }
-                
                 Lang::write($PALANG);
 
                 return true;