Changeset 12198

Show
Ignore:
Timestamp:
05/30/11 03:52:22 (2 years ago)
Author:
mbrevda
Message:

re #5164 - autoload classes when psoible

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

    r12167 r12198  
    1313 
    1414$dirname = dirname(__FILE__); 
    15 //PLEASE NOTE: for performance reasons, these are hardcoded  
    16 //and dont get included dynamically 
    17  
    18 //TODO: include these dynamically as needed/use __autoload() 
    19  
    20  
     15define('MODULE_STATUS_NOTINSTALLED', 0); 
     16define('MODULE_STATUS_DISABLED', 1); 
     17define('MODULE_STATUS_ENABLED', 2); 
     18define('MODULE_STATUS_NEEDUPGRADE', 3); 
     19define('MODULE_STATUS_BROKEN', -1); 
     20 
     21spl_autoload_register('fpbx__autoload'); 
    2122//----------include classes---------- 
    2223 
    2324 
    2425//guieleemnts class for dynamicly generating gui 
    25 require_once($dirname . '/libraries/components.class.php'); 
     26//require_once($dirname . '/libraries/components.class.php'); 
    2627 
    2728//php4 parser for xml's 
    28 require_once($dirname . '/libraries/xml2Array.class.php'); 
     29//require_once($dirname . '/libraries/xml2Array.class.php'); 
    2930 
    3031//freepbx class to manage cron 
    31 require_once($dirname . '/libraries/cronmanager.class.php'); 
     32//require_once($dirname . '/libraries/cronmanager.class.php'); 
    3233 
    3334//hooks class 
    34 require_once($dirname . '/libraries/moduleHook.class.php'); 
     35//require_once($dirname . '/libraries/moduleHook.class.php'); 
    3536 
    3637//freepbx notification engine 
    37 require_once($dirname . '/libraries/notifications.class.php'); 
     38//require_once($dirname . '/libraries/notifications.class.php'); 
    3839 
    3940//class to enforce extension/view restrictions amongst freepbx admins 
    …… 
    4142 
    4243//module related class. TODO: update this line if you know what it dose 
    43 require_once($dirname . '/libraries/modulelist.class.php'); 
     44//require_once($dirname . '/libraries/modulelist.class.php'); 
    4445 
    4546//class that handels freepbx global setting 
     47//dont autoload - we ALWAYS need this 
    4648require_once($dirname . '/libraries/freepbx_conf.class.php'); 
    4749 
    …… 
    8486 
    8587//table generation class 
    86 function log_message(){} define('BASEPATH', '');//make upstream scripts happy 
    87 require_once($dirname . '/helpers/Table.php'); 
    88  
    89  
     88//function log_message(){} define('BASEPATH', '');//make upstream scripts happy 
     89//require_once($dirname . '/helpers/Table.php'); 
     90 
     91//freepbx autoloader 
     92function fpbx__autoload($class) { 
     93  $dirname = dirname(__FILE__); 
     94  if (substr($class, 0, 3) == 'gui') { 
     95    $class = 'component'; 
     96  } 
     97  switch($class){ 
     98    case 'component': 
     99        require_once($dirname . '/libraries/components.class.php'); 
     100        break; 
     101    case 'xml2Array': 
     102      require_once($dirname . '/libraries/xml2Array.class.php'); 
     103      break; 
     104  case 'cronmanager': 
     105    require_once($dirname . '/libraries/cronmanager.class.php'); 
     106    break; 
     107  case 'moduleHook': 
     108    require_once($dirname . '/libraries/moduleHook.class.php'); 
     109    break; 
     110  case 'notifications': 
     111    require_once($dirname . '/libraries/notifications.class.php'); 
     112    break; 
     113  case 'modulelist': 
     114    require_once($dirname . '/libraries/modulelist.class.php'); 
     115    break; 
     116  case 'CI_Table': 
     117    //make upstream scripts happy 
     118    if (!function_exists('log_message')) { 
     119      function log_message(){} define('BASEPATH', ''); 
     120    } 
     121    require_once($dirname . '/helpers/Table.php'); 
     122    break; 
     123    } 
     124} 
    90125/** 
    91126 * returns true if asterisk is running with chan_dahdi 

  • freepbx/trunk/amp_conf/htdocs/admin/helpers/Table.php

    r12167 r12198  
    1 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed'); 
     1<?php 
    22/** 
    33 * CodeIgniter 

  • freepbx/trunk/amp_conf/htdocs/admin/helpers/html_helper.php

    r12167 r12198  
    1 <?php  
     1<?php 
    22/** 
    33 * CodeIgniter 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/cronmanager.class.php

    r12167 r12198  
    145145  } 
    146146} 
    147  
    148 ?> 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/featurecodes.class.php

    r10623 r12198  
    11<?php 
    2 class featurecode 
    3 { 
     2class featurecode { 
    43  var $_modulename; // Module name 
    54  var $_featurename;  // Feature name 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/gui_auth.php

    r12167 r12198  
    1 <?php 
     1<?php  
    22// Set language, needs to be set here for full localization of the gui 
    33set_language(); 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/moduleHook.class.php

    r10244 r12198  
    5555  } 
    5656} 
    57  
    58 ?> 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/modulelist.class.php

    r10950 r12198  
    11<?php 
    2  
    3 define('MODULE_STATUS_NOTINSTALLED', 0); 
    4 define('MODULE_STATUS_DISABLED', 1); 
    5 define('MODULE_STATUS_ENABLED', 2); 
    6 define('MODULE_STATUS_NEEDUPGRADE', 3); 
    7 define('MODULE_STATUS_BROKEN', -1); 
    82 
    93class modulelist{ 
    …… 
    7468  } 
    7569} 
    76 ?> 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/notifications.class.php

    r12167 r12198  
    220220  } 
    221221} 
    222  
    223 ?>