From fe9710d6fafab701280748655a6a0d24c74d8313 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 13 Jul 2013 17:13:06 +0200 Subject: bug 1010: Implement new gui for org client cert --- pages/account/18.php | 146 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 124 insertions(+), 22 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 2fbb8b4..d294f1b 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -14,22 +14,84 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ ?> - +*/ + +$orgfilterid=0; +if(array_key_exists('orgfilterid',$_REQUEST)) $orgfilterid=intval($_REQUEST['orgfilterid']); +$sorting=0; +if(array_key_exists('sorting',$_REQUEST)) $sorting=intval($_REQUEST['sorting']); +$status=0; +if(array_key_exists('status',$_REQUEST)) $status=intval($_REQUEST['status']); +?>
- + - - - - - - - + + + + + + + + + + + + + + + + + + + +//rebuild query 0) + { + $query .= "AND `org`.`orgid`=$orgfilterid "; + } + + if(1==$status) { $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 "; $query .= "HAVING `timeleft` > 0 AND `revoked`=0 "; } - $query .= "ORDER BY `oemail`.`modified` desc"; + switch ($sorting){ + case 0: + $query .= "ORDER BY `oemail`.`expire` desc"; + break; + case 1: + $query .= "ORDER BY `oemail`.`ou`, `oemail`.`expire` desc"; + break; + case 2: + $query .= "ORDER BY `oemail`.`CN`, `oemail`.`expire` desc"; + break; + } $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { ?> + - + $orgname) { + $orgname=$row['O'];?> + + + + + + + + + + + + + + + + + 0) $verified = _("Valid"); if($row['timeleft'] < 0) @@ -65,11 +164,12 @@ $verified = _("Pending"); if($row['revoked'] > 0) $verified = _("Revoked"); - if($row['revoked'] == 0) - $row['revoke'] = _("Not Revoked"); + if($row['revoked'] == 0) + $row['revoke'] = _("Not Revoked"); ?> - + + @@ -90,7 +190,7 @@ - @@ -99,9 +199,11 @@ "> + + +
-
+ +
+ +
+ +
" />     + " />
+
">
-
-

+ \ No newline at end of file -- cgit v1.2.1 From 28415701f781cd5ea4e4e3f14eb8bac1c7f4e791 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 13 Jul 2013 17:23:11 +0200 Subject: bug 1010: added filter function to includes/account.php --- pages/account/18.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index d294f1b..5d45f37 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -17,11 +17,11 @@ */ $orgfilterid=0; -if(array_key_exists('orgfilterid',$_REQUEST)) $orgfilterid=intval($_REQUEST['orgfilterid']); +if(array_key_exists('orgfilterid',$_SESSION['_config'])) $orgfilterid=intval($_SESSION['_config']['orgfilterid']); $sorting=0; -if(array_key_exists('sorting',$_REQUEST)) $sorting=intval($_REQUEST['sorting']); +if(array_key_exists('sorting',$_SESSION['_config'])) $sorting=intval($_SESSION['_config']['sorting']); $status=0; -if(array_key_exists('status',$_REQUEST)) $status=intval($_REQUEST['status']); +if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_config']['status']); ?>
-- cgit v1.2.1 From 68017fbfaf8aedaa67d6077c81caeddc4b9b9b48 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 13 Jul 2013 17:38:14 +0200 Subject: bug 1010: new gui for org server certs --- pages/account/18.php | 1 - pages/account/22.php | 137 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 117 insertions(+), 21 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 5d45f37..05f30de 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -91,7 +91,6 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c -//rebuild query - +*/ + +$orgfilterid=0; +if(array_key_exists('dorgfilterid',$_SESSION['_config'])) $orgfilterid=intval($_SESSION['_config']['dorgfilterid']); +$sorting=0; +if(array_key_exists('dsorting',$_SESSION['_config'])) $sorting=intval($_SESSION['_config']['dsorting']); +$status=0; +if(array_key_exists('dstatus',$_SESSION['_config'])) $status=intval($_SESSION['_config']['dstatus']); ?>
+ + - + + + + + - - - - - - - + + + + + + + + + + + + + + 0 "; - } - $query .= "ORDER BY `orgdomaincerts`.`modified` desc"; + `orgdomaincerts`.`description`, `orginfo`.`O` + from `orgdomaincerts`,`org`, `orginfo` + where `org`.`memid`='".intval($_SESSION['profile']['id'])."' + and `orgdomaincerts`.`orgid`=`org`.`orgid` and `orginfo`.`id` = `org`.`orgid`"; + + if($dorgfilterid>0) + { + $query .= "AND `org`.`orgid`=$dorgfilterid "; + } + + if(1==$dstatus) + { + $query .= "AND `revoked`=0 AND `renewed`=0 "; + $query .= "HAVING `timeleft` > 0 "; + } + switch ($dsorting){ + case 0: + $query .= "ORDER BY `orgdomaincerts`.`expire` desc"; + break; + case 1: + $query .= "ORDER BY `orgdomaincerts`.`CN`, `orgdomaincerts`.`expire` desc"; + break; + } + + //echo $query."
\n"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) @@ -55,8 +129,28 @@ $orgname) { + $orgname=$row['O'];?> + + + + + + + + + + + + + + + + 0) $verified = _("Valid"); if($row['timeleft'] < 0) @@ -95,9 +189,12 @@ " /> + + +
-
+ +
+ +
+ +
" />     + " />
" />
-

