[Linpha-cvs] SF.net SVN: linpha: [4678] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
Menu
▾
▴
[Linpha-cvs] SF.net SVN: linpha: [4678] trunk/linpha2
|
From: <bz...@us...> - 2007-02-14 14:43:38
|
Revision: 4678
http://svn.sourceforge.net/linpha/?rev=4678&view=rev
Author: bzrudi
Date: 2007-02-14 06:43:32 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
unique MetaData String
Modified Paths:
--------------
trunk/linpha2/admin/index.php
trunk/linpha2/admin/maintenance_db.php
trunk/linpha2/admin/metadata_select.php
trunk/linpha2/admin/permissions.php
trunk/linpha2/install/sql/sql.data.php
trunk/linpha2/lib/classes/linpha.imgview.class.php
trunk/linpha2/lib/classes/linpha.import.class.php
trunk/linpha2/lib/classes/linpha.metadata.class.php
Modified: trunk/linpha2/admin/index.php
===================================================================
--- trunk/linpha2/admin/index.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/admin/index.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -70,7 +70,7 @@
'settings' => Array('name' => 'Settings', 'link' => 'settings'),
'permissions' => Array('name' => 'Permissions', 'link' => 'permissions'),
'maintenance' => Array('name' => 'Maintenance', 'link' => 'maintenance'),
- 'metadata' => Array('name' => 'Meta Data', 'link' => 'metadata'),
+ 'metadata' => Array('name' => 'MetaData', 'link' => 'metadata'),
);
LinAdmin::printAdminMenu($array_menu,$cat1);
Modified: trunk/linpha2/admin/maintenance_db.php
===================================================================
--- trunk/linpha2/admin/maintenance_db.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/admin/maintenance_db.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -203,7 +203,7 @@
/**
* check comment/exif/iptc/xmp to photo association
*/
- echo '<br /><h2>'.i18n("Checking meta data").'</h2>';
+ echo '<br /><h2>'.i18n("Checking MetaData").'</h2>';
$array_meta = array('comments','data','exif','iptc'/*,'xmp'*/);
foreach($array_meta AS $value)
{
Modified: trunk/linpha2/admin/metadata_select.php
===================================================================
--- trunk/linpha2/admin/metadata_select.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/admin/metadata_select.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -3,7 +3,7 @@
/**
* @package admin
- * @subpackage metadata
+ * @subpackage MetaData
*
* for a description of the table structure, flag nr etc. see in the developper wiki at
* http://linpha.sourceforge.net/wiki/index.php/Tables_linpha_meta_fields
Modified: trunk/linpha2/admin/permissions.php
===================================================================
--- trunk/linpha2/admin/permissions.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/admin/permissions.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -13,7 +13,7 @@
'view' => Array('name' => 'View', 'link' => 'permissions_view'),
'write' => Array('name' => 'Write', 'link' => 'permissions_write'),
'basket' => Array('name' => 'Basket', 'link' => 'permissions_basket'),
- 'metadata' => Array('name' => 'Meta Data', 'link' => 'permissions_metadata'),
+ 'metadata' => Array('name' => 'MetaData', 'link' => 'permissions_metadata'),
'others' => Array('name' => 'Others', 'link' => 'permissions_others'),
);
Modified: trunk/linpha2/install/sql/sql.data.php
===================================================================
--- trunk/linpha2/install/sql/sql.data.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/install/sql/sql.data.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -181,7 +181,7 @@
"VALUES ('download', '')";
/**
- * metadata
+ * MetaData
* see http://linpha.sourceforge.net/wiki/index.php/Tables_linpha_meta_fields for the definition
*/
/**
Modified: trunk/linpha2/lib/classes/linpha.imgview.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.imgview.class.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/lib/classes/linpha.imgview.class.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -1146,7 +1146,7 @@
}
/**
- * save modified meta data
+ * save modified MetaData
*/
LinMetaDataModificate::saveModifiedMetaData();
}
@@ -1426,7 +1426,7 @@
}
/**
- * setup meta data view
+ * setup MetaData view
*/
function viewMeta()
{
@@ -1436,7 +1436,7 @@
$this->src_file = LinSql::getFullImagePath( $GLOBALS['linpha']->template->idCurrent );
/**
- * save modified meta data
+ * save modified MetaData
*/
LinMetaDataModificate::saveModifiedMetaData();
Modified: trunk/linpha2/lib/classes/linpha.import.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.import.class.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/lib/classes/linpha.import.class.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -256,7 +256,7 @@
LinImage::deleteCachedImage($photo_id,$data['img_type']);
/**
- * delete metadata (exif,iptc,xmp)
+ * delete MetaData (EXIF,IPTC,XMP)
*/
$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."meta_exif WHERE md5sum = '".$data['md5sum']."'");
$GLOBALS['linpha']->db->Execute("DELETE FROM ".LIN_PREFIX."meta_iptc WHERE md5sum = '".$data['md5sum']."'");
@@ -468,7 +468,7 @@
* exif date and exif rotate stuff
* globally turn off using 'sys_import_exif' if having problems with pjmt
*
- * @todo index all exif tags if we already have read the meta data!
+ * @todo index all exif tags if we already have read the MetaData!
* but should we also read iptc at this point?
*/
if( $GLOBALS['linpha']->sql->config->value['sys_import_exif'] )
Modified: trunk/linpha2/lib/classes/linpha.metadata.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.metadata.class.php 2007-02-14 12:54:11 UTC (rev 4677)
+++ trunk/linpha2/lib/classes/linpha.metadata.class.php 2007-02-14 14:43:32 UTC (rev 4678)
@@ -833,7 +833,7 @@
/**
- * Modificate metadata and save the information back to the file (iptc and xmp)
+ * Modificate MetaData and save the information back to the file (IPTC and XMP)
*/
class LinMetaDataModificate extends LinMetaData
{
@@ -1054,7 +1054,7 @@
}
/**
- * save iptc metadata back to file
+ * save IPTC MetaData back to file
*
* copied from pjmt/Write_File_Info.php
*/
@@ -1181,7 +1181,7 @@
echo "<p><a href=\"Example.php?jpeg_fname=$filename\" >View Full Metatdata Information</a></p>\n";
echo "<p><a href=\"Edit_File_Info_Example.php?jpeg_fname=$filename\" >Re-Edit Photoshop File Info</a></p>\n";
echo "<br><br>\n";
- echo "<p>Below is the updated image, you can save it and look at the changed metadata in your favorite image editor</p>\n";
+ echo "<p>Below is the updated image, you can save it and look at the changed MetaData in your favorite image editor</p>\n";
echo "<p><img src=\"$filename\" ></p>\n";*/
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
