Changeset 12416

Show
Ignore:
Timestamp:
08/17/11 09:17:38 (2 years ago)
Author:
mbrevda
Message:

some javascrupt libraries and other odds and ends

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r12297 r12416  
    1818define('MODULE_STATUS_NEEDUPGRADE', 3); 
    1919define('MODULE_STATUS_BROKEN', -1); 
     20 
     21//http://php.net/manual/en/function.phpversion.php 
     22if (!defined('PHP_VERSION_ID')) { 
     23    $version = explode('.', PHP_VERSION); 
     24    define('PHP_VERSION_ID', ($version[0] * 10000 + $version[1] * 100 + $version[2])); 
     25} 
    2026 
    2127spl_autoload_register('fpbx_framework_autoloader'); 

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

    r12392 r12416  
    8686    if ($action) { 
    8787      switch ($debug_level) { 
     88        case 0: 
     89          $db_dbug = $args; 
     90          break; 
    8891        case 1: 
    89           $db_dbug = 'getMessage'; 
     92          $db_dbug = $obj->getMessage(); 
    9093          break; 
    9194        case 2: 
    92           $db_dbug = 'getCode'; 
     95          $db_dbug = $obj->getCode(); 
    9396          break; 
    9497        case 3: 
    95           $db_dbug = 'getUserInfo'; 
     98          $db_dbug = $obj->getUserInfo(); 
    9699          break; 
    97100        case 4: 
    98           $db_dbug = 'getDebugInfo'; 
     101          $db_dbug = $obj->getDebugInfo(); 
    99102          break; 
    100103      } 
    101104       
    102105      if (is_array($args)) { 
    103         $args['error'] = $obj->$db_dbug(); 
     106        $args['error'] = $db_dbug; 
    104107        if (is_array($action)) { 
    105108          call_user_func_array($action[0]->$action[1], $args); 
    …… 
    111114          call_user_func($action[0]->$action[1], $obj->$db_dbug()); 
    112115        } else { 
    113           call_user_func($action, $obj->$db_dbug()); 
     116          call_user_func($action, $db_dbug); 
    114117        } 
    115118 

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

    r12391 r12416  
    262262    . $disc  
    263263    . "\n"; //add timestamp + file info 
    264   dbug_write($txt); 
     264  dbug_write($txt, true); 
    265265  if ($dump==1) {//force output via var_dump 
    266266    ob_start(); 
    …… 
    465465 * @author Moshe Brevda mbrevda => gmail ~ com 
    466466 */ 
    467 function dbug_write($txt,$check=''){ 
     467function dbug_write($txt, $check = false){ 
    468468  global $amp_conf; 
    469469 
    …… 
    475475  } 
    476476  $append=false; 
     477 
    477478  //optionaly ensure that dbug file is smaller than $max_size 
    478479  if($check){ 
    479480    $max_size = 52428800;//hardcoded to 50MB. is that bad? not enough? 
    480     $size = filesize($amp_conf['FPBXDBUGFILE']); 
    481     $append = (($size > $max_size) ? false : true ); 
     481    $size = sprintf("%u", filesize($amp_conf['FPBXDBUGFILE'])); 
     482    $append = ($size > $max_size ? true : false); 
    482483  } 
    483484  if ($append) { 

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php

    r12167 r12416  
    159159  <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> 
    160160  <meta http-equiv="X-UA-Compatible" content="chrome=1"> 
     161  <meta name="robots" content="noindex" /> 
    161162  <link href="<?php echo $mainstyle_css.$version_tag ?>" rel="stylesheet" type="text/css"> 
    162163<?php if (isset($use_nav_background) && $use_nav_background) { ?> 
    …… 
    241242  // TODO: include this in some sort of meta-data or xml file for parsing? Order is important so can't just read the directory 
    242243?> 
    243   <script type="text/javascript" src="assets/js/jquery-1.4.x.min.js"></script> 
     244  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script> 
     245  <script>window.jQuery || document.write('<script src="assets/js/jquery-1.4.x.min.js"><\/script>')</script> 
     246  <!--script type="text/javascript" src=""></script--> 
    244247  <script type="text/javascript" src="assets/js/jquery.cookie.js"></script> <!-- plugin for setting/retrieving cookies --> 
    245   <script type="text/javascript" src="assets/js/jquery-ui-1.8.x.min.js"></script> 
     248  <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/jquery-ui.min.js"></script> 
     249  <script>window.jQuery.ui || document.write('<script src="assets/js/jquery-ui-1.8.x.min.js"><\/script>')</script> 
     250  <!--script type="text/javascript" src="assets/js/jquery-ui-1.8.x.min.js"></script--> 
    246251  <script type="text/javascript" src="assets/js/script.legacy.js"></script> <!-- legacy script.js.php --> 
    247   <script type="text/javascript" src="assets/js/jquery.dimensions.js"></script> <!-- used by reload/module admin --> 
    248252  <script type="text/javascript" src="assets/js/jquery.toggleval.3.0.js"></script> <!-- plugin for adding help text to input boxes --> 
    249253  <script type="text/javascript" src="assets/js/interface.dim.js"></script> <!-- used for interface blocking (reload, modadmin) --> 
    250254  <script type="text/javascript" src="assets/js/tabber-minimized.js"></script> <!-- used for module admin (hiding content) --> 
     255  <script type="text/javascript" src="assets/js/jquery.eventsource.js"></script> <!-- polyfill+jquery functions for streamevent --> 
     256  <script type="text/javascript" src="assets/js/jquery.jstree.js"></script> <!-- jquery tree plugin --> 
    251257<?php 
    252258  } 

  • modules/branches/2.10/ivr/functions.inc.php

    r12291 r12416  
    556556    foreach ($ivr_entries as $k => $e) { 
    557557      $entries[$k]= $e; 
    558       $entries[$k]['hooks'] = mod_func_iterator('draw_entries_ivr', array('id' => $id, 'ext' => $e['selection'])); 
     558      $array = array('id' => $id, 'ext' => $e['selection']); 
     559      $entries[$k]['hooks'] = mod_func_iterator('draw_entries_ivr', $array); 
    559560    } 
    560561  } 
    561562   
    562563  $entries['blank'] = array('selection' => '', 'dest' => '', 'ivr_ret' => ''); 
    563   $entries['blank']['hooks'] = mod_func_iterator('draw_entries_ivr', array('id' => '', 'ext' => '')); 
     564  //assign to a vatriable first so that it can be passed by reference 
     565  $array = array('id' => '', 'ext' => ''); 
     566  $entries['blank']['hooks'] = mod_func_iterator('draw_entries_ivr', $array); 
    564567   
    565568  return load_view(dirname(__FILE__) . '/views/entries.php',