+ -- cgit v1.2.1 From f8eece94c2047e0eb2a68b05d3d5a2b047a7e430 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 13 Jul 2013 19:57:24 +0200 Subject: bug 1010: used trinary operator for variable declaration, changed white space /tabs, typo and added orginfo.O to order in SQL statement --- pages/account/18.php | 155 +++++++++++++++++++++++++-------------------------- pages/account/22.php | 138 ++++++++++++++++++++++----------------------- 2 files changed, 144 insertions(+), 149 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 05f30de..b4cee40 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -16,12 +16,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -$orgfilterid=0; -if(array_key_exists('orgfilterid',$_SESSION['_config'])) $orgfilterid=intval($_SESSION['_config']['orgfilterid']); -$sorting=0; -if(array_key_exists('sorting',$_SESSION['_config'])) $sorting=intval($_SESSION['_config']['sorting']); -$status=0; -if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_config']['status']); +$orgfilterd = array_key_exists('orgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['orgfilterid']) : 0; +$sorting = array_key_exists('sorting',$_SESSION['_config']) ? intval($_SESSION['_config']['sorting']) : 0; +$status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_config']['status']) : 0; ?>
@@ -36,22 +33,22 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c @@ -60,13 +57,13 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c @@ -76,10 +73,10 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c @@ -92,51 +89,51 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c 0) - { - $query .= "AND `org`.`orgid`=$orgfilterid "; - } + $query = "select UNIX_TIMESTAMP(`oemail`.`created`) as `created`, + UNIX_TIMESTAMP(`oemail`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, + UNIX_TIMESTAMP(`oemail`.`expire`) as `expired`, + `oemail`.`expire` as `expires`, `oemail`.`revoked` as `revoke`, + UNIX_TIMESTAMP(`oemail`.`revoked`) as `revoked`, + `oemail`.`CN`, `oemail`.`serial`, `oemail`.`id`, + `oemail`.`description`, `oemail`.`ou`, `orginfo`.`O` + from `orgemailcerts` as `oemail`, `org`, `orginfo` + where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and + `org`.`orgid`=`oemail`.`orgid` and `orginfo`.`id` = `org`.`orgid`"; + if($orgfilterid>0) + { + $query .= "AND `org`.`orgid`=$orgfilterid "; + } - if(1==$status) - { - $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 "; - $query .= "HAVING `timeleft` > 0 AND `revoked`=0 "; - } - switch ($sorting){ - case 0: - $query .= "ORDER BY `oemail`.`expire` desc"; - break; - case 1: - $query .= "ORDER BY `oemail`.`ou`, `oemail`.`expire` desc"; - break; - case 2: - $query .= "ORDER BY `oemail`.`CN`, `oemail`.`expire` desc"; - break; - } - $res = mysql_query($query); - if(mysql_num_rows($res) <= 0) - { + if(1==$status) + { + $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 "; + $query .= "HAVING `timeleft` > 0 AND `revoked`=0 "; + } + switch ($sorting){ + case 0: + $query .= "ORDER BY `orginfo`.`O`, `oemail`.`expire` desc"; + break; + case 1: + $query .= "ORDER BY `orginfo`.`O`, `oemail`.`ou`, `oemail`.`expire` desc"; + break; + case 2: + $query .= "ORDER BY `orginfo`.`O`, `oemail`.`CN`, `oemail`.`expire` desc"; + break; + } + $res = mysql_query($query); + if(mysql_num_rows($res) <= 0) + { ?> $orgname) { - $orgname=$row['O'];?> + $orgname=''; + while($row = mysql_fetch_assoc($res)) + { + if ($row['O']<>$orgname) { + $orgname=$row['O'];?> @@ -153,18 +150,18 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c - 0) - $verified = _("Valid"); - if($row['timeleft'] < 0) - $verified = _("Expired"); - if($row['expired'] == 0) - $verified = _("Pending"); - if($row['revoked'] > 0) - $verified = _("Revoked"); - if($row['revoked'] == 0) - $row['revoke'] = _("Not Revoked"); + 0) + $verified = _("Valid"); + if($row['timeleft'] < 0) + $verified = _("Expired"); + if($row['expired'] == 0) + $verified = _("Pending"); + if($row['revoked'] > 0) + $verified = _("Revoked"); + if($row['revoked'] == 0) + $row['revoke'] = _("Not Revoked"); ?> @@ -181,7 +178,7 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c - + @@ -195,7 +192,7 @@ if(array_key_exists('status',$_SESSION['_config'])) $status=intval($_SESSION['_c + "> diff --git a/pages/account/22.php b/pages/account/22.php index 72e3dff..7ad56bb 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -16,12 +16,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -$orgfilterid=0; -if(array_key_exists('dorgfilterid',$_SESSION['_config'])) $orgfilterid=intval($_SESSION['_config']['dorgfilterid']); -$sorting=0; -if(array_key_exists('dsorting',$_SESSION['_config'])) $sorting=intval($_SESSION['_config']['dsorting']); -$status=0; -if(array_key_exists('dstatus',$_SESSION['_config'])) $status=intval($_SESSION['_config']['dstatus']); ?> +$orgfilterd = array_key_exists('dorgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['dorgfilterid']) : 0; +$sorting = array_key_exists('dsorting',$_SESSION['_config']) ? intval($_SESSION['_config']['dsorting']) : 0; +$status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_config']['dstatus']) : 0; +?>
">     - "> ">
@@ -34,21 +32,21 @@ if(array_key_exists('dstatus',$_SESSION['_config'])) $status=intval($_SESSION['_ @@ -58,10 +56,10 @@ if(mysql_num_rows($reso) >= 1){ @@ -71,10 +69,10 @@ if(mysql_num_rows($reso) >= 1){ @@ -88,52 +86,52 @@ if(mysql_num_rows($reso) >= 1){ 0) - { - $query .= "AND `org`.`orgid`=$dorgfilterid "; - } + if($dorgfilterid>0) + { + $query .= "AND `org`.`orgid`=$dorgfilterid "; + } - if(1==$dstatus) - { - $query .= "AND `revoked`=0 AND `renewed`=0 "; - $query .= "HAVING `timeleft` > 0 "; - } - switch ($dsorting){ - case 0: - $query .= "ORDER BY `orgdomaincerts`.`expire` desc"; - break; - case 1: - $query .= "ORDER BY `orgdomaincerts`.`CN`, `orgdomaincerts`.`expire` desc"; - break; - } + if(1==$dstatus) + { + $query .= "AND `revoked`=0 AND `renewed`=0 "; + $query .= "HAVING `timeleft` > 0 "; + } + switch ($dsorting){ + case 0: + $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`expire` desc"; + break; + case 1: + $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`CN`, `orgdomaincerts`.`expire` desc"; + break; + } //echo $query."
\n"; - $res = mysql_query($query); - if(mysql_num_rows($res) <= 0) - { + $res = mysql_query($query); + if(mysql_num_rows($res) <= 0) + { ?> $orgname) { - $orgname=$row['O'];?> + $orgname=''; + while($row = mysql_fetch_assoc($res)) + { + if ($row['O']<>$orgname) { + $orgname=$row['O'];?> @@ -149,16 +147,16 @@ if(mysql_num_rows($reso) >= 1){ - 0) - $verified = _("Valid"); - if($row['timeleft'] < 0) - $verified = _("Expired"); - if($row['expired'] == 0) - $verified = _("Pending"); - if($row['revoked'] > 0) - $verified = _("Revoked"); + 0) + $verified = _("Valid"); + if($row['timeleft'] < 0) + $verified = _("Expired"); + if($row['expired'] == 0) + $verified = _("Pending"); + if($row['revoked'] > 0) + $verified = _("Revoked"); if($row['revoked'] == 0) $row['revoke'] = _("Not Revoked"); ?> @@ -186,7 +184,7 @@ if(mysql_num_rows($reso) >= 1){ + " /> -- cgit v1.2.1 From 080d7a1fd282b6d5fbcb37980ca6ada112bf67d7 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 14 Jul 2013 08:32:34 +0200 Subject: bug 1010: changed if then else to ternery operator --- pages/account/18.php | 48 ++++++++++++++++-------------------------------- pages/account/22.php | 42 ++++++++++++++---------------------------- 2 files changed, 30 insertions(+), 60 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index b4cee40..df33db6 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -32,23 +32,17 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c @@ -56,15 +50,9 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c @@ -72,12 +60,8 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c diff --git a/pages/account/22.php b/pages/account/22.php index 7ad56bb..a572773 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -31,23 +31,17 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ @@ -55,12 +49,8 @@ if(mysql_num_rows($reso) >= 1){ @@ -68,12 +58,8 @@ if(mysql_num_rows($reso) >= 1){ -- cgit v1.2.1 From 956ade74a777b49a5acf68aee9b893224f7ccbaf Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 14 Jul 2013 09:20:13 +0200 Subject: bug 1010: changed sprintf to printf in db block --- pages/account/18.php | 2 +- pages/account/22.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index df33db6..0854bb8 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -40,7 +40,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c $reso = mysql_query($query); if(mysql_num_rows($reso) >= 1){ while($row = mysql_fetch_assoc($res)){ - sprintf("",$row['id'], $row['id'] == $orgfilterid? " selected" : "" , $row['O']); + printf("",$row['id'], $row['id'] == $orgfilterid? " selected" : "" , $row['O']); } }?> diff --git a/pages/account/22.php b/pages/account/22.php index a572773..2746055 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -39,7 +39,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ $reso = mysql_query($query); if(mysql_num_rows($reso) >= 1){ while($row = mysql_fetch_assoc($res)){ - sprintf("",$row['id'], $row['id'] == $orgfilterid? " selected" : "" , $row['O']); + printf("",$row['id'], $row['id'] == $orgfilterid? " selected" : "" , $row['O']); } }?> -- cgit v1.2.1 From 4c592d37ecda8e3f840b9c383af3a84113ed2bf7 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 14 Jul 2013 10:30:59 +0200 Subject: bug 1010: fixed sql-statement for org query and the filter for status --- pages/account/18.php | 4 ++-- pages/account/22.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 0854bb8..7d352ba 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -35,7 +35,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c %s",0, 0 == $orgfilterid? " selected" : "" ,_("All")) ?> = 1){ @@ -88,7 +88,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c $query .= "AND `org`.`orgid`=$orgfilterid "; } - if(1==$status) + if(0==$status) { $query .= "AND `oemail`.`revoked`=0 AND `oemail`.`renewed`=0 "; $query .= "HAVING `timeleft` > 0 AND `revoked`=0 "; diff --git a/pages/account/22.php b/pages/account/22.php index 2746055..30aa542 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -34,7 +34,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ %s",0, 0 == $orgfilterid? " selected" : "" ,_("All")) ?> = 1){ @@ -89,7 +89,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ $query .= "AND `org`.`orgid`=$dorgfilterid "; } - if(1==$dstatus) + if(0==$dstatus) { $query .= "AND `revoked`=0 AND `renewed`=0 "; $query .= "HAVING `timeleft` > 0 "; -- cgit v1.2.1 From 7517a7273f5c8bd4f95bf6862d3093da86db105d Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 14 Jul 2013 21:12:22 +0200 Subject: bug 1010: Changed Order by in SQL-statement --- pages/account/18.php | 2 +- pages/account/22.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 7d352ba..e1b92a5 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -36,7 +36,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c = 1){ while($row = mysql_fetch_assoc($res)){ diff --git a/pages/account/22.php b/pages/account/22.php index 30aa542..2c159f6 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -35,7 +35,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ = 1){ while($row = mysql_fetch_assoc($res)){ -- cgit v1.2.1 From 59117bddf6b856ff0107516c5755e1edbd003cbe Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 14 Jul 2013 21:18:12 +0200 Subject: bug 1010: deleted d in variable name --- pages/account/22.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pages/account') diff --git a/pages/account/22.php b/pages/account/22.php index 2c159f6..581e19a 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -84,17 +84,17 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ where `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `orgdomaincerts`.`orgid`=`org`.`orgid` and `orginfo`.`id` = `org`.`orgid`"; - if($dorgfilterid>0) + if($orgfilterid>0) { $query .= "AND `org`.`orgid`=$dorgfilterid "; } - if(0==$dstatus) + if(0==$status) { $query .= "AND `revoked`=0 AND `renewed`=0 "; $query .= "HAVING `timeleft` > 0 "; } - switch ($dsorting){ + switch ($sorting){ case 0: $query .= "ORDER BY `orginfo`.`O`, `orgdomaincerts`.`expire` desc"; break; -- cgit v1.2.1 From 470a24fe0553128b6d558f60d1de2b11dab9182b Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 14 Jul 2013 23:12:40 +0200 Subject: bug 1010: Fixed variable names --- pages/account/18.php | 2 +- pages/account/22.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index e1b92a5..8196506 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -39,7 +39,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c ORDER BY `orginfo`.`O` "; $reso = mysql_query($query); if(mysql_num_rows($reso) >= 1){ - while($row = mysql_fetch_assoc($res)){ + while($row = mysql_fetch_assoc($reso)){ printf("",$row['id'], $row['id'] == $orgfilterid? " selected" : "" , $row['O']); } }?> diff --git a/pages/account/22.php b/pages/account/22.php index 581e19a..50f2b81 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -38,7 +38,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ ORDER BY `orginfo`.`O` "; $reso = mysql_query($query); if(mysql_num_rows($reso) >= 1){ - while($row = mysql_fetch_assoc($res)){ + while($row = mysql_fetch_assoc($reso)){ printf("",$row['id'], $row['id'] == $orgfilterid? " selected" : "" , $row['O']); } }?> @@ -86,7 +86,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ if($orgfilterid>0) { - $query .= "AND `org`.`orgid`=$dorgfilterid "; + $query .= "AND `org`.`orgid`=$orgfilterid "; } if(0==$status) -- cgit v1.2.1 From c1ffb425abb17cd7c639c7a31a53d79e2b7484bb Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Tue, 16 Jul 2013 22:34:34 +0200 Subject: bug 1010: fixed variable typo --- pages/account/18.php | 2 +- pages/account/22.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 8196506..d3831b9 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -$orgfilterd = array_key_exists('orgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['orgfilterid']) : 0; +$orgfilterid = array_key_exists('orgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['orgfilterid']) : 0; $sorting = array_key_exists('sorting',$_SESSION['_config']) ? intval($_SESSION['_config']['sorting']) : 0; $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_config']['status']) : 0; ?> diff --git a/pages/account/22.php b/pages/account/22.php index 50f2b81..1edb6e7 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -$orgfilterd = array_key_exists('dorgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['dorgfilterid']) : 0; +$orgfilterid = array_key_exists('dorgfilterid',$_SESSION['_config']) ? intval($_SESSION['_config']['dorgfilterid']) : 0; $sorting = array_key_exists('dsorting',$_SESSION['_config']) ? intval($_SESSION['_config']['dsorting']) : 0; $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_config']['dstatus']) : 0; ?> -- cgit v1.2.1 From 6fea4507451cbf0253cd611fa20bc4902d46eeb2 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sat, 20 Jul 2013 09:20:03 +0200 Subject: bug 1010: added and removed some blanks --- pages/account/18.php | 14 +++++++------- pages/account/22.php | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index d3831b9..d61fa0b 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -32,7 +32,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c @@ -60,8 +60,8 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c diff --git a/pages/account/22.php b/pages/account/22.php index 1edb6e7..47f7dee 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -31,7 +31,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ @@ -58,8 +58,8 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ -- cgit v1.2.1 From fed7fea0cb2eb44ccdced91e251a4f10431f5401 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 21 Jul 2013 15:03:27 +0200 Subject: bug 1010: typo fixing --- pages/account/18.php | 14 +++++++------- pages/account/22.php | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index d61fa0b..8f9055c 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -32,7 +32,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c @@ -60,8 +60,8 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c diff --git a/pages/account/22.php b/pages/account/22.php index 47f7dee..464f0ac 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -31,7 +31,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ @@ -58,8 +58,8 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ -- cgit v1.2.1 From 8fea7a3007d7062148ce8af0e0793ce8e2db778e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 30 Oct 2013 02:59:48 +0100 Subject: bug 1010: Minor clean-ups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix HTML - Correct spelling - Improve translatability of variable string Signed-off-by: Michael Tänzer --- pages/account/18.php | 7 ++++--- pages/account/22.php | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'pages/account') diff --git a/pages/account/18.php b/pages/account/18.php index 8f9055c..9ab13b2 100644 --- a/pages/account/18.php +++ b/pages/account/18.php @@ -60,15 +60,16 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c - + @@ -122,7 +123,7 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c - + diff --git a/pages/account/22.php b/pages/account/22.php index 464f0ac..0413da0 100644 --- a/pages/account/22.php +++ b/pages/account/22.php @@ -22,6 +22,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ ?>
" />     - " /> " />
@@ -50,9 +50,9 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
@@ -49,8 +49,8 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
@@ -50,9 +50,9 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
@@ -49,8 +49,8 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_
" />     + " />     " />
+ @@ -58,15 +59,16 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ - + @@ -122,7 +124,7 @@ $status = array_key_exists('dstatus',$_SESSION['_config']) ? intval($_SESSION['_ - + -- cgit v1.2.1
" />     + " />     " />