itemId
language
diff -rupN galler21.ori/modules/multilang/classes/MultilangExtHelper.class gallery21/modules/multilang/classes/MultilangExtHelper.class
--- galler21.ori/modules/multilang/classes/MultilangExtHelper.class 1970-01-01 05:30:00.000000000 +0530
+++ gallery21/modules/multilang/classes/MultilangExtHelper.class 2009-12-28 17:44:24.720672490 +0530
@@ -0,0 +1,122 @@
+
+ * @version $Revision: 17581 $
+ * @static
+ */
+class MultilangExtHelper {
+
+ /**
+ * This is an onLoad function called by RewriteUrlGenerator::init if there's a path keyword
+ * that needs to be parsed to an itemId. Used by other modules that has %path%.
+ *
+ * @return GalleryStatus a status code
+ */
+ function fetchItemIdByPath($path) {
+ global $gallery;
+ if (empty($path)) {
+ return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER), null);
+ }
+
+ list ($ret, $rootId) = GalleryCoreApi::getPluginParameter('module', 'core', 'id.rootAlbum');
+ if ($ret) {
+ return array($ret, null);
+ }
+ $rootId = (int)$rootId;
+
+ if ($path == '/') {
+ return array(null, $rootId);
+ }
+
+ $currentId = $rootId;
+ GalleryCoreApi::requireOnce(
+ 'modules/core/classes/helpers/GalleryFileSystemEntityHelper_simple.class');
+
+ foreach (preg_split('|/|', $path, -1, PREG_SPLIT_NO_EMPTY) as $pathComponent) {
+ $curId = $currentId;
+ list ($ret, $currentId) =
+ GalleryCoreApi::fetchChildIdByPathComponent($currentId, $pathComponent);
+ if ($ret)
+ {
+ $currentId = $curId;
+ list ($ret, $currentId) =
+ MultilangExtHelper::fetchChildIdByPathComponent($currentId, $pathComponent);
+ if ($ret) {
+ return array($ret, null);
+ }
+ }
+ }
+
+ return array(null, $currentId);
+ }
+
+ function fetchChildIdByPathComponent($parentId, $pathComponent) {
+ global $gallery;
+
+ if (empty($parentId) || empty($pathComponent)) {
+ return array(GalleryCoreApi::error(ERROR_BAD_PARAMETER),
+ null);
+ }
+
+ $storage =& $gallery->getStorage();
+
+ $query = '
+ SELECT
+ [GalleryMultiLangItemMap::itemId]
+ FROM
+ [GalleryMultiLangItemMap], [GalleryChildEntity]
+ WHERE
+ [GalleryChildEntity::parentId] = ?
+ AND
+ [GalleryChildEntity::id] = [GalleryMultiLangItemMap::itemId]
+ AND
+ [GalleryMultiLangItemMap::pathComponent] = ?
+ ';
+ $data = array();
+ $data[] = (int)$parentId;
+ $data[] = $pathComponent;
+
+ list ($ret, $searchResults) = $gallery->search($query, $data);
+ if ($ret) {
+ return array($ret, null);
+ }
+
+ if ($searchResults->resultCount() == 0) {
+ return array(GalleryCoreApi::error(ERROR_MISSING_OBJECT, __FILE__, __LINE__,
+ "Parent $parentId path $pathComponent"), null);
+ }
+
+ if ($searchResults->resultCount() > 1) {
+ return array(GalleryCoreApi::error(ERROR_COLLISION), null);
+ }
+
+ $data = array();
+ $result = $searchResults->nextResult();
+ $targetId = (int)$result[0];
+
+ return array(null, $targetId);
+ }
+}
+?>
diff -rupN galler21.ori/modules/multilang/classes/MultiLangHelper.class gallery21/modules/multilang/classes/MultiLangHelper.class
--- galler21.ori/modules/multilang/classes/MultiLangHelper.class 2009-12-28 16:24:27.586391537 +0530
+++ gallery21/modules/multilang/classes/MultiLangHelper.class 2009-12-28 23:25:55.054632625 +0530
@@ -46,7 +46,7 @@ class MultiLangHelper {
$query = '
SELECT [MultiLangItemMap::language], [MultiLangItemMap::title],
- [MultiLangItemMap::summary], [MultiLangItemMap::description]
+ [MultiLangItemMap::summary], [MultiLangItemMap::description], [MultiLangItemMap::pathComponent]
FROM [MultiLangItemMap]
WHERE [MultiLangItemMap::itemId] = ?
';
@@ -59,7 +59,7 @@ class MultiLangHelper {
$data = array();
while ($result = $searchResults->nextResult()) {
$data[$result[0]] = array('title' => $result[1], 'summary' => $result[2],
- 'description' => $result[3]);
+ 'description' => $result[3], 'pathComponent' => $result[4]);
}
return array(null, $data);
}
@@ -75,14 +75,14 @@ class MultiLangHelper {
* @return object GalleryStatus a status code
* @static
*/
- function setItemData($item, $language, $title=null, $summary=null, $description=null) {
+ function setItemData($item, $language, $title=null, $summary=null, $description=null, $pathComponent=null) {
$itemId = $item->getId();
list ($ret, $data) = MultiLangHelper::getItemData($itemId);
if ($ret) {
return $ret->wrap(__FILE__, __LINE__);
}
- if (empty($title) && empty($summary) && empty($description)) {
+ if (empty($title) && empty($summary) && empty($description) && empty($pathComponent)) {
/* Remove data for this item/language (if there is any to remove) */
if (isset($data[$language])) {
$ret = GalleryCoreApi::removeMapEntry(
@@ -115,7 +115,7 @@ class MultiLangHelper {
$ret = GalleryCoreApi::updateMapEntry(
'MultiLangItemMap',
array('itemId' => $itemId, 'language' => $language),
- array('title' => $title, 'summary' => $summary, 'description' => $description));
+ array('title' => $title, 'summary' => $summary, 'description' => $description, 'pathComponent' => $pathComponent));
if ($ret) {
return $ret->wrap(__FILE__, __LINE__);
}
@@ -123,7 +123,7 @@ class MultiLangHelper {
$ret = GalleryCoreApi::addMapEntry(
'MultiLangItemMap',
array('itemId' => $itemId, 'language' => $language,
- 'title' => $title, 'summary' => $summary, 'description' => $description));
+ 'title' => $title, 'summary' => $summary, 'description' => $description, 'pathComponent' => $pathComponent));
if ($ret) {
return $ret->wrap(__FILE__, __LINE__);
}
@@ -183,6 +183,7 @@ class MultiLangHelper {
$item->setTitle($data[$language]['title']);
$item->setSummary($data[$language]['summary']);
$item->setDescription($data[$language]['description']);
+ $item->setPathComponent($data[$language]['pathComponent'], true);
}
return null;
diff -rupN galler21.ori/modules/multilang/MultiLangItemEdit.inc gallery21/modules/multilang/MultiLangItemEdit.inc
--- galler21.ori/modules/multilang/MultiLangItemEdit.inc 2009-12-28 16:24:27.586391537 +0530
+++ gallery21/modules/multilang/MultiLangItemEdit.inc 2009-12-28 18:24:05.391912060 +0530
@@ -55,9 +55,14 @@ class MultiLangItemEdit extends ItemEdit
if (($item->getId() == $rootAlbumId) && empty($form['title'])) {
$error[] = 'form[error][title][missingRootTitle]';
+ } else if (empty($form['pathComponent'])){
+ $error[] = 'form[error][pathComponent][missing]';
+ }
+ else if (!$gallery->getPlatform()->isLegalPathComponent($form['pathComponent'], true)) {
+ $error[] = 'form[error][pathComponent][invalid]';
} else {
$ret = MultiLangHelper::setItemData($item, $form['language'],
- $form['title'], $form['summary'], $form['description']);
+ $form['title'], $form['summary'], $form['description'], $form['pathComponent']);
if ($ret) {
return array($ret->wrap(__FILE__, __LINE__), null, null, null);
}
@@ -91,6 +96,7 @@ class MultiLangItemEdit extends ItemEdit
$form['mainTitle'] = $item->getTitle();
$form['mainSummary'] = $item->getSummary();
$form['mainDescription'] = $item->getDescription();
+ $form['mainPathComponent'] = $item->getPathComponent();
list ($ret, $form['languageData']) = MultiLangHelper::getItemData($item->getId());
if ($ret) {
return array($ret->wrap(__FILE__, __LINE__), null, null);
@@ -103,6 +109,7 @@ class MultiLangItemEdit extends ItemEdit
$form['languageData'][$form['language']]['title'] = $form['title'];
$form['languageData'][$form['language']]['summary'] = $form['summary'];
$form['languageData'][$form['language']]['description'] = $form['description'];
+ $form['languageData'][$form['language']]['pathComponent'] = $form['pathComponent'];
}
$supportedLanguages = $translator->getSupportedLanguages();
diff -rupN galler21.ori/modules/multilang/templates/MultiLangItemEdit.tpl gallery21/modules/multilang/templates/MultiLangItemEdit.tpl
--- galler21.ori/modules/multilang/templates/MultiLangItemEdit.tpl 2009-12-28 16:24:27.586391537 +0530
+++ gallery21/modules/multilang/templates/MultiLangItemEdit.tpl 2009-12-28 18:02:28.980664678 +0530
@@ -19,6 +19,8 @@ function pick(idx) {
o.value = document.getElementById('sum_' + idx).innerHTML;
o = document.getElementById('description');
o.value = document.getElementById('dsc_' + idx).innerHTML;
+ o = document.getElementById('pathComponent');
+ o.value = document.getElementById('path_' + idx).innerHTML;
index = idx;
isChanged = 0;
}
@@ -32,6 +34,7 @@ function changed() { isChanged = 1; }
{$form.languageData[$language].title}
{$form.languageData[$language].summary}
{$form.languageData[$language].description}
+{$form.languageData[$language].pathComponent}
{else}
{/if}
@@ -54,6 +57,9 @@ function changed() { isChanged = 1; }
| {g->text text="Description"} |
{$form.mainDescription|markup} |
+
+ | {g->text text="pathComponent"} |
+ {$form.mainPathComponent|markup} |
{g->text text="Language"}
@@ -78,6 +84,19 @@ function changed() { isChanged = 1; }
{g->text text="The root album must have a title."}
{/if}
+
+ {g->text text="URL"}
+ {strip}
+ {foreach from=$ItemAdmin.parents item=parent}
+ {if empty($parent.parentId)}
+ /
+ {else}
+ {$parent.pathComponent}/
+ {/if}
+ {/foreach}
+ {/strip}
+
{g->text text="Summary"}
diff -rupN galler21.ori/modules/rewrite/classes/RewriteSimpleHelper.class gallery21/modules/rewrite/classes/RewriteSimpleHelper.class
--- galler21.ori/modules/rewrite/classes/RewriteSimpleHelper.class 2009-12-28 16:24:27.766388859 +0530
+++ gallery21/modules/rewrite/classes/RewriteSimpleHelper.class 2009-12-28 22:58:06.135865364 +0530
@@ -47,7 +47,9 @@ class RewriteSimpleHelper {
$path = substr($path, 0, -5);
}
- list ($ret, $itemId) = GalleryCoreApi::fetchItemIdByPath($path);
+ GalleryCoreApi::requireOnce('modules/multilang/classes/MultilangExtHelper.class');
+ list ($ret, $itemId) = MultilangExtHelper::fetchItemIdByPath($path);
+
if ($ret) {
return $ret->wrap(__FILE__, __LINE__);
}