[Phplinker-commits] r501 - in /trunk: doc/ smarty/default/templates/admin/ www/admin/ www/admin/api/

Mon, 04 Jun 2007 06:19:57 -0700 

Author: rhari
Date: Mon Jun  4 15:19:21 2007
New Revision: 501

URL: http://svn.gna.org/viewcvs/phplinker?rev=501&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/doc/phplinker.sql
    trunk/smarty/default/templates/admin/moderator.tpl
    trunk/smarty/default/templates/admin/url_search.tpl
    trunk/www/admin/api/update_url_info.php
    trunk/www/admin/moderator.php
    trunk/www/admin/url_add.php

Modified: trunk/doc/phplinker.sql
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/doc/phplinker.sql?rev=501&r1=500&r2=501&view=diff
==============================================================================
--- trunk/doc/phplinker.sql (original)
+++ trunk/doc/phplinker.sql Mon Jun  4 15:19:21 2007
@@ -132,7 +132,7 @@
   `login` varchar(32) collate utf8_bin NOT NULL,
   `email` varchar(128) collate utf8_bin NOT NULL,
   PRIMARY KEY  (`id`),
-  KEY `login` (`login`),
+  UNIQUE KEY `login` (`login`),
   KEY `email` (`email`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 

Modified: trunk/smarty/default/templates/admin/moderator.tpl
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/smarty/default/templates/admin/moderator.tpl?rev=501&r1=500&r2=501&view=diff
==============================================================================
--- trunk/smarty/default/templates/admin/moderator.tpl (original)
+++ trunk/smarty/default/templates/admin/moderator.tpl Mon Jun  4 15:19:21 2007
@@ -30,7 +30,8 @@
   <tr align="left" class="row_header">
     <td colspan="2"><h4><b></b></h4></td>
     <td colspan="2" align="center"><h4><b>Url</b></h4></td>
-    <td colspan="2"  width="20%" 
align="center"><h4><b>Description</b></h4></td>
+    <td colspan="2" align="center"><h4><b>Login</b></h4></td>
+    <td colspan="2" width="20%" align="center"><h4><b>Description</b></h4></td>
     <td colspan="2" width="25%" align="center"><h4><b>Category</b></h4></td>
     <td colspan="2" align="center"><h4><b><a class="srh" 
href="{$link_url}">State&nbsp;{$img_state}</a></b></h4></td>
     <td colspan="2" ><h4><b><a class="srh"  
href="{$link_date}">Date&nbsp;{$img_date}</a></b></h4></td>
@@ -40,6 +41,7 @@
     {$myData[run_increment]}
    {/section}
 <tr align="left" >
+    <td colspan="2"></td>
     <td colspan="2"></td>
     <td colspan="2" align="center"></td>
     <input type="hidden" value="{$order}" name="order">

Modified: trunk/smarty/default/templates/admin/url_search.tpl
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/smarty/default/templates/admin/url_search.tpl?rev=501&r1=500&r2=501&view=diff
==============================================================================
--- trunk/smarty/default/templates/admin/url_search.tpl (original)
+++ trunk/smarty/default/templates/admin/url_search.tpl Mon Jun  4 15:19:21 2007
@@ -89,6 +89,7 @@
   <tr align="left" class="row_header">
     <td colspan="2"><h4><b>#</b></h4></td>
     <td colspan="2" align="center"><h4><b><a class="srh" 
href="{$link_urls}">Url&nbsp;{$img_url}</a></b></h4></td>
+    <td colspan="2" align="center"><h4><b><a class="srh" 
href="{$link_logins}">Login&nbsp;{$img_login}</a></b></h4></td>
     <td colspan="2"  width="20%" align="center"><h4><b><a class="srh" 
href="{$link_desc}">Description&nbsp;{$img_desc}</a></b></h4></td>
     <td colspan="2" width="25%" align="center"><h4><b>Category</b></h4></td>
     <td colspan="2"><h4><b><a class="srh" 
href="{$link_visible}">Visible&nbsp;{$img_visible}</a></b></h4></td>

Modified: trunk/www/admin/api/update_url_info.php
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/www/admin/api/update_url_info.php?rev=501&r1=500&r2=501&view=diff
==============================================================================
--- trunk/www/admin/api/update_url_info.php (original)
+++ trunk/www/admin/api/update_url_info.php Mon Jun  4 15:19:21 2007
@@ -81,9 +81,15 @@
  }
 
 if ($nb < 1){
-  $qry_ins_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"INSERT INTO webmaster (login, email) VALUES ('".$login."', '".$email."')");
-  $qry_get_id_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"SELECT id FROM webmaster ORDER BY id DESC LIMIT 1");
-  $webmaster_id = mysql_result($qry_get_id_webmaster,0,"id");
+  $qry_verif_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"SELECT id FROM webmaster WHERE LOWER(login) LIKE '".strtolower($login)."'");
+  if (mysql_num_rows ($qry_verif_webmaster) > 0){
+    $webmaster_id = mysql_result ($qry_verif_webmaster, 0, "id");
+  }
+  else {
+    $qry_ins_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"INSERT INTO webmaster (login, email) VALUES ('".$login."', '".$email."')");
+    $qry_get_id_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"SELECT id FROM webmaster ORDER BY id DESC LIMIT 1");
+    $webmaster_id = mysql_result($qry_get_id_webmaster,0,"id");
+  }
   $insert_db = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"INSERT INTO url 
