[Pkg-voip-commits] r6351 - in /freepbx-modules/trunk: ./ debian/changelog debian/patches/logfile_messages

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Wed Oct 29 15:56:17 2008
New Revision: 6351

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6351
Log:
Refreshed logfile_messages.

Modified:
    freepbx-modules/trunk/   (props changed)
    freepbx-modules/trunk/debian/changelog
    freepbx-modules/trunk/debian/patches/logfile_messages

Propchange: freepbx-modules/trunk/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Wed Oct 29 15:56:17 2008
@@ -1,2 +1,2 @@
 debian/changelog	4788 at 5e74be4b-f5d6-0310-a852-e9e23c5afa6a:freepbx-modules%2Ftrunk:debian%2Fchangelog
-debian/patches/series	5513 at 5e74be4b-f5d6-0310-a852-e9e23c5afa6a:freepbx-modules%2Ftrunk:debian%2Fpatches%2Fseries
+debian/patches/logfile_messages	5519 at 5e74be4b-f5d6-0310-a852-e9e23c5afa6a:freepbx-modules%2Ftrunk:debian%2Fpatches%2Flogfile_messages

Propchange: freepbx-modules/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk1 (original)
+++ bzr:revision-id:v3-trunk1 Wed Oct 29 15:56:17 2008
@@ -1,3 +1,4 @@
 31 daniel at daniel-watkins.co.uk-20081028143239-uhau4jyx9i1jkvqq
 32 daniel at daniel-watkins.co.uk-20081028143702-aswvk90klypd0xbd
 33 daniel at daniel-watkins.co.uk-20081028143916-31taii6k1vy2hg2w
+34 daniel at daniel-watkins.co.uk-20081028144533-kf1ulpr54oh2l77p

Propchange: freepbx-modules/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Oct 29 15:56:17 2008
@@ -1,5 +1,5 @@
-timestamp: 2008-10-28 14:39:16.778000116 +0000
+timestamp: 2008-10-28 14:45:33.312999964 +0000
 committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
 properties: 
 	branch-nick: freepbx-modules
-	rebase-of: daniel at daniel-watkins.co.uk-20081028143916-fb5z0xbtox0o49ni
+	rebase-of: daniel at daniel-watkins.co.uk-20081028144533-e7hmxj8hb6z1964g

Modified: freepbx-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/changelog?rev=6351&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/changelog (original)
+++ freepbx-modules/trunk/debian/changelog Wed Oct 29 15:56:17 2008
@@ -2,11 +2,12 @@
 
   * New upstream release.
   * debian/patches:
+    * Refreshed logfile_messages.
     * Removed sqlite_trunk_query as the problem it fixes has been fixed
       upstream.
     * Removed checkperms_indications as it has been merged upstream.
 
- -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Tue, 28 Oct 2008 14:38:48 +0000
+ -- Daniel Watkins <daniel.watkins at credativ.co.uk>  Tue, 28 Oct 2008 14:45:11 +0000
 
 freepbx-modules (2.4.0~1) UNRELEASED; urgency=low
 

Modified: freepbx-modules/trunk/debian/patches/logfile_messages
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/logfile_messages?rev=6351&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/logfile_messages (original)
+++ freepbx-modules/trunk/debian/patches/logfile_messages Wed Oct 29 15:56:17 2008
@@ -2,9 +2,11 @@
 to /var/log/asterisk/messages .
 
 Upstream issue: http://freepbx.org/trac/ticket/2780 .
---- trunk.orig/modules/logfiles/page.logfiles.php
-+++ trunk/modules/logfiles/page.logfiles.php
-@@ -9,22 +9,34 @@ $action = isset($_REQUEST['action']) ? $
+Index: freepbx-modules/modules/logfiles/page.logfiles.php
+===================================================================
+--- freepbx-modules.orig/modules/logfiles/page.logfiles.php	2008-07-16 16:07:14.000000000 +0100
++++ freepbx-modules/modules/logfiles/page.logfiles.php	2008-10-28 14:44:43.000000000 +0000
+@@ -9,22 +9,34 @@
  <div class="content">
  <?php
  
@@ -30,8 +32,8 @@
 +		"display=$display&type=$type&action=showlog"?>"><?php echo _("Redisplay Asterisk $log_name log (last 2000 lines)") ?></a><br>
  		<hr><br>
  		<?php
--		echo system ('tail --line=2000 '.$amp_conf['ASTLOGDIR'].'/full | sed -e "s/$/<br>/"'); 
-+		echo system ('tail --line=2000 '.$log_file_full.' | sed -e "s/$/<br>/"'); 
+-		system ('tail --line=2000 '.$amp_conf['ASTLOGDIR'].'/full | sed -e "s,<,\&lt;,g;s,>,\&gt;,g;s/$/<br>/"'); 
++		system ('tail --line=2000 '.$log_file_full.' | sed -e "s/$/<br>/"'); 
  		break;
  
  	default: