Changeset 3007

Show
Ignore:
Timestamp:
11/05/06 20:57:08 (7 years ago)
Author:
qldrob
Message:

Merged revisions 2993,2995-3006 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r3000 | qldrob | 2006-11-06 07:31:07 +1000 (Mon, 06 Nov 2006) | 2 lines


Revert r2747

........

r3001 | qldrob | 2006-11-06 09:46:11 +1000 (Mon, 06 Nov 2006) | 2 lines


Apply #1108, thanks nobbie!

........

r3002 | qldrob | 2006-11-06 10:04:38 +1000 (Mon, 06 Nov 2006) | 2 lines


Add images from #1150 and #1151

........

r3003 | qldrob | 2006-11-06 10:06:42 +1000 (Mon, 06 Nov 2006) | 2 lines


And remove the old ones..

........

r3004 | qldrob | 2006-11-06 10:07:11 +1000 (Mon, 06 Nov 2006) | 2 lines


Add the changes to CDR code

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.2

    • Property svnmerge-integrated changed from /freepbx/trunk:1-2992 to /freepbx/trunk:1-2993,2995-3006

  • freepbx/branches/2.2/amp_conf/htdocs/admin/cdr/call-log.php

    r2614 r3007  
    248248} 
    249249//--$list_total = $instance_table_graph -> Get_list ($FG_TABLE_CLAUSE, null, null, null, null, null, null); 
     250 
     251/* --AMP BEGIN-- */ 
     252//enforce restrictions for this AMP User 
     253session_start(); 
     254$AMP_CLAUSE = $HTTP_SESSION_VARS['AMP_SQL']; 
     255if (!isset($AMP_CLAUSE)) { 
     256        $AMP_CLAUSE = " AND src = 'NeverReturnAnything'"; 
     257} 
     258$FG_TABLE_CLAUSE .= $AMP_CLAUSE; 
     259/* --AMP END-- */ 
     260 
    250261 
    251262 
    …… 
    857868<br/> 
    858869<table width="60%"><tr><td> 
    859 <a href="export_pdf.php" target="_blank"><img src="./images/pdf.gif " border="0"/></a> <a href="export_pdf.php" target="_blank">Export PDF file</a> 
     870<a href="export_pdf.php" target="_blank"><img src="./images/pdf.png " border="0"/></a> <a href="export_pdf.php" target="_blank">Export PDF file</a> 
    860871</td> 
    861872<td> 
    862 <a href="export_csv.php" target="_blank" ><img src="./images/excel.gif" border="0"/></a> <a href="export_csv.php" target="_blank">Export CSV file</a> 
     873<a href="export_csv.php" target="_blank" ><img src="./images/excel.png" border="0"/></a> <a href="export_csv.php" target="_blank">Export CSV file</a> 
    863874</td></tr></table> 
    864875 

  • freepbx/branches/2.2/amp_conf/htdocs/admin/config.php

    r2990 r3007  
    251251        $module_hook = new moduleHook; 
    252252         
    253         // let hooking modules process the $_REQUEST 
    254         $module_hook->process_hooks($itemid,$modkey,$item,$_REQUEST); 
    255253        // populate object variables 
    256254        $module_hook->install_hooks($itemid,$modkey,$item); 
    …… 
    263261          echo $currentcomponent->generateconfigpage(); 
    264262        } 
     263 
     264        // let hooking modules process the $_REQUEST 
     265        $module_hook->process_hooks($itemid,$modkey,$item,$_REQUEST); 
    265266 
    266267      }