Show
Ignore:
Timestamp:
12/05/11 04:06:01 (2 years ago)
Author:
mbrevda
Message:

upstream changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/extensions.class.php

    r12986 r12992  
    10341034        $this->options = preg_replace('/w\(.*\)/', 'w', $this->options); 
    10351035        break; 
     1036      case 'app_meetme': 
    10361037      default: 
    1037       case 'app_meetme': 
    10381038        $this->app = 'MeetMe'; 
    10391039        break; 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/libraries/utility.functions.php

    r12990 r12992  
    10531053    header('Content-Description: File Transfer'); 
    10541054    header('Content-Type: ' . $type); 
    1055     header('Content-Disposition: attachment; filename=' . $name); 
     1055    header('Content-Disposition: attachment; filename="' . $name . '"'); 
    10561056    header('Content-Transfer-Encoding: binary'); 
    10571057    header('Expires: 0'); 
     
    10591059    header('Pragma: public'); 
    10601060    header('Content-Length: ' . filesize($file)); 
    1061     ob_clean(); 
     1061    while (ob_get_level()) { 
     1062      ob_end_clean(); 
     1063    } 
    10621064    flush(); 
    10631065    readfile($file); 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/views/login.php

    r12447 r12992  
    2323$html .= form_close(); 
    2424$html .= '</div></div>'; 
    25 $html .= br(5) . '<div style="color: white;font-size:small">' 
     25$html .= br(5) . '<div id="key" style="color: white;font-size:small">' 
    2626    . session_id() 
    2727    . '</div>'; 
     28/*$html .= '<script type="text/javascript">'; 
     29$html .= '$(document).ready(function(){ 
     30    $("#key").click(function(){ 
     31      dest = "ssh://" + window.location.hostname + " \"/usr/sbin/amportal a u ' . session_id() . '\""; 
     32      console.log(dest) 
     33      window.open(dest).close(); setTimeout(\'window.location.reload()\', 3000); 
     34    }); 
     35})'; 
     36$html .= '</script>';*/ 
    2837echo $html; 
    2938