Changeset 12447

Show
Ignore:
Timestamp:
08/29/11 08:37:31 (2 years ago)
Author:
mbrevda
Message:

re #5342 - quick touch up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/bin/freepbx_engine

    r12395 r12447  
    497497        mysql -u$AMPDBUSER -D$AMPDBNAME -p$AMPDBPASS 
    498498      ;; 
    499       ulock) 
     499      unlock|u) 
    500500        `php -r ' 
    501501        $bootstrap_settings["freepbx_auth"] = false; 
    …… 
    531531${b}modadmin$bx|${b}ma$bx:  Runs the module_admin script with additional argument as passed 
    532532${b}mysql$bx|${b}m$bx:  Connect to freebx's mysql connection (assumes server is on localhost) s  
    533 ${b}ulock$bx: Unlock the web gui from the cli (requires root)  
     533${b}unlock$bx|${b}u$bx: Unlock the web gui from the cli (requires root)  
    534534${b}reload$bx|${b}r$bx:      Does a full dialplan regeneration/reload (like clicking  
    535535               the orange bar)      

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

    r12445 r12447  
    128128    $html .= load_view(dirname(__FILE__) . '/views/menu.php', $header); 
    129129    $html .= $no_auth; 
    130     $html .= load_view('views/freepbx_footer.php'); 
     130    $html .= load_view($amp_conf['VIEW_FOOTER']); 
    131131    echo $html; 
    132132    exit(); 

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

    r12445 r12447  
    2323$html .= form_close(); 
    2424$html .= '</div></div>'; 
     25$html .= br(5) . '<div style="color: white;font-size:small">' 
     26    . session_id() 
     27    . '</div>'; 
    2528echo $html; 
    2629