phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] sms/inc class.menu.inc.php class.sms.inc.php


From: Sigurd Nes
Subject: [Phpgroupware-cvs] sms/inc class.menu.inc.php class.sms.inc.php
Date: Fri, 02 Jun 2006 09:10:18 +0000

CVSROOT:        /sources/phpgroupware
Module name:    sms
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/06/02 09:10:18

Modified files:
        inc            : class.menu.inc.php class.sms.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.menu.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.sms.inc.php.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: sms/inc/class.menu.inc.php
diff -u sms/inc/class.menu.inc.php:1.5 sms/inc/class.menu.inc.php:1.6
--- sms/inc/class.menu.inc.php:1.5      Thu Jun  1 12:30:22 2006
+++ sms/inc/class.menu.inc.php  Fri Jun  2 09:10:18 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage core
-       * @version $Id: class.menu.inc.php,v 1.5 2006/06/01 12:30:22 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.6 2006/06/02 09:10:18 sigurdne 
Exp $
        */
 
        /**
@@ -87,11 +87,11 @@
                                $menu['sub_menu'][$j]['name']                   
=       lang('autoreplay');
                                $menu['sub_menu'][$j]['statustext']             
=       lang('autoreplay');
                                $j++;
-                               if($page=='.config.boards')
+                               if($page=='.config.board')
                                {
                                        $menu['sub_menu'][$j]['this']=True;
                                }
-                               $menu['sub_menu'][$j]['link']                   
=       
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiboards.index');
+                               $menu['sub_menu'][$j]['link']                   
=       
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiboard.index');
                                $menu['sub_menu'][$j]['name']                   
=       lang('boards');
                                $menu['sub_menu'][$j]['statustext']             
=       lang('boards');
                                $j++;
Index: sms/inc/class.sms.inc.php
diff -u sms/inc/class.sms.inc.php:1.12 sms/inc/class.sms.inc.php:1.13
--- sms/inc/class.sms.inc.php:1.12      Wed May 31 12:42:46 2006
+++ sms/inc/class.sms.inc.php   Fri Jun  2 09:10:18 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage sms
-       * @version $Id: class.sms.inc.php,v 1.12 2006/05/31 12:42:46 sigurdne 
Exp $
+       * @version $Id: class.sms.inc.php,v 1.13 2006/06/02 09:10:18 sigurdne 
Exp $
        */
 
        /**
@@ -584,21 +584,23 @@
                        if (!$pref_bodybgcolor) { $pref_bodybgcolor = 
"#E0D0C0"; }
                        if (!$pref_oddbgcolor) { $pref_oddbgcolor = "#EEDDCC"; }
                        if (!$pref_evenbgcolor) { $pref_evenbgcolor = 
"#FFEEDD"; }
-                       $db_query = "SELECT board_pref_template FROM 
phpgw_sms_featboard WHERE board_code='$code'";
-                       $db_result = dba_query($db_query);
-                       if ($db_row = dba_fetch_array($db_result))
+                       $sql = "SELECT board_pref_template FROM 
phpgw_sms_featboard WHERE board_code='$code'";
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       if ($this->db->next_record())
                        {
-                               $template = $db_row[board_pref_template];
-                               $db_query1 = "SELECT * FROM 
phpgw_sms_tblSMSIncoming WHERE in_code='$code' ORDER BY in_datetime DESC LIMIT 
0,$line";
-                               $db_result1 = dba_query($db_query1);
-                               $content = "<html>\n<head>\n<title>$web_title - 
Code: $code</title>\n<meta name=\"author\" 
content=\"http://playsms.sourceforge.net\";>\n</head>\n<body 
bgcolor=\"$pref_bodybgcolor\" topmargin=\"0\" leftmargin=\"0\">\n<table 
width=100% cellpadding=2 cellspacing=2>\n";
+                               $template = $this->db->f('board_pref_template');
+                               $sql = "SELECT * FROM phpgw_sms_tblsmsincoming 
WHERE in_code='$code' ORDER BY in_datetime DESC";
+                               $this->db->query($sql,__LINE__,__FILE__);
+
+//                             $content = "<html>\n<head>\n<title>$web_title - 
Code: $code</title>\n<meta name=\"author\" 
content=\"http://playsms.sourceforge.net\";>\n</head>\n<body 
bgcolor=\"$pref_bodybgcolor\" topmargin=\"0\" leftmargin=\"0\">\n<table 
width=100% cellpadding=2 cellspacing=2>\n";
+                               $content = "<table width=100% cellpadding=2 
cellspacing=2>\n";
                                $i = 0;
-                               while ($db_row1 = dba_fetch_array($db_result1))
+                               while ($this->db->next_record())
                                {
                                        $i++;
-                                       $sender = $db_row1[in_masked];
-                                       $datetime = $db_row1[in_datetime];
-                                       $message = $db_row1[in_msg];
+                                       $sender = $this->db->f('in_masked');
+                                       $datetime = $this->db->f('in_datetime');
+                                       $message = $this->db->f('in_msg');
                                        $tmp_template = $template;
                                        $tmp_template = 
str_replace("##SENDER##",$sender,$tmp_template);
                                        $tmp_template = 
str_replace("##DATETIME##",$datetime,$tmp_template);
@@ -613,7 +615,8 @@
                                        }
                                        $content .= "\n<tr><td width=100% 
bgcolor=\"$pref_zigzagcolor\">\n$tmp_template</td></tr>\n\n";
                                }
-                               $content .= "</table>\n</body>\n</html>\n";
+//                             $content .= "</table>\n</body>\n</html>\n";
+                               $content .= "</table>\n";
                                return $content;
                        }
                }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]