[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] eldaptir add.php, 1.9, 1.9.4.1 addserver.php, 1.6.2.2
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] eldaptir add.php, 1.9, 1.9.4.1 addserver.php, 1.6.2.2, 1.6.2.2.2.1 deleteserver.php, 1.5.2.1, 1.5.2.1.2.1 edit.php, 1.16, 1.16.4.1 editserver.php, 1.6.2.3, 1.6.2.3.2.1 index.php, 1.10, 1.10.4.1 servers.php, 1.9, 1.9.4.1 view.php, 1.17, 1.17.4.1 viewou.php, 1.20.2.1, 1.20.2.1.2.1 |
|
Date: |
Thu, 09 Oct 2003 23:28:10 +0000 |
Update of /cvsroot/phpgroupware/eldaptir
In directory subversions:/tmp/cvs-serv8936
Modified Files:
Tag: Version-0_9_16-branch
add.php addserver.php deleteserver.php edit.php editserver.php
index.php servers.php view.php viewou.php
Log Message:
globals and sql
Index: addserver.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/addserver.php,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.2.2.1
diff -C2 -d -r1.6.2.2 -r1.6.2.2.2.1
*** addserver.php 28 Feb 2003 15:50:44 -0000 1.6.2.2
--- addserver.php 9 Oct 2003 23:28:08 -0000 1.6.2.2.2.1
***************
*** 32,36 ****
$errorcount = 0;
! $GLOBALS['phpgw']->db->query("SELECT * FROM
phpgw_eldaptir_servers WHERE name='".$server_name."'");
if ($GLOBALS['phpgw']->db->next_record())
{
--- 32,37 ----
$errorcount = 0;
! $GLOBALS['phpgw']->db->query('SELECT * FROM
phpgw_eldaptir_servers'
! . " WHERE
name='".$GLOBALS['phpgw']->db->db_addslashes($server_name)."'", __LINE__,
__FILE__);
if ($GLOBALS['phpgw']->db->next_record())
{
***************
*** 56,71 ****
if($default_checked)
{
! $GLOBALS['phpgw']->db->query("UPDATE
phpgw_eldaptir_servers SET is_default=0");
}
! $server_name = addslashes($server_name);
! $server_type = addslashes($server_type);
! $server_basedn = addslashes($server_basedn);
! $server_rootdn = addslashes($server_rootdn);
! $server_rootpw = addslashes($server_rootpw);
$GLOBALS['phpgw']->db->query("INSERT INTO
phpgw_eldaptir_servers (name,type,basedn,rootdn,rootpw,is_default) VALUES ("
. "'" . $server_name . "','" . $server_type .
"','" . $server_basedn . "','"
! . $server_rootdn . "','" . $server_rootpw .
"'," . $default_checked .")");
}
}
--- 57,72 ----
if($default_checked)
{
! $GLOBALS['phpgw']->db->query('UPDATE
phpgw_eldaptir_servers SET is_default=0', __LINE__, __FILE__);
}
! $server_name =
$GLOBALS['phpgw']->db->db_addslashes($server_name);
! $server_type =
$GLOBALS['phpgw']->db->db_addslashes($server_type);
! $server_basedn =
$GLOBALS['phpgw']->db->db_addslashes($server_basedn);
! $server_rootdn =
$GLOBALS['phpgw']->db->db_addslashes($server_rootdn);
! $server_rootpw =
$GLOBALS['phpgw']->db->db_addslashes($server_rootpw);
$GLOBALS['phpgw']->db->query("INSERT INTO
phpgw_eldaptir_servers (name,type,basedn,rootdn,rootpw,is_default) VALUES ("
. "'" . $server_name . "','" . $server_type .
"','" . $server_basedn . "','"
! . $server_rootdn . "','" . $server_rootpw .
"'," . $default_checked .")", __LINE__, __FILE__);
}
}
Index: edit.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/edit.php,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -d -r1.16 -r1.16.4.1
*** edit.php 19 Nov 2001 16:08:46 -0000 1.16
--- edit.php 9 Oct 2003 23:28:08 -0000 1.16.4.1
***************
*** 13,18 ****
/* $Id$ */
! $dn = $HTTP_GET_VARS['dn'];
! $ou = $HTTP_GET_VARS['ou'];
if (!$dn)
{
--- 13,18 ----
/* $Id$ */
! $dn = $_GET['dn'];
! $ou = $_GET['ou'];
if (!$dn)
{
Index: editserver.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/editserver.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.3.2.1
diff -C2 -d -r1.6.2.3 -r1.6.2.3.2.1
*** editserver.php 27 Feb 2003 21:53:13 -0000 1.6.2.3
--- editserver.php 9 Oct 2003 23:28:08 -0000 1.6.2.3.2.1
***************
*** 42,46 ****
. '<input type="hidden" name="server_id" value="' . $server_id
. '">' . "\n";
! $submit = $HTTP_POST_VARS['submit'];
if ($submit)
{
--- 42,46 ----
. '<input type="hidden" name="server_id" value="' . $server_id
. '">' . "\n";
! $submit = $_POST['submit'];
if ($submit)
{
***************
*** 51,55 ****
}
! $GLOBALS['phpgw']->db->query("SELECT COUNT(*) from
phpgw_eldaptir_servers WHERE name='$server_name' AND id !='$server_id'");
$GLOBALS['phpgw']->db->next_record();
if ($GLOBALS['phpgw']->db->f(0) != 0)
--- 51,57 ----
}
! $GLOBALS['phpgw']->db->query('SELECT COUNT(*) FROM
phpgw_eldaptir_servers'
! . " WHERE name='" .
$GLOBALS['phpgw']->db->db_addslashes($server_name) . "'"
! . ' AND id !=' . intval($server_id),
__LINE__, __FILE__);
$GLOBALS['phpgw']->db->next_record();
if ($GLOBALS['phpgw']->db->f(0) != 0)
***************
*** 58,65 ****
}
! $server_name = addslashes($server_name);
! $server_type = addslashes($server_type);
! $server_basedn = addslashes($server_basedn);
! $server_rootdn = addslashes($server_rootdn);
/*
if($server_rootpw)
--- 60,67 ----
}
! $server_name =
$GLOBALS['phpgw']->db->db_addslashes($server_name);
! $server_type =
$GLOBALS['phpgw']->db->db_addslashes($server_type);
! $server_basedn =
$GLOBALS['phpgw']->db->db_addslashes($server_basedn);
! $server_rootdn =
$GLOBALS['phpgw']->db->db_addslashes($server_rootdn);
/*
if($server_rootpw)
***************
*** 91,95 ****
. $chgpass
. "',is_default=" . $default_checked
! . " WHERE id=" . $server_id);
}
}
--- 93,97 ----
. $chgpass
. "',is_default=" . $default_checked
! . ' WHERE id=' . intval($server_id),
__LINE__, __FILE__);
}
}
***************
*** 108,112 ****
}
! $GLOBALS['phpgw']->db->query("SELECT * FROM phpgw_eldaptir_servers
WHERE id=".$server_id);
while ($GLOBALS['phpgw']->db->next_record())
{
--- 110,114 ----
}
! $GLOBALS['phpgw']->db->query('SELECT * FROM phpgw_eldaptir_servers
WHERE id='.intval($server_id),__LINE__,__FILE__);
while ($GLOBALS['phpgw']->db->next_record())
{
Index: deleteserver.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/deleteserver.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.1.2.1
diff -C2 -d -r1.5.2.1 -r1.5.2.1.2.1
*** deleteserver.php 28 Jan 2003 22:42:17 -0000 1.5.2.1
--- deleteserver.php 9 Oct 2003 23:28:08 -0000 1.5.2.1.2.1
***************
*** 39,43 ****
if ($confirm)
{
! $GLOBALS['phpgw']->db->query("DELETE FROM
phpgw_eldaptir_servers WHERE id=" . $server_id);
Header('Location: ' .
$GLOBALS['phpgw']->link('/eldaptir/servers.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
}
--- 39,44 ----
if ($confirm)
{
! $GLOBALS['phpgw']->db->query('DELETE FROM
phpgw_eldaptir_servers'
! . ' WHERE id=' . intval($server_id),
__LINE__, __FILE__);
Header('Location: ' .
$GLOBALS['phpgw']->link('/eldaptir/servers.php',"start=$start&query=$query&sort=$sort&order=$order&filter=$filter"));
}
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/index.php,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** index.php 19 Nov 2001 15:50:05 -0000 1.10
--- index.php 9 Oct 2003 23:28:08 -0000 1.10.4.1
***************
*** 13,17 ****
/* $Id$ */
! $server_id = $HTTP_GET_VARS['server_id'];
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'eldaptir';
--- 13,17 ----
/* $Id$ */
! $server_id = $_GET['server_id'];
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'eldaptir';
Index: view.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/view.php,v
retrieving revision 1.17
retrieving revision 1.17.4.1
diff -C2 -d -r1.17 -r1.17.4.1
*** view.php 19 Nov 2001 16:08:46 -0000 1.17
--- view.php 9 Oct 2003 23:28:08 -0000 1.17.4.1
***************
*** 13,18 ****
/* $Id$ */
! $dn = $HTTP_GET_VARS['dn'];
! $ou = $HTTP_GET_VARS['ou'];
if (!$dn)
{
--- 13,18 ----
/* $Id$ */
! $dn = $_GET['dn'];
! $ou = $_GET['ou'];
if (!$dn)
{
Index: viewou.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/viewou.php,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.1.2.1
diff -C2 -d -r1.20.2.1 -r1.20.2.1.2.1
*** viewou.php 3 Mar 2003 22:27:10 -0000 1.20.2.1
--- viewou.php 9 Oct 2003 23:28:08 -0000 1.20.2.1.2.1
***************
*** 29,39 ****
$ldapobj = CreateObject('eldaptir.ldap',$servers[$server_id]);
! $start = $HTTP_POST_VARS['start'] ? $HTTP_POST_VARS['start'] :
$HTTP_GET_VARS['start'];
! $query = $HTTP_POST_VARS['query'];
! $sort = $HTTP_GET_VARS['sort'];
! $order = $HTTP_GET_VARS['order'];
! $qfield = $HTTP_GET_VARS['qfield'];
! $ou = $HTTP_GET_VARS['ou'];
if($ou)
--- 29,39 ----
$ldapobj = CreateObject('eldaptir.ldap',$servers[$server_id]);
! $start = $_POST['start'] ? $_POST['start'] : $_GET['start'];
! $query = $_POST['query'];
! $sort = $_GET['sort'];
! $order = $_GET['order'];
! $qfield = $_GET['qfield'];
! $ou = $_GET['ou'];
if($ou)
Index: servers.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/servers.php,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** servers.php 19 Nov 2001 16:08:46 -0000 1.9
--- servers.php 9 Oct 2003 23:28:08 -0000 1.9.4.1
***************
*** 45,66 ****
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
! if (! $start) { $start = 0; }
!
! if (!$sort)
{
! $sort = "ASC";
}
if ($order)
{
! $ordermethod = "order by $order $sort ";
}
else
{
! $ordermethod = " order by name asc ";
}
if ($query)
{
! $querymethod = " WHERE name like '%$query%' OR basedn like
'%$query%'";
}
--- 45,68 ----
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
! if (! $start)
{
! $start = 0;
}
+
+ $sort = (strtoupper($sort) == 'DESC' ? 'DESC' : 'ASC');
+
if ($order)
{
! $ordermethod = 'ORDER BY ' .
$GLOBALS['phpgw']->db->db_addslashes($order) . " $sort ";
}
else
{
! $ordermethod = " ORDER BY name $order ";
}
if ($query)
{
! $query = $GLOBALS['phpgw']->db->db_addslashes($query);
! $querymethod = " WHERE name LIKE '%$query%' OR basedn like
'%$query%'";
}
***************
*** 70,74 ****
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
! $GLOBALS['phpgw']->db->limit_query($sql,$start,__LINE__,__FILE__);
while ($GLOBALS['phpgw']->db->next_record())
{
--- 72,76 ----
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
!
$GLOBALS['phpgw']->db->limit_query($sql,intval($start),__LINE__,__FILE__);
while ($GLOBALS['phpgw']->db->next_record())
{
Index: add.php
===================================================================
RCS file: /cvsroot/phpgroupware/eldaptir/add.php,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** add.php 19 Nov 2001 16:08:46 -0000 1.9
--- add.php 9 Oct 2003 23:28:08 -0000 1.9.4.1
***************
*** 13,19 ****
/* $Id$ */
! $dn = $HTTP_GET_VARS['dn'];
! $ou = $HTTP_GET_VARS['ou'];
! $submit = $HTTP_POST_VARS['submit'];
$GLOBALS['phpgw_info']['flags'] = array(
--- 13,19 ----
/* $Id$ */
! $dn = $_GET['dn'];
! $ou = $_GET['ou'];
! $submit = $_POST['submit'];
$GLOBALS['phpgw_info']['flags'] = array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] eldaptir add.php, 1.9, 1.9.4.1 addserver.php, 1.6.2.2, 1.6.2.2.2.1 deleteserver.php, 1.5.2.1, 1.5.2.1.2.1 edit.php, 1.16, 1.16.4.1 editserver.php, 1.6.2.3, 1.6.2.3.2.1 index.php, 1.10, 1.10.4.1 servers.php, 1.9, 1.9.4.1 view.php, 1.17, 1.17.4.1 viewou.php, 1.20.2.1, 1.20.2.1.2.1,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] eldaptir/inc class.ldap_iplanet.inc.php, 1.2, 1.2.4.1 class.ldap_openldap2.inc.php, 1.2, 1.2.4.1 functions.inc.php, 1.24, 1.24.4.1
- Next by Date:
[Phpgroupware-cvs] forum/inc class.boforum.inc.php, 1.1.2.7, 1.1.2.7.2.1 class.soforum.inc.php, 1.1.2.6, 1.1.2.6.2.1 class.uiadmin.inc.php, 1.1.2.4, 1.1.2.4.2.1
- Previous by thread:
[Phpgroupware-cvs] eldaptir/inc class.ldap_iplanet.inc.php, 1.2, 1.2.4.1 class.ldap_openldap2.inc.php, 1.2, 1.2.4.1 functions.inc.php, 1.24, 1.24.4.1
- Next by thread:
[Phpgroupware-cvs] forum/inc class.boforum.inc.php, 1.1.2.7, 1.1.2.7.2.1 class.soforum.inc.php, 1.1.2.6, 1.1.2.6.2.1 class.uiadmin.inc.php, 1.1.2.4, 1.1.2.4.2.1
- Index(es):