Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12903] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/publisher
|
From: <be...@us...> - 2014-12-13 15:49:56
|
Revision: 12903
http://sourceforge.net/p/xoops/svn/12903
Author: beckmi
Date: 2014-12-13 15:49:41 +0000 (Sat, 13 Dec 2014)
Log Message:
-----------
Beta 4 (see changelog)
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/mimetypes.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/permissions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/author_items.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_columns.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_new.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_recent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/items_spot.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_files.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/latest_news.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/blocks/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/blockform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/category.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/file.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/form/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/formdatetime.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/groupperm.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/item.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/metagen.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/mimetype.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/permission.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/publisher.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/rating.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/session.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/themetabform.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/uploader.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/ajax_upload.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/comment_functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/common.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/install.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/notification.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/plugin.tag.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/search.inc.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/seo_functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/rate.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/search.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/submit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/templates/publisher_item.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/thumb.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/visit.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/class/constants.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/tests/todo.txt
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/include/constants.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/category.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -249,6 +249,10 @@
xoops_cp_footer();
+/**
+ * @param $categoryObj
+ * @param int $level
+ */
function publisher_displayCategory($categoryObj, $level = 0)
{
$publisher = PublisherPublisher::getInstance();
@@ -283,6 +287,12 @@
unset($categoryObj);
}
+/**
+ * @param bool $showmenu
+ * @param int $categoryid
+ * @param int $nb_subcats
+ * @param null $categoryObj
+ */
function publisher_editCat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryObj = null)
{
$publisher = PublisherPublisher::getInstance();
@@ -364,7 +374,7 @@
publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC);
$startitem = XoopsRequest::getInt('startitem');
// Get the total number of published ITEMS
- $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(_PUBLISHER_STATUS_PUBLISHED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
// creating the items objects that are published
$itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $sel_cat);
$totalitemsOnPage = count($itemsObj);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/clone.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -83,6 +83,11 @@
// work around for PHP < 5.0.x
if (!function_exists('file_put_contents')) {
+ /**
+ * @param $filename
+ * @param $data
+ * @param bool $file_append
+ */
function file_put_contents($filename, $data, $file_append = false)
{
if ($fp = fopen($filename, (!$file_append ? 'w+' : 'a+'))) {
@@ -93,6 +98,9 @@
}
// recursive clonning script
+/**
+ * @param $path
+ */
function publisher_cloneFileFolder($path)
{
global $patKeys;
@@ -127,6 +135,11 @@
}
}
+/**
+ * @param $dirname
+ *
+ * @return bool
+ */
function publisher_createLogo($dirname)
{
if (!extension_loaded("gd")) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/file.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -23,6 +23,11 @@
$op = XoopsRequest::getString('op');
+/**
+ * @param bool $showmenu
+ * @param int $fileid
+ * @param int $itemid
+ */
function publisher_editFile($showmenu = false, $fileid = 0, $itemid = 0)
{
$publisher = PublisherPublisher::getInstance();
@@ -44,7 +49,7 @@
}
echo "<br />\n";
- echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>";
+ echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_EDITING . "</span>";
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_EDITING_DSC . "</span>";
publisher_openCollapsableBar('editfile', 'editfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
} else {
@@ -54,7 +59,7 @@
if ($showmenu) {
//publisher_adminMenu(2, _AM_PUBLISHER_FILE . " > " . _AM_PUBLISHER_FILE_ADD);
}
- echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 06 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>";
+ echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_PUBLISHER_FILE_ADDING . "</span>";
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_FILE_ADDING_DSC . "</span>";
publisher_openCollapsableBar('addfile', 'addfileicon', _AM_PUBLISHER_FILE_INFORMATIONS);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -33,6 +33,10 @@
$op = $_POST['op'];
}
+/**
+ * @param $src
+ * @param $dst
+ */
function recurse_copy($src,$dst)
{
$dir = opendir($src);
@@ -316,7 +320,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
// $itemObj->setVar('dobr', !$arrArticle['dobr']);
// $itemObj->setVar('item_tag', $arrArticle['tags']);
@@ -369,7 +373,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['filerealname']);
$fileObj->setVar('description', $arrFile['filerealname']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['mimetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/ams0.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -166,7 +166,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setVar('rating', $arrArticle['rating']);
$itemObj->setVar('votes', $arrArticle['votes']);
@@ -204,7 +204,7 @@
$fileObj = $publisher_file_handler->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/cjaycontent.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -33,6 +33,10 @@
$op = $_POST['op'];
}
+/**
+ * @param $src
+ * @param $dst
+ */
function recurse_copy($src, $dst)
{
$dir = opendir($src);
@@ -134,7 +138,7 @@
// $itemObj->setVar('dohtml', !$arrArticle['nohtml']);
// $itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', $arrArticle['weight']);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
// $itemObj->setVar('dobr', !$arrArticle['dobr']);
// $itemObj->setVar('item_tag', $arrArticle['tags']);
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/fmcontent.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -1,347 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * @copyright The XUUPS Project http://sourceforge.net/projects/xuups/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Publisher
- * @since 1.02 Beta 4
- * @author trabis <lus...@gm...>
- * @author The SmartFactory <www.smartfactory.ca>
- * @author Marius Scurtescu <ma...@ro...>
- * @author ZySpec <ow...@zy...>
- * @version $Id$
- */
-
-include_once dirname(__DIR__) . '/admin_header.php';
-$myts = MyTextSanitizer::getInstance();
-
-$importFromModuleName = "FmContent " . @$_POST['fmcontent_version'];
-
-$scriptname = "fmcontent.php";
-
-$op = 'start';
-
-if (isset($_POST['op']) && ($_POST['op'] == 'go')) {
- $op = $_POST['op'];
-}
-
-if ('start' == $op) {
- xoops_load('XoopsFormLoader');
-
- publisher_cpHeader();
- //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- publisher_openCollapsableBar('fmimport', 'fmimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
-
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('fmcontent');
- $fm_module_id = $moduleObj->getVar('mid');
-
- $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
- $fmTopicCount = $fmTopicHdlr->getCount(new Criteria('topic_modid', $fm_module_id));
-
- if (empty($fmTopicCount)) {
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
- } else {
- include_once $GLOBALS['xoops']->path('www/class/xoopstree.php');
- $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
- $fmContentCount = $fmContentHdlr->getCount(new Criteria('content_modid', $fm_module_id));
-
- if (empty($fmContentCount)) {
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $fmContentCount) . "</span>";
- } else {
-/*
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, $fmTopicCount) . "</span>";
- $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
-*/
- // Categories to be imported
- $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.content_id) FROM " . $GLOBALS['xoopsDB']->prefix("fmcontent_topic") . " AS cat INNER JOIN " . $GLOBALS['xoopsDB']->prefix("fmcontent_content") . " AS art ON ((cat.topic_id=art.content_topic) AND (cat.topic_modid=art.content_modid)) WHERE cat.topic_modid={$fm_module_id} GROUP BY art.content_topic";
-
- $result = $GLOBALS['xoopsDB']->query($sql);
- $cat_cbox_options = array();
-
- while (list ($cid, $pid, $cat_title, $art_count) = $GLOBALS['xoopsDB']->fetchRow($result)) {
- $cat_title = $myts->displayTarea($cat_title);
- $cat_cbox_options[$cid] = "{$cat_title} ($art_count)";
- }
- // now get articles in the top level category (content_topic=0)
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('content_modid', $fm_module_id));
- $criteria->add(new Criteria('content_topic', 0));
- $cnt_tla_contents = $fmContentHdlr->getCount($criteria);
- if ($cnt_tla_contents) {
- $cat_cbox_options[0] = _AM_PUBLISHER_IMPORT_FMCONTENT_NAME . " ({$cnt_tla_contents})";
- }
- natcasesort($cat_cbox_options); //put them in "alphabetical" order
-
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-size: small; display: block;'>" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $fmContentCount, count($cat_cbox_options)) . "</span>";
- $form = new XoopsThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
-
- $cat_label = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_CATEGORIES, implode("<br />", $cat_cbox_options));
- $cat_label->setDescription(_AM_PUBLISHER_IMPORT_CATEGORIES_DSC);
- $form->addElement($cat_label);
-
- // Publisher parent category
- xoops_load('tree');
- $categoryHdlr = $publisher->getHandler('category');
- $catObjs = $categoryHdlr->getAll();
- $myObjTree = new XoopsObjectTree($catObjs, 'categoryid', 'parentid');
- $catSelBox = $myObjTree->makeSelBox('parent_category', 'name', '-', 0, true);
- $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, $catSelBox);
- $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
- $form->addElement($parent_cat_sel);
-/*
- $mytree = new XoopsTree($GLOBALS['xoopsDB']->prefix("publisher_categories"), "categoryid", "parentid");
- ob_start();
- $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
-
- $parent_cat_sel = new XoopsFormLabel(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY, ob_get_contents());
- $parent_cat_sel->setDescription(_AM_PUBLISHER_IMPORT_PARENT_CATEGORY_DSC);
- $form->addElement($parent_cat_sel);
- ob_end_clean();
-*/
- $form->addElement(new XoopsFormHidden('op', 'go'));
- $form->addElement(new XoopsFormButton ('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
-
- $form->addElement(new XoopsFormHidden('from_module_version', $_POST['news_version']));
-
- $form->display();
- }
- }
-
- publisher_closeCollapsableBar('fmimport', 'fmimporticon');
- xoops_cp_footer();
-}
-
-if ('go' == $op) {
- publisher_cpHeader();
- //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
- publisher_openCollapsableBar('fmimportgo', 'fmimportgoicon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_RESULT);
-
- $module_handler = xoops_gethandler('module');
- $moduleObj = $module_handler->getByDirname('fmcontent');
- $fm_module_id = $moduleObj->getVar('mid');
-
- $gperm_handler = xoops_gethandler('groupperm');
-
- $cnt_imported_cat = 0;
- $cnt_imported_articles = 0;
-
- $parentId = (isset($_POST['parent_category'])) ? (int) $_POST['parent_category'] : 0;
-
- // get all FmContent Content items without a category (content_topic=0)
- $fmContentHdlr =& xoops_getmodulehandler('page', 'fmcontent');
-
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('content_modid', $fm_module_id));
- $criteria->add(new Criteria('content_topic', 0));
- $fmContentObjs = $fmContentHdlr->getAll($criteria);
-
- if (is_array($fmContentObjs) && count($fmContentObjs)) {
- ++$cnt_imported_cat; //count category if there was content to import
-
- // create Publsher category to hold FmContent Content items with no Topic (content_topic=0)
- $categoryObj = $publisher->getHandler('category')->create();
- $categoryObj->setVars(array('parentid' => $parentId,
- 'name' => _AM_PUBLISHER_IMPORT_FMCONTENT_NAME,
- 'description' => _AM_PUBLISHER_IMPORT_FMCONTENT_TLT,
- 'image' => '',
- 'total' => 0,
- 'weight' => 1,
- 'created' => time(),
- 'moderator', $GLOBALS['xoopsUser']->getVar('uid'))
- );
- $categoryObj->store();
-
- $fmTopicHdlr =& xoops_getmodulehandler('topic', 'fmcontent');
-
- // insert articles for this category
- foreach($fmContentObjs as $thisFmContentObj) {
- $itemObj = $publisher->getHandler('item')->create();
- $itemObj->setVars(array('categoryid' => $categoryObj->categoryid(),
- 'title' => $thisFmContentObj->getVar('content_title'),
- 'uid' => $thisFmContentObj->getVar('content_uid'),
- 'summary' => $thisFmContentObj->getVar('content_short'),
- 'body' => $thisFmContentObj->getVar('content_text'),
- 'datesub' => $thisFmContentObj->getVar('content_create'),
- 'dohtml' => $thisFmContentObj->getVar('dohtml'),
- 'dosmiley' => $thisFmContentObj->getVar('dosmiley'),
- 'doxcode' => $thisFmContentObj->getVar('doxcode'),
- 'doimage' => $thisFmContentObj->getVar('doimage'),
- 'dobr' => $thisFmContentObj->getVar('dobr'),
- 'weight' => $thisFmContentObj->getVar('content_order'),
- 'status' => ($thisFmContentObj->getVar('content_status')) ? _PUBLISHER_STATUS_PUBLISHED : _PUBLISHER_STATUS_OFFLINE,
- 'counter' => $thisFmContentObj->getVar('content_hits'),
- 'rating' => 0,
- 'votes' => 0,
- 'comments' => $thisFmContentObj->getVar('content_comments'),
- 'meta_keywords' => $thisFmContentObj->getVar('content_words'),
- 'meta_description' => $thisFmContentObj->getVar('content_desc'))
- );
- $contentImg = $thisFmContentObj->getVar('content_img');
- if (!empty($contentImg)) {
- $itemObj->setVars(array('images' => 1,
- 'image' => $thisFmContentObj->getVar('content_img'))
- );
- }
-
- if (!$itemObj->store()) {
- echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
- continue;
- } else {
- $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
- ++$cnt_imported_articles;
- }
- }
-
- // Saving category permissions
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
-
- unset($fmContentObjs, $itemObj, $categoryObj);
- echo "<br />\n";
- }
-
- // Process all "normal" Topics (categories) from FmContent
- $newCatArray = array();
- $newArticleArray = array();
- $oldToNew = array();
-
- $fmTopicObjs = $fmTopicHdlr->getAll(new Criteria('topic_modid', $fm_module_id));
-
- // first create FmContent Topics as Publisher Categories
- foreach($fmTopicObjs as $thisFmTopicObj) {
- $CatIds = array('oldid' => $thisFmTopicObj->getVar('topic_id'),
- 'oldpid' => $thisFmTopicObj->getVar('topic_pid')
- );
-
- $categoryObj = $publisher->getHandler('category')->create();
-
- $categoryObj->setVars(array('parentid' => $thisFmTopicObj->getVar('topic_pid'),
- 'weight' => $thisFmTopicObj->getVar('topic_weight'),
- 'name' => $thisFmTopicObj->getVar('topic_title'),
- 'description' => $thisFmTopicObj->getVar('topic_desc'))
- );
-
- // Category image
- if (('blank.gif' != $thisFmTopicObj->getVar('topic_img')) && ('' != $thisFmTopicObj->getVar('topic_img'))) {
- if (copy($GLOBALS['xoops']->path("www/uploads/fmcontent/img/" . $thisFmTopicObj->getVar('topic_img')), $GLOBALS['xoops']->path("www/uploads/publisher/images/category/" . $thisFmTopicObj->getVar('topic_img')))) {
- $categoryObj->setVar('image', $thisFmTopicObj->getVar('topic_img'));
- }
- }
- if (!$publisher->getHandler('category')->insert($categoryObj)) {
- echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $thisFmTopicObj->getVar('topic_title')) . "<br />\n";
- continue;
- }
-
- $CatIds['newid'] = $categoryObj->categoryid();
- ++$cnt_imported_cat;
-
- echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->name()) . "<br />\n";
-
- // retrieve all articles (content) for this category
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('content_modid', $fm_module_id)); //only for this instance of fmcontent
- $criteria->add(new Criteria('content_topic', $thisFmTopicObj->getVar('topic_id'))); //for this category
- $fmContentObjs = $fmContentHdlr->getAll($criteria);
-
- // insert articles for this category
- foreach($fmContentObjs as $thisFmContentObj) {
- $itemObj = $publisher->getHandler('item')->create();
- $itemObj->setVars(array('categoryid' => $CatIds['newid'],
- 'title' => $thisFmContentObj->getVar('content_title'),
- 'uid' => $thisFmContentObj->getVar('content_uid'),
- 'summary' => $thisFmContentObj->getVar('content_short'),
- 'body' => $thisFmContentObj->getVar('content_text'),
- 'counter' => $thisFmContentObj->getVar('content_hits'),
- 'datesub' => $thisFmContentObj->getVar('content_create'),
- 'dohtml' => $thisFmContentObj->getVar('dohtml'),
- 'dosmiley' => $thisFmContentObj->getVar('dosmiley'),
- 'doxcode' => $thisFmContentObj->getVar('doxcode'),
- 'doimage' => $thisFmContentObj->getVar('doimage'),
- 'dobr' => $thisFmContentObj->getVar('dobr'),
- 'weight' => $thisFmContentObj->getVar('content_order'),
- 'status' => ($thisFmContentObj->getVar('content_status')) ? _PUBLISHER_STATUS_PUBLISHED : _PUBLISHER_STATUS_OFFLINE,
- 'rating' => 0,
- 'votes' => 0,
- 'comments' => $thisFmContentObj->getVar('content_comments'),
- 'meta_keywords' => $thisFmContentObj->getVar('content_words'),
- 'meta_description' => $thisFmContentObj->getVar('content_desc'))
- );
- $contentImg = $thisFmContentObj->getVar('content_img');
- if (!empty($contentImg)) {
- $itemObj->setVar('images', 1);
- $itemObj->setVar('image', $thisFmContentObj->getVar('content_img'));
- }
-
- if (!$itemObj->store()) {
- echo sprintf(" " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $thisFmContentObj->getVar('title')) . "<br />\n";
- continue;
- } else {
- $newArticleArray[$thisFmContentObj->getVar('storyid')] = $itemObj->itemid();
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />\n";
- ++$cnt_imported_articles;
- }
- }
-
- // Saving category permissions
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_view', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'category_read');
- $groupsIds = $gperm_handler->getGroupIds('fmcontent_submit', $thisFmContentObj->getVar('topic_id'), $fm_module_id);
- publisher_saveCategoryPermissions($groupsIds, $categoryObj->categoryid(), 'item_submit');
-
- $newCatArray[$CatIds['oldid']] = $CatIds;
- unset($CatIds);
- echo "<br />\n";
- }
-
- // Looping through cat to change the parentid to the new parentid
- foreach ($newCatArray as $oldid => $CatIds) {
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('categoryid', $CatIds['newid']));
- $oldpid = $CatIds['oldpid'];
- $newpid = (0 == $oldpid) ? $parentId : $newCatArray[$oldpid]['newid'];
- $publisher->getHandler('category')->updateAll('parentid', $newpid, $criteria);
- unset($criteria);
- }
-
- // Looping through the comments to link them to the new articles and module
- echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />\n";
-
- $publisher_module_id = $publisher->getModule()->mid();
-
- $comment_handler = xoops_gethandler('comment');
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('com_modid', $fm_module_id));
- $comments = $comment_handler->getObjects($criteria);
- foreach ($comments as $comment) {
- $comment->setVar('com_itemid', $newArticleArray[$comment->getVar('com_itemid')]);
- $comment->setVar('com_modid', $publisher_module_id);
- $comment->setNew();
- if (!$comment_handler->insert($comment)) {
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />\n";
- } else {
- echo " " . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />\n";
- }
-
- }
-
- echo "<br /><br />" . _AM_PUBLISHER_IMPORT_DONE . "<br />\n"
- . "" . sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br />\n"
- . "" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br />\n"
- . "<br/>\n<a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br />\n";
-
- publisher_closeCollapsableBar('fmimportgo', 'fmimportgoicon');
- xoops_cp_footer();
-}
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/news.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -166,7 +166,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setVar('rating', $arrArticle['rating']);
$itemObj->setVar('votes', $arrArticle['votes']);
@@ -204,7 +204,7 @@
$fileObj = $publisher_file_handler->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -171,7 +171,7 @@
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('dobr', $arrArticle['nobreaks']);
$itemObj->setVar('weight', $arrArticle['weight']);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setGroups_read(explode(" ", trim($arrArticle['groupid'])));
// HTML Wrap
@@ -202,7 +202,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -166,9 +166,9 @@
$itemObj->setGroups_read(explode(" ", trim($arrArticle['groupid'])));
// status
- $status = _PUBLISHER_STATUS_PUBLISHED;
+ $status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
if ($arrArticle['offline']) {
- $status = _PUBLISHER_STATUS_OFFLINE;
+ $status = PublisherConstants::_PUBLISHER_STATUS_OFFLINE;
}
$itemObj->setVar('status', $status);
@@ -200,7 +200,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['fileshowname']);
$fileObj->setVar('description', $arrFile['filedescript']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['minetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import/xnews.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -33,6 +33,10 @@
$op = $_POST['op'];
}
+/**
+ * @param $src
+ * @param $dst
+ */
function recurse_copy($src, $dst)
{
$dir = opendir($src);
@@ -173,7 +177,7 @@
ob_end_clean();
$form->addElement(new XoopsFormHidden('op', 'go'));
- $form->addElement(new XoopsFormButton ('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
+ $form->addElement(new XoopsFormButton('', 'import', _AM_PUBLISHER_IMPORT, 'submit'));
$form->addElement(new XoopsFormHidden('from_module_version', $_POST['xnews_version']));
@@ -340,7 +344,7 @@
$itemObj->setVar('dohtml', !$arrArticle['nohtml']);
$itemObj->setVar('dosmiley', !$arrArticle['nosmiley']);
$itemObj->setVar('weight', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_PUBLISHED);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED);
$itemObj->setVar('dobr', !$arrArticle['dobr']);
$itemObj->setVar('item_tag', $arrArticle['tags']);
@@ -393,7 +397,7 @@
$fileObj = $publisher->getHandler('file')->create();
$fileObj->setVar('name', $arrFile['filerealname']);
$fileObj->setVar('description', $arrFile['filerealname']);
- $fileObj->setVar('status', _PUBLISHER_STATUS_FILE_ACTIVE);
+ $fileObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_FILE_ACTIVE);
$fileObj->setVar('uid', $arrArticle['uid']);
$fileObj->setVar('itemid', $itemObj->itemid());
$fileObj->setVar('mimetype', $arrFile['mimetype']);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/import.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -115,17 +115,6 @@
}
}
- // FmContent
- $fmcontent_version = 0;
- $moduleObj = $module_handler->getByDirname('fmcontent');
- if ($moduleObj) {
- $from_module_version = round($moduleObj->getVar('version') / 100, 2);
- if (($from_module_version >= 1.1)) {
- $importfile_select_array["fmcontent"] = "FmContent " . $from_module_version;
- $fmcontent_version = $from_module_version;
- }
- }
-
// XF-Section
/*$xfs_version = 0;
$moduleObj = $module_handler->getByDirname('xfsection');
@@ -174,7 +163,7 @@
$sform->display();
unset($hidden);
} else {
- echo "<span style='color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block;'>" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
+ echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_MODULE . "</span>";
}
// End of collapsable bar
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/item.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -75,11 +75,11 @@
$itemObj->setVarsFromRequest();
$old_status = $itemObj->status();
- $new_status = XoopsRequest::getInt('status', _PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
+ $new_status = XoopsRequest::getInt('status', PublisherConstants::_PUBLISHER_STATUS_PUBLISHED); //_PUBLISHER_STATUS_NOTSET;
switch ($new_status) {
- case _PUBLISHER_STATUS_SUBMITTED:
- if (($old_status == _PUBLISHER_STATUS_NOTSET)) {
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED:
+ if (($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET)) {
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
} else {
$error_msg = _AM_PUBLISHER_ITEMNOTCREATED;
@@ -87,18 +87,18 @@
$redirect_msg = _AM_PUBLISHER_ITEM_RECEIVED_NEED_APPROVAL;
break;
- case _PUBLISHER_STATUS_PUBLISHED:
- if (($old_status == _PUBLISHER_STATUS_NOTSET) || ($old_status == _PUBLISHER_STATUS_SUBMITTED)) {
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED:
+ if (($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET) || ($old_status == PublisherConstants::_PUBLISHER_STATUS_SUBMITTED)) {
$redirect_msg = _AM_PUBLISHER_SUBMITTED_APPROVE_SUCCESS;
- $notifToDo = array(_PUBLISHER_NOT_ITEM_PUBLISHED);
+ $notifToDo = array(PublisherConstants::_PUBLISHER_NOT_ITEM_PUBLISHED);
} else {
$redirect_msg = _AM_PUBLISHER_PUBLISHED_MOD_SUCCESS;
}
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
break;
- case _PUBLISHER_STATUS_OFFLINE:
- if ($old_status == _PUBLISHER_STATUS_NOTSET) {
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE:
+ if ($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET) {
$redirect_msg = _AM_PUBLISHER_OFFLINE_CREATED_SUCCESS;
} else {
$redirect_msg = _AM_PUBLISHER_OFFLINE_MOD_SUCCESS;
@@ -106,8 +106,8 @@
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
break;
- case _PUBLISHER_STATUS_REJECTED:
- if ($old_status == _PUBLISHER_STATUS_NOTSET) {
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED:
+ if ($old_status == PublisherConstants::_PUBLISHER_STATUS_NOTSET) {
$error_msg = _AM_PUBLISHER_ITEMNOTUPDATED;
} else {
$error_msg = _AM_PUBLISHER_ITEMNOTCREATED;
@@ -178,7 +178,7 @@
publisher_openCollapsableBar('submiteditemstable', 'submiteditemsicon', _AM_PUBLISHER_SUBMISSIONSMNGMT, _AM_PUBLISHER_SUBMITTED_EXP);
// Get the total number of submitted ITEM
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_SUBMITTED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_SUBMITTED));
$itemsObj = $publisher->getHandler('item')->getAllSubmitted($publisher->getConfig('idxcat_perpage'), $submittedstartitem, -1, $orderBy, $ascOrDesc);
@@ -227,7 +227,7 @@
publisher_openCollapsableBar('item_publisheditemstable', 'item_publisheditemsicon', _AM_PUBLISHER_PUBLISHEDITEMS, _AM_PUBLISHER_PUBLISHED_DSC);
// Get the total number of published ITEM
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_PUBLISHED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
$itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $publishedstartitem, -1, $orderBy, $ascOrDesc);
@@ -276,7 +276,7 @@
// Display Offline articles
publisher_openCollapsableBar('offlineitemstable', 'offlineitemsicon', _AM_PUBLISHER_ITEMS . " " . _CO_PUBLISHER_OFFLINE, _AM_PUBLISHER_OFFLINE_EXP);
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_OFFLINE));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_OFFLINE));
$itemsObj = $publisher->getHandler('item')->getAllOffline($publisher->getConfig('idxcat_perpage'), $offlinestartitem, -1, $orderBy, $ascOrDesc);
@@ -326,7 +326,7 @@
publisher_openCollapsableBar('Rejecteditemstable', 'rejecteditemsicon', _AM_PUBLISHER_REJECTED_ITEM, _AM_PUBLISHER_REJECTED_ITEM_EXP, _AM_PUBLISHER_SUBMITTED_EXP);
// Get the total number of Rejected ITEM
- $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_REJECTED));
+ $totalitems = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_REJECTED));
$itemsObj = $publisher->getHandler('item')->getAllRejected($publisher->getConfig('idxcat_perpage'), $rejectedstartitem, -1, $orderBy, $ascOrDesc);
@@ -373,6 +373,11 @@
}
xoops_cp_footer();
+/**
+ * @param bool $showmenu
+ * @param int $itemid
+ * @param bool $clone
+ */
function publisher_editItem($showmenu = false, $itemid = 0, $clone = false)
{
$publisher = PublisherPublisher::getInstance();
@@ -398,53 +403,53 @@
if ($clone) {
$itemObj->setNew();
$itemObj->setVar('itemid', 0);
- $itemObj->setVar('status', _PUBLISHER_STATUS_NOTSET);
+ $itemObj->setVar('status', PublisherConstants::_PUBLISHER_STATUS_NOTSET);
$itemObj->setVar('datesub', time());
}
switch ($itemObj->status()) {
- case _PUBLISHER_STATUS_SUBMITTED:
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED:
$breadcrumb_action1 = _CO_PUBLISHER_SUBMITTED;
$breadcrumb_action2 = _AM_PUBLISHER_APPROVING;
$page_title = _AM_PUBLISHER_SUBMITTED_TITLE;
$page_info = _AM_PUBLISHER_SUBMITTED_INFO;
$button_caption = _AM_PUBLISHER_APPROVE;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
break;
- case _PUBLISHER_STATUS_PUBLISHED:
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED:
$breadcrumb_action1 = _CO_PUBLISHER_PUBLISHED;
$breadcrumb_action2 = _AM_PUBLISHER_EDITING;
$page_title = _AM_PUBLISHER_PUBLISHEDEDITING;
$page_info = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
break;
- case _PUBLISHER_STATUS_OFFLINE:
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE:
$breadcrumb_action1 = _CO_PUBLISHER_OFFLINE;
$breadcrumb_action2 = _AM_PUBLISHER_EDITING;
$page_title = _AM_PUBLISHER_OFFLINEEDITING;
$page_info = _AM_PUBLISHER_OFFLINEEDITING_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_OFFLINE;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_OFFLINE;
break;
- case _PUBLISHER_STATUS_REJECTED:
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED:
$breadcrumb_action1 = _CO_PUBLISHER_REJECTED;
$breadcrumb_action2 = _AM_PUBLISHER_REJECTED;
$page_title = _AM_PUBLISHER_REJECTED_EDIT;
$page_info = _AM_PUBLISHER_REJECTED_EDIT_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_REJECTED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_REJECTED;
break;
- case _PUBLISHER_STATUS_NOTSET: // Then it's a clone...
+ case PublisherConstants::_PUBLISHER_STATUS_NOTSET: // Then it's a clone...
$breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
$breadcrumb_action2 = _AM_PUBLISHER_CLONE_NEW;
$button_caption = _AM_PUBLISHER_CREATE;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
$page_title = _AM_PUBLISHER_ITEM_DUPLICATING;
$page_info = _AM_PUBLISHER_ITEM_DUPLICATING_DSC;
break;
@@ -456,7 +461,7 @@
$page_title = _AM_PUBLISHER_PUBLISHEDEDITING;
$page_info = _AM_PUBLISHER_PUBLISHEDEDITING_INFO;
$button_caption = _AM_PUBLISHER_MODIFY;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
break;
}
@@ -485,7 +490,7 @@
$breadcrumb_action1 = _AM_PUBLISHER_ITEMS;
$breadcrumb_action2 = _AM_PUBLISHER_CREATINGNEW;
$button_caption = _AM_PUBLISHER_CREATE;
- $new_status = _PUBLISHER_STATUS_PUBLISHED;
+ $new_status = PublisherConstants::_PUBLISHER_STATUS_PUBLISHED;
if ($showmenu) {
//publisher_adminMenu(2, $breadcrumb_action1 . " > " . $breadcrumb_action2);
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-12-13 13:16:18 UTC (rev 12902)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/publisher/admin/main.php 2014-12-13 15:49:41 UTC (rev 12903)
@@ -55,16 +55,16 @@
$totalcategories = $publisher->getHandler('category')->getCategoriesCount(-1);
// Total submitted ITEMs
-$totalsubmitted = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_SUBMITTED));
+$totalsubmitted = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_SUBMITTED));
// Total published ITEMs
-$totalpublished = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_PUBLISHED));
+$totalpublished = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_PUBLISHED));
// Total offline ITEMs
-$totaloffline = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_OFFLINE));
+$totaloffline = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_OFFLINE));
// Total rejected
-$totalrejected = $publisher->getHandler('item')->getItemsCount(-1, array(_PUBLISHER_STATUS_REJECTED));
+$totalrejected = $publisher->getHandler('item')->getItemsCount(-1, array(PublisherConstants::_PUBLISHER_STATUS_REJECTED));
// Check Path Configuration
if ((publisher_getPathStatus('root', true) < 0) ||
@@ -142,38 +142,38 @@
}
switch ($statussel) {
- case _PUBLISHER_STATUS_ALL :
+ case PublisherConstants::_PUBLISHER_STATUS_ALL :
$selectedtxt0 = "selected='selected'";
$caption = _AM_PUBLISHER_ALL;
$cond = "";
$status_explaination = _AM_PUBLISHER_ALL_EXP;
break;
- case _PUBLISHER_STATUS_SUBMITTED :
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED :
$selectedtxt1 = "selected='selected'";
$caption = _CO_PUBLISHER_SUBMITTED;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_SUBMITTED . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_SUBMITTED . " ";
$status_explaination = _AM_PUBLISHER_SUBMITTED_EXP;
break;
- case _PUBLISHER_STATUS_PUBLISHED :
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED :
$selectedtxt2 = "selected='selected'";
$caption = _CO_PUBLISHER_PUBLISHED;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_PUBLISHED . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_PUBLISHED . " ";
$status_explaination = _AM_PUBLISHER_PUBLISHED_EXP;
break;
- case _PUBLISHER_STATUS_OFFLINE :
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE :
$selectedtxt3 = "selected='selected'";
$caption = _CO_PUBLISHER_OFFLINE;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_OFFLINE . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_OFFLINE . " ";
$status_explaination = _AM_PUBLISHER_OFFLINE_EXP;
break;
- case _PUBLISHER_STATUS_REJECTED :
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED :
$selectedtxt4 = "selected='selected'";
$caption = _CO_PUBLISHER_REJECTED;
- $cond = " WHERE status = " . _PUBLISHER_STATUS_REJECTED . " ";
+ $cond = " WHERE status = " . PublisherConstants::_PUBLISHER_STATUS_REJECTED . " ";
$status_explaination = _AM_PUBLISHER_REJECTED_ITEM_EXP;
break;
}
@@ -230,7 +230,7 @@
switch ($itemsObj[$i]->status()) {
- case _PUBLISHER_STATUS_SUBMITTED :
+ case PublisherConstants::_PUBLISHER_STATUS_SUBMITTED :
$statustxt = _CO_PUBLISHER_SUBMITTED;
$approve = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/approve.gif' title='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' alt='" . _AM_PUBLISHER_SUBMISSION_MODERATE . "' /></a> ";
$clone = '';
@@ -238,7 +238,7 @@
$modify = "";
break;
- case _PUBLISHER_STATUS_PUBLISHED :
+ case PublisherConstants::_PUBLISHER_STATUS_PUBLISHED :
$statustxt = _CO_PUBLISHER_PUBLISHED;
$approve = "";
$clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a> ";
@@ -246,7 +246,7 @@
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
break;
- case _PUBLISHER_STATUS_OFFLINE :
+ case PublisherConstants::_PUBLISHER_STATUS_OFFLINE :
$statustxt = _CO_PUBLISHER_OFFLINE;
$approve = "";
$clone = "<a href='item.php?op=clone&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/clone.gif' title='" . _AM_PUBLISHER_CLONE_ITEM . "' alt='" . _AM_PUBLISHER_CLONE_ITEM . "' /></a> ";
@@ -254,7 +254,7 @@
$delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/assets/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "' /></a>";
break;
- case _PUBLISHER_STATUS_REJECTED :
+ case PublisherConstants::_PUBLISHER_STATUS_REJECTED :
$statustxt = _CO_PUBLISHER_REJECTED;
$approve = "";
$clone = "<a href='item.php?op=clone&itemid=" . $item...
[truncated message content] |
