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

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    sms
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/06/01 11:56:19

Modified files:
        inc            : class.menu.inc.php class.uipolls.inc.php 
Added files:
        inc            : class.uicustom.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.menu.inc.php.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.uicustom.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/sms/inc/class.uipolls.inc.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: sms/inc/class.menu.inc.php
diff -u sms/inc/class.menu.inc.php:1.3 sms/inc/class.menu.inc.php:1.4
--- sms/inc/class.menu.inc.php:1.3      Mon May 29 12:58:57 2006
+++ sms/inc/class.menu.inc.php  Thu Jun  1 11:56:19 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.3 2006/05/29 12:58:57 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.4 2006/06/01 11:56:19 sigurdne 
Exp $
        */
 
        /**
@@ -103,11 +103,11 @@
                                $menu['sub_menu'][$j]['name']                   
=       lang('commands');
                                $menu['sub_menu'][$j]['statustext']             
=       lang('commands');
                                $j++;
-                               if($page=='.config.customs')
+                               if($page=='.config.custom')
                                {
                                        $menu['sub_menu'][$j]['this']=True;
                                }
-                               $menu['sub_menu'][$j]['link']                   
=       
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uicustoms.index');
+                               $menu['sub_menu'][$j]['link']                   
=       
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uicustom.index');
                                $menu['sub_menu'][$j]['name']                   
=       lang('customs');
                                $menu['sub_menu'][$j]['statustext']             
=       lang('customs');
                                $j++;
Index: sms/inc/class.uipolls.inc.php
diff -u sms/inc/class.uipolls.inc.php:1.4 sms/inc/class.uipolls.inc.php:1.5
--- sms/inc/class.uipolls.inc.php:1.4   Thu Jun  1 09:43:53 2006
+++ sms/inc/class.uipolls.inc.php       Thu Jun  1 11:56:19 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package sms
        * @subpackage polls
-       * @version $Id: class.uipolls.inc.php,v 1.4 2006/06/01 09:43:53 
sigurdne Exp $
+       * @version $Id: class.uipolls.inc.php,v 1.5 2006/06/01 11:56:19 
sigurdne Exp $
        */
 
        /**
@@ -150,7 +150,6 @@
                        echo parse_navbar();
 
                        $err    = urldecode(get_var('err',array('POST','GET')));
-                       $add_autoreply_code     = 
get_var('add_autoreply_code',array('POST','GET'));
 
                        if ($err)
                        {
@@ -168,8 +167,8 @@
                        $content .= "
                            <p>
                            <form action=$add_url method=post>
-                           <p>SMS poll code: <input type=text size=3 
maxlength=10 name=add_poll_code value=\"$add_poll_code\">
-                           <p>SMS poll title: <input type=text size=60 
maxlength=200 name=add_poll_title value=\"$add_poll_title\">
+                           <p>SMS poll code: <input type=text size=3 
maxlength=10 name=poll_code value=\"$poll_code\">
+                           <p>SMS poll title: <input type=text size=60 
maxlength=200 name=poll_title value=\"$poll_title\">
                            <p><input type=submit class=button value=Add>
                            </form>
                        ";
@@ -199,19 +198,19 @@
                                return;
                        }
 
-                       $add_poll_code  = 
strtoupper(get_var('add_poll_code',array('POST','GET')));
-                       $add_poll_title = 
get_var('add_poll_title',array('POST','GET'));
+                       $poll_code      = 
strtoupper(get_var('poll_code',array('POST','GET')));
+                       $poll_title     = 
get_var('poll_title',array('POST','GET'));
 
                        $uid = $this->account;
                        $target = 'add';
 
-                       if ($add_poll_title && $add_poll_code)
+                       if ($poll_title && $poll_code)
                        {
-                           if ($this->sms->checkavailablecode($add_poll_code))
+                           if ($this->sms->checkavailablecode($poll_code))
                            {
                                        $sql = "
                                            INSERT INTO phpgw_sms_featpoll 
(uid,poll_code,poll_title)
-                                           VALUES 
('$uid','$add_poll_code','$add_poll_title')
+                                           VALUES 
('$uid','$poll_code','$poll_title')
                                        ";
                                        $this->db->transaction_begin();
 
@@ -223,12 +222,12 @@
                                        
                                        if ($new_uid)
                                        {
-                                           $error_string = "SMS poll with code 
`$add_poll_code` has been added";
+                                           $error_string = "SMS poll with code 
`$poll_code` has been added";
                                        }
                            }
                            else
                            {
-                                       $error_string = "SMS code 
`$add_poll_code` already exists, reserved or use by other feature!";
+                                       $error_string = "SMS code `$poll_code` 
already exists, reserved or use by other feature!";
                            }
                        }
                        else