Skip to content

Commit

Permalink
Merge pull request #4 from mambax7/master
Browse files Browse the repository at this point in the history 
2.01 RC-1
  • Loading branch information
@mambax7
mambax7 committed Jun 5, 2016
2 parents b60369e + a5640d0 commit b5d5db3
Show file tree
Hide file tree
Showing 59 changed files with 715 additions and 314 deletions.
24 changes: 21 additions & 3 deletions README.md
View file
@@ -1,4 +1,22 @@
#SmartPartner
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
![alt XOOPS CMS](http://xoops.org/images/logoXoops4GithubRepository.png)
##SmartPartner for [XOOPS CMS 2.5.8+](https://xoops.org)
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](LICENSE)
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/mambax7/smartpartner.svg?style=flat)](https://scrutinizer-ci.com/g/XoopsModules25x/smartpartner/?branch=master)
[![Codacy Badge](https://api.codacy.com/project/badge/grade/2d27c0023ee54f0b9ba2b5d17a68b2a5)](https://www.codacy.com/app/mambax7/smartpartner)
[![Code Climate](https://img.shields.io/codeclimate/github/mambax7/smartpartner.svg?style=flat)](https://codeclimate.com/github/mambax7/smartpartner)
[![SensioLabsInsight](https://insight.sensiolabs.com/projects/626a39f7-d06e-47a6-8fc9-20bd04275bb1/mini.png)](https://insight.sensiolabs.com/projects/626a39f7-d06e-47a6-8fc9-20bd04275bb1)
[![Latest Pre-Resease](https://img.shields.io/github/tag/XoopsModules25x/smartpartner.svg?style=flat)](https://github.com/XoopsModules25x/smartpartner/tags/)
[![Latest Version](https://img.shields.io/github/release/XoopsModules25x/smartpartner.svg?style=flat)](https://github.com/XoopsModules25x/smartpartner/releases/)

SmartPartner for [XOOPS CMS](http://xoops.org) is an advanced Partners Management System for your XOOPS site.

[![Tutorial Available](http://xoops.org/images/tutorial-available-blue.svg)](https://www.gitbook.com/book/xoops/xoops-smartpartner-module/) Tutorial: see [here](https://www.gitbook.com/book/xoops/xoops-smartpartner-module/).
To contribute to the Tutorial, [fork it on GitHub](https://github.com/XoopsDocs/smartpartner-tutorial)

[![Translations on Transifex](http://xoops.org/images/translations-transifex-blue.svg)](https://www.transifex.com/xoops)

Please visit us on [http://xoops.org](https://xoops.org)

The upcoming "next generation" version of XOOPS CMS is being crafted on GitHub at: https://github.com/XOOPS


SmartPartner is an advanced Partners Management System for your XOOPS site.
9 changes: 8 additions & 1 deletion admin/admin_footer.php
View file
Expand Up @@ -17,6 +17,13 @@
* @author XOOPS Development Team
*/

echo "<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n" . " <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . " </div>\n" . ' ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
echo "<div class='adminfooter'>\n"
. " <div style='text-align: center;'>\n"
. " <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
. " </div>\n"
. ' '
. _AM_MODULEADMIN_ADMIN_FOOTER
. "\n"
. '</div>';

xoops_cp_footer();
53 changes: 41 additions & 12 deletions admin/category.php
View file
Expand Up @@ -18,16 +18,44 @@ function displayCategory($categoryObj, $level = 0)
$description = substr($description, 0, 100 - 1) . '...';
}
}
$modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . '&parentid=' . $categoryObj->parentid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SPARTNER_CATEGORY_EDIT . "' alt='" . _AM_SPARTNER_CATEGORY_EDIT . "' /></a>";
$delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SPARTNER_CATEGORY_DELETE . "' alt='" . _AM_SPARTNER_CATEGORY_DELETE . "' /></a>";
$modify = "<a href='category.php?op=mod&categoryid="
. $categoryObj->categoryid()
. '&parentid='
. $categoryObj->parentid()
. "'><img src='"
. $pathIcon16
. '/edit.png'
. "' title='"
. _AM_SPARTNER_CATEGORY_EDIT
. "' alt='"
. _AM_SPARTNER_CATEGORY_EDIT
. "' /></a>";
$delete = "<a href='category.php?op=del&categoryid="
. $categoryObj->categoryid()
. "'><img src='"
. $pathIcon16
. '/delete.png'
. "' title='"
. _AM_SPARTNER_CATEGORY_DELETE
. "' alt='"
. _AM_SPARTNER_CATEGORY_DELETE
. "' /></a>";

$spaces = '';
for ($j = 0; $j < $level; ++$j) {
$spaces .= '&nbsp;&nbsp;&nbsp;';
}

echo '<tr>';
echo "<td class='even' align='lefet'>" . $spaces . "<a href='" . $categoryObj->getCategoryUrl() . "'><img src='" . XOOPS_URL . "/modules/smartpartner/assets/images/icon/subcat.gif' alt='' />&nbsp;" . $categoryObj->name() . '</a></td>';
echo "<td class='even' align='lefet'>"
. $spaces
. "<a href='"
. $categoryObj->getCategoryUrl()
. "'><img src='"
. XOOPS_URL
. "/modules/smartpartner/assets/images/icon/subcat.gif' alt='' />&nbsp;"
. $categoryObj->name()
. '</a></td>';
echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
echo "<td class='even' align='center'> $modify $delete </td>";
echo '</tr>';
Expand Down Expand Up @@ -59,7 +87,7 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
//$categoryObj = new SmartpartnerCategory($categoryid);
$categoryObj = $smartPartnerCategoryHandler->get($categoryid);

echo "<br />\n";
echo "<br>\n";
if ($categoryObj->notLoaded()) {
redirect_header('category.php', 1, _AM_SPARTNER_NOCOLTOEDIT);
}
Expand All @@ -69,7 +97,7 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
$categoryObj = $smartPartnerCategoryHandler->create();
}

//echo "<br />\n";
//echo "<br>\n";
smartpartner_collapsableBar('createtable', 'createtableicon', _AM_SPARTNER_CATEGORY_CREATE, _AM_SPARTNER_CATEGORY_CREATE_INFO);
}
// Start category form
Expand All @@ -88,10 +116,10 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
$image_select = new XoopsFormSelect('', 'image', $categoryObj->image());
$image_select->addOption('-1', '---------------');
$image_select->addOptionArray($image_array);
$image_select->setExtra("onchange='showImgSelected(\"image3\", \"image\", \"" . 'uploads/smartpartner/images/category/' . "\", \"\", \"" . XOOPS_URL . "\")'");
$image_select->setExtra("onchange='showImgSelected(\"image3\", \"image\", \"" . 'uploads/smartpartner/assets/images/category/' . "\", \"\", \"" . XOOPS_URL . "\")'");
$image_tray = new XoopsFormElementTray(_AM_SPARTNER_CATEGORY_IMAGE, '&nbsp;');
$image_tray->addElement($image_select);
$image_tray->addElement(new XoopsFormLabel('', "<br /><br /><img src='" . smartpartner_getImageDir('category', false) . $categoryObj->image() . "' name='image3' id='image3' alt='' />"));
$image_tray->addElement(new XoopsFormLabel('', "<br><br><img src='" . smartpartner_getImageDir('category', false) . $categoryObj->image() . "' name='image3' id='image3' alt='' />"));
$image_tray->setDescription(_AM_SPARTNER_CATEGORY_IMAGE_DSC);
$sform->addElement($image_tray);

Expand Down Expand Up @@ -122,7 +150,7 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
// Added by fx2024
// sub Categories

$cat_tray = new XoopsFormElementTray(_AM_SPARTNER_CATEGORY_SUBCATS_CREATE, '<br /><br />');
$cat_tray = new XoopsFormElementTray(_AM_SPARTNER_CATEGORY_SUBCATS_CREATE, '<br><br>');
$cat_tray->setDescription(_AM_SPARTNER_CATEGORY_SUBCATS_CREATE_DSC);
for ($i = 0; $i < $nb_subcats; ++$i) {
if ($i < (isset($_POST['scname']) ? count($_POST['scname']) : 0)) {
Expand Down Expand Up @@ -362,7 +390,7 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO

smartpartner_xoops_cp_header();

$categoryObj =& $smartPartnerCategoryHandler->create();
$categoryObj = $smartPartnerCategoryHandler->create();
$categoryObj->setVar('name', $_POST['name']);
$categoryObj->setVar('description', $_POST['description']);
$categoryObj->setVar('weight', $_POST['weight']);
Expand Down Expand Up @@ -402,7 +430,8 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
// no confirm: show deletion condition
$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
xoops_cp_header();
xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_SPARTNER_CATEGORY_DELETE . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_SPARTNER_CATEGORY_DELETE_CONFIRM, _AM_SPARTNER_DELETE);
xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php',
_AM_SPARTNER_CATEGORY_DELETE . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SPARTNER_CATEGORY_DELETE_CONFIRM, _AM_SPARTNER_DELETE);
xoops_cp_footer();
}
exit();
Expand All @@ -422,7 +451,7 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
echo $indexAdmin->renderButton('left', '');

/*
echo "<br />\n";
echo "<br>\n";
echo "<form><div style=\"margin-bottom: 12px;\">";
echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_SPARTNER_CATEGORY_CREATE . "'>&nbsp;&nbsp;";
//echo "<input type='button' name='button' onclick=\"location='partner.php?op=mod'\" value='" . _AM_SPARTNER_CREATEITEM . "'>&nbsp;&nbsp;";
Expand Down Expand Up @@ -454,7 +483,7 @@ function editcat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryO
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage_admin'], $startcategory, 'startcategory');
echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
echo '<br />';
echo '<br>';
smartpartner_close_collapsable('createdcategories', 'createdcategoriesicon');
echo '<br>';
//editcat(false);
Expand Down
43 changes: 35 additions & 8 deletions admin/file.php
View file
Expand Up @@ -39,13 +39,13 @@ function editfile($showmenu = false, $fileid = 0, $id = 0)
redirect_header('javascript:history.go(-1)', 1, _AM_SPARTNER_NOFILESELECTED);
}

echo "<br />\n";
echo "<br>\n";
echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_SPARTNER_FILE_EDITING . '</span>';
echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SPARTNER_FILE_EDITING_DSC . '</span>';
smartpartner_collapsableBar('editfile', 'editfileicon', _AM_SPARTNER_FILE_INFORMATIONS);
} else {
// there's no parameter, so we're adding an item
$fileObj =& $smartPartnerFileHandler->create();
$fileObj = $smartPartnerFileHandler->create();
$fileObj->setVar('id', $id);

echo "<span style='color: #2F5376; font-weight: bold; font-size: 16px; margin: 6px 6px 0 0; '>" . _AM_SPARTNER_FILE_ADDING . '</span>';
Expand Down Expand Up @@ -201,7 +201,8 @@ function editfile($showmenu = false, $fileid = 0, $id = 0)
$fileid = isset($_GET['fileid']) ? (int)$_GET['fileid'] : 0;

smartpartner_xoops_cp_header();
xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php', _AM_SPARTNER_DELETETHISFILE . ' <br />' . $fileObj->name() . ' <br /> <br />', _AM_SPARTNER_DELETE);
xoops_confirm(array('op' => 'del', 'fileid' => $fileObj->fileid(), 'confirm' => 1, 'name' => $fileObj->name()), 'file.php',
_AM_SPARTNER_DELETETHISFILE . ' <br>' . $fileObj->name() . ' <br> <br>', _AM_SPARTNER_DELETE);
xoops_cp_footer();
}

Expand All @@ -218,7 +219,7 @@ function editfile($showmenu = false, $fileid = 0, $id = 0)

global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;

echo "<br />\n";
echo "<br>\n";

smartpartner_collapsableBar('toptable', 'toptableicon', _AM_SPARTNER_PUBLISHEDITEMS, _AM_SPARTNER_PUBLISHED_DSC);

Expand All @@ -241,13 +242,39 @@ function editfile($showmenu = false, $fileid = 0, $id = 0)
for ($i = 0; $i < $totalItemsOnPage; ++$i) {
$categoryObj =& $itemsObj[$i]->category();

$modify = "<a href='partner.php?op=mod&id=" . $itemsObj[$i]->id() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SPARTNER_EDITITEM . "' alt='" . _AM_SPARTNER_EDITITEM . "' /></a>";
$delete = "<a href='partner.php?op=del&id=" . $itemsObj[$i]->id() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SPARTNER_EDITITEM . "' alt='" . _AM_SPARTNER_DELETEITEM . "'/></a>";
$modify = "<a href='partner.php?op=mod&id="
. $itemsObj[$i]->id()
. "'><img src='"
. $pathIcon16
. '/edit.png'
. "' title='"
. _AM_SPARTNER_EDITITEM
. "' alt='"
. _AM_SPARTNER_EDITITEM
. "' /></a>";
$delete = "<a href='partner.php?op=del&id="
. $itemsObj[$i]->id()
. "'><img src='"
. $pathIcon16
. '/delete.png'
. "' title='"
. _AM_SPARTNER_EDITITEM
. "' alt='"
. _AM_SPARTNER_DELETEITEM
. "'/></a>";

echo '<tr>';
echo "<td class='head' align='center'>" . $itemsObj[$i]->id() . '</td>';
echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
echo "<td class='even' align='left'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/partner.php?id=' . $itemsObj[$i]->id() . "'>" . $itemsObj[$i]->title() . '</a></td>';
echo "<td class='even' align='left'><a href='"
. XOOPS_URL
. '/modules/'
. $xoopsModule->dirname()
. '/partner.php?id='
. $itemsObj[$i]->id()
. "'>"
. $itemsObj[$i]->title()
. '</a></td>';
echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub() . '</td>';
echo "<td class='even' align='center'> $modify $delete </td>";
echo '</tr>';
Expand All @@ -259,7 +286,7 @@ function editfile($showmenu = false, $fileid = 0, $id = 0)
echo '</tr>';
}
echo "</table>\n";
echo "<br />\n";
echo "<br>\n";

$pagenav = new XoopsPageNav($totalitems, $xoopsModuleConfig['perpage'], $startitem, 'startitem');
echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
Expand Down
8 changes: 4 additions & 4 deletions admin/import.php
View file
Expand Up @@ -32,19 +32,19 @@
include_once($importfile_path);
}
foreach ($msgs as $m) {
echo $m . '<br />';
echo $m . '<br>';
}
echo '<br />';
echo '<br>';
if ($error == true) {
$endMsg = _AM_SPARTNER_IMPORT_ERROR;
} else {
$endMsg = _AM_SPARTNER_IMPORT_SUCCESS;
}

echo $endMsg;
echo '<br /><br />';
echo '<br><br>';
echo "<a href='import.php'>" . _AM_SPARTNER_IMPORT_BACK . '</a>';
echo '<br /><br />';
echo '<br><br>';
break;

case 'default':
Expand Down

0 comments on commit b5d5db3

Please sign in to comment.