Changeset 5959 for extensions/AMetaData/amd_aip.class.inc.php

Timestamp:

Apr 25, 2010, 1:22:40 AM (14 years ago)

Author:

grum

Message:

Some changes on release 0.4b

File:

• extensions/AMetaData/amd_aip.class.inc.php (modified) (20 diffs)

extensions/AMetaData/amd_aip.class.inc.php

@@ -115 +115 @@
   {
     add_event_handler('loc_end_page_header', array(&$this->css, 'applyCSS'));
+    GPCCss::applyGpcCss();
   }
 
@@ -603 +604 @@
     if($result)
     {
-      while($row=mysql_fetch_assoc($result))
+      while($row=pwg_db_fetch_assoc($result))
       {
         if($row['groupId']==-1)
@@ -633 +634 @@
     if($result)
     {
-      while($row=mysql_fetch_assoc($result))
+      while($row=pwg_db_fetch_assoc($result))
       {
         $datas['groups'][]=Array(
@@ -732 +733 @@
 
     $data=Array(
-      'sheetContent' => $this->BBtoHTML($lang['g003_help_'.$tab]),
+      'sheetContent' => GPCCore::BBtoHTML($lang['g003_help_'.$tab]),
       'title' => l10n('g003_help_tab_'.$tab),
     );
@@ -740 +741 @@
     $template->assign_var_from_handle('AMD_BODY_PAGE', 'body_page');
   }
-
-
-
-  /**
-   * convert (light) BB tag to HTML tag
-   *
-   * all BB codes are not recognized, only :
-   *  - [ul] [/ul]
-   *  - [li] [/li]
-   *  - [b] [/b]
-   *  - [i] [/i]
-   *  - [url] [/url]
-   *  - carriage return is replaced by a <br>
-   *
-   * @param String $text : text to convert
-   * @return String : BB to HTML text
-   */
-  protected function BBtoHTML($text)
-  {
-    $patterns = Array(
-      '/\[li\](.*?)\[\/li\]\n*/im',
-      '/\[b\](.*?)\[\/b\]/ism',
-      '/\[i\](.*?)\[\/i\]/ism',
-      '/\[url\]([\w]+?:\/\/[^ \"\n\r\t<]*?)\[\/url\]/ism',
-      '/\[url=([\w]+?:\/\/[^ \"\n\r\t<]*?)\](.*?)\[\/url\]/ism',
-      '/\n{0,1}\[ul\]\n{0,1}/im',
-      '/\n{0,1}\[\/ul\]\n{0,1}/im',
-      '/\n/im',
-    );
-    $replacements = Array(
-      '<li>\1</li>',
-      '<b>\1</b>',
-      '<i>\1</i>',
-      '<a href="\1">\1</a>',
-      '<a href="\1">\2</a>',
-      '<ul>',
-      '</ul>',
-      '<br>',
-    );
-
-    return(preg_replace($patterns, $replacements, $text));
-  }
-
-
 
 
@@ -827 +784 @@
 
       $sql.=" LEFT JOIN ".CADDIE_TABLE." ct ON ait.imageId = ct.element_id
-            WHERE ct.user_id = ".$user['id'].";";
+            WHERE ct.user_id = ".$user['id']." ";
+
+      if($mode=="caddieAdd") $sql.=" AND ait.analyzed='n'";
     }
 
@@ -841 +800 @@
     {
       $i=0;
-      while($row=mysql_fetch_row($result))
+      while($row=pwg_db_fetch_row($result))
       {
         $returned.=$row[0];
@@ -876 +835 @@
     $returned="";
 
-    if(count($list)>0)
+    if(count($list)>0 and trim($imagesList)!='')
     {
       // $path = path of piwigo's on the server filesystem
@@ -885 +844 @@
       if($result)
       {
-        while($row=mysql_fetch_assoc($result))
+        while($row=pwg_db_fetch_assoc($result))
         {
           /*
@@ -938 +897 @@
     if($result)
     {
-      while($row=mysql_fetch_row($result))
+      while($row=pwg_db_fetch_row($result))
       {
         $numOfPictures=$row[0];
@@ -951 +910 @@
     if($result)
     {
-      while($row=mysql_fetch_row($result))
+      while($row=pwg_db_fetch_row($result))
       {
         $numOfPicturesNotAnalyzed=$row[0];
@@ -962 +921 @@
     if($result)
     {
-      while($row=mysql_fetch_row($result))
+      while($row=pwg_db_fetch_row($result))
       {
         $numOfPicturesWithoutTags=$row[0];
@@ -1051 +1010 @@
     if($result)
     {
-      while($row=mysql_fetch_assoc($result))
+      while($row=pwg_db_fetch_assoc($result))
       {
         $datas[]=array(
@@ -1110 +1069 @@
     if($result)
     {
-      while($row=mysql_fetch_assoc($result))
+      while($row=pwg_db_fetch_assoc($result))
       {
         $datas[]=array(
@@ -1148 +1107 @@
       if($result)
       {
-        if(mysql_num_rows($result)==0)
+        if(pwg_db_num_rows($result)==0)
         {
           $sql="INSERT INTO ".$this->tables['selected_tags']."
@@ -1197 +1156 @@
       {
         $datas=Array();
-        while($row=mysql_fetch_assoc($result))
+        while($row=pwg_db_fetch_assoc($result))
         {
           if($row['groupId']==$id)
@@ -1298 +1257 @@
       {
         $datas=Array();
-        while($row=mysql_fetch_assoc($result))
+        while($row=pwg_db_fetch_assoc($result))
         {
           $datas[]=Array(
@@ -1410 +1369 @@
       $sql="INSERT INTO ".$this->tables['groups']." VALUES('', 9999)";
       $result=pwg_query($sql);
-      $groupId=mysql_insert_id();
+      $groupId=pwg_db_insert_id();
     }
 
@@ -1470 +1429 @@
       if($result)
       {
-        while($row=mysql_fetch_assoc($result))
+        while($row=pwg_db_fetch_assoc($result))
         {
           if(array_key_exists($row['lang'], $datasLang['language_list']))
@@ -1519 +1478 @@
     if($result)
     {
-      while($row=mysql_fetch_assoc($result))
+      while($row=pwg_db_fetch_assoc($result))
       {
         $datas['groups'][]=Array(