Changeset 11143 for extensions/Copyrights

Timestamp:

May 31, 2011, 4:08:12 PM (13 years ago)

Author:

Mattias

Message:

Several bugfixes in admin.php, admin.tpl and main.inc.php, concerning the "Invalid URL - plugin copyrights not active"

Also it shows "N/A" at the picture information when there is no copyright for that picture.

Location:

extensions/Copyrights

Files:

• TODO (modified) (1 diff)
• admin.php (modified) (1 diff)
• admin.tpl (modified) (1 diff)
• image.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)

extensions/Copyrights/TODO

@@ -1 +1 @@
 - Implement single mode Batch Manager
-  Probably use prefilters combined with loc_begin_element_set_unit
+                Probably use prefilters combined with loc_begin_element_set_unit
 - Add Icon field to copyrights
 - Show the copyright when image is displayed
+                It doesnt show the picture, but it does show the name of the copyright
+- Bugs:
+        - If you create a new copyright with a name that's already used
+        - Description doesnt show with the copyright info (on the admin page)

extensions/Copyrights/admin.php

@@ -50 +50 @@
     $query = sprintf(
       'INSERT INTO %s
-      (`name`,`url`,`des`,`visible`) VALUES
+      (`name`,`url`,`descr`,`visible`) VALUES
       ("%s","%s","%s",%d)
       ;',

extensions/Copyrights/admin.tpl

@@ -20 +20 @@
         <tr>
           <td>{'Description'|@translate}</td>
-          <td><textarea name='desc' id='desc'>{$CRdesc}</textarea></td>
+          <td><textarea name='descr' id='descr'>{$CRdescr}</textarea></td>
         </tr>
         <tr>

extensions/Copyrights/image.php

@@ -31 +31 @@
                 <td class="label">Copyright</td>
                 <td class="value">
+                        {if $CR_INFO_NAME}
                         <a target="_blanc" href="{$CR_INFO_URL}" title="{$CR_INFO_NAME}">{$CR_INFO_NAME}</a>
+                        {else}N/A{/if}
                 </td>
         </tr>
@@ -56 +58 @@
                 $query = '
                   select name, url
-                  FROM '.$prefixeTable.'copyrights_admin NATURAL JOIN '.$prefixeTable.'copyrights_media
+                  FROM '.COPYRIGHTS_ADMIN.' NATURAL JOIN '.COPYRIGHTS_MEDIA.'
                   WHERE media_id = '.$page['image_id'].'
+                  AND visible = 1
                   ;';
                 $result = pwg_query($query);
                 $row = mysql_fetch_array($result);
-                $name = $row['name'];
-                $url = $row['url'];
+                //if(count($row) > 0)
+                //{
+                        $name = $row['name'];
+                        $url = $row['url'];
+                //}
                         
                 // Sending data to the template

extensions/Copyrights/main.inc.php

@@ -33 +33 @@
 
 define('COPYRIGHTS_PATH', PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)) . '/'); // The plugin path
-define('COPYRIGHTS_WEB_PATH', get_root_url().'admin.php?page=plugin-copyrights');
+define('COPYRIGHTS_WEB_PATH', get_root_url().'admin.php?page=plugin-Copyrights');
 // Whats the difference between "COPYRIGHTS_PATH" and "COPYRIGHTS_WEB_PATH" ???