Author: rhari
Date: Mon Jun 4 15:20:46 2007
New Revision: 502
URL: http://svn.gna.org/viewcvs/phplinker?rev=502&view=rev
Log:
#223
Ajout du champs login dans url_search et moderator
#229
Bug fix
#231
Rendre unique le login dans webmaster
Modified:
trunk/www/admin/url_search.php
Modified: trunk/www/admin/url_search.php
URL:
http://svn.gna.org/viewcvs/phplinker/trunk/www/admin/url_search.php?rev=502&r1=501&r2=502&view=diff
==============================================================================
--- trunk/www/admin/url_search.php (original)
+++ trunk/www/admin/url_search.php Mon Jun 4 15:20:46 2007
@@ -65,6 +65,7 @@
$test = $_SERVER["QUERY_STRING"];
$img_url = "";
+$img_login = "";
$img_date = "";
$img_hit = "";
$img_desc = "";
@@ -115,6 +116,14 @@
$order_by=" ORDER BY url ASC";
$img_url ="<img src='../imgs/up.png' border='0' alt='up'>";
break;
+ case"login1":
+ $order_by=" ORDER BY login DESC";
+ $img_login ="<img src='../imgs/down.png' border='0' alt='down'>";
+ break;
+ case"login2":
+ $order_by=" ORDER BY login ASC";
+ $img_login ="<img src='../imgs/up.png' border='0' alt='up'>";
+ break;
case"date1":
$order_by=" ORDER BY last_update DESC";
$img_date ="<img src='../imgs/down.png' border='0' alt='down'>";
@@ -146,11 +155,11 @@
if($_GET['categorized']=="none"){
$categorized_request = " AND 2=2";
}elseif($_GET['categorized']==0){
- $categorized_request =" AND id NOT IN ( SELECT id_url FROM url2category )";
+ $categorized_request =" AND url.id NOT IN ( SELECT id_url FROM
url2category )";
}else{
$categorized_request="";
if($_GET['cat'] == "all"){
- $categorized_request =" AND id IN ( SELECT id_url FROM url2category )";
+ $categorized_request =" AND url.id IN ( SELECT id_url FROM url2category
)";
}else{
$cat = $_GET['cat'];
$all = "(";
@@ -180,7 +189,7 @@
$categorized_request = $all;
}else{
$all = str_replace("(,","(",$all);
- $all = " AND id IN".$all;
+ $all = " AND url.id IN".$all;
$categorized_request = $all;
}
}
@@ -190,25 +199,29 @@
$result_for_all ="Pas de resultat pour cette requette";
}elseif(!empty($simple_request) || ($_GET['state']=="" &&
$_GET['categorized']=="none")){
//echo "SELECT id FROM url WHERE 1=1 " .$simple_request;
- $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id FROM
url WHERE 1=1 " .$simple_request);
+ $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT url.id
as id FROM url WHERE 1=1 " .$simple_request);
$nbr = mysql_num_rows($qryCount);
if(mysql_num_rows($qryCount)!=0){
while($id_loop = mysql_fetch_array($qryCount)){
$qryChange = mysql_query("SELECT id_url, id_category FROM url2category
WHERE `id_url`= ".$id_loop['id']) or die(mysql_query());
$arrayChange = mysql_fetch_array($qryChange);
- $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT
count(*) as nb FROM url WHERE 1=1" .$simple_request);
- if ($titi = mysql_fetch_array($qryCount))
- $res = $titi['nb'];
+ $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT
count(*) as nb FROM url,webmaster WHERE 1=1 AND url.id_webmaster=webmaster.id
" .$simple_request);
+ if ($t_count = mysql_fetch_array($qryCount))
+ $res = $t_count['nb'];
$page_next = (isset($_GET['page_next'])) ? $_GET['page_next'] : 1;
// la valeur 'page' ici doit être eq à la valeur de
params['urlVar']
$pPage = (isset($_GET['setPerPage'])) ? $_GET['setPerPage'] : 5;
// la valeur 10 ici doit être eq à la valeur de params['perPage']
$debut = $page_next * $pPage - $pPage;
- $qry =sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id , url,
hit , description , state , date_format(last_update,'%d-%m-%Y') as date_new
FROM url WHERE 1=1 " .$simple_request." ".$order_by." LIMIT
".$debut.",".$pPage);
- $toto = 0;
+ $qry = "SELECT url.id as id , url, hit , description , state ,
date_format(last_update,'%d-%m-%Y') as date_new, id_webmaster, login FROM
url,webmaster WHERE 1=1 AND (url.id_webmaster = webmaster.id) "
.$simple_request." ".$order_by." LIMIT ".$debut.",".$pPage;
+// echo $qry;
+ $qry =sql_query('die',__FILE__,__LINE__,__FUNCTION__,$qry);
+ $t_nb = 0;
$Counter = 0;
$rang=1;
- while ($res != $toto) {
- if ($toto >= $debut && $toto < ($debut+$pPage) && $Counter < $pPage) {
+ while ($res != $t_nb) {
+ if ($t_nb >= $debut && $t_nb < ($debut+$pPage) && $Counter < $pPage) {
+ $id_webmaster = mysql_result ($qry, $Counter, "id_webmaster");
+ $login = mysql_result ($qry, $Counter, "login");
$id = mysql_result ($qry, $Counter, "id");
$url = mysql_result ($qry, $Counter, "url");
$hit = mysql_result ($qry, $Counter, "hit");
@@ -252,6 +265,7 @@
$tr
<td colspan=\"2\"><span>$rang</span></td>
<td colspan=\"2\"><span><a href=\"$url\"
target=\"blank\">$url</a></span></td>
+ <td colspan=\"2\"><span>$login</span></td>
<td colspan=\"2\"><span>$court</span></td>
<td colspan=\"2\"><span>$category_name</td>
<td colspan=\"2\"><span>$visible</span></td>
@@ -264,7 +278,7 @@
} else {
$myData[] = "";
}
- $toto++;
+ $t_nb++;
$rang++;
}
}
@@ -306,6 +320,7 @@
);
$link_urls = linker_urls_link('url1','url2');
+$link_logins = linker_urls_link('login1','login2');
$link_desc = linker_urls_link('desc1','desc2');
$link_visible = linker_urls_link('visible1','visible2');
$link_state = linker_urls_link('state1','state2');
@@ -318,6 +333,7 @@
$link = $links['all'];
linker_tpl("nbr" , $nbr);
linker_tpl("link_urls" , $link_urls);
+ linker_tpl("link_logins" , $link_logins);
linker_tpl("link_desc" , $link_desc);
linker_tpl("link_visible" , $link_visible);
linker_tpl("link_state" , $link_state);
@@ -336,6 +352,7 @@
linker_tpl("categorized" , $_GET['categorized']);
linker_tpl("cat" , $cat);
linker_tpl("img_url" , $img_url);
+ linker_tpl("img_login" , $img_login);
linker_tpl("img_date" , $img_date);
linker_tpl("img_hit" , $img_hit);
linker_tpl("img_desc" , $img_desc);
_______________________________________________
PHPLinker-commits mailing list
[email protected]
https://mail.gna.org/listinfo/phplinker-commits