(url, description, last_update, id_webmaster) VALUES ('".$url."', 
'".utf8_decode($description)."', '".date("Y-m-d h:i:s")."', 
'".$webmaster_id."')");
   if ($categorized == 1){
     $know_first = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id 
FROM  url ORDER BY id DESC LIMIT 1");

Modified: trunk/www/admin/moderator.php
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/www/admin/moderator.php?rev=501&r1=500&r2=501&view=diff
==============================================================================
--- trunk/www/admin/moderator.php (original)
+++ trunk/www/admin/moderator.php Mon Jun  4 15:19:21 2007
@@ -91,53 +91,58 @@
 if(isset($_GET['mod']) && $_GET['mod']!="" ){
 if(($action == "update") && isset($action) && isset($_GET['mod']) && 
$_GET['mod']!="Array" && $_GET["todo"]=="Accepter"){
 foreach($_GET['mod'] as $value){
-   $update = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"UPDATE url SET 
state = 'moderated' WHERE id=".$value);
+   $update = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"UPDATE url SET 
state = 'moderated' WHERE url.id=".$value);
  }
 $sms = "ok";
  }
 if(($action == "update") && isset($action) && isset($_GET['mod']) && 
$_GET['mod']!="Array" &&  $_GET["todo"]=="Refuser"){
 foreach($_GET['mod'] as $value){
-   $qry_get_idwebmaster = "SELECT id_webmaster FROM url WHERE id = ".$value;
+   $qry_get_idwebmaster = "SELECT id_webmaster FROM url WHERE url.id = 
".$value;
    $qry_get_idwebmaster = 
sql_query('die',__FILE__,__LINE__,__FUNCTION__,$qry_get_idwebmaster);
    $id_webmaster = mysql_result($qry_get_idwebmaster, 0, "id_webmaster");
-   $update = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"DELETE FROM url 
WHERE id=".$value);
+   $update = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"DELETE FROM url 
WHERE url.id=".$value);
    $update2 = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"DELETE FROM 
url2category WHERE id_url=".$value);
    $update3 = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"DELETE FROM 
webmaster WHERE id = ".$id_webmaster);
  }
 $sms = "ok";
  }
 }
-  $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id FROM 
url WHERE state != 'moderated'");
+  $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT url.id 
FROM url WHERE state != 'moderated'");
    $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 state != 'moderated'");
-       if ($titi = mysql_fetch_array($qryCount))
-        $res = $titi['nb'];
+       $qryCount = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT 
count(*) as nb FROM url,webmaster WHERE url.id_webmaster=webmaster.id AND state 
!= 'moderated'");
+       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 state != 'moderated' ". $order_by."  LIMIT ".$debut.",".$pPage);
-       $toto = 0;
+       $qry =sql_query('die',__FILE__,__LINE__,__FUNCTION__,"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 url.id_webmaster = 
webmaster.id AND state != 'moderated' ". $order_by."  LIMIT 
".$debut.",".$pPage);
+       $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 = mysql_result ($qry, $Counter, "id");
           $url = mysql_result ($qry, $Counter, "url");
+          $login = mysql_result ($qry, $Counter, "login");
           $hit = mysql_result ($qry, $Counter, "hit");
           $description1 = mysql_result ($qry, $Counter,"description");
           $state = mysql_result ($qry, $Counter,"state");
           $state = str_replace("_"," ",$state);
           $date = mysql_result ($qry, $Counter,"date_new");
-          $qryChange = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT 
id_url, id_category FROM url2category  WHERE `id_url`= ".$id) or 
die(mysql_query());
+          $qryChange = "SELECT id_url, id_category FROM url2category  WHERE 
`id_url`= ".$id;
+//        echo $qryChange."<br>";
+          $qryChange = 
sql_query('die',__FILE__,__LINE__,__FUNCTION__,$qryChange) or 
die(mysql_query());
           $arrayChange = mysql_fetch_array($qryChange);
           $test_for_this = mysql_num_rows($qryChange);
+//        echo $test_for_this."<br>";
           if(isset($arrayChange["id_category"])){
             if($test_for_this > 1){
+              $category_name = "";
               for($x=0;$x<$test_for_this;$x++){
                 $category_name = $category_name . 
linker_path($arrayChange["id_category"])." <br> ";
               }
@@ -167,6 +172,7 @@
        $tr
     <td colspan=\"2\"><span><input type='checkbox' name='mod[]' 
value='$id'></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>$state</span></td>
@@ -177,7 +183,7 @@
         } else {
           $myData[] = "";
         }
-        $toto++;
+        $t_nb++;
         $rang++;
        }
 

Modified: trunk/www/admin/url_add.php
URL: 
http://svn.gna.org/viewcvs/phplinker/trunk/www/admin/url_add.php?rev=501&r1=500&r2=501&view=diff
==============================================================================
--- trunk/www/admin/url_add.php (original)
+++ trunk/www/admin/url_add.php Mon Jun  4 15:19:21 2007
@@ -48,29 +48,35 @@
   $categ_id = $_GET["categ_id"];
  }
 if($action == "insert" && $action !=""){
-  if(($url=="") || ($description=="") ||(is_numeric($url) == true) 
||(is_numeric($description) == true) || ($email=="") || ($login=="")){
-    $sms = "des zones sont rest&eacute;e vides<br> Veuillez remplir 
correctement le formulaire";
-  }else{
-    $know_second = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id 
FROM  url WHERE url = '".$url."'");
-    if(mysql_num_rows($know_second)!=0){
-      $sms = "Ce liens existe d&eacute;j&agrave;";
+  $qry_verif_login = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"SELECT id FROM webmaster WHERE LOWER(login) LIKE '".strtolower($login)."'");
+  if (mysql_num_rows($qry_verif_login) > 0){
+    $webmaster_id = mysql_result($qry_verif_login, 0, "id");
+  }
+  else{
+    $qry_ins_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"INSERT INTO webmaster (login, email) VALUES ('".$login."', '".$email."')");
+    $qry_get_id_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"SELECT id FROM webmaster ORDER BY id DESC LIMIT 1");
+    $webmaster_id = mysql_result($qry_get_id_webmaster,0,"id");
+  }
+    if(($url=="") || ($description=="") ||(is_numeric($url) == true) 
||(is_numeric($description) == true) || ($email=="") || ($login=="")){
+      $sms = "des zones sont rest&eacute;e vides<br> Veuillez remplir 
correctement le formulaire";
     }else{
-      $qry_ins_webmaster = sql_query('die', __FILE__, __LINE__, __FUNCTION__, 
"INSERT INTO webmaster (login, email) VALUES ('".$login."', '".$email."')");
-      $qry_get_id_webmaster = sql_query('die', __FILE__, __LINE__, 
__FUNCTION__, "SELECT id FROM webmaster ORDER BY id DESC LIMIT 1");
-      $webmaster_id = mysql_result($qry_get_id_webmaster,0,"id");
-      $insert_db = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"INSERT INTO 
url (id, url, description, state,  hit, last_update, id_webmaster) VALUES ('', 
'".$url."', '".$description."', '".$state."', 0 , '".date("Y-m-d h:i:s")."', 
'".$webmaster_id."')");
-     if (isset($_GET['categ_checked'])){
-       $know_first = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id 
FROM  url ORDER BY id DESC LIMIT 1");
-       $id_url = mysql_result($know_first,0,"id");
-       foreach($_GET['categ_checked'] as $value){
-        $update_cat_url =  
sql_query('die',__FILE__,__LINE__,__FUNCTION__,"INSERT INTO url2category 
(id_url, id_category) VALUES (".$id_url.",".$value.")");
-       }
-       }
-     linker_log("[".$_SESSION['login'] ."]Insert URL url_".$id_url);
+      $know_second = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT id 
FROM  url WHERE url = '".$url."'");
+      if(mysql_num_rows($know_second)!=0){
+       $sms = "Ce liens existe d&eacute;j&agrave;";
+      }else{
+       $insert_db = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"INSERT 
INTO url (id, url, description, state,  hit, last_update, id_webmaster) VALUES 
('', '".$url."', '".$description."', '".$state."', 0 , '".date("Y-m-d 
h:i:s")."', '".$webmaster_id."')");
+       if (isset($_GET['categ_checked'])){
+         $know_first = sql_query('die',__FILE__,__LINE__,__FUNCTION__,"SELECT 
id FROM  url ORDER BY id DESC LIMIT 1");
+         $id_url = mysql_result($know_first,0,"id");
+         foreach($_GET['categ_checked'] as $value){
+           $update_cat_url =  
sql_query('die',__FILE__,__LINE__,__FUNCTION__,"INSERT INTO url2category 
(id_url, id_category) VALUES (".$id_url.",".$value.")");
+         }
+       }
+       linker_log("[".$_SESSION['login'] ."]Insert URL url_".$id_url);
 
-      echo "<script language ='javascript'>window.location='url_add'</script>";
+       echo "<script language 
='javascript'>window.location='url_add'</script>";
+      }
     }
-  }
  }
 ?>
 <?


_______________________________________________
PHPLinker-commits mailing list
[email protected]
https://mail.gna.org/listinfo/phplinker-commits

Reply via email to