Changeset 12201

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

re #5164 - move functions that need to always be included to their own file so that we can lazy load the class

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r11090 r12201  
    4747} 
    4848 
    49 //-------------------------------------------------------------------------------------------------- 
    50 /* Legacy functions associated with ampuser class 
    51 **/ 
    52  
    53 // returns true if extension is within allowed range 
    54 function checkRange($extension){ 
    55   $low = isset($_SESSION["AMP_user"]->_extension_low)?$_SESSION["AMP_user"]->_extension_low:''; 
    56   $high = isset($_SESSION["AMP_user"]->_extension_high)?$_SESSION["AMP_user"]->_extension_high:''; 
    57    
    58   if ((($extension >= $low) && ($extension <= $high)) || ($low == '' && $high == '')) 
    59     return true; 
    60   else 
    61     return false; 
    62 } 
    63  
    64 function getAmpAdminUsers() { 
    65   global $db; 
    66  
    67   $sql = "SELECT username FROM ampusers WHERE sections='*'"; 
    68   $results = $db->getAll($sql); 
    69   if(DB::IsError($results)) { 
    70      die_freepbx($sql."<br>\n".$results->getMessage()); 
    71   } 
    72   return $results; 
    73 } 
    74  
    75 function getAmpUser($username) { 
    76   global $db; 
    77    
    78   $sql = "SELECT username, password_sha1, extension_low, extension_high, deptname, sections FROM ampusers WHERE username = '".$db->escapeSimple($username)."'"; 
    79   $results = $db->getAll($sql); 
    80   if(DB::IsError($results)) { 
    81      die_freepbx($sql."<br>\n".$results->getMessage()); 
    82   } 
    83    
    84   if (count($results) > 0) { 
    85     $user = array(); 
    86     $user["username"] = $results[0][0]; 
    87     $user["password_sha1"] = $results[0][1]; 
    88     $user["extension_low"] = $results[0][2]; 
    89     $user["extension_high"] = $results[0][3]; 
    90     $user["deptname"] = $results[0][4]; 
    91     $user["sections"] = explode(";",$results[0][5]); 
    92     return $user; 
    93   } else { 
    94     return false; 
    95   } 
    96 } 
    97  
    98 // returns true if department string matches dept for this user 
    99 function checkDept($dept){ 
    100   $deptname = isset($_SESSION["AMP_user"])?$_SESSION["AMP_user"]->_deptname:null; 
    101    
    102   if ( ($dept == null) || ($dept == $deptname) ) 
    103     return true; 
    104   else 
    105     return false; 
    106 } 
    107  
    10849?> 

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

    r12198 r12201  
    238238} 
    239239 
    240 // Helpers for eleswhere 
    241  
    242 // Return Array() of 'enabled' features for a specific module 
    243 function featurecodes_getModuleFeatures($modulename) { 
    244   $s = "SELECT featurename, description "; 
    245   $s .= "FROM featurecodes "; 
    246   $s .= "WHERE modulename = ".sql_formattext($modulename)." AND enabled = 1 "; 
    247  
    248   $results = sql($s, "getAll", DB_FETCHMODE_ASSOC); 
    249  
    250   if (is_array($results)) { 
    251     return $results; 
    252   } else { 
    253     return null; 
    254      
    255   } 
    256 } 
    257  
    258 function featurecodes_getAllFeaturesDetailed($sort_module=true) { 
    259   global $amp_conf; 
    260  
    261   $fd = $amp_conf['ASTETCDIR'].'/freepbx_featurecodes.conf'; 
    262   $overridecodes = array(); 
    263   if (file_exists($fd)) { 
    264     $overridecodes = parse_ini_file($fd,true); 
    265   } 
    266   $s = "SELECT featurecodes.modulename, featurecodes.featurename, featurecodes.description AS featuredescription, featurecodes.enabled AS featureenabled, featurecodes.defaultcode, featurecodes.customcode, "; 
    267   $s .= "modules.enabled AS moduleenabled, featurecodes.providedest "; 
    268   $s .= "FROM featurecodes "; 
    269   $s .= "INNER JOIN modules ON modules.modulename = featurecodes.modulename "; 
    270   $s .= ($sort_module ? "ORDER BY featurecodes.modulename, featurecodes.description " : "ORDER BY featurecodes.description "); 
    271    
    272   $results = sql($s, "getAll", DB_FETCHMODE_ASSOC); 
    273   if (is_array($results)) { 
    274     $modules = module_getinfo(false, MODULE_STATUS_ENABLED); 
    275     foreach ($results as $key => $item) { 
    276  
    277       // get the module display name 
    278       $results[$key]['moduledescription'] = (!empty($modules[ $item['modulename'] ]['name']) ? $modules[ $item['modulename'] ]['name'] : ucfirst($item['modulename'])); 
    279       if (isset($overridecodes[$item['modulename']][$item['featurename']]) && trim($overridecodes[$item['modulename']][$item['featurename']]) != '') { 
    280         $results[$key]['defaultcode'] = $overridecodes[$item['modulename']][$item['featurename']]; 
    281       } 
    282     } 
    283      
    284     return $results; 
    285   } else { 
    286     return null; 
    287   } 
    288 } 
    289  
    290 // removes all features for a specific module 
    291 function featurecodes_delModuleFeatures($modulename) { 
    292        $s = "DELETE "; 
    293        $s .= "FROM featurecodes "; 
    294        $s .= "WHERE modulename = ".sql_formattext($modulename); 
    295  
    296        sql($s, 'query'); 
    297  
    298        return true; 
    299 } 
    300  
    301 function featurecodes_getFeatureCode($modulename, $featurename) { 
    302   $fc_code = ''; 
    303    
    304   $fcc = new featurecode($modulename, $featurename); 
    305   $fc_code = $fcc->getCodeActive(); 
    306   unset($fcc); 
    307  
    308   return $fc_code != '' ? $fc_code : _('** MISSING FEATURE CODE **'); 
    309 } 
    310  
    311 function featurecodes_delFeatureCode($modulename, $featurename) { 
    312        $s = "DELETE "; 
    313        $s .= "FROM featurecodes "; 
    314        $s .= "WHERE modulename = ".sql_formattext($modulename)." "; 
    315        $s .= "AND featurename = ".sql_formattext($featurename); 
    316  
    317        sql($s, 'query'); 
    318  
    319        return true; 
    320 } 
    321  
    322240?> 

  • freepbx/trunk/amp_conf/htdocs/admin/libraries/legacy.functions.php

    r11090 r12201  
    11<?php 
     2 
     3//-------------------------------------------------------------------------------------------------- 
     4/* Legacy functions associated with ampuser class 
     5**/ 
     6 
     7// returns true if extension is within allowed range 
     8function checkRange($extension){ 
     9  $low = isset($_SESSION["AMP_user"]->_extension_low)?$_SESSION["AMP_user"]->_extension_low:''; 
     10  $high = isset($_SESSION["AMP_user"]->_extension_high)?$_SESSION["AMP_user"]->_extension_high:''; 
     11   
     12  if ((($extension >= $low) && ($extension <= $high)) || ($low == '' && $high == '')) 
     13    return true; 
     14  else 
     15    return false; 
     16} 
     17 
     18function getAmpAdminUsers() { 
     19  global $db; 
     20 
     21  $sql = "SELECT username FROM ampusers WHERE sections='*'"; 
     22  $results = $db->getAll($sql); 
     23  if(DB::IsError($results)) { 
     24     die_freepbx($sql."<br>\n".$results->getMessage()); 
     25  } 
     26  return $results; 
     27} 
     28 
     29function getAmpUser($username) { 
     30  global $db; 
     31   
     32  $sql = "SELECT username, password_sha1, extension_low, extension_high, deptname, sections FROM ampusers WHERE username = '".$db->escapeSimple($username)."'"; 
     33  $results = $db->getAll($sql); 
     34  if(DB::IsError($results)) { 
     35     die_freepbx($sql."<br>\n".$results->getMessage()); 
     36  } 
     37   
     38  if (count($results) > 0) { 
     39    $user = array(); 
     40    $user["username"] = $results[0][0]; 
     41    $user["password_sha1"] = $results[0][1]; 
     42    $user["extension_low"] = $results[0][2]; 
     43    $user["extension_high"] = $results[0][3]; 
     44    $user["deptname"] = $results[0][4]; 
     45    $user["sections"] = explode(";",$results[0][5]); 
     46    return $user; 
     47  } else { 
     48    return false; 
     49  } 
     50} 
     51 
     52// returns true if department string matches dept for this user 
     53function checkDept($dept){ 
     54  $deptname = isset($_SESSION["AMP_user"])?$_SESSION["AMP_user"]->_deptname:null; 
     55   
     56  if ( ($dept == null) || ($dept == $deptname) ) 
     57    return true; 
     58  else 
     59    return false; 
     60} 
    261 
    362/* below are legacy functions required to allow pre 2.0 modules to function (ie: interact with 'extensions' table) */