Menu
▾
▴
xoops-svn — All SVN commits will be posted to this ML
You can subscribe to this list here.
| 2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
| 2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
| 2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
| 2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
| 2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <txm...@us...> - 2012-02-03 12:27:08
|
Revision: 8876
http://xoops.svn.sourceforge.net/xoops/?rev=8876&view=rev
Author: txmodxoops
Date: 2012-02-03 12:26:57 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
Revision
Modified Paths:
--------------
XoopsModules/profile/branches/timgno/modules/profile/language/italian/admin.php
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_fieldlist.html
Modified: XoopsModules/profile/branches/timgno/modules/profile/language/italian/admin.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/language/italian/admin.php 2012-02-03 11:58:33 UTC (rev 8875)
+++ XoopsModules/profile/branches/timgno/modules/profile/language/italian/admin.php 2012-02-03 12:26:57 UTC (rev 8876)
@@ -112,8 +112,7 @@
define("_PROFILE_AM_STEPORDER", "Ordine");
define("_PROFILE_AM_STEPSAVE", "Salvataggio al termine della compilazione");
define("_PROFILE_AM_STEPINTRO", "Descrizione");
-//1.62
-define('_PROFILE_AM_ACTION', 'Azione');
+
//1.63 by TXMod xoops
define("_PROFILE_AM_NOFRAMEWORKS", "Errore: Non stai utilizzando il Frameworks \"modulo admin\". Si prega di installare questo Frameworks");
?>
\ No newline at end of file
Modified: XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_fieldlist.html
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_fieldlist.html 2012-02-03 11:58:33 UTC (rev 8875)
+++ XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_fieldlist.html 2012-02-03 12:26:57 UTC (rev 8876)
@@ -22,7 +22,7 @@
</td>
<td>
<{if $field.canEdit}>
- <input type="text" name="weight[<{$field.field_id}>]" size="5" maxlength="5" value="<{$field.field_weight}>" />
+ <input type="text" name="weight[<{$field.field_id}>]" size="3" maxlength="5" value="<{$field.field_weight}>" />
<{/if}>
</td>
<td align= "center">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-02-03 11:58:46
|
Revision: 8875
http://xoops.svn.sourceforge.net/xoops/?rev=8875&view=rev
Author: txmodxoops
Date: 2012-02-03 11:58:33 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
Added Files
Revision Files
Modified Paths:
--------------
XoopsModules/xnews/branches/timgno/xnews/admin/importer.php
XoopsModules/xnews/branches/timgno/xnews/admin/stories.php
XoopsModules/xnews/branches/timgno/xnews/admin/topics.php
XoopsModules/xnews/branches/timgno/xnews/class/class.newsstory.php
XoopsModules/xnews/branches/timgno/xnews/class/class.xnewsstory.php
XoopsModules/xnews/branches/timgno/xnews/class/xnews_topics.php
XoopsModules/xnews/branches/timgno/xnews/include/functions.php
XoopsModules/xnews/branches/timgno/xnews/index.php
XoopsModules/xnews/branches/timgno/xnews/ratenews.php
XoopsModules/xnews/branches/timgno/xnews/sql/mysql.sql
XoopsModules/xnews/branches/timgno/xnews/templates/xnews_item.html
XoopsModules/xnews/branches/timgno/xnews/xoops_version.php
Added Paths:
-----------
XoopsModules/xnews/branches/timgno/xnews/class/class.newsimport.php
Modified: XoopsModules/xnews/branches/timgno/xnews/admin/importer.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/admin/importer.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/admin/importer.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -22,15 +22,15 @@
{
$topic = new xni_NewsTopic(0, $to_module_subprefix);
- $topic->topic_pid = $arrCat['topic_pid'];
- $topic->topic_title = $arrCat['topic_title'];
- $topic->topic_description = $arrCat['topic_description'];
+ $topic->topic_pid = $arrCat['topics_pid'];
+ $topic->topic_title = $arrCat['topics_title'];
+ $topic->topic_description = $arrCat['topics_description'];
$topic->menu = $arrCat['menu'];
- $topic->topic_frontpage = $arrCat['topic_frontpage'];
- $topic->topic_rssurl = $arrCat['topic_rssurl'];
- $topic->topic_color = $arrCat['topic_color'];
+ $topic->topic_frontpage = $arrCat['topics_frontpage'];
+ $topic->topic_rssurl = $arrCat['topics_rssurl'];
+ $topic->topic_color = $arrCat['topics_color'];
//DNPROSSI - Added for version 1.69
- if ( isset($arrCat['topic_weight'] ) ) { $topic->topic_weight = $arrCat['topic_weigth']; }
+ if ( isset($arrCat['topics_weight'] ) ) { $topic->topic_weight = $arrCat['topics_weigth']; }
if ($from_module_dirname == 'news')
{
@@ -44,15 +44,15 @@
}
// Category image
- if ( ($arrCat['topic_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '') )
+ if ( ($arrCat['topics_imgurl'] != 'blank.gif') && ($arrCat['topic_imgurl'] != '') )
{
- if ($arrCat['topic_imgurl'] == 'xoops.gif')
+ if ($arrCat['topics_imgurl'] == 'xoops.gif')
{
- $topic->topic_imgurl = $arrCat['topic_imgurl'];
+ $topic->topic_imgurl = $arrCat['topics_imgurl'];
}
else
{
- if ( copy($sourcepath . $arrCat['topic_imgurl'], $destinationpath . $arrCat['topic_imgurl']) )
+ if ( copy($sourcepath . $arrCat['topic_imgurl'], $destinationpath . $arrCat['topics_imgurl']) )
{
$topic->topic_imgurl = $arrCat['topic_imgurl'];
echo sprintf(_AM_XNI_IMPORTED_FILE, $topic->topic_imgurl()) . "<br />";
@@ -75,21 +75,21 @@
// Saving topic permissions
if ($from_module_dirname == 'news')
{
- $groupsIds = $gperm_handler->getGroupIds('news_approve', $arrCat['topic_id'], $news_module_id);
+ $groupsIds = $gperm_handler->getGroupIds('news_approve', $arrCat['topics_id'], $news_module_id);
xni_savePermissions($to_module_dirname, $groupsIds, $topic->topic_id(), $to_module_subprefix . 'approve');
- $groupsIds = $gperm_handler->getGroupIds('news_view', $arrCat['topic_id'], $news_module_id);
+ $groupsIds = $gperm_handler->getGroupIds('news_view', $arrCat['topics_id'], $news_module_id);
xni_savePermissions($to_module_dirname, $groupsIds, $topic->topic_id(), $to_module_subprefix . 'view');
- $groupsIds = $gperm_handler->getGroupIds('news_submit', $arrCat['topic_id'], $news_module_id);
+ $groupsIds = $gperm_handler->getGroupIds('news_submit', $arrCat['topics_id'], $news_module_id);
xni_savePermissions($to_module_dirname, $groupsIds, $topic->topic_id(), $to_module_subprefix . 'submit');
// echo intval($topic->topic_id()) . '<br/>';
}
else
{
- $groupsIds = $gperm_handler->getGroupIds($from_module_subprefix . 'approve', $arrCat['topic_id'], $news_module_id);
+ $groupsIds = $gperm_handler->getGroupIds($from_module_subprefix . 'approve', $arrCat['topics_id'], $news_module_id);
xni_savePermissions($to_module_dirname, $groupsIds, $topic->topic_id(), $to_module_subprefix . 'approve');
- $groupsIds = $gperm_handler->getGroupIds($from_module_subprefix . 'view', $arrCat['topic_id'], $news_module_id);
+ $groupsIds = $gperm_handler->getGroupIds($from_module_subprefix . 'view', $arrCat['topics_id'], $news_module_id);
xni_savePermissions($to_module_dirname, $groupsIds, $topic->topic_id(), $to_module_subprefix . 'view');
- $groupsIds = $gperm_handler->getGroupIds($from_module_subprefix . 'submit', $arrCat['topic_id'], $news_module_id);
+ $groupsIds = $gperm_handler->getGroupIds($from_module_subprefix . 'submit', $arrCat['topics_id'], $news_module_id);
xni_savePermissions($to_module_dirname, $groupsIds, $topic->topic_id(), $to_module_subprefix . 'submit');
}
@@ -97,7 +97,7 @@
echo sprintf(_AM_XNI_IMPORT_CATEGORY_SUCCESS, $topic->topic_title());
- $sql = "SELECT * FROM " . $xoopsDB->prefix($from_module_subprefix . 'stories') . " WHERE topicid=" . $arrCat['topic_id'];
+ $sql = "SELECT * FROM " . $xoopsDB->prefix($from_module_subprefix . 'stories') . " WHERE stories_topicid=" . $arrCat['topics_id'];
$resultArticles = $xoopsDB->query($sql);
while ($arrArticle = $xoopsDB->fetchArray($resultArticles))
{
Modified: XoopsModules/xnews/branches/timgno/xnews/admin/stories.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/admin/stories.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/admin/stories.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -39,7 +39,7 @@
xoops_cp_header();
// Options
$op = xnews_CleanVars($_REQUEST, 'op', 'default', 'string');
-
+$prune_op = xnews_CleanVars($_REQUEST, 'prune_op', 'default_prune', 'string');
//Menu admin
$storiesAdmin = new ModuleAdmin();
switch ($op)
@@ -147,8 +147,9 @@
break;
case "new_stories":
- echo $storiesAdmin->addNavigation('stories.php');
- $storiesAdmin->addItemButton(_AM_XNEWS_STORIESLIST, 'stories.php?op=default', 'list');
+ echo $storiesAdmin->addNavigation('stories.php');
+ $storiesAdmin->addItemButton(_AM_XNEWS_DELETESTORIES, 'stories.php?op=del_stories&prune_op=default_prune', 'delete');
+ $storiesAdmin->addItemButton(_AM_XNEWS_STORIESLIST, 'stories.php?op=default', 'list');
echo $storiesAdmin->renderButton();
// Create a New Story
$obj =& $storiesHandler->create();
@@ -156,11 +157,16 @@
break;
case "edit_stories":
+ echo $storiesAdmin->addNavigation('stories.php');
+ $storiesAdmin->addItemButton(_AM_XNEWS_NEWSTORY, 'stories.php?op=new_stories', 'add');
+ $storiesAdmin->addItemButton(_AM_XNEWS_DELETESTORIES, 'stories.php?op=del_stories&prune_op=default_prune', 'delete');
+ $storiesAdmin->addItemButton(_AM_XNEWS_STORIESLIST, 'stories.php?op=default', 'list');
+ echo $storiesAdmin->renderButton();
$obj = $storiesHandler->get($_REQUEST["stories_id"]);
$form = $obj->getForm();
break;
- case "delete_stories":
+ case "del_story":
$obj =& $storiesHandler->get($_REQUEST["stories_id"]);
if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
@@ -172,10 +178,70 @@
echo $obj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => 1, "stories_id" => $_REQUEST["stories_id"], "op" => "delete_stories"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWS_FORMSUREDEL, $obj->getVar("stories")));
+ xoops_confirm(array("ok" => 1, "stories_id" => $_REQUEST["stories_id"], "op" => "del_story"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWS_FORMSUREDEL, $obj->getVar("stories")));
}
break;
+ case "del_stories":
+ switch($prune_op)
+ {
+ case 'default_prune':
+ default:
+ echo $storiesAdmin->addNavigation('stories.php');
+ $storiesAdmin->addItemButton(_AM_XNEWS_NEWSTORY, 'stories.php?op=new_stories', 'add');
+ $storiesAdmin->addItemButton(_AM_XNEWS_STORIESLIST, 'stories.php?op=default', 'list');
+ echo $storiesAdmin->renderButton();
+
+ /*$obj = $storiesHandler->get($_REQUEST["stories_topicid"]);
+ $sform = $obj->getFormPrune();*/
+ break;
+
+ case 'prunenews':
+ $timestamp=intval($_POST['prune_date']);
+ $expired= intval($_POST['expired']);
+ $topiclist='';
+ if(isset($_POST['pruned_topics'])) {
+ $topiclist=$_POST['pruned_topics'];
+ }
+
+ if(intval($_POST['ok'])==1) {
+ $story = new nw_NewsStory();
+ $count=$story->GetCountStoriesPublishedBefore($timestamp,$expired,$topiclist);
+ $msg=sprintf(_AM_XNEWS_PRUNE_DELETED,$count);
+ $story->DeleteBeforeDate($timestamp,$expired,$topiclist);
+ unset($story);
+ nw_updateCache();
+ redirect_header( 'index.php', 3, $msg);
+ }
+ break;
+
+ case 'confirmbeforetoprune':
+ global $dateformat;
+ $story = new nw_NewsStory();
+ $topiclist='';
+ if(isset($_POST['pruned_topics'])) {
+ $topiclist=implode(',',$_POST['pruned_topics']);
+ }
+ echo '<h2>' . _AM_XNEWS_PRUNENEWS . '</h2>';
+ $expired=0;
+ if(isset($_POST['onlyexpired'])) {
+ $expired = intval($_POST['onlyexpired']);
+ }
+ $date=$_POST['prune_date'];
+ $timestamp=mktime(0,0,0,intval(substr($date,5,2)), intval(substr($date,8,2)), intval(substr($date,0,4)));
+ $count=$story->GetCountStoriesPublishedBefore($timestamp, $expired, $topiclist);
+ if($count) {
+ $displaydate=formatTimestamp($timestamp,$dateformat);
+ $msg=sprintf(_AM_XNEWS_PRUNE_CONFIRM,$displaydate, $count);
+ xoops_confirm(array( 'prune_op' => 'prunenews', 'expired' => $expired, 'pruned_topics' => $topiclist, 'prune_date' => $timestamp, 'ok' => 1), 'index.php', $msg);
+ } else {
+ printf(_AM_XNEWS_NOTHING_PRUNE);
+ }
+ unset($story);
+ break;
+ }
+ break;
+
case "update_online_stories":
if (isset($_REQUEST["stories_id"])) {
@@ -193,11 +259,12 @@
case "default":
default:
echo $storiesAdmin->addNavigation('stories.php');
- $storiesAdmin->addItemButton(_AM_XNEWS_NEWSTORY, 'stories.php?op=new_stories', 'add');
+ $storiesAdmin->addItemButton(_AM_XNEWS_NEWSTORY, 'stories.php?op=new_stories', 'add');
+ $storiesAdmin->addItemButton(_AM_XNEWS_DELETESTORIES, 'stories.php?op=del_stories&prune_op=default_prune', 'delete');
echo $storiesAdmin->renderButton();
$criteria = new CriteriaCompo();
- $criteri->add(new Criteria('stories_topicid', '0', '>'));
+ $criteria->add(new Criteria('stories_topicid', '0', '>'));
$criteria->setSort("stories_id");
$numrows = $storiesHandler->getCount();
if (isset($_REQUEST['limit'])) {
@@ -291,7 +358,7 @@
}
echo "<td align=\"center\" width=\"10%\">
<a href=\"stories.php?op=edit_stories&stories_id=".$stories_arr[$i]->getVar("stories_id")."\"><img src=\"". $pathImageIcon ."/edit.png\" alt=\""._EDIT."\" title=\""._EDIT."\"></a>
- <a href=\"stories.php?op=delete_stories&stories_id=".$stories_arr[$i]->getVar("stories_id")."\"><img src=\"". $pathImageIcon ."/delete.png\" alt=\""._DELETE."\" title=\""._DELETE."\"></a>
+ <a href=\"stories.php?op=del_story&stories_id=".$stories_arr[$i]->getVar("stories_id")."\"><img src=\"". $pathImageIcon ."/delete.png\" alt=\""._DELETE."\" title=\""._DELETE."\"></a>
</td>";
echo "</tr>";
}
Modified: XoopsModules/xnews/branches/timgno/xnews/admin/topics.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/admin/topics.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/admin/topics.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -158,7 +158,7 @@
echo $topicsAdmin->renderButton();
$criteria = new CriteriaCompo();
- $criteri->add(new Criteria('topics_id', '0', '>'));
+ $criteria->add(new Criteria('topics_id', '0', '>'));
$criteria->setSort("topics_id");
$numrows = $topicsHandler->getCount();
if (isset($_REQUEST['limit'])) {
Added: XoopsModules/xnews/branches/timgno/xnews/class/class.newsimport.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/class/class.newsimport.php (rev 0)
+++ XoopsModules/xnews/branches/timgno/xnews/class/class.newsimport.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -0,0 +1,18 @@
+<?php
+
+// better place this on a separate file so you can reuse it
+class xni_TableObject extends XoopsObject
+{
+ /**
+ * constructor
+ */
+ function xni_TableObject($row, $id_name = 'cid', $pid_name = 'pid', $title_name = 'title')
+ {
+ $this->XoopsObject();
+ $this->initVar($id_name, XOBJ_DTYPE_INT, $row[$id_name]);
+ $this->initVar($pid_name, XOBJ_DTYPE_INT, $row[$pid_name]);
+ $this->initVar($title_name, XOBJ_DTYPE_TXTBOX, $row[$title_name]);
+ }
+}
+
+?>
Modified: XoopsModules/xnews/branches/timgno/xnews/class/class.newsstory.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/class/class.newsstory.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/class/class.newsstory.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -570,12 +570,12 @@
*/
function adminlink()
{
- //<img src='" . NW_MODULE_URL . "/images/leftarrow22.png' border='0' alt='" . _MA_NW_PREVIOUS_ARTICLE . "'/></a>";
- $ret2 = "<a href='" . NW_MODULE_URL . "/submit.php?op=edit&stories_id=" . $this->stories_id() . "' title='" . _EDIT . "'>";
+ //<img src='" . NW_MODULE_URL . "/images/leftarrow22.png' border='0' alt='" . _MA_XNEWS_PREVIOUS_ARTICLE . "'/></a>";
+ $ret2 = "<a href='" . NW_MODULE_URL . "/submit.php?op=edit&stories_id=" . $this->storyid() . "' title='" . _EDIT . "'>";
$ret2 .= "<img src='" . NW_MODULE_URL . "/images/edit_block.png' width='22px' height='22px' border='0' alt='" . _EDIT . "'/></a> ";
- $ret2 .= "<a href='" . NW_MODULE_URL . "/admin/index.php?op=delete&stories_id=" . $this->stories_id() . "' title='" . _DELETE . "'>";
+ $ret2 .= "<a href='" . NW_MODULE_URL . "/admin/index.php?op=delete&stories_id=" . $this->storyid() . "' title='" . _DELETE . "'>";
$ret2 .= "<img src='" . NW_MODULE_URL . "/images/delete_block.png' width='24px' height='24px' border='0' alt='" . _DELETE . "'/></a> ";
- //$ret = " [ <a href='" . NW_MODULE_URL . "/submit.php?op=edit&stories_id=".$this->stories_id()."'>"._EDIT."</a> | <a href='".NW_MODULE_URL . "/admin/index.php?op=delete&stories_id=".$this->stories_id()."'>"._DELETE."</a> ] ";
+ //$ret = " [ <a href='" . NW_MODULE_URL . "/submit.php?op=edit&stories_id=".$this->storyid()."'>"._EDIT."</a> | <a href='".NW_MODULE_URL . "/admin/index.php?op=delete&stories_id=".$this->storyid()."'>"._DELETE."</a> ] ";
return $ret2;
}
@@ -649,8 +649,8 @@
if ( $topics_display == 1 ) {
//DNPROSSI SEO
$cat_path = '';
- if ( $seo_enabled != 0 ) $cat_path = xnews_remove_accents($this->topics_title());
- $ret = "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_TOPICS, $this->stories_topicid(), $cat_path) . "'>";
+ if ( $seo_enabled != 0 ) $cat_path = nw_remove_accents($this->topics_title());
+ $ret = "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_TOPICS, $this->topicid(), $cat_path) . "'>";
$ret .= "<img src='" . NW_TOPICS_FILES_URL . "/" . $this->topics_imgurl() . "' alt='";
$ret .= $this->topics_title() . "' hspace='10' vspace='10' align='";
$ret .= $this->topicalign() . "'" . $margin . " /></a>";
@@ -662,8 +662,8 @@
if ( $topics_display == 1 ) {
//DNPROSSI SEO
$cat_path = '';
- if ( $seo_enabled != 0 ) $cat_path = xnews_remove_accents($this->topics_title());
- $ret = "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_TOPICS, $this->stories_topicid(), $cat_path) . "'>";
+ if ( $seo_enabled != 0 ) $cat_path = nw_remove_accents($this->topics_title());
+ $ret = "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_TOPICS, $this->topicid(), $cat_path) . "'>";
$ret .= "<img src='" . NW_TOPICS_FILES_URL . "/" . $this->picture() . "' alt='";
$ret .= $this->topics_title() . "' hspace='10' vspace='10' align='";
$ret .= $this->topicalign() . "'" . $margin . " /></a>";
@@ -676,11 +676,11 @@
function storylink()
{
- $seo_enabled = xnews_getmoduleoption('seo_enable', NW_MODULE_DIR_NAME);
+ $seo_enabled = xoops_getmoduleoption('seo_enable', NW_MODULE_DIR_NAME);
$ret = '';
$story_path = '';
- if ( $seo_enabled != 0 ) $story_path = xnews_remove_accents($this->title());
- $ret = "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_ARTICLES, $this->stories_id(), $story_path) . "'>" . $this->title() . "</a>";
+ if ( $seo_enabled != 0 ) $story_path = nw_remove_accents($this->title());
+ $ret = "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_ARTICLES, $this->storyid(), $story_path) . "'>" . $this->title() . "</a>";
return $ret;
}
@@ -702,8 +702,8 @@
$ret = '';
$cat_path = '';
if ( $topics_display == 1 ) {
- if ( $seo_enabled != 0 ) $cat_path = xnews_remove_accents($this->topics_title());
- $ret = "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_TOPICS, $this->stories_topicid(), $cat_path) . "'>" . $this->topics_title() . "</a>";
+ if ( $seo_enabled != 0 ) $cat_path = nw_remove_accents($this->topics_title());
+ $ret = "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_TOPICS, $this->topicid(), $cat_path) . "'>" . $this->topics_title() . "</a>";
}
return $ret;
@@ -721,12 +721,12 @@
//DNPROSSI SEO
$seo_enabled = xnews_getmoduleoption('seo_enable', NW_MODULE_DIR_NAME);
$story = array();
- $story['id'] = $this->stories_id();
+ $story['id'] = $this->storyid();
$story['poster'] = $this->uname();
$story['author_name'] = $this->uname();
- $story['author_stories_uid'] = $this->stories_uid();
+ $story['author_stories_uid'] = $this->uid();
if ( $story['poster'] != false ) {
- $story['poster'] = "<a href='".XOOPS_URL."/userinfo.php?stories_uid=".$this->stories_uid()."'>".$story['poster']."</a>";
+ $story['poster'] = "<a href='".XOOPS_URL."/userinfo.php?stories_uid=".$this->uid()."'>".$story['poster']."</a>";
} else {
if($xoopsModuleConfig['displayname']!=3) {
$story['poster'] = $xoopsConfig['anonymous'];
@@ -735,12 +735,12 @@
if ($xoopsModuleConfig['ratenews']) {
$story['rating'] = number_format($this->rating(), 2);
if ($this->stories_votes == 1) {
- $story['stories_votes'] = _MA_NW_ONEVOTE;
+ $story['stories_votes'] = _MA_XNEWS_ONEVOTE;
} else {
- $story['stories_votes'] = sprintf(_MA_NW_NUMVOTES,$this->stories_votes);
+ $story['stories_votes'] = sprintf(_MA_XNEWS_NUMVOTES,$this->stories_votes);
}
}
- $story['posttimestamp'] = $this->stories_published();
+ $story['posttimestamp'] = $this->published();
$story['posttime'] = formatTimestamp($story['posttimestamp'],xnews_getmoduleoption('dateformat', NW_MODULE_DIR_NAME));
$story['topics_description'] = $myts->displayTarea($this->topics_description);
@@ -759,10 +759,10 @@
if ( $fullcount > 1 ) {
$story_path = '';
//DNPROSSI SEO
- if ( $seo_enabled != 0 ) $story_path = xnews_remove_accents($this->title());
- $morelink .= "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_ARTICLES, $this->stories_id(), $story_path) . "'>";
- $morelink .= _MA_NW_READMORE . "</a>";
- //$morelink .= " | ".sprintf(_MA_NW_BYTESMORE, $totalcount);
+ if ( $seo_enabled != 0 ) $story_path = nw_remove_accents($this->title());
+ $morelink .= "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_ARTICLES, $this->storyid(), $story_path) . "'>";
+ $morelink .= _MA_XNEWS_READMORE . "</a>";
+ //$morelink .= " | ".sprintf(_MA_XNEWS_BYTESMORE, $totalcount);
if (XOOPS_COMMENT_APPROVENONE != $xoopsModuleConfig['com_rule']) {
$morelink .= " | ";
}
@@ -771,16 +771,16 @@
$ccount = $this->comments();
$story_path = '';
//DNPROSSI SEO
- if ( $seo_enabled != 0 ) $story_path = xnews_remove_accents($this->title());
+ if ( $seo_enabled != 0 ) $story_path = nw_remove_accents($this->title());
if ( $ccount == 0 ) {
- $morelink .= _MA_NW_NO_COMMENT;
+ $morelink .= _MA_XNEWS_NO_COMMENT;
} else {
- $morelink .= "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_ARTICLES, $this->stories_id(), $story_path);
+ $morelink .= "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_ARTICLES, $this->storyid(), $story_path);
if ( $ccount == 1 ) {
- $morelink .= "'>"._MA_NW_ONECOMMENT."</a>";
+ $morelink .= "'>"._MA_XNEWS_ONECOMMENT."</a>";
} else {
$morelink .= "'>";
- $morelink .= sprintf(_MA_NW_NUMCOMMENTS, $ccount);
+ $morelink .= sprintf(_MA_XNEWS_NUMCOMMENTS, $ccount);
$morelink .= "</a>";
}
}
@@ -789,17 +789,17 @@
$story['adminlink'] = '';
$approveprivilege = 0;
- if(xnews_is_admin_group()) {
+ if(nw_is_admin_group()) {
$approveprivilege = 1;
}
- if($xoopsModuleConfig['authoredit']==1 && (is_object($xoopsUser) && $xoopsUser->getVar('stories_uid')==$this->stories_uid())) {
+ if($xoopsModuleConfig['authoredit']==1 && (is_object($xoopsUser) && $xoopsUser->getVar('stories_uid')==$this->uid())) {
$approveprivilege = 1;
}
if ($approveprivilege) {
$story['adminlink'] = $this->adminlink();
}
- $story['mail_link'] = 'mailto:?subject='.sprintf(_MA_NW_INTARTICLE,$xoopsConfig['sitename']).'&body='.sprintf(_MA_NW_INTARTFOUND, $xoopsConfig['sitename']).': '.NW_MODULE_URL . '/article.php?stories_id='.$this->stories_id();
+ $story['mail_link'] = 'mailto:?subject='.sprintf(_MA_XNEWS_INTARTICLE,$xoopsConfig['sitename']).'&body='.sprintf(_MA_XNEWS_INTARTFOUND, $xoopsConfig['sitename']).': '.NW_MODULE_URL . '/article.php?stories_id='.$this->storyid();
$story['imglink'] = '';
$story['align'] = '';
if ( $this->topicdisplay() ) {
@@ -814,12 +814,12 @@
//DNPROSSI SEO
$story_path = '';
- if ( $seo_enabled != 0 ) $story_path = xnews_remove_accents($this->title());
- $story['title'] = "<a href='" . xnews_seo_UrlGenerator(_MA_NW_SEO_ARTICLES, $this->stories_id(), $story_path) . "'>" . $this->title() . "</a>";
- $story['hits'] = $this->stories_counter();
+ if ( $seo_enabled != 0 ) $story_path = nw_remove_accents($this->title());
+ $story['title'] = "<a href='" . nw_seo_UrlGenerator(_MA_XNEWS_SEO_ARTICLES, $this->storyid(), $story_path) . "'>" . $this->title() . "</a>";
+ $story['hits'] = $this->counter();
if($filescount>0) {
$story['files_attached']= true;
- $story['attached_link']="<a href='".NW_MODULE_URL . '/article.php?stories_id='.$this->stories_id()."' title='"._MA_NW_ATTACHEDLIB."'><img src='".NW_MODULE_URL . '/images/attach.png'."' title='"._MA_NW_ATTACHEDLIB."'></a>";
+ $story['attached_link']="<a href='".NW_MODULE_URL . '/article.php?stories_id='.$this->storyid()."' title='"._MA_XNEWS_ATTACHEDLIB."'><img src='".NW_MODULE_URL . '/images/attach.png'."' title='"._MA_XNEWS_ATTACHEDLIB."'></a>";
} else {
$story['files_attached']= false;
$story['attached_link']='';
@@ -837,7 +837,7 @@
static $tblusers = array();
$option=-1;
if($stories_uid == 0) {
- $stories_uid=$this->stories_uid();
+ $stories_uid=$this->uid();
}
if(is_array($tblusers) && array_key_exists($stories_uid,$tblusers)) {
@@ -958,10 +958,10 @@
$created = time();
$stories_published = ( $this->approved ) ? intval($this->stories_published) : 0;
//DNPROSSI - ADD TAGS FOR UPDATES - ADDED imagerows, pdfrows
- $sql = sprintf("INSERT INTO %s (stories_id, stories_uid, title, created, stories_published, stories_expired, hostname, nohtml, nosmiley, hometext, bodytext, stories_counter, stories_topicid, stories_ihome, notifypub, story_type, topicdisplay, topicalign, comments, rating, stories_votes, description, keywords, picture, dobr, tags, imagerows, pdfrows) VALUES (%u, %u, '%s', %u, %u, %u, '%s', %u, %u, '%s', '%s', %u, %u, %u, %u, '%s', %u, '%s', %u, %u, %u, '%s', '%s', '%s', '%u','%s', %u, %u)", $this->table, $newstories_id, intval($this->stories_uid()), $title, $created, $stories_published, $stories_expired, $hostname, intval($this->nohtml()), intval($this->nosmiley()), $hometext, $bodytext, $stories_counter, intval($this->stories_topicid()), intval($this->stories_ihome()), intval($this->notifypub()), $type, intval($this->topicdisplay()), $this->topicalign, intval($this->comments()), $rating, $stories_votes, $description, $keywords, $picture, intval($this->dobr()), $tags, intval($this->imagerows()), intval($this->pdfrows()));
+ $sql = sprintf("INSERT INTO %s (stories_id, stories_uid, title, created, stories_published, stories_expired, hostname, nohtml, nosmiley, hometext, bodytext, stories_counter, stories_topicid, stories_ihome, notifypub, story_type, topicdisplay, topicalign, comments, rating, stories_votes, description, keywords, picture, dobr, tags, imagerows, pdfrows) VALUES (%u, %u, '%s', %u, %u, %u, '%s', %u, %u, '%s', '%s', %u, %u, %u, %u, '%s', %u, '%s', %u, %u, %u, '%s', '%s', '%s', '%u','%s', %u, %u)", $this->table, $newstories_id, intval($this->uid()), $title, $created, $stories_published, $stories_expired, $hostname, intval($this->nohtml()), intval($this->nosmiley()), $hometext, $bodytext, $stories_counter, intval($this->topicid()), intval($this->stories_ihome()), intval($this->notifypub()), $type, intval($this->topicdisplay()), $this->topicalign, intval($this->comments()), $rating, $stories_votes, $description, $keywords, $picture, intval($this->dobr()), $tags, intval($this->imagerows()), intval($this->pdfrows()));
} else {
- $sql = sprintf("UPDATE %s SET title='%s', stories_published=%u, stories_expired=%u, nohtml=%u, nosmiley=%u, hometext='%s', bodytext='%s', stories_topicid=%u, stories_ihome=%u, topicdisplay=%u, topicalign='%s', comments=%u, rating=%u, stories_votes=%u, stories_uid=%u, description='%s', keywords='%s', picture='%s', dobr='%u', tags='%s', imagerows='%u', pdfrows='%u' WHERE stories_id = %u", $this->table, $title, intval($this->stories_published()), $stories_expired, intval($this->nohtml()), intval($this->nosmiley()), $hometext, $bodytext, intval($this->stories_topicid()), intval($this->stories_ihome()), intval($this->topicdisplay()), $this->topicalign, intval($this->comments()), $rating, $stories_votes, intval($this->stories_uid()), $description, $keywords, $picture, intval($this->dobr()), $tags, intval($this->imagerows()), intval($this->pdfrows()), intval($this->stories_id()));
- $newstories_id = intval($this->stories_id());
+ $sql = sprintf("UPDATE %s SET title='%s', stories_published=%u, stories_expired=%u, nohtml=%u, nosmiley=%u, hometext='%s', bodytext='%s', stories_topicid=%u, stories_ihome=%u, topicdisplay=%u, topicalign='%s', comments=%u, rating=%u, stories_votes=%u, stories_uid=%u, description='%s', keywords='%s', picture='%s', dobr='%u', tags='%s', imagerows='%u', pdfrows='%u' WHERE stories_id = %u", $this->table, $title, intval($this->published()), $stories_expired, intval($this->nohtml()), intval($this->nosmiley()), $hometext, $bodytext, intval($this->topicid()), intval($this->stories_ihome()), intval($this->topicdisplay()), $this->topicalign, intval($this->comments()), $rating, $stories_votes, intval($this->uid()), $description, $keywords, $picture, intval($this->dobr()), $tags, intval($this->imagerows()), intval($this->pdfrows()), intval($this->storyid()));
+ $newstories_id = intval($this->storyid());
}
if (!$this->db->queryF($sql)) {
return false;
@@ -1325,9 +1325,9 @@
$arr_replace = array('', '', '');
$cpt = 1;
if(isset($titles) && is_array($titles)) {
- $titles[] = strip_tags(sprintf(_MA_NW_PAGE_AUTO_SUMMARY,1, $this->title()));
+ $titles[] = strip_tags(sprintf(_MA_XNEWS_PAGE_AUTO_SUMMARY,1, $this->title()));
}
- $item = "<a href='".NW_MODULE_URL . '/article.php?stories_id='.$this->stories_id()."&page=0'>".sprintf(_MA_NW_PAGE_AUTO_SUMMARY,1, $this->title()).'</a><br />';
+ $item = "<a href='".NW_MODULE_URL . '/article.php?stories_id='.$this->storyid()."&page=0'>".sprintf(_MA_XNEWS_PAGE_AUTO_SUMMARY,1, $this->title()).'</a><br />';
$auto_summary .= $item;
foreach($delimiters as $item) {
@@ -1336,8 +1336,8 @@
if(xoops_trim($item) == '') {
$item = $cpt;
}
- $titles[] = strip_tags(sprintf(_MA_NW_PAGE_AUTO_SUMMARY,$cpt, $item));
- $item = "<a href='".NW_MODULE_URL . '/article.php?stories_id='.$this->stories_id().'&page='.($cpt-1)."'>".sprintf(_MA_NW_PAGE_AUTO_SUMMARY,$cpt, $item).'</a><br />';
+ $titles[] = strip_tags(sprintf(_MA_XNEWS_PAGE_AUTO_SUMMARY,$cpt, $item));
+ $item = "<a href='".NW_MODULE_URL . '/article.php?stories_id='.$this->storyid().'&page='.($cpt-1)."'>".sprintf(_MA_XNEWS_PAGE_AUTO_SUMMARY,$cpt, $item).'</a><br />';
$auto_summary .= $item;
}
}
Modified: XoopsModules/xnews/branches/timgno/xnews/class/class.xnewsstory.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/class/class.xnewsstory.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/class/class.xnewsstory.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -185,4 +185,4 @@
return $keywords;
}
}
-?>
+?>
\ No newline at end of file
Modified: XoopsModules/xnews/branches/timgno/xnews/class/xnews_topics.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/class/xnews_topics.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/class/xnews_topics.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -182,6 +182,41 @@
$form->display();
return $form;
}
+
+ function getFormPrune($action = false)
+ {
+ if ($action === false) {
+ $action = $_SERVER["REQUEST_URI"];
+ }
+ include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+ $sform = new XoopsThemeForm(_AM_NW_PRUNENEWS, 'pruneform', $action, 'post');
+ $sform->addElement(new XoopsFormTextDateSelect(_AM_NW_PRUNE_BEFORE, 'prune_date', 15, time()), true);
+ $onlyexpired=new xoopsFormCheckBox('', 'onlyexpired');
+ $onlyexpired->addOption(1, _AM_NW_PRUNE_EXPIREDONLY);
+ $sform->addElement($onlyexpired, false);
+ $sform->addElement(new XoopsFormHidden('prune_op', 'confirmbeforetoprune'), false);
+ $topiclist=new XoopsFormSelect(_AM_NW_PRUNE_TOPICS, 'pruned_topics', '', 5, true);
+ // For topics pid
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('topics_weight ASC, topics_title');
+ $criteria->setOrder('ASC');
+ $allTopics = $topicsHandler->getall($criteria);
+ $mytree = new XoopsObjectTree($allTopics, 'topics_id', 'topics_pid');
+ $topics_arr = $$mytree->getAllChild('topics_pid');
+ if(count($topics_arr)) {
+ foreach ($topics_arr as $onetopic) {
+ $topiclist->addOption($onetopic->getVar("topics_id"), $onetopic->getVar("topics_title"));
+ }
+ }
+ $topiclist->setDescription(_AM_NW_EXPORT_PRUNE_DSC);
+ $sform->addElement($topiclist,false);
+ $button_tray = new XoopsFormElementTray('' ,'');
+ $submit_btn = new XoopsFormButton('', 'post', _SUBMIT, 'submit');
+ $button_tray->addElement($submit_btn);
+ $sform->addElement($button_tray);
+ $sform->display();
+ return $form;
+ }
}
class xnewsxnews_topicsHandler extends XoopsPersistableObjectHandler
{
Modified: XoopsModules/xnews/branches/timgno/xnews/include/functions.php
===================================================================
--- XoopsModules/xnews/branches/timgno/xnews/include/functions.php 2012-02-02 17:05:21 UTC (rev 8874)
+++ XoopsModules/xnews/branches/timgno/xnews/include/functions.php 2012-02-03 11:58:33 UTC (rev 8875)
@@ -310,8 +310,203 @@
}
return $Path;
}
+
+/**
+ * Returns a module's option
+ *
+ * Return's a module's option (for the news module)
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ * @param string $option module option's name
+ */
+function nw_getmoduleoption($option, $repmodule)
+{
+ global $xoopsModuleConfig, $xoopsModule;
+ static $tbloptions= Array();
+ if(is_array($tbloptions) && array_key_exists($option, $tbloptions)) {
+ return $tbloptions[$option];
+ }
+
+ $retval = false;
+ if (isset($xoopsModuleConfig) && (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $repmodule && $xoopsModule->getVar('isactive'))) {
+ if(isset($xoopsModuleConfig[$option])) {
+ $retval= $xoopsModuleConfig[$option];
+ }
+ } else {
+ $module_handler =& xoops_gethandler('module');
+ $module =& $module_handler->getByDirname($repmodule);
+ $config_handler =& xoops_gethandler('config');
+ if ($module) {
+ $moduleConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
+ if(isset($moduleConfig[$option])) {
+ $retval= $moduleConfig[$option];
+ }
+ }
+ }
+ $tbloptions[$option]=$retval;
+ return $retval;
+}
+
+
+/**
+ * Updates rating data in item table for a given item
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_updaterating($storyid)
+{
+ global $xoopsDB;
+ $query = 'SELECT rating FROM '.$xoopsDB->prefix('nw_stories_votedata').' WHERE storyid = '.$storyid;
+ $voteresult = $xoopsDB->query($query);
+ $votesDB = $xoopsDB->getRowsNum($voteresult);
+ $totalrating = 0;
+ while(list($rating)=$xoopsDB->fetchRow($voteresult)){
+ $totalrating += $rating;
+ }
+ $finalrating = $totalrating/$votesDB;
+ $finalrating = number_format($finalrating, 4);
+ $sql = sprintf("UPDATE %s SET rating = %u, votes = %u WHERE storyid = %u", $xoopsDB->prefix('nw_stories'), $finalrating, $votesDB, $storyid);
+ $xoopsDB->queryF($sql);
+}
+
+/**
+ * Internal function for permissions
+ *
+ * Returns a list of all the permitted topics Ids for the current user
+ *
+ * @return array $topics Permitted topics Ids
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_MygetItemIds($permtype='nw_view')
+{
+ global $xoopsUser;
+ static $tblperms = array();
+ if(is_array($tblperms) && array_key_exists($permtype,$tblperms)) {
+ return $tblperms[$permtype];
+ }
+
+ $module_handler =& xoops_gethandler('module');
+ $newsModule =& $module_handler->getByDirname(NW_MODULE_DIR_NAME);
+ $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : XOOPS_GROUP_ANONYMOUS;
+ $gperm_handler =& xoops_gethandler('groupperm');
+ $topics = $gperm_handler->getItemIds($permtype, $groups, $newsModule->getVar('mid'));
+ $tblperms[$permtype] = $topics;
+ return $topics;
+}
+
+function nw_html2text($document)
+{
+ // PHP Manual:: function preg_replace
+ // $document should contain an HTML document.
+ // This will remove HTML tags, javascript sections
+ // and white space. It will also convert some
+ // common HTML entities to their text equivalent.
+
+ $search = array ("'<script[^>]*?>.*?</script>'si", // Strip out javascript
+ "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+ "'([\r\n])[\s]+'", // Strip out white space
+ "'&(quot|#34);'i", // Replace HTML entities
+ "'&(amp|#38);'i",
+ "'&(lt|#60);'i",
+ "'&(gt|#62);'i",
+ "'&(nbsp|#160);'i",
+ "'&(iexcl|#161);'i",
+ "'&(cent|#162);'i",
+ "'&(pound|#163);'i",
+ "'&(copy|#169);'i",
+ "'&#(\d+);'e"); // evaluate as php
+
+ $replace = array ("",
+ "",
+ "\\1",
+ "\"",
+ "&",
+ "<",
+ ">",
+ " ",
+ chr(161),
+ chr(162),
+ chr(163),
+ chr(169),
+ "chr(\\1)");
+
+ $text = preg_replace($search, $replace, $document);
+ return $text;
+}
+
+/**
+ * Is Xoops 2.3.x ?
+ *
+ * @return boolean need to say it ?
+ */
+function nw_isX23()
+{
+ $x23 = false;
+ $xv = str_replace('XOOPS ','',XOOPS_VERSION);
+ if(substr($xv,2,1) >= '3') {
+ $x23 = true;
+ }
+ return $x23;
+}
+
+/**
+ * version of xoops
+ *
+ * @return string
+ */
+function nw_xoops_version()
+{
+ $xv = '';
+ $xv = str_replace('XOOPS ','',XOOPS_VERSION);
+ $xv = substr($xv,0,3);
+ return $xv;
+}
+
+/**
+ * Retreive an editor according to the module's option "form_options"
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+//function &nw_getWysiwygForm($caption, $name, $value = '', $rows, $cols, $supplemental='')
+function &nw_getWysiwygForm($caption, $name, $value, $rows, $cols, $width, $height, $supplemental)
+{
+ $editor_option = strtolower(nw_getmoduleoption('form_options', NW_MODULE_DIR_NAME));
+ $editor = false;
+ $editor_configs=array();
+ $editor_configs['name'] =$name;
+ $editor_configs['value'] = $value;
+ $editor_configs['rows'] = $rows;
+ $editor_configs['cols'] = $cols;
+ $editor_configs['width'] = $width;
+ $editor_configs['height'] = $height;
+ $editor_configs['editor'] = $editor_option;
+ $editor = new XoopsFormEditor($caption, $name, $editor_configs);
+
+ return $editor;
+}
+
/**
+ * Internal function
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_DublinQuotes($text) {
+ return str_replace("\"", ' ',$text);
+}
+
+
+/**
* Creates all the meta datas :
* - For Mozilla/Netscape and Opera the site navigation's bar
* - The Dublin's Core Metadata
@@ -323,6 +518,771 @@
* @author Instant Zero (http://xoops.instant-zero.com)
* @copyright (c) Instant Zero
*/
+function nw_CreateMetaDatas($story = null)
+{
+ global $xoopsConfig, $xoTheme, $xoopsTpl;
+ $content = '';
+ $myts =& MyTextSanitizer::getInstance();
+ include_once NW_MODULE_PATH . '/class/class.newstopic.php';
+
+ /**
+ * Firefox and Opera Navigation's Bar
+ */
+ if(nw_getmoduleoption('sitenavbar', NW_MODULE_DIR_NAME)) {
+ $content .= sprintf("<link rel=\"Home\" title=\"%s\" href=\"%s/\" />\n",$xoopsConfig['sitename'],XOOPS_URL);
+ $content .= sprintf("<link rel=\"Contents\" href=\"%s\" />\n",NW_MODULE_URL . '/index.php');
+ $content .= sprintf("<link rel=\"Search\" href=\"%s\" />\n",XOOPS_URL.'/search.php');
+ $content .= sprintf("<link rel=\"Glossary\" href=\"%s\" />\n",NW_MODULE_URL . '/archive.php');
+ $content .= sprintf("<link rel=\"%s\" href=\"%s\" />\n",$myts->htmlSpecialChars(_MA_XNEWS_SUBMITNEWS), NW_MODULE_URL . '/submit.php');
+ $content .= sprintf("<link rel=\"alternate\" type=\"application/rss+xml\" title=\"%s\" href=\"%s/\" />\n",$xoopsConfig['sitename'], XOOPS_URL.'/backend.php');
+
+ // Create chapters
+ include_once XOOPS_ROOT_PATH.'/class/tree.php';
+ include_once NW_MODULE_PATH . '/class/class.newstopic.php';
+ $xt = new nw_NewsTopic();
+ $allTopics = $xt->getAllTopics(nw_getmoduleoption('restrictindex', NW_MODULE_DIR_NAME));
+ $topic_tree = new XoopsObjectTree($allTopics, 'topic_id', 'topic_pid');
+ $topics_arr = $topic_tree->getAllChild(0);
+ foreach ($topics_arr as $onetopic) {
+ $content .= sprintf("<link rel=\"Chapter\" title=\"%s\" href=\"%s\" />\n",$onetopic->topic_title(),NW_MODULE_URL . '/index.php?topic_id='.$onetopic->topic_id());
+ }
+ }
+
+ /**
+ * Meta Keywords and Description
+ * If you have set this module's option to 'yes' and if the information was entered, then they are rendered in the page else they are computed
+ */
+ $meta_keywords = '';
+ if(isset($story) && is_object($story)) {
+ if(xoops_trim($story->keywords()) != '') {
+ $meta_keywords = $story->keywords();
+ } else {
+ $meta_keywords = nw_createmeta_keywords($story->hometext().' '.$story->bodytext());
+ }
+ if(xoops_trim($story->description())!='') {
+ $meta_description = strip_tags($story->description);
+ } else {
+ $meta_description = strip_tags($story->title);
+ }
+ if(isset($xoTheme) && is_object($xoTheme)) {
+ $xoTheme->addMeta( 'meta', 'keywords', $meta_keywords);
+ $xoTheme->addMeta( 'meta', 'description', $meta_description);
+ } elseif(isset($xoopsTpl) && is_object($xoopsTpl)) { // Compatibility for old Xoops versions
+ $xoopsTpl->assign('xoops_meta_keywords', $meta_keywords);
+ $xoopsTpl->assign('xoops_meta_description', $meta_description);
+ }
+ }
+
+ /**
+ * Dublin Core's meta datas
+ */
+ if(nw_getmoduleoption('dublincore', NW_MODULE_DIR_NAME) && isset($story) && is_object($story)) {
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfigMetaFooter =& $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
+ $content .= '<meta name="DC.Title" content="'.nw_DublinQuotes($story->title())."\" />\n";
+ $content .= '<meta name="DC.Creator" content="'.nw_DublinQuotes($story->uname())."\" />\n";
+ $content .= '<meta name="DC.Subject" content="'.nw_DublinQuotes($meta_keywords)."\" />\n";
+ $content .= '<meta name="DC.Description" content="'.nw_DublinQuotes($story->title())."\" />\n";
+ $content .= '<meta name="DC.Publisher" content="'.nw_DublinQuotes($xoopsConfig['sitename'])."\" />\n";
+ $content .= '<meta name="DC.Date.created" scheme="W3CDTF" content="'.date('Y-m-d',$story->created)."\" />\n";
+ $content .= '<meta name="DC.Date.issued" scheme="W3CDTF" content="'.date('Y-m-d',$story->published)."\" />\n";
+ $content .= '<meta name="DC.Identifier" content="'.NW_MODULE_URL . '/article.php?storyid='.$story->storyid()."\" />\n";
+ $content .= '<meta name="DC.Source" content="'.XOOPS_URL."\" />\n";
+ $content .= '<meta name="DC.Language" content="'._LANGCODE."\" />\n";
+ $content .= '<meta name="DC.Relation.isReferencedBy" content="'.NW_MODULE_URL . '/index.php?topic_id='.$story->topicid()."\" />\n";
+ if(isset($xoopsConfigMetaFooter['meta_copyright'])) {
+ $content .= '<meta name="DC.Rights" content="'.nw_DublinQuotes($xoopsConfigMetaFooter['meta_copyright'])."\" />\n";
+ }
+ }
+
+ /**
+ * Firefox 2 micro summaries
+ */
+ if(nw_getmoduleoption('firefox_microsummaries', NW_MODULE_DIR_NAME)) {
+ $content .= sprintf("<link rel=\"microsummary\" href=\"%s\" />\n",NW_MODULE_URL . '/micro_summary.php');
+ }
+
+ if(isset($xoopsTpl) && is_object($xoopsTpl)) {
+ $xoopsTpl->assign('xoops_module_header', $content);
+ }
+}
+
+
+
+/**
+ * Create the meta keywords based on the content
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_createmeta_keywords($content)
+{
+ include NW_MODULE_PATH . '/config.php';
+ include_once NW_MODULE_PATH . '/class/blacklist.php';
+ include_once NW_MODULE_PATH . '/class/registryfile.php';
+
+ if(!$cfg['meta_keywords_auto_generate']) {
+ return '';
+ }
+ $registry = new nw_registryfile('nw_metagen_options.txt');
+ $tcontent = '';
+ $tcontent = $registry->getfile();
+ if(xoops_trim($tcontent) != '') {
+ list($keywordscount, $keywordsorder) = explode(',',$tcontent);
+ } else {
+ $keywordscount = $cfg['meta_keywords_count'];
+ $keywordsorder = $cfg['meta_keywords_order'];
+ }
+
+ $tmp = array();
+ // Search for the "Minimum keyword length"
+ if(isset($_SESSION['nw_keywords_limit'])) {
+ $limit = $_SESSION['nw_keywords_limit'];
+ } else {
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfigSearch =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
+ $limit = $xoopsConfigSearch['keyword_min'];
+ $_SESSION['nw_keywords_limit'] = $limit;
+ }
+ $myts =& MyTextSanitizer::getInstance();
+ $content = str_replace ("<br />", " ", $content);
+ $content= $myts->undoHtmlSpecialChars($content);
+ $content= strip_tags($content);
+ $content=strtolower($content);
+ $search_pattern=array(" ","\t","\r\n","\r","\n",",",".","'",";",":",")","(",'"','?','!','{','}','[',']','<','>','/','+','-','_','\\','*');
+ $replace_pattern=array(' ',' ',' ',' ',' ',' ',' ',' ','','','','','','','','','','','','','','','','','','','');
+ $content = str_replace($search_pattern, $replace_pattern, $content);
+ $keywords = explode(' ',$content);
+ switch($keywordsorder) {
+ case 0: // Ordre d'apparition dans le texte
+ $keywords = array_unique($keywords);
+ break;
+ case 1: // Ordre de fr\xE9quence des mots
+ $keywords = array_count_values($keywords);
+ asort($keywords);
+ $keywords = array_keys($keywords);
+ break;
+ case 2: // Ordre inverse de la fr\xE9quence des mots
+ $keywords = array_count_values($keywords);
+ arsort($keywords);
+ $keywords = array_keys($keywords);
+ break;
+ }
+ // Remove black listed words
+ $metablack = new nw_blacklist();
+ $words = $metablack->getAllKeywords();
+ $keywords = $metablack->remove_blacklisted($keywords);
+
+ foreach($keywords as $keyword) {
+ if(strlen($keyword)>=$limit && !is_numeric($keyword)) {
+ $tmp[] = $keyword;
+ }
+ }
+ $tmp = array_slice($tmp, 0, $keywordscount);
+ if(count($tmp) > 0) {
+ return implode(',',$tmp);
+ } else {
+ if(!isset($config_handler) || !is_object($config_handler)) {
+ $config_handler =& xoops_gethandler('config');
+ }
+ $xoopsConfigMetaFooter =& $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
+ if(isset($xoopsConfigMetaFooter['meta_keywords'])) {
+ return $xoopsConfigMetaFooter['meta_keywords'];
+ } else {
+ return '';
+ }
+ }
+}
+
+
+/**
+ * Remove module's cache
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+*/
+function nw_updateCache() {
+ global $xoopsModule;
+ $folder = $xoopsModule->getVar('dirname');
+ $tpllist = array();
+ include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+ include_once XOOPS_ROOT_PATH.'/class/template.php';
+ $tplfile_handler =& xoops_gethandler('tplfile');
+ $tpllist = $tplfile_handler->find(null, null, null, $folder);
+ $xoopsTpl = new XoopsTpl();
+ xoops_template_clear_module_cache($xoopsModule->getVar('mid')); // Clear module's blocks cache
+
+ // Remove cache for each page.
+ foreach ($tpllist as $onetemplate) {
+ if( $onetemplate->getVar('tpl_type') == 'module' ) {
+ // Note, I've been testing all the other methods (like the one of Smarty) and none of them run, that's why I have used this code
+ $files_del = array();
+ $files_del = glob(XOOPS_CACHE_PATH.'/*'.$onetemplate->getVar('tpl_file').'*');
+ if(count($files_del) >0) {
+ foreach($files_del as $one_file) {
+ unlink($one_file);
+ }
+ }
+ }
+ }
+}
+
+/**
+ * Verify that a mysql table exists
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+*/
+function nw_TableExists($tablename)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF("SHOW TABLES LIKE '$tablename'");
+ return($xoopsDB->getRowsNum($result) > 0);
+}
+
+/**
+ * Verify that a field exists inside a mysql table
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+*/
+function nw_FieldExists($fieldname,$table)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF("SHOW COLUMNS FROM $table LIKE '$fieldname'");
+ return($xoopsDB->getRowsNum($result) > 0);
+}
+
+/**
+ * Add a field to a mysql table
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_AddField($field, $table)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field;");
+ return $result;
+}
+
+/**
+ * Verify that the current user is a member of the Admin group
+ */
+function nw_is_admin_group()
+{
+ global $xoopsUser, $xoopsModule;
+ if(is_object($xoopsUser)) {
+ if(in_array('1',$xoopsUser->getGroups())) {
+ return true;
+ } else {
+ if($xoopsUser->isAdmin($xoopsModule->mid())) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ } else {
+ return false;
+ }
+}
+
+
+/**
+ * Verify if the current "user" is a bot or not
+ *
+ * If you have a problem with this function, insert the folowing code just before the line if(isset($_SESSION['nw_cache_bot'])) { :
+ * return false;
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_isbot()
+{
+ if(isset($_SESSION['nw_cache_bot'])) {
+ return $_SESSION['nw_cache_bot'];
+ } else {
+ // Add here every bot you know separated by a pipe | (not matter with the upper or lower cases)
+ // If you want to see the result for yourself, add your navigator's user agent at the end (mozilla for example)
+ $botlist='AbachoBOT|Arachnoidea|ASPSeek|Atomz|cosmos|crawl25-public.alexa.com|CrawlerBoy Pinpoint.com|Crawler|DeepIndex|EchO!|exabot|Excalibur Internet Spider|FAST-WebCrawler|Fluffy the spider|GAIS Robot/1.0B2|GaisLab data gatherer|Google|Googlebot-Image|googlebot|Gulliver|ia_archiver|Infoseek|Links2Go|Lycos_Spider_(modspider)|Lycos_Spider_(T-Rex)|MantraAgent|Mata Hari|Mercator|MicrosoftPrototypeCrawler|Mo...@so...|MSNBOT|NEC Research Agent|NetMechanic|Nokia-WAPToolkit|nttdirectory_robot|Openfind|Oracle Ultra Search|PicoSearch|Pompos|Scooter|Slider_Search_v1-de|Slurp|Slurp.so|SlySearch|Spider|Spinne|SurferF3|Surfnomore Spider|suzuran|teomaagent1|TurnitinBot|Ultraseek|VoilaBot|vspider|W3C_Validator|Web Link Validator|WebTrends|WebZIP|whatUseek_winona|WISEbot|Xenu Link Sleuth|ZyBorg';
+ $botlist=strtoupper($botlist);
+ $currentagent=strtoupper(xoops_getenv('HTTP_USER_AGENT'));
+ $retval=false;
+ $botarray=explode('|',$botlist);
+ foreach($botarray as $onebot) {
+ if(strstr($currentagent,$onebot)) {
+ $retval=true;
+ break;
+ }
+ }
+ }
+ $_SESSION['nw_cache_bot']=$retval;
+ return $retval;
+}
+
+
+/**
+ * Create an infotip
+ *
+ * @package News
+ * @author Instant Zero (http://xoops.instant-zero.com)
+ * @copyright (c) Instant Zero
+ */
+function nw_make_infotips($text)
+{
+ $infotips = nw_getmoduleoption('infotips', NW_MODULE_DIR_NAME);
+ if($infotips>0) {
+ $myts =& MyTextSanitizer::getInstance();
+ //DNPROSSI changed xoops_substr to mb_substr for utf-8 support
+ return $myts->htmlSpecialChars(mb_substr(strip_tags($text),0,$infotips,'UTF-8'));
+ }
+}
+
+/**
+ * @author Monte Ohrt <monte at ohrt dot com>, modified by Amos Robinson
+ * <amos dot robinson at gmail dot com>
+ */
+function nw_close_tags($string)
+{
+ // match opened tags
+ if(preg_match_all('/<([a-z\:\-]+)[^\/]>/', $string, $start_tags)) {
+ $start_tags = $start_tags[1];
+ // match closed tags
+ if(preg_match_all('/<\/([a-z]+)>/', $string, $end_tags)) {
+ $complete_tags = array();
+ $end_tags = $end_tags[1];
+
+ foreach($start_tags as $key => $val) {
+ $posb = array_search($val, $end_tags);
+ if(is_integer($posb)) {
+ unset($end_tags[$posb]);
+ } else {
+ $complete_tags[] = $val;
+ }
+ }
+ } else {
+ $complete_tags = $start_tags;
+ }
+
+ $complete_tags = array_reverse($complete_tags);
+ for($i = 0; $i < count($complete_tags); $i++) {
+ $string .= '</' . $complete_tags[$i] . '>';
+ }
+ }
+ return $string;
+}
+
+/**
+ * Smarty truncate_tagsafe modifier plugin
+ *
+ * Type: modifier<br>
+ * Name: truncate_tagsafe<br>
+ * Purpose: Truncate a string to a certain length if necessary,
+ * optionally splitting in the middle of a word, and
+ * appending the $etc string or inserting $etc into the middle.
+ * Makes sure no tags are left half-open or half-closed
+ * (e.g. "Banana in a <a...")
+ * @author Monte Ohrt <monte at ohrt dot com>, modified by Amos Robinson
+ * <amos dot robinson at gmail dot com>
+ * @param string
+ * @param integer
+ * @param string
+ * @param boolean
+ * @param boolean
+ * @return string
+ */
+function nw_truncate_tagsafe($string, $length = 80, $etc = '...', $break_words = false)
+{
+ if ($length == 0) return '';
+ if (strlen($string) > $length) {
+ $length -= strlen($etc);
+ if (!$break_words) {
+ $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
+ $string = preg_replace('/<[^>]*$/', '', $string);
+ $string = nw_close_tags($string);
+ }
+ return $string . $etc;
+ } else {
+ return $string;
+ }
+}
+
+/**
+ * Resize a Picture to some given dimensions (using the wideImage library)
+ *
+ * @param string $src_path Picture's source
+ * @param string $dst_path Picture's destination
+ * @param integer $param_width Maximum picture's width
+ * @param integer $param_height Maximum picture's height
+ * @param boolean $keep_original Do we have to keep the original picture ?
+ * @param string $fit Resize mode (see the wideImage library for more information)
+ */
+function nw_resizePicture($src_path , $dst_path, $param_width , $param_height, $keep_original = false, $fit = 'inside')
+{
+ require_once NW_MODULE_PATH . '/class/wideimage/WideImage.inc.php';
+ $resize = true;
+ $pictureDimensions = getimagesize($src_path);
+ if (is_array($pictureDimensions)) {
+ $pictureWidth = $pictureDimensions[0];
+ $pictureHeight = $pictureDimensions[1];
+ if ($pictureWidth < $param_width && $pictureHeight < $param_height) {
+ $resize = false;
+ }
+ }
+
+ $img = wiImage::load($src_path);
+ if ($resize) {
+ $result = $img->resize($param_width, $param_height, $fit);
+ $result->saveToFile($dst_path);
+ } else {
+ @copy($src_path, $dst_path);
+ }
+ if(!$keep_original) {
+ @unlink( $src_path ) ;
+ }
+ return true;
+}
+
+function nw_latestnews_mk_chkbox($options, $number) {
+ $chk = "";
+ if ($options[$number] == 1) {
+ $chk = " checked='checked'";
+ }
+ $chkbox = "<input type='radio' name='options[$number]' value='1'".$chk." /> "._YES." ";
+ $chk = "";
+ if ($options[$number] == 0) {
+ $chk = " checked='checked'";
+ }
+ $chkbox .= "<input type='radio' name='options[$number]' value='0'".$chk." /> "._NO."</td></tr>";
+ return $chkbox;
+}
+
+function nw_latestnews_mk_select($options, $number) {
+ $slc = "";
+ if ($options[$number] == 1) {
+ $slc = " checked='checked'";
+ }
+ $select = "<input type='radio' name='options[$number]' value='1'".$slc." /> "._LEFT." ";
+ $slc = "";
+ if ($options[$number] == 0) {
+ $slc = " checked='checked'";
+ }
+ $select .= "<input type='radio' name='options[$number]' value='0'".$slc." /> "._RIGHT."</td></tr>";
+ return $select;
+}
+
+function nw_remove_numbers($string) {
+ $vowels = array("1", "2", "3", "4", "5", "6", "7", "8", "9", "0", " ");
+ $string = str_replace($vowels, '', $string);
+ return $string;
+}
+
+function nw_prepareFolder($folder) {
+ if(!is_dir($folder))
+ {
+ mkdir($folder, 0777);
+ file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
+ }
+}
+
+//DNPROSSI SEO
+function nw_remove_accents($chain){
+ /**
+ * if XOOPS ML is present, let's sanitize the title with the current language
+ */
+ $myts = MyTextSanitizer::getInstance();
+ if (method_exists($myts, 'formatForML')) {
+ $chain = $myts->formatForML($chain);
+ }
+
+ /**
+ * if xLanguage is present, let's prepare the title with the current language
+ */
+ $module_handler =& xoops_gethandler('module');
+ $xlanguage = $module_handler->getByDirname('xlanguage');
+ if ( is_object($xlanguage) && $xlanguage->getVar('isactive') == true )
+ {
+ require_once XOOPS_ROOT_PATH.'/modules/xlanguage/include/functions.php';
+ $chain = xlanguage_ml($chain);
+ }
+
+ $chain = rawurlencode($chain);
+ //$chain = utf8_decode($chain);
+
+ // Transform punctuation
+ // Tab Space ! " # % & ' ( ) , / : ; < = > ? @ [ \ ] ^ { | } ~ .
+ $pattern = array("/%09/", "/%20/", "/%21/", "/%22/", "/%23/", "/%25/", "/%26/", "/%27/", "/%28/", "/%29/", "/%2C/", "/%2F/", "/%3A/", "/%3B/", "/%3C/", "/%3D/", "/%3E/", "/%3F/", "/%40/", "/%5B/", "/%5C/", "/%5D/", "/%5E/", "/%7B/", "/%7C/", "/%7D/", "/%7E/", "/%39/","/\./");
+ $rep_pat = array( "-" , "-" , "" , "" , "" , "-100" , "" , "-" , "" , "" , "" , "-" , "" , "" , "" , "-" , "" , "" , "-at-" , "" , "-" , "" , "-" , "" , "-" , "" , "-" , "-" , "" );
+ $chain = preg_replace($pattern, $rep_pat, $chain);
+
+ return $chain;
+}
+
+function nw_seo_UrlGenerator($op, $id, $short_url = "")
+{
+ if ( nw_getmoduleoption('seo_enable', NW_MODULE_DIR_NAME) != 0 )
+ {
+ if ( !empty($short_url) ) $short_url = $short_url;
+
+ switch($op) {
+ case _MA_XNEWS_SEO_PDF:
+ $short_url .= nw_getmoduleoption('seo_endofurl_pdf', NW_MODULE_DIR_NAME);
+ break;
+ case _MA_XNEWS_SEO_PRINT:
+ $short_url .= nw_getmoduleoption('seo_endofurl', NW_MODULE_DIR_NAME);
+ break;
+ case _MA_XNEWS_SEO_ARTICLES:
+ $short_url .= nw_getmoduleoption('seo_endofurl', NW_MODULE_DIR_NAME);
+ break;
+ case _MA_XNEWS_SEO_TOPICS:
+ $short_url .= nw_getmoduleoption('seo_endofurl', NW_MODULE_DIR_NAME);
+ break;
+ }
+ if ( nw_getmoduleoption('seo_enable', NW_MODULE_DIR_NAME) == 1 )
+ {
+ // generate SEO url using htaccess
+ $seo_path = "";
+ if ( nw_getmoduleoption('seo_path', NW_MODULE_DIR_NAME) != '' ) {
+ // generate SEO url using seo path eg news, info, blog
+ $seo_path = "/" . strtolower(nw_getmoduleoption('seo_path', NW_MODULE_DIR_NAME));
+ if ( nw_getmoduleoption('seo_level', NW_MODULE_DIR_NAME) == 0 )
+ {
+ // generate SEO url using root level htaccess
+ $seo_path .= ".";
+ return XOOPS_URL . "/" . NW_MODULE_DIR_NAME . $seo_path . "${op}.${id}/${short_url}";
+ } else {
+ // generate SEO url using module level htaccess
+ $seo_path .= ".";
+ return NW_MODULE_URL . $seo_path . "${op}.${id}/${short_url}";
+ }
+ } else {
+ // generate SEO url with no seo path
+ $seo_path = "/" . strtolower(nw_getmoduleoption('seo_path', NW_MODULE_DIR_NAME));
+ if ( nw_getmoduleoption('seo_level', NW_MODULE_DIR_NAME) == 0 )
+ {
+ // generate SEO url using root level htaccess
+ return XOOPS_URL . "/" . NW_MODULE_DIR_NAME . $seo_path . "${op}.${id}/${short_url}";
+ } else {
+ // generate SEO url using module level htaccess
+ return NW_MODULE_URL . $seo_path . "${op}.${id}/${short_url}";
+ }
+ }
+ } else if ( nw_getmoduleoption('seo_enable', NW_MODULE_DIR_NAME) == 2 ) {
+ // generate SEO url using path-info
+ $seo_path = "";
+ if ( nw_getmoduleoption('seo_path', NW_MODULE_DIR_NAME) != "" ) {
+ $seo_path = strtolower(nw_getmoduleoption('seo_path', NW_MODULE_DIR_NAME)) . ".";
+ }
+ return NW_MODULE_URL . "/index.php/". $seo_path . "${op}.${id}/${short_url}";
+ } else {
+ ...
[truncated message content] |
|
From: <be...@us...> - 2012-02-02 17:05:33
|
Revision: 8874
http://xoops.svn.sourceforge.net/xoops/?rev=8874&view=rev
Author: beckmi
Date: 2012-02-02 17:05:21 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Release 1.37 (By Timgno)
Added Paths:
-----------
XoopsModules/TDMCreate/releases/1.37/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/about.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_footer.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_header.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/const.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/includes.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/menu.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/class/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/class/constArchitecture.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/class/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/class/object.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/class/tdmcreate_tables.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_about_language.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_about.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_footer.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_header.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_index.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_language.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_menu.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_pages.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_admin_permissions.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_architecture.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_blocks.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_blocks_language.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_blocks_templates.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_changelog.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_class.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_class_admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_css_admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_entete.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_help_language.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_include_coms.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_include_configs.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_include_functions.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_include_install.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_include_search.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_main_header.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_main_index.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_main_language.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_modinfo_language.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_sql.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates_admin_about.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates_admin_help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates_footer.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates_header.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates_index.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_templates_pages.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_user_header.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_user_index.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_user_pages.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/const/const_xoopsversion.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/css/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/css/admin.css
XoopsModules/TDMCreate/releases/1.37/TDMCreate/css/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/changelog.TXT
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/credits.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/install.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/lang_diff.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/licence.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/docs/readme.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/about.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/arrow.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/blank.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/const.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/delete.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/delete.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/edit.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/edit.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/fields.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/index.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/modules.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/off.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/off.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/on.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/on.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/permissions.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/pref.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/tables.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/deco/update.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/about.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/const.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/index.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/modules.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/off.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/on.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/tables.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/icons/update.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/logo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/menu/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/menu/bg.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/menu/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/menu/left_both.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/menu/right_both.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/TDMCreate_slogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/TDMLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/Test1Logo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/blank.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/documentation_slogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/imprintLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/mytubeLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/partadsLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xcvLogo.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xnews_slogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xsitemapLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xtransamLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xtransam_slogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xtutorialsLogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/modules/xtutorials_slogo.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/ads.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/blank.gif
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/broken.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/cat.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/contact.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/plugin.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/shoutbox.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/images/uploads/tables/topic.png
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/comment_delete.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/comment_edit.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/comment_new.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/comment_post.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/comment_reply.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/functions.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/functions_const.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/install.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/jq.init.js
XoopsModules/TDMCreate/releases/1.37/TDMCreate/include/update.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/arabic/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/arabic/admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/arabic/help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/arabic/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/arabic/modinfo.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/bulgarian/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/bulgarian/admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/bulgarian/help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/bulgarian/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/bulgarian/modinfo.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/help/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/help/help.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/help/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/french/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/french/admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/french/help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/french/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/french/modinfo.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/admin.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/help/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/help/help.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/help/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/help.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/italian/modinfo.php
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/update language 1.0 to 1.1.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/update language 1.1 to 1.15.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/language/update language 1.1 to 1.37.txt
XoopsModules/TDMCreate/releases/1.37/TDMCreate/modules/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/sql/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/sql/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/admin/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/admin/help.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/admin/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/blocks/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/help/
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/help/help.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/help/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/templates/index.html
XoopsModules/TDMCreate/releases/1.37/TDMCreate/xoops_version.php
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/about.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/about.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * TDMCreate module
+ *
+ * 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 XOOPS Project (http://www.xoops.org)
+ * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @package TDMCreate
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
+
+include '../../../include/cp_header.php';
+include 'admin_header.php';
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_footer.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_footer.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,24 @@
+<?php
+/**
+ * XoopsPoll module
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package XoopsPoll
+ * @since 2.5.0
+ * @author Mamba (www.xoops.org)
+ * @version $Id $
+**/
+global $pathImageAdmin;
+
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . $pathImageAdmin.'/xoopsmicrobutton.gif'.' '." alt='XOOPS' title='XOOPS'></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_header.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_header.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/admin_header.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Marquee module
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package Marquee
+ * @since 2.5.0
+ * @author XOOPS Module Team
+ * @version $Id $
+**/
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include_once("../include/functions.php");
+include_once 'includes.php';
+
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+ //return false;
+ }
+//load class
+$modulesHandler =& xoops_getModuleHandler('tdmcreate_modules', 'TDMCreate');
+$tablesHandler =& xoops_getModuleHandler('tdmcreate_tables', 'TDMCreate');
+
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
+ include_once(XOOPS_ROOT_PATH."/class/template.php");
+ $xoopsTpl = new XoopsTpl();
+}
+
+$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
+$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
+//xoops_cp_header();
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/const.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/const.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/const.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,219 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+include 'admin_header.php';
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+ echo $indexAdmin->addNavigation('const.php');
+
+if (isset($_REQUEST['op'])) {
+ $op = $_REQUEST['op'];
+} else {
+ @$op = 'default';
+}
+
+//Class
+$modulesHandler =& xoops_getModuleHandler('TDMCreate_modules', 'TDMCreate');
+$tablesHandler =& xoops_getModuleHandler('TDMCreate_tables', 'TDMCreate');
+
+//Nom du module
+$modules =& $modulesHandler->get($_REQUEST['modules_name']);
+$modules_name = $modules->getVar('modules_name');
+$modules_desc = $modules->getVar('modules_description');
+$modules_author_website_name = $modules->getVar('modules_author_website_name');
+$modules_author_website_url = $modules->getVar('modules_author_website_url');
+$modules_image = $modules->getVar('modules_image');
+$modules_active_search = $modules->getVar('modules_active_search');
+$modules_active_comments = $modules->getVar('modules_active_comments');
+
+//Nom des tables et combien de tables
+$criteria = new CriteriaCompo();
+$criteria->add(new Criteria('tables_modules', $_REQUEST['modules_name']));
+$nb_tables = $tablesHandler->getCount($criteria);
+$tables_arr = $tablesHandler->getall($criteria);
+
+switch ($op) {
+ case "creation":
+
+ //Effacer repertoire du nouveau module s'il existe
+ clearDir($modPath.'/modules/'.$modules_name);
+
+ //Debut
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ /************************************************/
+ /*Structure*/
+ /************************************************/
+ //Creation de l'architecture
+ const_architecture($modules_name, $modules_image);
+ //Creation du changelog.txt
+ const_changelog($modules, $modules_name);
+ //Creation de admin index.php
+ const_admin_index($modules, $modules_name, $tables_arr);
+ //const_class_admin($modules, $modules_name);
+
+ foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_id = $tables_arr[$i]->getVar('tables_id');
+ $tables_name = $tables_arr[$i]->getVar('tables_name');
+ $tables_module_table = $tables_arr[$i]->getVar('tables_module_table');
+ $tables_img = $tables_arr[$i]->getVar('tables_img');
+ $tables_champs = $tables_arr[$i]->getVar('tables_champs');
+ $tables_parametres = $tables_arr[$i]->getVar('tables_parametres');
+ $tables_blocks = $tables_arr[$i]->getVar('tables_blocs');
+ $tables_display_admin = $tables_arr[$i]->getVar('tables_display_admin');
+ $tables_display_user = $tables_arr[$i]->getVar('tables_display_user');
+ $tables_search = $tables_arr[$i]->getVar('tables_search');
+ $tables_coms = $tables_arr[$i]->getVar('tables_coms');
+
+ //Fabrication
+ //Copie of images tables
+ $tables_img1 = $modPath."/images/uploads/tables/".$tables_img;
+ if (file_exists($tables_img1)) {
+ copy($tables_img1, $modPath."/modules/".$modules_name."/images/deco/".$tables_img);
+ }
+ //Creation des classes
+ const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
+
+ //Creation of pages admin
+ if ( $tables_display_admin == 1 ) {
+ const_admin_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_champs, $tables_parametres);
+ }
+ //Creation of pages and templates user
+ if ( $tables_display_user == 1 && $tables_module_table != null ) {
+ const_user_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_champs, $tables_parametres);
+ const_templates_pages($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ }
+ //Creation de search
+ if ( $modules_active_search == 1 && $tables_search == 1 ) {
+ const_include_search($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
+ }
+ //Creation des coms
+ if ( $modules_active_comments == 1 && $tables_coms == 1 ) {
+ const_include_coms($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
+ }
+
+ //Creation of the file mysql.sql
+ const_sql($modules_name, $tables_module_table, $tables_name, $tables_champs);
+
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'");
+ list( $topic ) = $xoopsDB->fetchRow($result);
+ //Creation des blocs
+ if ( $tables_blocks == 1 ) {
+ const_blocks($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres, $topic);
+ //Creation du template des blocks
+ const_blocks_templates($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ }
+ }
+ //Creation de xoopsversion.php
+ /*Mettre xoops version vers la fin pour integrer les bloc, etc*/
+ const_xoopsversion($modules, $modules_name, $tables_arr, $tables_module_table);
+ // Creation of template index
+ const_templates_index($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ // Creation of template header
+ const_templates_header($modules, $modules_name);
+ // Creation of template footer
+ const_templates_footer($modules, $modules_name, $tables_module_table);
+ // Creation of template admin about
+ const_templates_admin_about($modules, $modules_name);
+ // Creation of template admin help
+ const_templates_admin_help($modules, $modules_name);
+ //Creation du fichier permissions
+ if ( $topic == 1) { //|| $tables_module_table != null
+ const_admin_permissions($modules, $modules_name, $tables_arr, $topic);
+ }
+
+ //Include
+ //Configs
+ const_include_configs($modules, $modules_name, $modules_author_website_name, $modules_author_website_url);
+ //Style
+ //const_css_admin($modules, $modules_name);
+ //const_include_style($modules, $modules_name);
+ //Functions
+ const_include_functions($modules, $modules_name);
+ //Creation du fichier install pour l'uploads
+ const_include_install($modules, $modules_name, $tables_arr);
+ //Language
+ ///////////////////////////////////////////////////////////////////////
+ //Creation du language main.php
+ const_main_language($modules, $modules_name, $modules_desc, $tables_arr);
+ //Creation du language modinfo.php
+ const_modinfo_language($modules, $modules_name, $modules_desc, $tables_arr, $topic);
+ //Creation du language admin.php
+ const_admin_language($modules, $modules_name, $tables_arr, $tables_name);
+ //Creation du language blocks.php
+ const_blocks_language($modules, $modules_name, $tables_arr);
+ //Creation du language help/help.html
+ const_help_language($modules, $modules_name, $modules_desc);
+ ///////////////////////////////////////////////////////////////////////
+ //Creation de la class menu
+ //const_class_menu($modules, $modules_name);
+
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ //Creation de admin header.php
+ const_admin_header($modules, $modules_name, $tables_arr);
+ //Creation de admin footer.php
+ const_admin_footer($modules, $modules_name, $tables_arr);
+ //Creation de admin menu.php
+ const_admin_menu($modules, $modules_name, $tables_arr, $topic);
+ //Creation de admin about.php
+ //$menu++;
+ const_admin_about($modules, $modules_name);
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ const_user_header($modules, $modules_name, $tables_id, $tables_module_table, $tables_name);
+ const_user_index($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
+ echo '</table>';
+
+ break;
+
+ case "default":
+ default:
+
+ include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+ $action = $_SERVER['REQUEST_URI'];
+
+ $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', true);
+
+ $modules_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'modules_name', 'modules_name');
+ $modules_select->addOptionArray($modulesHandler->getList());
+ $form->addElement($modules_select, true);
+
+ foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_name = $tables_arr[$i]->getVar('tables_name');
+ }
+
+ $tables_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_TABLES, 'tables_name', $tables_name, 4);
+ $tables_select->addOptionArray($tablesHandler->getList());
+ $form->addElement($tables_select, false);
+
+ $form->addElement(new XoopsFormHidden('op', 'creation'));
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->display();
+ break;
+}
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/includes.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/includes.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/includes.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,66 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include '../../../include/cp_header.php';
+include_once("../include/functions.php");
+
+$modPath = XOOPS_ROOT_PATH.'/modules/TDMCreate';
+$cPath = $modPath.'/const';
+
+include_once $cPath.'/const_architecture.php';
+include_once $cPath.'/const_xoopsversion.php';
+include_once $cPath.'/const_changelog.php';
+include_once $cPath.'/const_include_search.php';
+include_once $cPath.'/const_include_coms.php';
+include_once $cPath.'/const_include_configs.php';
+include_once $cPath.'/const_include_functions.php';
+include_once $cPath.'/const_include_install.php';
+//include_once $cPath.'/const_include_style.php';
+include_once $cPath.'/const_sql.php';
+include_once $cPath.'/const_blocks.php';
+include_once $cPath.'/const_blocks_templates.php';
+include_once $cPath.'/const_class.php';
+include_once $cPath.'/const_class_admin.php';
+//include_once $cPath.'/const_class_menu.php';
+
+include_once $cPath.'/const_admin_header.php';
+include_once $cPath.'/const_admin_footer.php';
+include_once $cPath.'/const_admin_menu.php';
+include_once $cPath.'/const_admin_index.php';
+include_once $cPath.'/const_admin_pages.php';
+include_once $cPath.'/const_admin_about.php';
+include_once $cPath.'/const_admin_permissions.php';
+include_once $cPath.'/const_admin_language.php';
+include_once $cPath.'/const_modinfo_language.php';
+include_once $cPath.'/const_about_language.php';
+include_once $cPath.'/const_help_language.php';
+include_once $cPath.'/const_blocks_language.php';
+include_once $cPath.'/const_main_language.php';
+include_once $cPath.'/const_user_header.php';
+include_once $cPath.'/const_user_index.php';
+include_once $cPath.'/const_user_pages.php';
+include_once $cPath.'/const_templates_header.php';
+include_once $cPath.'/const_templates_index.php';
+include_once $cPath.'/const_templates_pages.php';
+include_once $cPath.'/const_templates_footer.php';
+include_once $cPath.'/const_templates_admin_about.php';
+include_once $cPath.'/const_templates_admin_help.php';
+
+?>
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.html
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.html (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.html 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/index.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,46 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+include '../../../include/cp_header.php';
+include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+include_once(XOOPS_ROOT_PATH."/class/tree.php");
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+include_once("../include/functions.php");
+include 'admin_header.php';
+//xoops_cp_header();
+//apelle du menu admin
+
+
+xoops_cp_header();
+
+ $criteria = new CriteriaCompo();
+ $count_modules = $modulesHandler->getCount($criteria);
+
+ $indexAdmin = new ModuleAdmin();
+
+
+$indexAdmin->addInfoBox(_AM_TDMCREATE_ADMIN_NUMMODULES) ;
+$indexAdmin->addInfoBoxLine(_AM_TDMCREATE_ADMIN_NUMMODULES, "<label>" ._AM_TDMCREATE_THEREARE_NUMMODULES. "</label>", $count_modules, 'Green') ;
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/menu.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/menu.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,50 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+
+$module_handler =& xoops_gethandler('module');
+$xoopsModule =& XoopsModule::getByDirname('TDMCreate');
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathImageAdmin = $moduleInfo->getInfo('icons32');
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_INDEX;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_MODULES;
+$adminmenu[$i]["link"] = 'admin/modules.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/add.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_TABLES;
+$adminmenu[$i]["link"] = 'admin/tables.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/index.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_CONST;
+$adminmenu[$i]["link"] = 'admin/const.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/modifiedlink.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMIN_ABOUT;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/about.png';
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/modules.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/modules.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,177 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include '../../../include/cp_header.php';
+include_once("../include/functions.php");
+include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/class/tdmcreate_modules.php';
+include 'admin_header.php';
+xoops_cp_header();
+
+if (isset($_REQUEST['op'])) {
+ $op = $_REQUEST['op'];
+} else {
+ @$op = 'default';
+}
+
+switch ($op) {
+ case "modules_save":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if (isset($_REQUEST['modules_id'])) {
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ } else {
+ $obj =& $modulesHandler->create();
+ }
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/modules/";
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
+ $name_img = $_REQUEST['modules_name'].'_slogo.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('modules_image', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('modules_image', $_REQUEST['modules_image']);
+ }
+
+ $obj->setVar('modules_name', $_REQUEST['modules_name']);
+ $obj->setVar('modules_version', $_REQUEST['modules_version']);
+ $obj->setVar('modules_description', $_REQUEST['modules_description']);
+ $obj->setVar('modules_author', $_REQUEST['modules_author']);
+ $obj->setVar('modules_author_mail', $_REQUEST['modules_author_mail']);
+ $obj->setVar('modules_author_website_url', $_REQUEST['modules_author_website_url']);
+ $obj->setVar('modules_author_website_name', $_REQUEST['modules_author_website_name']);
+ $obj->setVar('modules_credits', $_REQUEST['modules_credits']);
+ $obj->setVar('modules_license', $_REQUEST['modules_license']);
+ $obj->setVar('modules_release_info', $_REQUEST['modules_release_info']);
+ $obj->setVar('modules_release_file', $_REQUEST['modules_release_file']);
+ $obj->setVar('modules_manual', $_REQUEST['modules_manual']);
+ $obj->setVar('modules_manual_file', $_REQUEST['modules_manual_file']);
+ $obj->setVar('modules_demo_site_url', $_REQUEST['modules_demo_site_url']);
+ $obj->setVar('modules_demo_site_name', $_REQUEST['modules_demo_site_name']);
+ $obj->setVar('modules_forum_site_url', $_REQUEST['modules_forum_site_url']);
+ $obj->setVar('modules_forum_site_name', $_REQUEST['modules_forum_site_name']);
+ $obj->setVar('modules_module_website_url', $_REQUEST['modules_module_website_url']);
+ $obj->setVar('modules_module_website_name', $_REQUEST['modules_module_website_name']);
+ $obj->setVar('modules_release', $_REQUEST['modules_release']);
+ $obj->setVar('modules_module_status', $_REQUEST['modules_module_status']);
+ $obj->setVar('modules_display_admin', $_REQUEST['modules_display_admin']);
+ $obj->setVar('modules_display_user', $_REQUEST['modules_display_user']);
+ $obj->setVar('modules_active_search', $_REQUEST['modules_active_search']);
+ $obj->setVar('modules_active_comments', $_REQUEST['modules_active_comments']);
+
+ if ($modulesHandler->insert($obj)) {
+ redirect_header('modules.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ }
+ break;
+
+ case "modules_create":
+ $modcreate_admin = new ModuleAdmin();
+ echo $modcreate_admin->addNavigation('modules.php');
+ $modcreate_admin->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=modules_list', 'list');
+ echo $modcreate_admin->renderButton();
+
+ $obj =& $modulesHandler->create();
+ $form = $obj->getForm();
+ break;
+ case "modules_edit":
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ $form = $obj->getForm();
+ break;
+ case "modules_delete":
+ $obj =& $modulesHandler->get($_REQUEST['modules_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1)
+ {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('modules.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($modulesHandler->delete($obj)) {
+ $xoopsDB->queryF("DELETE FROM ".$xoopsDB->prefix("tdmcreate_modules")." WHERE modules_id = ".$_REQUEST['modules_id']);
+ redirect_header('modules.php', 3, _AM_TDMCREATE_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'modules_id' => $_REQUEST['modules_id'], 'op' => 'modules_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMCREATE_FORMSUREDEL, $obj->getVar('modules_name')));
+ }
+ break;
+ case "modules_list":
+ default:
+ $modcreate_admin = new ModuleAdmin();
+ echo $modcreate_admin->addNavigation('modules.php');
+ $modcreate_admin->addItemButton(_AM_TDMCREATE_MODULES_NEW, 'modules.php?op=modules_create', 'add');
+ echo $modcreate_admin->renderButton();
+
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('modules_name');
+ $criteria->setOrder('ASC');
+ $modules_arr = $modulesHandler->getall($criteria);
+ $numrows_modules = $modulesHandler->getCount();
+
+ if ( $numrows_modules > 0 )
+ {
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<tr class="center">';
+ echo '<th width="20%">'._AM_TDMCREATE_NAME.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_IMAGE.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_ADMIN.'</th>';
+ echo '<th width="15%">'._AM_TDMCREATE_DISPLAY_USER.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_BLOCS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_NB_CHAMPS.'</th>';
+ echo '<th width="10%">'._AM_TDMCREATE_FORMACTION.'</th>';
+ echo '</tr>';
+ $class = 'odd';
+ foreach (array_keys($modules_arr) as $i)
+ {
+ $modules_id = $modules_arr[$i]->getVar('modules_id');
+ $modules_name = $modules_arr[$i]->getVar('modules_name');
+ $modules_image = $modules_arr[$i]->getVar('modules_image');
+ //$modules_blocks = $modules_arr[$i]->getVar('modules_blocs');
+ $modules_display_admin = $modules_arr[$i]->getVar('modules_display_admin');
+ $modules_display_user = $modules_arr[$i]->getVar('modules_display_user');
+ $display_admin = ($modules_display_admin == 1) ? _YES : _NO;
+ $display_user = ($modules_display_user == 1) ? _YES : _NO;
+ echo '<tr class="odd center">';
+ echo '<td><b>'.$modules_name.'</b></td>';
+ echo '<td><img src="../images/uploads/modules/'.$modules_image.'" height="30px"></td>';
+ echo '<td>'.$display_admin.'</td>';
+ echo '<td>'.$display_user.'</td>';
+ echo '<td> </td>';
+ echo '<td> </td>';
+ echo '<td>';
+ echo '<a href="modules.php?op=modules_edit&modules_id='.$modules_id.'"><img src='. $pathImageIcon ."/edit.png alt="._AM_TDMCREATE_FORMEDIT.'" title="'._AM_TDMCREATE_FORMEDIT.'"></a> <a href="modules.php?op=modules_delete&modules_id='.$modules_id.'"><img src='. $pathImageIcon ."/delete.png alt="._AM_TDMCREATE_FORMDEL.'" title="'._AM_TDMCREATE_FORMDEL.'"></a>';
+ echo '</td>';
+ echo '</tr>';
+ }
+ echo '</table><br><br>';
+ }
+ break;
+}
+include "admin_footer.php";
\ No newline at end of file
Added: XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/tables.php (rev 0)
+++ XoopsModules/TDMCreate/releases/1.37/TDMCreate/admin/tables.php 2012-02-02 17:05:21 UTC (rev 8874)
@@ -0,0 +1,526 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+include 'admin_header.php';
+include_once XOOPS_ROOT_PATH.'/modules/TDMCreate/class/tdmcreate_tables.php';
+xoops_cp_header();
+
+if (isset($_REQUEST['op'])) {
+ $op = $_REQUEST['op'];
+} else {
+ @$op = 'default';
+}
+
+switch ($op) {
+ case "tables_save":
+
+ if (isset($_REQUEST['tables_id'])) {
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ } else {
+ $obj =& $tablesHandler->create();
+ }
+
+ //Nom du module
+ $modules =& $modulesHandler->get($_REQUEST['tables_modules']);
+ $modules_name = $modules->getVar('modules_name');
+
+ $obj->setVar('tables_modules', $_REQUEST['tables_modules']);
+
+ if ( $_REQUEST['select'] == 1 )
+ {
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_topic'));
+ $obj->setVar('tables_name', 'topic');
+ $obj->setVar('tables_blocs', 0);
+ $obj->setVar('tables_display_admin', 1);
+ $obj->setVar('tables_display_user', 1);
+ $obj->setVar('tables_search', 0);
+ $obj->setVar('tables_coms', 0);
+ $obj->setVar('tables_nb_champs', 7);
+
+ $tables_champs = 'topic_id:int:11:unsigned:NOT NULL: :|topic_pid:int:5:unsigned:NOT NULL:0:|topic_title:varchar:255: :NOT NULL: :|topic_desc:text: : :NOT NULL: :|topic_img:varchar:255: :NOT NULL: :|topic_weight:int:5: :NOT NULL:0:|topic_color:varchar:10: :NULL: :';
+ if ( isset($_REQUEST['tables_submitter']) == 1 )
+ $tables_champs .= '|topic_submitter:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_date_created']) == 1 )
+ $tables_champs .= '|topic_date_created:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_online']) == 1 )
+ $tables_champs .= '|topic_online:tinyint:1: :NOT NULL:0:';
+
+ $tables_parametres = 'XoopsFormTopic:0:0:0:0:0:0|XoopsFormText:1:1:0:1:0:1|XoopsFormTextArea:0:1:0:0:0:1|XoopsFormUploadImage:1:1:0:0:0:0|XoopsFormText:1:1:0:0:0:1|XoopsFormColorPicker:1:1:0:0:0:0|XoopsFormSelectUser:0:0:0:0:0:1|XoopsFormTextDateSelect:0:0:0:0:0:1|XoopsFormCheckBox:1:1:0:0:0:1';
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+
+ if(is_dir($pathImageAdmin)){
+ $uploaddir = $pathImageAdmin;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
+ }
+
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
+ $name_img = 'topic.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('tables_img', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('tables_img', $_REQUEST['tables_img1']);
+ }
+ } else {
+
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
+ $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $obj->setVar('tables_blocs', $_REQUEST['tables_blocs']);
+ $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
+ $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
+ $obj->setVar('tables_search', $_REQUEST['tables_search']);
+ $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
+ $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
+
+ $tables_champs = '';
+ $tables_parametres = '';
+ for($i=0; $i<$_REQUEST['tables_nb_champs']; $i++)
+ {
+ //Rajouts des parametres: text:on:off: ...
+ if ( $i != 0 ) {
+ $tables_parametres .= ( !empty($_REQUEST['champs_param_elements'][$i]) ) ? "".$_REQUEST['champs_param_elements'][$i].":" : " :";
+ $tables_parametres .= ( !empty($_REQUEST['champs_param_display_admin'][$i]) ) ? "1:" : "0:";
+ $tables_parametres .= ( !empty($_REQUEST['champs_param_display_user'][$i]) ) ? "1:" : "0:";
+ $tables_parametres .= ( !empty($_REQUEST['champs_param_display_blocs'][$i]) ) ? "1:" : "0:";
+ $tables_parametres .= ( $i == $_REQUEST['champs_param_main_field']) ? "1:" : "0:";
+ $tables_parametres .= ( !empty($_REQUEST['champs_param_search_field'][$i]) ) ? "1:" : "0:";
+ $tables_parametres .= ( !empty($_REQUEST['champs_param_required_field'][$i]) ) ? "1" : "0";
+ }
+
+ //Rajouts des champs: test:int:4: ...
+ $tables_champs .= (!empty($_REQUEST['champs_name'][$i])) ? "".$_REQUEST['champs_name'][$i].":" : " :";
+ $tables_champs .= (!empty($_REQUEST['champs_type'][$i])) ? "".$_REQUEST['champs_type'][$i].":" : " :";
+ $tables_champs .= (!empty($_REQUEST['champs_valeur'][$i])) ? "".$_REQUEST['champs_valeur'][$i].":" : " :";
+ $tables_champs .= (!empty($_REQUEST['champs_attributs'][$i])) ? "".$_REQUEST['champs_attributs'][$i].":" : " :";
+ $tables_champs .= (!empty($_REQUEST['champs_null'][$i])) ? "".strtoupper($_REQUEST['champs_null'][$i]).":" : " :";
+ $tables_champs .= (!empty($_REQUEST['champs_default'][$i])) ? "".$_REQUEST['champs_default'][$i].":" : " :";
+ $tables_champs .= (!empty($_REQUEST['champs_clef'][$i])) ? "".$_REQUEST['champs_clef'][$i]."" : " ";
+
+ //Coupure entre les champs et coupre entre les parametres
+ if ( $i != $_REQUEST['tables_nb_champs'] - 1) {
+ $tables_champs .= '|';
+ if ( $i != 0 )
+ $tables_parametres .= '|';
+ } else {
+ if ( isset($_REQUEST['tables_submitter']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_submitter:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_date_created']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_date_created:int:10: :NOT NULL:0:';
+ if ( isset($_REQUEST['tables_online']) == 1 )
+ $tables_champs .= '|'.strtolower($_REQUEST['tables_name']).'_online:tinyint:1: :NOT NULL:0:';
+
+ $tables_parametres .= '|XoopsFormSelectUser:1:1:1:0:0:1|XoopsFormTextDateSelect:1:1:1:0:0:1|XoopsFormCheckBox:1:1:1:0:0:1';
+ }
+ }
+ }
+ $obj->setVar('tables_champs', $tables_champs);
+ $obj->setVar('tables_parametres', $tables_parametres);
+
+ if ($tablesHandler->insert($obj))
+ {
+ redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ }
+
+ break;
+
+ case "tables_save1":
+
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+
+ if (isset($_REQUEST['tables_id'])) {
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ } else {
+ $obj =& $tablesHandler->create();
+ }
+ //Nom du module
+ $modules =& $modulesHandler->get($_REQUEST['tables_modules']);
+ $modules_name = $modules->getVar('modules_name');
+
+ $tables_blocks = (isset($_REQUEST['tables_blocs'])) ? $_REQUEST['tables_blocs'] : '0';
+ $tables_display_admin = (isset($_REQUEST['tables_display_admin'])) ? $_REQUEST['tables_display_admin'] : '0';
+ $tables_display_user = (isset($_REQUEST['tables_display_user'])) ? $_REQUEST['tables_display_user'] : '0';
+ $tables_search = (isset($_REQUEST['tables_search'])) ? $_REQUEST['tables_search'] : '0';
+ $tables_coms = (isset($_REQUEST['tables_coms'])) ? $_REQUEST['tables_coms'] : '0';
+ $select = (isset($_REQUEST['select'])) ? $_REQUEST['select'] : '0';
+
+ //Image
+ include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+ if(is_dir($pathImageAdmin)){
+ $uploaddir = $pathImageAdmin;
+ }else{
+ $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/images/uploads/tables/";
+ }
+ $uploader = new XoopsMediaUploader($uploaddir, "gif|jpeg|pjpeg|png", 104857600, null, null);
+
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile"]['name']) ;
+ $name_img = $_REQUEST['tables_name'].'.'.$extension;
+ $uploader->setTargetFileName($name_img);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+ if (!$uploader->upload()) {
+ $errors = $uploader->getErrors();
+ redirect_header("javascript:history.go(-1)",3, $errors);
+ } else {
+ $obj->setVar('tables_img', $uploader->getSavedFileName());
+ }
+ } else {
+ $obj->setVar('tables_img', $_REQUEST['tables_img']);
+ }
+
+ $obj->setVar('tables_modules', strtolower($_REQUEST['tables_modules']));
+ $obj->setVar('tables_module_table', strtolower($modules_name.'_'.$_REQUEST['tables_name']));
+ $obj->setVar('tables_name', strtolower($_REQUEST['tables_name']));
+ $obj->setVar('tables_blocs', $_REQUEST['tables_blocs']);
+ $obj->setVar('tables_display_admin', $_REQUEST['tables_display_admin']);
+ $obj->setVar('tables_display_user', $_REQUEST['tables_display_user']);
+ //mettre des isset pour search
+ if ( isset($_REQUEST['tables_search']) )
+ $obj->setVar('tables_search', $_REQUEST['tables_search']);
+ if ( isset($_REQUEST['tables_coms']) )
+ $obj->setVar('tables_coms', $_REQUEST['tables_coms']);
+ $obj->setVar('tables_nb_champs', $_REQUEST['tables_nb_champs']);
+
+ if ($tablesHandler->insert($obj)) {
+ redirect_header('tables.php?op=default', 2, _AM_TDMCREATE_FORMOK);
+ }
+ break;
+
+ case "edit_tables":
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ $form = $obj->getFormTable();
+ break;
+
+ case "edit_champs":
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ $form = $obj->getFormEditChamps(false, $_REQUEST['tables_id']);
+ break;
+
+ case "delete_tables":
+ $obj =& $tablesHandler->get($_REQUEST['tables_id']);
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('tables.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($tablesHandler->delete($obj)) {
+ redirect_header('tables.php', 3, _AM_TDMCREATE_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ ...
[truncated message content] |
|
From: <txm...@us...> - 2012-02-02 16:44:44
|
Revision: 8873
http://xoops.svn.sourceforge.net/xoops/?rev=8873&view=rev
Author: txmodxoops
Date: 2012-02-02 16:44:38 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Minor Revision
Removed Paths:
-------------
XoopsModules/TDMCreate/releases/1.37/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dj...@us...> - 2012-02-02 15:20:22
|
Revision: 8872
http://xoops.svn.sourceforge.net/xoops/?rev=8872&view=rev
Author: djculex
Date: 2012-02-02 15:20:11 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
- BUG: User website not added to form
- BUG: Ie adding horizontal scroll to colorbox when not needed (Yeeeeahh IE
- Personal: Update personal hate-list...IE still no.1
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
XoopsModules/smallworld/trunk/smallworld/editprofile.php
XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html
Modified: XoopsModules/smallworld/trunk/smallworld/css/smallworld.css
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-02 13:46:31 UTC (rev 8871)
+++ XoopsModules/smallworld/trunk/smallworld/css/smallworld.css 2012-02-02 15:20:11 UTC (rev 8872)
@@ -469,7 +469,7 @@
.smallworld_remove2 {
position:relative;
top:-120px;
- left: 400px;
+ left: 50%;
font-size:8px;
}
Modified: XoopsModules/smallworld/trunk/smallworld/editprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/editprofile.php 2012-02-02 13:46:31 UTC (rev 8871)
+++ XoopsModules/smallworld/trunk/smallworld/editprofile.php 2012-02-02 15:20:11 UTC (rev 8872)
@@ -315,6 +315,7 @@
$xoopsTpl->append('smallworld_register_title',_SMALLWORLD_REGRISTATION_TITLE);
$xoopsTpl->assign('smallworld_beforesubmit',_SMALLWORLD_TEXTBEFORESUBMIT);
$xoopsTpl->assign('smallworld_save',_SMALLWORLD_SUBMIT);
+ $xoopsTpl->assign('smallworld_user_website',$r['website']);
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css');
Modified: XoopsModules/smallworld/trunk/smallworld/js/smallworld.js
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-02 13:46:31 UTC (rev 8871)
+++ XoopsModules/smallworld/trunk/smallworld/js/smallworld.js 2012-02-02 15:20:11 UTC (rev 8872)
@@ -41,7 +41,7 @@
if (xoops_smallworld('#smallworld_regform1').length) { // implies *not* zero
xoops_smallworld('#smallworld_regform1').show();
xoops_smallworld.fn.colorbox({
- width:"50%",
+ innerWidth:"75%",
height:"70%",
inline:true,
onComplete: function() {
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html 2012-02-02 13:46:31 UTC (rev 8871)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_edittemplate.html 2012-02-02 15:20:11 UTC (rev 8872)
@@ -233,7 +233,7 @@
<{if $show_website != 'no'}>
<tr>
<td valign="top"><p><{$smarty.const._SMALLWORLD_WEBSITE}></p></td>
- <td><textarea name="website" id="website">http://</textarea>
+ <td><textarea name="website" id="website"><{$smallworld_user_website}></textarea>
</td>
</tr>
<{/if}>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-02-02 13:46:38
|
Revision: 8871
http://xoops.svn.sourceforge.net/xoops/?rev=8871&view=rev
Author: txmodxoops
Date: 2012-02-02 13:46:31 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Beta 2
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php
Removed Paths:
-------------
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php
Added: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/building.php 2012-02-02 13:46:31 UTC (rev 8871)
@@ -0,0 +1,222 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 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.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+include 'admin_header.php';
+xoops_cp_header();
+
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('const.php');
+
+$op = TDMCreate_CleanVars($_REQUEST, 'op', 'default', 'string');
+
+$modPath = XOOPS_ROOT_PATH.'/modules/TDMCreate';
+
+switch ($op) {
+ case "creation":
+ $modules =& $modulesHandler->get($_REQUEST['modules_name']);
+ $modules_name = $modules->getVar('modules_name');
+ $modules_desc = $modules->getVar('modules_description');
+ $modules_author_website_name = $modules->getVar('modules_author_website_name');
+ $modules_author_website_url = $modules->getVar('modules_author_website_url');
+ $modules_image = $modules->getVar('modules_image');
+ //Effacer repertoire du nouveau module s'il existe
+ clearDir($modPath.'/modules/'.$modules_name);
+
+ //Nom des tables et combien de tables
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('tables_modules', $_REQUEST['modules_name']));
+ $nb_tables = $tablesHandler->getCount($criteria);
+ $tables_arr = $tablesHandler->getall($criteria);
+
+ //Debut
+ echo '<table width="100%" cellspacing="1" class="outer">';
+ /************************************************/
+ /*Structure*/
+ /************************************************/
+ //Creation de l'architecture
+ const_architecture($modules_name, $modules_image);
+ //Creation du changelog.txt
+ const_changelog($modules, $modules_name);
+ //Creation de admin index.php
+ const_admin_index($modules, $modules_name, $tables_arr);
+ //const_class_admin($modules, $modules_name);
+
+ foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_id = $tables_arr[$i]->getVar('tables_id');
+ $tables_name = $tables_arr[$i]->getVar('tables_name');
+ $tables_module_table = $tables_arr[$i]->getVar('tables_module_table');
+ $tables_img = $tables_arr[$i]->getVar('tables_img');
+ $tables_champs = $tables_arr[$i]->getVar('tables_champs');
+ $tables_parametres = $tables_arr[$i]->getVar('tables_parametres');
+ $tables_blocks = $tables_arr[$i]->getVar('tables_blocks');
+ $tables_display_admin = $tables_arr[$i]->getVar('tables_display_admin');
+ $tables_display_user = $tables_arr[$i]->getVar('tables_display_user');
+ $tables_search = $tables_arr[$i]->getVar('tables_search');
+ $tables_coms = $tables_arr[$i]->getVar('tables_coms');
+
+ //Fabrication
+ //Copie of images tables
+ $tables_img1 = $modPath."/images/uploads/tables/".$tables_img;
+ if (file_exists($tables_img1)) {
+ copy($tables_img1, $modPath."/modules/".$modules_name."/images/deco/".$tables_img);
+ }
+ //Creation des classes
+ const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
+
+ //Creation of pages admin
+ if ( $tables_display_admin == 1 ) {
+ const_admin_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_champs, $tables_parametres);
+ }
+ //Creation of pages and templates user
+ if ( $tables_display_user == 1 && $tables_module_table != null ) {
+ //const_user_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $champs_param_display_user, $champs_param_type, $tables_img, $tables_champs, $tables_parametres);
+ }
+ //Creation de search
+ if ( $tables_search == 1 ) {
+ const_include_search($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
+ }
+ //Creation des coms
+ if ( $tables_coms == 1 ) {
+ const_include_coms($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
+ }
+
+ //Creation of the file mysql.sql
+ const_sql($modules_name, $tables_module_table, $tables_name, $tables_champs);
+
+ $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'");
+ list( $topic ) = $xoopsDB->fetchRow($result);
+ //Creation des blocs
+ if ( $tables_blocks == 1 ) {
+ const_blocks($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres, $topic);
+ //Creation du template des blocks
+ const_blocks_templates($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ }
+ }
+ //Variables
+ $tables_id = $tablesHandler->getVar('tables_id');
+ $tables_name = $tablesHandler->getVar('tables_name');
+ $tables_module_table = $tablesHandler->getVar('tables_module_table');
+ $tables_img = $tablesHandler->getVar('tables_img');
+ $tables_champs = $tablesHandler->getVar('tables_champs');
+ $tables_parametres = $tablesHandler->getVar('tables_parametres');
+ $tables_blocks = $tablesHandler->getVar('tables_blocks');
+ $tables_display_admin = $tablesHandler->getVar('tables_display_admin');
+ $tables_display_user = $tablesHandler->getVar('tables_display_user');
+ $tables_search = $tablesHandler->getVar('tables_search');
+ $tables_coms = $tablesHandler->getVar('tables_coms');
+ //Creation de xoopsversion.php
+ /*Mettre xoops version vers la fin pour integrer les bloc, etc*/
+ const_xoopsversion($modules, $modules_name, $tables_blocks, $tables_arr, $tables_module_table, $tables_parametres);
+ // Creation of template index
+ const_templates_index($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
+ // Creation of template header
+ const_templates_header($modules, $modules_name);
+ // Creation of template footer
+ const_templates_footer($modules, $modules_name, $tables_module_table);
+ // Creation of template admin about
+ const_templates_admin_about($modules, $modules_name);
+ // Creation of template admin help
+ const_templates_admin_help($modules, $modules_name);
+ //Creation du fichier permissions
+ $topic = 0;
+ if ( $topic == 1 || $tables_module_table != null) { //
+ const_admin_permissions($modules, $modules_name, $tables_arr, $topic);
+ }
+
+ //Include
+ //Configs
+ const_include_configs($modules, $modules_name, $modules_author_website_name, $modules_author_website_url);
+ //Style
+ //const_css_admin($modules, $modules_name);
+ //const_include_style($modules, $modules_name);
+ //Functions
+ const_include_functions($modules, $modules_name);
+ //Creation du fichier install pour l'uploads
+ const_include_install($modules, $modules_name, $tables_arr);
+ //Language
+ ///////////////////////////////////////////////////////////////////////
+ //Creation du language main.php
+ const_main_language($modules, $modules_name, $modules_desc);
+ //Creation du language modinfo.php
+ const_modinfo_language($modules, $modules_name, $modules_desc);
+ //Creation du language admin.php
+ const_admin_language($modules, $modules_name, $modules_desc);
+ //Creation du language blocks.php
+ const_blocks_language($modules, $modules_name);
+ //Creation du language help.php
+ const_help_language($modules, $modules_name);
+ ///////////////////////////////////////////////////////////////////////
+ //Creation de la class menu
+ //const_class_menu($modules, $modules_name);
+
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ //Creation de admin header.php
+ const_admin_header($modules, $modules_name, $tables_arr);
+ //Creation de admin footer.php
+ const_admin_footer($modules, $modules_name, $tables_arr);
+ //Creation de admin menu.php
+ const_admin_menu($modules, $modules_name, $tables_arr, $topic);
+ //Creation de admin about.php
+ //$menu++;
+ const_admin_about($modules, $modules_name);
+ /************************************************/
+ /*Admin*/
+ /************************************************/
+ if ( $tables_display_user == 1 && $tables_module_table != null ) {
+ const_user_header($modules, $modules_name, $tables_id, $tables_module_table, $tables_name);
+ const_user_index($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
+ }
+ echo '</table>';
+
+ break;
+
+ case "default":
+ default:
+
+ include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+ $action = $_SERVER['REQUEST_URI'];
+
+ $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', true);
+
+ $modules_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'modules_name', 'modules_name');
+ $modules_select->addOptionArray($modulesHandler->getList());
+ $form->addElement($modules_select, true);
+
+ /*foreach (array_keys($tables_arr) as $i)
+ {
+ //Variables
+ $tables_name = $tables_arr[$i]->getVar('tables_name');
+ }*/
+ $tables_name = $tablesHandler->getVar('tables_name');
+ $tables_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_TABLES, 'tables_name', $tables_name, 4);
+ $tables_select->addOptionArray($tablesHandler->getList());
+ $form->addElement($tables_select, false);
+
+ $form->addElement(new XoopsFormHidden('op', 'creation'));
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ $form->display();
+ break;
+}
+include "admin_footer.php";
\ No newline at end of file
Deleted: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php 2012-02-02 13:45:24 UTC (rev 8870)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/const.php 2012-02-02 13:46:31 UTC (rev 8871)
@@ -1,222 +0,0 @@
-<?php
-/**
- * ****************************************************************************
- * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
- * - Licence GPL Copyright (c) (http://www.tdmxoops.net)
- *
- * Cette licence, contient des limitations!!!
- *
- * 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.
- *
- * @license TDM GPL license
- * @author TDM TEAM DEV MODULE
- *
- * ****************************************************************************
- */
-
-include 'admin_header.php';
-xoops_cp_header();
-
-$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation('const.php');
-
-$op = TDMCreate_CleanVars($_REQUEST, 'op', 'default', 'string');
-
-$modPath = XOOPS_ROOT_PATH.'/modules/TDMCreate';
-
-switch ($op) {
- case "creation":
- $modules =& $modulesHandler->get($_REQUEST['modules_name']);
- $modules_name = $modules->getVar('modules_name');
- $modules_desc = $modules->getVar('modules_description');
- $modules_author_website_name = $modules->getVar('modules_author_website_name');
- $modules_author_website_url = $modules->getVar('modules_author_website_url');
- $modules_image = $modules->getVar('modules_image');
- //Effacer repertoire du nouveau module s'il existe
- clearDir($modPath.'/modules/'.$modules_name);
-
- //Nom des tables et combien de tables
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('tables_modules', $_REQUEST['modules_name']));
- $nb_tables = $tablesHandler->getCount($criteria);
- $tables_arr = $tablesHandler->getall($criteria);
-
- //Debut
- echo '<table width="100%" cellspacing="1" class="outer">';
- /************************************************/
- /*Structure*/
- /************************************************/
- //Creation de l'architecture
- const_architecture($modules_name, $modules_image);
- //Creation du changelog.txt
- const_changelog($modules, $modules_name);
- //Creation de admin index.php
- const_admin_index($modules, $modules_name, $tables_arr);
- //const_class_admin($modules, $modules_name);
-
- foreach (array_keys($tables_arr) as $i)
- {
- //Variables
- $tables_id = $tables_arr[$i]->getVar('tables_id');
- $tables_name = $tables_arr[$i]->getVar('tables_name');
- $tables_module_table = $tables_arr[$i]->getVar('tables_module_table');
- $tables_img = $tables_arr[$i]->getVar('tables_img');
- $tables_champs = $tables_arr[$i]->getVar('tables_champs');
- $tables_parametres = $tables_arr[$i]->getVar('tables_parametres');
- $tables_blocks = $tables_arr[$i]->getVar('tables_blocks');
- $tables_display_admin = $tables_arr[$i]->getVar('tables_display_admin');
- $tables_display_user = $tables_arr[$i]->getVar('tables_display_user');
- $tables_search = $tables_arr[$i]->getVar('tables_search');
- $tables_coms = $tables_arr[$i]->getVar('tables_coms');
-
- //Fabrication
- //Copie of images tables
- $tables_img1 = $modPath."/images/uploads/tables/".$tables_img;
- if (file_exists($tables_img1)) {
- copy($tables_img1, $modPath."/modules/".$modules_name."/images/deco/".$tables_img);
- }
- //Creation des classes
- const_class($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
-
- //Creation of pages admin
- if ( $tables_display_admin == 1 ) {
- const_admin_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_img, $tables_champs, $tables_parametres);
- }
- //Creation of pages and templates user
- if ( $tables_display_user == 1 && $tables_module_table != null ) {
- //const_user_pages($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $champs_param_display_user, $champs_param_type, $tables_img, $tables_champs, $tables_parametres);
- }
- //Creation de search
- if ( $tables_search == 1 ) {
- const_include_search($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
- }
- //Creation des coms
- if ( $tables_coms == 1 ) {
- const_include_coms($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres, $tables_img);
- }
-
- //Creation of the file mysql.sql
- const_sql($modules_name, $tables_module_table, $tables_name, $tables_champs);
-
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE tables_name = 'topic'");
- list( $topic ) = $xoopsDB->fetchRow($result);
- //Creation des blocs
- if ( $tables_blocks == 1 ) {
- const_blocks($modules, $modules_name, $tables_module_table, $tables_name, $tables_champs, $tables_parametres, $topic);
- //Creation du template des blocks
- const_blocks_templates($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
- }
- }
- //Variables
- $tables_id = $tablesHandler->getVar('tables_id');
- $tables_name = $tablesHandler->getVar('tables_name');
- $tables_module_table = $tablesHandler->getVar('tables_module_table');
- $tables_img = $tablesHandler->getVar('tables_img');
- $tables_champs = $tablesHandler->getVar('tables_champs');
- $tables_parametres = $tablesHandler->getVar('tables_parametres');
- $tables_blocks = $tablesHandler->getVar('tables_blocks');
- $tables_display_admin = $tablesHandler->getVar('tables_display_admin');
- $tables_display_user = $tablesHandler->getVar('tables_display_user');
- $tables_search = $tablesHandler->getVar('tables_search');
- $tables_coms = $tablesHandler->getVar('tables_coms');
- //Creation de xoopsversion.php
- /*Mettre xoops version vers la fin pour integrer les bloc, etc*/
- const_xoopsversion($modules, $modules_name, $tables_blocks, $tables_arr, $tables_module_table, $tables_parametres);
- // Creation of template index
- const_templates_index($modules, $modules_name, $tables_name, $tables_module_table, $tables_champs, $tables_parametres);
- // Creation of template header
- const_templates_header($modules, $modules_name);
- // Creation of template footer
- const_templates_footer($modules, $modules_name, $tables_module_table);
- // Creation of template admin about
- const_templates_admin_about($modules, $modules_name);
- // Creation of template admin help
- const_templates_admin_help($modules, $modules_name);
- //Creation du fichier permissions
- $topic = 0;
- if ( $topic == 1 || $tables_module_table != null) { //
- const_admin_permissions($modules, $modules_name, $tables_arr, $topic);
- }
-
- //Include
- //Configs
- const_include_configs($modules, $modules_name, $modules_author_website_name, $modules_author_website_url);
- //Style
- //const_css_admin($modules, $modules_name);
- //const_include_style($modules, $modules_name);
- //Functions
- const_include_functions($modules, $modules_name);
- //Creation du fichier install pour l'uploads
- const_include_install($modules, $modules_name, $tables_arr);
- //Language
- ///////////////////////////////////////////////////////////////////////
- //Creation du language main.php
- const_main_language($modules, $modules_name, $modules_desc);
- //Creation du language modinfo.php
- const_modinfo_language($modules, $modules_name, $modules_desc);
- //Creation du language admin.php
- const_admin_language($modules, $modules_name, $modules_desc);
- //Creation du language blocks.php
- const_blocks_language($modules, $modules_name);
- //Creation du language help.php
- const_help_language($modules, $modules_name);
- ///////////////////////////////////////////////////////////////////////
- //Creation de la class menu
- //const_class_menu($modules, $modules_name);
-
- /************************************************/
- /*Admin*/
- /************************************************/
- //Creation de admin header.php
- const_admin_header($modules, $modules_name, $tables_arr);
- //Creation de admin footer.php
- const_admin_footer($modules, $modules_name, $tables_arr);
- //Creation de admin menu.php
- const_admin_menu($modules, $modules_name, $tables_arr, $topic);
- //Creation de admin about.php
- //$menu++;
- const_admin_about($modules, $modules_name);
- /************************************************/
- /*Admin*/
- /************************************************/
- if ( $tables_display_user == 1 && $tables_module_table != null ) {
- const_user_header($modules, $modules_name, $tables_id, $tables_module_table, $tables_name);
- const_user_index($modules, $modules_name, $tables_id, $tables_module_table, $tables_name, $tables_champs, $tables_parametres);
- }
- echo '</table>';
-
- break;
-
- case "default":
- default:
-
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
- $action = $_SERVER['REQUEST_URI'];
-
- $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', true);
-
- $modules_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'modules_name', 'modules_name');
- $modules_select->addOptionArray($modulesHandler->getList());
- $form->addElement($modules_select, true);
-
- /*foreach (array_keys($tables_arr) as $i)
- {
- //Variables
- $tables_name = $tables_arr[$i]->getVar('tables_name');
- }*/
- $tables_name = $tablesHandler->getVar('tables_name');
- $tables_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_TABLES, 'tables_name', $tables_name, 4);
- $tables_select->addOptionArray($tablesHandler->getList());
- $form->addElement($tables_select, false);
-
- $form->addElement(new XoopsFormHidden('op', 'creation'));
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $form->display();
- break;
-}
-include "admin_footer.php";
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-02-02 13:45:35
|
Revision: 8870
http://xoops.svn.sourceforge.net/xoops/?rev=8870&view=rev
Author: txmodxoops
Date: 2012-02-02 13:45:24 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
fixed minor bugs
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/about.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_modules.php
XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/xoops_version.php
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/about.php 2012-02-02 12:32:01 UTC (rev 8869)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/about.php 2012-02-02 13:45:24 UTC (rev 8870)
@@ -44,6 +44,6 @@
$aboutAdmin = new ModuleAdmin();
echo $aboutAdmin->addNavigation("about.php");
-echo $aboutAdmin->renderabout($GLOBALS['xoopsModuleConfig']['id_paypal'], false);
+echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
include "admin_footer.php";
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php 2012-02-02 12:32:01 UTC (rev 8869)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/menu.php 2012-02-02 13:45:24 UTC (rev 8870)
@@ -68,7 +68,7 @@
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU5;
//$adminmenu[$i]["desc"] = _MI_TDMCREATE_ADMENU5_DESC
-$adminmenu[$i]["link"] = 'admin/const.php';
+$adminmenu[$i]["link"] = 'admin/building.php';
$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/builder.png';
$i++;
$adminmenu[$i]["title"] = _MI_TDMCREATE_ADMENU6;
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php 2012-02-02 12:32:01 UTC (rev 8869)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/admin/tables.php 2012-02-02 13:45:24 UTC (rev 8870)
@@ -79,7 +79,7 @@
if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
$extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["attachedfile1"]['name']) ;
- $name_img = 'topic.'.$extension;
+ $name_img = $_GET['tables_name'].'.'.$extension;
$uploader->setTargetFileName($name_img);
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_modules.php 2012-02-02 12:32:01 UTC (rev 8869)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/class/tdmcreate_modules.php 2012-02-02 13:45:24 UTC (rev 8870)
@@ -95,7 +95,7 @@
$editor_configs["cols"] = 100;
$editor_configs["width"] = "100%";
$editor_configs["height"] = "100px";
- $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['TDMCreate_editor'];
+ $editor_configs["editor"] = $GLOBALS['xoopsModuleConfig']['tdmcreate_editor'];
$form->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULES_DESCRIPTION, "modules_description", $editor_configs), true);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_AUTHOR, 'modules_author', 50, 255, $this->getVar('modules_author')), true);
$form->addElement(new XoopsFormText(_AM_TDMCREATE_MODULES_LICENSE, 'modules_license', 50, 255, $this->getVar('modules_license')), true);
@@ -106,8 +106,7 @@
$modules_active_search = $this->isNew() ? '1' : $this->getVar('modules_active_search');
$form->addElement(new XoopsFormRadioYN(_AM_TDMCREATE_MODULES_ACTIVE_SEARCH, 'modules_active_search', $modules_active_search, _YES, _NO));
- $modules_image = $this->getVar('modules_image') ? $this->getVar('modules_image') : 'blank.gif';
-
+ $modules_image = $this->getVar('modules_image') ? $this->getVar('modules_image') : 'blank.gif';
$uploadirectory = "/modules/".$xoopsModule->dirname()."/images/uploads/modules";
$imgtray = new XoopsFormElementTray(_AM_TDMCREATE_MODULES_IMAGE,'<br />');
$imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, "./modules/".$xoopsModule->dirname()."/images/uploads/modules");
Modified: XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/xoops_version.php 2012-02-02 12:32:01 UTC (rev 8869)
+++ XoopsModules/TDMCreate/branches/timgno/modules/TDMCreate/xoops_version.php 2012-02-02 13:45:24 UTC (rev 8870)
@@ -53,14 +53,16 @@
$modversion['license'] = 'GNU GPL 2.0';
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-$modversion['release_info'] = "Beta 1 18/12/2011";
+$modversion['release_info'] = "Beta 2 30/01/2012";
$modversion['release_file'] = XOOPS_URL."/modules/".$dirname."/docs/changelog.txt";
-$modversion['release_date'] = "2011/12/18";
+$modversion['release_date'] = "2012/01/30";
$modversion['manual'] = "Install Manual";
$modversion['manual_file'] = XOOPS_URL."/modules/".$dirname."/docs/install.txt";
$modversion['min_php'] = "5.2";
$modversion['min_xoops'] = "2.5";
+$modversion['min_admin']= "1.1";
+$modversion['min_db']= array('mysql'=> "5.0.7", 'mysqli'=> "5.0.7");
$modversion['image'] = "images/{$dirname}_slogo.png";
$modversion['dirname'] = "$dirname";
@@ -75,8 +77,8 @@
$modversion['forum_site_name'] = "Xoops Community";
$modversion['module_website_url'] = "http://www.xoops.org/";
$modversion['module_website_name'] = "Xoops";
-$modversion['release'] = "18-12-2011";
-$modversion['module_status'] = "Beta 1";
+$modversion['release'] = "30/01/2012";
+$modversion['module_status'] = "Beta 2";
// Admin things
$modversion['hasAdmin'] = 1;
@@ -97,6 +99,8 @@
$modversion["onInstall"] = "include/install.php";
//$modversion["onUpdate"] = "include/update.php";
+$modversion['hasMain'] = 0;
+
$modversion['templates'][] = array( 'file' => 'tdmcreate_filemanager.html', 'description' => '', 'type' => 'admin' );
// Config
@@ -117,13 +121,5 @@
$modversion['config'][$i]['formtype'] = 'textbox';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 15;
-$i++;
-$modversion["config"][$i]["name"] = "id_paypal";
-$modversion["config"][$i]["title"] = "_MI_TDMCREATE_IDPAYPAL";
-$modversion["config"][$i]["description"] = "_MI_TDMCREATE_IDPAYPAL_DESC";
-$modversion["config"][$i]["formtype"] = "textbox";
-$modversion["config"][$i]["valuetype"] = "text";
-$modversion["config"][$i]["default"] = '6KJ7RW5DR3VTJ';
unset($i);
-
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <txm...@us...> - 2012-02-02 12:32:16
|
Revision: 8869
http://xoops.svn.sourceforge.net/xoops/?rev=8869&view=rev
Author: txmodxoops
Date: 2012-02-02 12:32:01 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Added buttons, deleted links in category, fields and steps
Added Paths:
-----------
XoopsModules/profile/branches/timgno/
XoopsModules/profile/branches/timgno/Frameworks/
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/about.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/category.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/fields.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/help.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/home.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/permissions.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/stats.png
XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/users.png
XoopsModules/profile/branches/timgno/class/
XoopsModules/profile/branches/timgno/class/captcha/
XoopsModules/profile/branches/timgno/class/captcha/config.recaptcha.php
XoopsModules/profile/branches/timgno/modules/
XoopsModules/profile/branches/timgno/modules/profile/
XoopsModules/profile/branches/timgno/modules/profile/activate.php
XoopsModules/profile/branches/timgno/modules/profile/admin/
XoopsModules/profile/branches/timgno/modules/profile/admin/about.php
XoopsModules/profile/branches/timgno/modules/profile/admin/admin_footer.php
XoopsModules/profile/branches/timgno/modules/profile/admin/admin_header.php
XoopsModules/profile/branches/timgno/modules/profile/admin/category.php
XoopsModules/profile/branches/timgno/modules/profile/admin/deactivate.php
XoopsModules/profile/branches/timgno/modules/profile/admin/directory.php
XoopsModules/profile/branches/timgno/modules/profile/admin/field.php
XoopsModules/profile/branches/timgno/modules/profile/admin/header.php
XoopsModules/profile/branches/timgno/modules/profile/admin/index.html
XoopsModules/profile/branches/timgno/modules/profile/admin/index.php
XoopsModules/profile/branches/timgno/modules/profile/admin/menu.php
XoopsModules/profile/branches/timgno/modules/profile/admin/permissions.php
XoopsModules/profile/branches/timgno/modules/profile/admin/step.php
XoopsModules/profile/branches/timgno/modules/profile/admin/user.php
XoopsModules/profile/branches/timgno/modules/profile/admin/validation.php
XoopsModules/profile/branches/timgno/modules/profile/admin/visibility.php
XoopsModules/profile/branches/timgno/modules/profile/changelog.txt
XoopsModules/profile/branches/timgno/modules/profile/changemail.php
XoopsModules/profile/branches/timgno/modules/profile/changepass.php
XoopsModules/profile/branches/timgno/modules/profile/class/
XoopsModules/profile/branches/timgno/modules/profile/class/category.php
XoopsModules/profile/branches/timgno/modules/profile/class/field.php
XoopsModules/profile/branches/timgno/modules/profile/class/index.html
XoopsModules/profile/branches/timgno/modules/profile/class/profile.php
XoopsModules/profile/branches/timgno/modules/profile/class/regstep.php
XoopsModules/profile/branches/timgno/modules/profile/class/validation.php
XoopsModules/profile/branches/timgno/modules/profile/class/visibility.php
XoopsModules/profile/branches/timgno/modules/profile/comment_delete.php
XoopsModules/profile/branches/timgno/modules/profile/comment_edit.php
XoopsModules/profile/branches/timgno/modules/profile/comment_new.php
XoopsModules/profile/branches/timgno/modules/profile/comment_post.php
XoopsModules/profile/branches/timgno/modules/profile/comment_reply.php
XoopsModules/profile/branches/timgno/modules/profile/directory.php
XoopsModules/profile/branches/timgno/modules/profile/docs/
XoopsModules/profile/branches/timgno/modules/profile/docs/changelog.txt
XoopsModules/profile/branches/timgno/modules/profile/docs/credits.txt
XoopsModules/profile/branches/timgno/modules/profile/docs/index.html
XoopsModules/profile/branches/timgno/modules/profile/docs/install.txt
XoopsModules/profile/branches/timgno/modules/profile/docs/lang_diff.txt
XoopsModules/profile/branches/timgno/modules/profile/docs/licence.txt
XoopsModules/profile/branches/timgno/modules/profile/docs/readme.txt
XoopsModules/profile/branches/timgno/modules/profile/dojsonvalidate.php
XoopsModules/profile/branches/timgno/modules/profile/edituser.php
XoopsModules/profile/branches/timgno/modules/profile/footer.php
XoopsModules/profile/branches/timgno/modules/profile/header.php
XoopsModules/profile/branches/timgno/modules/profile/images/
XoopsModules/profile/branches/timgno/modules/profile/images/index.html
XoopsModules/profile/branches/timgno/modules/profile/images/left_both.gif
XoopsModules/profile/branches/timgno/modules/profile/images/logo.png
XoopsModules/profile/branches/timgno/modules/profile/images/modadminbg.gif
XoopsModules/profile/branches/timgno/modules/profile/images/no.png
XoopsModules/profile/branches/timgno/modules/profile/images/right_both.gif
XoopsModules/profile/branches/timgno/modules/profile/images/yes.png
XoopsModules/profile/branches/timgno/modules/profile/include/
XoopsModules/profile/branches/timgno/modules/profile/include/forms.php
XoopsModules/profile/branches/timgno/modules/profile/include/index.html
XoopsModules/profile/branches/timgno/modules/profile/include/install.php
XoopsModules/profile/branches/timgno/modules/profile/include/update.php
XoopsModules/profile/branches/timgno/modules/profile/index.php
XoopsModules/profile/branches/timgno/modules/profile/js/
XoopsModules/profile/branches/timgno/modules/profile/js/index.html
XoopsModules/profile/branches/timgno/modules/profile/js/jquery.json.validation.js
XoopsModules/profile/branches/timgno/modules/profile/language/
XoopsModules/profile/branches/timgno/modules/profile/language/english/
XoopsModules/profile/branches/timgno/modules/profile/language/english/admin.php
XoopsModules/profile/branches/timgno/modules/profile/language/english/help/
XoopsModules/profile/branches/timgno/modules/profile/language/english/help/help.html
XoopsModules/profile/branches/timgno/modules/profile/language/english/help/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/english/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/english/mail_template/
XoopsModules/profile/branches/timgno/modules/profile/language/english/mail_template/emailchanged.tpl
XoopsModules/profile/branches/timgno/modules/profile/language/english/mail_template/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/english/main.php
XoopsModules/profile/branches/timgno/modules/profile/language/english/modinfo.php
XoopsModules/profile/branches/timgno/modules/profile/language/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/italian/
XoopsModules/profile/branches/timgno/modules/profile/language/italian/admin.php
XoopsModules/profile/branches/timgno/modules/profile/language/italian/help/
XoopsModules/profile/branches/timgno/modules/profile/language/italian/help/help.html
XoopsModules/profile/branches/timgno/modules/profile/language/italian/help/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/italian/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/italian/mail_template/
XoopsModules/profile/branches/timgno/modules/profile/language/italian/mail_template/emailchanged.tpl
XoopsModules/profile/branches/timgno/modules/profile/language/italian/mail_template/index.html
XoopsModules/profile/branches/timgno/modules/profile/language/italian/main.php
XoopsModules/profile/branches/timgno/modules/profile/language/italian/modinfo.php
XoopsModules/profile/branches/timgno/modules/profile/lostpass.php
XoopsModules/profile/branches/timgno/modules/profile/preloads/
XoopsModules/profile/branches/timgno/modules/profile/preloads/core.php
XoopsModules/profile/branches/timgno/modules/profile/preloads/index.html
XoopsModules/profile/branches/timgno/modules/profile/register.php
XoopsModules/profile/branches/timgno/modules/profile/search.php
XoopsModules/profile/branches/timgno/modules/profile/sql/
XoopsModules/profile/branches/timgno/modules/profile/sql/index.html
XoopsModules/profile/branches/timgno/modules/profile/sql/mysql.sql
XoopsModules/profile/branches/timgno/modules/profile/templates/
XoopsModules/profile/branches/timgno/modules/profile/templates/index.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_categorylist.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_fieldlist.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_steplist.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_admin_visibility.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_avatar.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_breadcrumbs.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_changepass.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_directory_catlist.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_directory_index.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_directory_search.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_editprofile.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_email.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_form.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_register.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_results.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_search.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_userform.html
XoopsModules/profile/branches/timgno/modules/profile/templates/profile_userinfo.html
XoopsModules/profile/branches/timgno/modules/profile/templates/style.css
XoopsModules/profile/branches/timgno/modules/profile/user.php
XoopsModules/profile/branches/timgno/modules/profile/userinfo.php
XoopsModules/profile/branches/timgno/modules/profile/xoops_version.php
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/about.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/about.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/category.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/category.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/fields.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/fields.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/help.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/help.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/home.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/home.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/permissions.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/permissions.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/stats.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/stats.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/users.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/profile/branches/timgno/Frameworks/moduleclasses/icons/32/users.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/profile/branches/timgno/class/captcha/config.recaptcha.php
===================================================================
--- XoopsModules/profile/branches/timgno/class/captcha/config.recaptcha.php (rev 0)
+++ XoopsModules/profile/branches/timgno/class/captcha/config.recaptcha.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * CAPTCHA configurations for Recaptcha mode
+ *
+ * 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 XOOPS project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package class
+ * @subpackage CAPTCHA
+ * @since 2.5.2
+ * @author trabis <lus...@gm...>
+ * @version $Id: config.recaptcha.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+return $config = array(
+ 'private_key' => $GLOBALS['xoopsModuleConfig']['profile_privateapikey'], //'YourPrivateApiKey'
+ 'public_key' => $GLOBALS['xoopsModuleConfig']['profile_publicapikey'], //'YourPublicApiKey',
+ 'theme' => 'clean', // 'red' | 'white' | 'blackglass' | 'clean' | 'custom'
+ 'lang' => _LANGCODE
+ );
+?>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/activate.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/activate.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/activate.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Extended User Profile
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package profile
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: activate.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+
+$xoopsOption['pagetype'] = "user";
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php';
+
+include $GLOBALS['xoops']->path('header.php');
+if (!empty($_GET['id']) && !empty($_GET['actkey'])) {
+ $id = intval($_GET['id']);
+ $actkey = trim($_GET['actkey']);
+ if (empty($id)) {
+ redirect_header(XOOPS_URL, 1, '');
+ exit();
+ }
+ $member_handler =& xoops_gethandler('member');
+ $thisuser =& $member_handler->getUser($id);
+ if (!is_object($thisuser)) {
+ redirect_header(XOOPS_URL, 1, '');
+ exit();
+ }
+ if ($thisuser->getVar('actkey') != $actkey) {
+ redirect_header(XOOPS_URL . '/', 5, _US_ACTKEYNOT);
+ } else {
+ if ($thisuser->getVar('level') > 0) {
+ redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n'). '/index.php', 5, _US_ACONTACT, false);
+ } else {
+ if (false != $member_handler->activateUser($thisuser)) {
+ $config_handler =& xoops_gethandler('config');
+ $GLOBALS['xoopsConfigUser'] = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
+ if ($GLOBALS['xoopsConfigUser']['activation_type'] == 2) {
+ $myts =& MyTextSanitizer::getInstance();
+ $xoopsMailer = xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('activated.tpl');
+ $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
+ $xoopsMailer->setToUsers($thisuser);
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $GLOBALS['xoopsConfig']['sitename']) );
+ include $GLOBALS['xoops']->path('header.php');
+ if (!$xoopsMailer->send()) {
+ printf(_US_ACTVMAILNG, $thisuser->getVar('uname') );
+ } else {
+ printf(_US_ACTVMAILOK, $thisuser->getVar('uname') );
+ }
+ include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
+ } else {
+ redirect_header(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false);
+ }
+ } else {
+ redirect_header(XOOPS_URL . '/index.php', 5, 'Activation failed!');
+ }
+ }
+ }
+// Not implemented yet: re-send activiation code
+} else if (!empty($_REQUEST['email']) && $xoopsConfigUser['activation_type'] != 0) {
+ $myts =& MyTextSanitizer::getInstance();
+ $member_handler =& xoops_gethandler('member');
+ $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes(trim($_REQUEST['email']))));
+ if (count($getuser) == 0) {
+ redirect_header(XOOPS_URL, 2, _US_SORRYNOTFOUND);
+ }
+ if ($getuser[0]->isActive()) {
+ redirect_header(XOOPS_URL, 2, sprintf(_US_USERALREADYACTIVE, $getuser[0]->getVar('email')));
+ }
+ $xoopsMailer =& xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setTemplate('register.tpl');
+ $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
+ $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsMailer->assign('SITEURL', XOOPS_URL . "/");
+ $xoopsMailer->setToUsers($getuser[0]);
+ $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
+ $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']);
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser[0]->getVar('uname') ));
+ if (!$xoopsMailer->send()) {
+ echo _US_YOURREGMAILNG;
+ } else {
+ echo _US_YOURREGISTERED;
+ }
+} else {
+ include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+ $form = new XoopsThemeForm('', 'form', 'activate.php');
+ $form->addElement(new XoopsFormText(_US_EMAIL, 'email', 25, 255) );
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit') );
+ $form->display();
+}
+
+$xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER);
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php';
+?>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/about.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/about.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/about.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,31 @@
+<?php
+/**
+ * XOOPS Profile module
+ *
+ * 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 XOOPS Project (http://www.xoops.org)
+ * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
+ * @package xoopsPoll
+ * @since 2.5.0
+ * @author Mage, Mamba
+ * @version $Id $
+ **/
+
+include '../../../include/cp_header.php';
+include 'admin_header.php';
+xoops_cp_header();
+
+$module_info =& $module_handler->get($xoopsModule->getVar("mid"));
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
+
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/admin_footer.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/admin_footer.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/admin_footer.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,22 @@
+<?php
+/**
+ * xSitemMap module
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package xSitemMap
+ * @since 2.5.0
+ * @author XOOPS Module Team
+ * @version $Id $
+**/
+echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
+echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
+
+xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/admin_header.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/admin_header.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/admin_header.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Extended User Profile
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package profile
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: admin_header.php 8067 2011-12-06 20:13:21Z timgno $
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+ }else{
+ xoops_cp_header();
+ echo xoops_error(_PROFILE_AM_NOFRAMEWORKS);
+ xoops_cp_footer();
+ //return false;
+ }
+
+$dirname = basename(dirname(dirname( __FILE__ ) ));
+$module_handler =& xoops_gethandler('module');
+$xoopsModule = & $module_handler->getByDirname($dirname);
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ( !isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl']) ) {
+ include_once $GLOBALS['xoops']->path( "/class/template.php" );
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+}
+//xoops_cp_header();
+$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
+$xoopsTpl->assign('pathImageAdmin', $pathImageAdmin);
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('user');
+?>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/category.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/category.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/category.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,106 @@
+<?php
+// $Id: category.php 8066 2011-11-06 05:09:33Z beckmi $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: XOOPS Foundation //
+// URL: http://www.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+include 'admin_header.php';
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('category.php');
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
+
+$handler =& xoops_getmodulehandler('category');
+switch($op ) {
+default:
+case "list":
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_weight');
+ $criteria->setOrder('ASC');
+ $GLOBALS['xoopsTpl']->assign('categories', $handler->getObjects($criteria, true, false) );
+ $indexAdmin->addItemButton(_ADD.' '._PROFILE_AM_CATEGORY, 'category.php?op=new', 'add');
+ $GLOBALS['xoopsTpl']->assign('addcategory', $indexAdmin->renderButton() );
+ $template_main = "profile_admin_categorylist.html";
+ break;
+
+case "new":
+ include_once '../include/forms.php';
+ $obj =& $handler->create();
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+case "edit":
+ include_once '../include/forms.php';
+ $obj = $handler->get($_REQUEST['id']);
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+case "save":
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ if ( isset($_REQUEST['id']) ) {
+ $obj =& $handler->get($_REQUEST['id']);
+ } else {
+ $obj =& $handler->create();
+ }
+ $obj->setVar('cat_title', $_REQUEST['cat_title']);
+ $obj->setVar('cat_description', $_REQUEST['cat_description']);
+ $obj->setVar('cat_weight', $_REQUEST['cat_weight']);
+ if ( $handler->insert($obj) ) {
+ redirect_header('category.php', 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_CATEGORY) );
+ }
+ include_once '../include/forms.php';
+ echo $obj->getHtmlErrors();
+ $form =& $obj->getForm();
+ $form->display();
+ break;
+
+case "delete":
+ $obj =& $handler->get($_REQUEST['id']);
+ if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ if ( $handler->delete($obj) ) {
+ redirect_header('category.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_CATEGORY) );
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('cat_title') ));
+ }
+ break;
+}
+if ( isset($template_main) ) {
+ $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
+include 'admin_footer.php';
+//xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/deactivate.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/deactivate.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/deactivate.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,32 @@
+<?php
+include 'header.php';
+xoops_cp_header();
+
+if ( !isset($_REQUEST['uid']) ) {
+ redirect_header("index.php", 2, _PROFILE_AM_NOSELECTION);
+}
+$member_handler = xoops_gethandler('member');
+$user = $member_handler->getUser($_REQUEST['uid']);
+if ( !$user || $user->isNew() ) {
+ redirect_header("index.php", 2, _PROFILE_AM_USERDONEXIT);
+}
+
+if ( in_array(XOOPS_GROUP_ADMIN, $user->getGroups() ) ) {
+ redirect_header("index.php", 2, _PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS);
+}
+$user->setVar('level', $_REQUEST['level']);
+if ( $member_handler->insertUser($user) ) {
+ if ( $_REQUEST['level'] == 1 ) {
+ $message = _PROFILE_AM_USER_ACTIVATED;
+ } else {
+ $message = _PROFILE_AM_USER_DEACTIVATED;
+ }
+} else {
+ if ( $_REQUEST['level'] == 1 ) {
+ $message = _PROFILE_AM_USER_NOT_ACTIVATED;
+ } else {
+ $message = _PROFILE_AM_USER_NOT_DEACTIVATED;
+ }
+}
+redirect_header("../userinfo.php?uid=" . $user->getVar('uid'), 3, $message);
+?>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/directory.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/directory.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/directory.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,71 @@
+<?php
+// $Id: directory.php 5204 2010-09-06 20:10:52Z mageg $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: XOOPS Foundation //
+// URL: http://www.xoops.org/ //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+ include ('header.php');
+ xoops_loadLanguage('admin', 'profile');
+
+ switch ($_REQUEST['op']){
+ case 'reset':
+ XoopsCache::delete($GLOBALS['xoopsModule']->getVar('dirname').'_fields', $fields, 8000);
+ XoopsCache::delete($GLOBALS['xoopsModule']->getVar('dirname').'_fields_cache', $fields, 8000*1000);
+ redirect_header('directory.php?op='.'order'.'&fct='.'fields', 5, _PROFILE_AM_MSG_FIELDORDER_RESET);
+ exit(0);
+ case 'save':
+ switch($_REQUEST['fct']) {
+ case 'fields':
+ $weights = $_POST['weight'];
+ $fields = array();
+ foreach($weights as $field => $weight){
+ $fields[] = array('field' => $field, 'weight' => $weight);
+ }
+ $fields = profile_orderfields($fields, false);
+
+ XoopsCache::delete($GLOBALS['xoopsModule']->getVar('dirname').'_fields', $fields, 8000);
+ XoopsCache::delete($GLOBALS['xoopsModule']->getVar('dirname').'_fields_cache', $fields, 8000*1000);
+ XoopsCache::write($GLOBALS['xoopsModule']->getVar('dirname').'_fields', $fields, 8000);
+ XoopsCache::write($GLOBALS['xoopsModule']->getVar('dirname').'_fields_cache', $fields, 8000*1000);
+ redirect_header('directory.php?op='.'order'.'&fct='.'fields', 5, _PROFILE_AM_MSG_FIELDORDERSAVED);
+ exit(0);
+ }
+ default:
+ case 'order':
+ switch($_REQUEST['fct']) {
+ default:
+ case 'fields':
+ xoops_cp_header();
+ echo profile_directory_listorder();
+ xoops_cp_footer();
+ break;
+ }
+ break;
+
+ }
+?>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/field.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/field.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/field.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,308 @@
+<?php
+/**
+ * Extended User Profile
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package profile
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: field.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+include 'admin_header.php';
+xoops_cp_header();
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('field.php');
+
+$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
+
+$profilefield_handler =& xoops_getmodulehandler('field');
+
+switch($op ) {
+default:
+case "list":
+ $fields = $profilefield_handler->getObjects(null, true, false);
+
+ $module_handler =& xoops_gethandler('module');
+ $modules = $module_handler->getObjects(null, true);
+
+ $cat_handler =& xoops_getmodulehandler('category');
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_weight');
+ $cats = $cat_handler->getObjects($criteria, true);
+ unset($criteria);
+
+ $categories[0] = _PROFILE_AM_DEFAULT;
+ if ( count($cats) > 0 ) {
+ foreach (array_keys($cats) as $i ) {
+ $categories[$cats[$i]->getVar('cat_id')] = $cats[$i]->getVar('cat_title');
+ }
+ }
+ $GLOBALS['xoopsTpl']->assign('categories', $categories);
+ unset($categories);
+ $valuetypes = array(XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
+ XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
+ XOBJ_DTYPE_INT => _PROFILE_AM_INT,
+ XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
+ XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
+ XOBJ_DTYPE_URL => _PROFILE_AM_URL,
+ XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER,
+ XOBJ_DTYPE_MTIME => _PROFILE_AM_DATE);
+
+ $fieldtypes = array('checkbox' => _PROFILE_AM_CHECKBOX,
+ 'group' => _PROFILE_AM_GROUP,
+ 'group_multi' => _PROFILE_AM_GROUPMULTI,
+ 'language' => _PROFILE_AM_LANGUAGE,
+ 'radio' => _PROFILE_AM_RADIO,
+ 'select' => _PROFILE_AM_SELECT,
+ 'select_multi' => _PROFILE_AM_SELECTMULTI,
+ 'textarea' => _PROFILE_AM_TEXTAREA,
+ 'dhtml' => _PROFILE_AM_DHTMLTEXTAREA,
+ 'textbox' => _PROFILE_AM_TEXTBOX,
+ 'timezone' => _PROFILE_AM_TIMEZONE,
+ 'yesno' => _PROFILE_AM_YESNO,
+ 'date' => _PROFILE_AM_DATE,
+ 'datetime' => _PROFILE_AM_DATETIME,
+ 'longdate' => _PROFILE_AM_LONGDATE,
+ 'theme' => _PROFILE_AM_THEME,
+ 'autotext' => _PROFILE_AM_AUTOTEXT,
+ 'rank' => _PROFILE_AM_RANK);
+
+ foreach (array_keys($fields) as $i ) {
+ $fields[$i]['canEdit'] = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
+ $fields[$i]['canDelete'] = $fields[$i]['field_config'];
+ $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
+ $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
+ $categories[$fields[$i]['cat_id']][] = $fields[$i];
+ $weights[$fields[$i]['cat_id']][] = $fields[$i]['field_weight'];
+ }
+ //sort fields order in categories
+ foreach (array_keys($categories) as $i ) {
+ array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]), SORT_ASC, $categories[$i]);
+ }
+ ksort($categories);
+ $GLOBALS['xoopsTpl']->assign('fieldcategories', $categories);
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+ $indexAdmin->addItemButton(_ADD.' '._PROFILE_AM_FIELD, 'field.php?op=new', 'add');
+ $GLOBALS['xoopsTpl']->assign('addfield', $indexAdmin->renderButton() );
+ $template_main = "profile_admin_fieldlist.html";
+ break;
+
+case "new":
+ include_once('../include/forms.php');
+ $obj =& $profilefield_handler->create();
+ $form = profile_getFieldForm($obj);
+ $form->display();
+ break;
+
+case "edit":
+ $obj =& $profilefield_handler->get($_REQUEST['id']);
+ if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit') ) { //If no configs exist
+ redirect_header('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
+ }
+ include_once('../include/forms.php');
+ $form = profile_getFieldForm($obj);
+ $form->display();
+ break;
+
+case "reorder":
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ if ( isset($_POST['field_ids']) && count($_POST['field_ids']) > 0 ) {
+ $oldweight = $_POST['oldweight'];
+ $oldcat = $_POST['oldcat'];
+ $category = $_POST['category'];
+ $weight = $_POST['weight'];
+ $ids = array();
+ foreach ($_POST['field_ids'] as $field_id ) {
+ if ( $oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id] ) {
+ //if field has changed
+ $ids[] = intval($field_id);
+ }
+ }
+ if ( count($ids) > 0 ) {
+ $errors = array();
+ //if there are changed fields, fetch the fieldcategory objects
+ $field_handler =& xoops_getmodulehandler('field');
+ $fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
+ foreach ($ids as $i ) {
+ $fields[$i]->setVar('field_weight', intval($weight[$i]) );
+ $fields[$i]->setVar('cat_id', intval($category[$i]) );
+ if ( !$field_handler->insert($fields[$i]) ) {
+ $errors = array_merge($errors, $fields[$i]->getErrors() );
+ }
+ }
+ if ( count($errors) == 0 ) {
+ //no errors
+ redirect_header('field.php', 2, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELDS) );
+ } else {
+ redirect_header('field.php', 3, implode('<br />', $errors) );
+ }
+ }
+ }
+ break;
+
+case "save":
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ $redirect_to_edit = false;
+ if ( isset($_REQUEST['id']) ) {
+ $obj =& $profilefield_handler->get($_REQUEST['id']);
+ if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit') ) { //If no configs exist
+ redirect_header('admin.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
+ }
+ } else {
+ $obj =& $profilefield_handler->create();
+ $obj->setVar('field_name', $_REQUEST['field_name']);
+ $obj->setVar('field_moduleid', $GLOBALS['xoopsModule']->getVar('mid') );
+ $obj->setVar('field_show', 1);
+ $obj->setVar('field_edit', 1);
+ $obj->setVar('field_config', 1);
+ $redirect_to_edit = true;
+ }
+ $obj->setVar('field_title', $_REQUEST['field_title']);
+ $obj->setVar('field_description', $_REQUEST['field_description']);
+ if ( $obj->getVar('field_config') ) {
+ $obj->setVar('field_type', $_REQUEST['field_type']);
+ if ( isset($_REQUEST['field_valuetype']) ) {
+ $obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
+ }
+ $options = $obj->getVar('field_options');
+
+ if ( isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions']) ) {
+ foreach ($_REQUEST['removeOptions'] as $index ) {
+ unset($options[$index]);
+ }
+ $redirect_to_edit = true;
+ }
+
+ if ( !empty($_REQUEST['addOption']) ) {
+ foreach ($_REQUEST['addOption'] as $option ) {
+ if ( empty($option['value']) ) continue;
+ $options[$option['key']] = $option['value'];
+ $redirect_to_edit = true;
+ }
+ }
+ $obj->setVar('field_options', $options);
+ }
+ if ( $obj->getVar('field_edit') ) {
+ $required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
+ $obj->setVar('field_required', $required); //0 = no, 1 = yes
+ if ( isset($_REQUEST['field_maxlength']) ) {
+ $obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
+ }
+ if ( isset($_REQUEST['field_default']) ) {
+ $field_default = $obj->getValueForSave($_REQUEST['field_default']);
+ //Check for multiple selections
+ if ( is_array($field_default) ) {
+ $obj->setVar('field_default', serialize($field_default) );
+ } else {
+ $obj->setVar('field_default', $field_default);
+ }
+ }
+ }
+
+ if ( $obj->getVar('field_show') ) {
+ $obj->setVar('field_weight', $_REQUEST['field_weight']);
+ $obj->setVar('cat_id', $_REQUEST['field_category']);
+ }
+ if ( /*$obj->getVar('field_edit') && */isset($_REQUEST['step_id']) ) {
+ $obj->setVar('step_id', $_REQUEST['step_id']);
+ }
+ if ( $profilefield_handler->insert($obj) ) {
+ $groupperm_handler =& xoops_gethandler('groupperm');
+
+ $perm_arr = array();
+ if ( $obj->getVar('field_show') ) {
+ $perm_arr[] = 'profile_show';
+ $perm_arr[] = 'profile_visible';
+ }
+ if ( $obj->getVar('field_edit') ) {
+ $perm_arr[] = 'profile_edit';
+ }
+ if ( $obj->getVar('field_edit') || $obj->getVar('field_show') ) {
+ $perm_arr[] = 'profile_search';
+ }
+ if ( count($perm_arr) > 0 ) {
+ foreach ($perm_arr as $perm ) {
+ $criteria = new CriteriaCompo(new Criteria('gperm_name', $perm) );
+ $criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id') )) );
+ $criteria->add(new Criteria('gperm_modid', intval($GLOBALS['xoopsModule']->getVar('mid') )) );
+ if ( isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm]) ) {
+ $perms = $groupperm_handler->getObjects($criteria);
+ if ( count($perms) > 0 ) {
+ foreach (array_keys($perms) as $i ) {
+ $groups[$perms[$i]->getVar('gperm_groupid')] =& $perms[$i];
+ }
+ } else {
+ $groups = array();
+ }
+ foreach ($_REQUEST[$perm] as $groupid ) {
+ $groupid = intval($groupid);
+ if ( !isset($groups[$groupid]) ) {
+ $perm_obj =& $groupperm_handler->create();
+ $perm_obj->setVar('gperm_name', $perm);
+ $perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id') ));
+ $perm_obj->setVar('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid') );
+ $perm_obj->setVar('gperm_groupid', $groupid);
+ $groupperm_handler->insert($perm_obj);
+ unset($perm_obj);
+ }
+ }
+ $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
+ if ( count($removed_groups) > 0 ) {
+ $criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") );
+ $groupperm_handler->deleteAll($criteria);
+ }
+ unset($groups);
+
+ } else {
+ $groupperm_handler->deleteAll($criteria);
+ }
+ unset($criteria);
+ }
+ }
+ $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
+ redirect_header($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD) );
+ }
+ include_once('../include/forms.php');
+ echo $obj->getHtmlErrors();
+ $form = profile_getFieldForm($obj);
+ $form->display();
+ break;
+
+case "delete":
+ $obj =& $profilefield_handler->get($_REQUEST['id']);
+ if ( !$obj->getVar('field_config') ) {
+ redirect_header('index.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
+ }
+ if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
+ if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ }
+ if ( $profilefield_handler->delete($obj) ) {
+ redirect_header('field.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_FIELD) );
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title') ));
+ }
+ break;
+}
+
+if ( isset($template_main) ) {
+ $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+}
+include 'admin_footer.php';
+//xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/header.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/header.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/header.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Extended User Profile
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package profile
+ * @since 2.3.0
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: header.php 5204 2010-09-06 20:10:52Z mageg $
+ */
+
+require_once "../../../include/cp_header.php";
+
+xoops_loadLanguage('user');
+if ( !isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl']) ) {
+ include_once $GLOBALS['xoops']->path( "/class/template.php" );
+ $GLOBALS['xoopsTpl'] = new XoopsTpl();
+}
+?>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/index.html
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/index.html (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/index.html 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/index.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/index.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/index.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,53 @@
+<?php
+// $Id: index.php 8066 2011-11-06 05:09:33Z beckmi $
+// ------------------------------------------------------------------------ //
+// XOOPS - PHP Content Management System //
+// Copyright (c) 2000 XOOPS.org //
+// <http://www.xoops.org/> //
+// ------------------------------------------------------------------------ //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation; either version 2 of the License, or //
+// (at your option) any later version. //
+// //
+// 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. See the //
+// GNU General Public License for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program; if not, write to the Free Software //
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
+// ------------------------------------------------------------------------ //
+// Author: Raul Recio (AKA UNFOR) //
+// Project: The XOOPS Project //
+// ------------------------------------------------------------------------- //
+
+include_once 'admin_header.php';
+xoops_cp_header();
+
+$indexAdmin = new ModuleAdmin();
+//-----------------------
+// $xpPartnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname'));
+
+// $totalPartners = $xpPartnerHandler->getCount();
+// $totalNonActivePartners = $xpPartnerHandler->getCount(new Criteria('status', 0, '='));
+// $totalActivePartners = $totalPartners - $totalNonActivePartners;
+
+// $indexAdmin->addInfoBox(_MD_XPARTNERS_DASHBOARD);
+
+// $indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALACTIVE. "</infolabel>", $totalActivePartners, 'Green');
+// $indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALNONACTIVE. "</infolabel>", $totalNonActivePartners, 'Red');
+// $indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALPARTNERS. "</infolabel><infotext>", $totalPartners."</infotext>");
+//----------------------------
+
+echo $indexAdmin->addNavigation('index.php');
+echo $indexAdmin->renderIndex();
+
+include 'admin_footer.php';
+//xoops_cp_footer();
\ No newline at end of file
Added: XoopsModules/profile/branches/timgno/modules/profile/admin/menu.php
===================================================================
--- XoopsModules/profile/branches/timgno/modules/profile/admin/menu.php (rev 0)
+++ XoopsModules/profile/branches/timgno/modules/profile/admin/menu.php 2012-02-02 12:32:01 UTC (rev 8869)
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Extended User Profile
+ *
+ * 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 XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package profile
+ * @since 2.3.0
+ * @author Jan Pedersen
+ * @author Taiwen Jiang <ph...@us...>
+ * @version $Id: menu.php 8066 2011-11-06 05:09:33Z beckmi $
+ */
+
+$module_handler =& xoops_gethandler('module');
+$xoopsModule =& XoopsModule::getByDirname('profile');
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathIcon32 = $moduleInfo->getInfo('icons32');
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]['title'] = _PROFILE_MI_HOME;
+$adminmenu[$i]['link'] = "admin/index.php";
+$adminmenu[$i]['icon'] = '../../'.$pathIcon32.'/home.png' ;
+$i++;
+$adminmenu[$i]['title'] = _PROFILE_MI_USERS;
+$adminmenu[$i]['link'] = "...
[truncated message content] |
|
From: <be...@us...> - 2012-02-01 12:36:00
|
Revision: 8868
http://xoops.svn.sourceforge.net/xoops/?rev=8868&view=rev
Author: beckmi
Date: 2012-02-01 12:35:49 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Updating to 2.36 Beta 2 (JJDai)
Modified Paths:
--------------
XoopsModules/extcal/branches/jjdai/extcal/class/event.php
XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt
XoopsModules/extcal/branches/jjdai/extcal/edit_event.php
XoopsModules/extcal/branches/jjdai/extcal/header.php
XoopsModules/extcal/branches/jjdai/extcal/include/functions.php
XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt
XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html
XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html
XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html
XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html
XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html
XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html
XoopsModules/extcal/branches/jjdai/extcal/view_year.php
XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php
Added Paths:
-----------
XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php
XoopsModules/extcal/branches/jjdai/extcal/css/images/
XoopsModules/extcal/branches/jjdai/extcal/css/images/Critical.png
XoopsModules/extcal/branches/jjdai/extcal/css/images/Help.png
XoopsModules/extcal/branches/jjdai/extcal/css/images/Info.png
XoopsModules/extcal/branches/jjdai/extcal/css/images/Warning.png
XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css
Added: XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php (rev 0)
+++ XoopsModules/extcal/branches/jjdai/extcal/class/colorTools.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -0,0 +1,223 @@
+<?PHP
+
+class ColorTools{
+
+ function __construct(){
+ }
+
+
+/**************************************************************
+Ajoute ou rtir un icrement sur chaque compsante RGB d'une couleur
+Les valeur sont limiter au bornes inf\xE9rieure et sup\xE9rieure 0 et 255
+***************************************************************/
+Function modifierCouleur($colorHexa,
+ $incrementRouge, $incrementVert, $incrementBleu,
+ $plancherRouge = 0, $plafondRouge = 255,
+ $plancherVert = 0, $plafondVert = 255,
+ $plancherBleu = 0, $plafondBleu = 255
+ ) {
+
+
+ $t10 = $this->hexa2rgbA($colorHexa);
+
+ $t10[1] = $this->bornerValeur($t10[1] + $incrementRouge, $plancherRouge, $plafondRouge);
+ $t10[2] = $this->bornerValeur($t10[2] + $incrementVert, $plancherVert, $plafondVert);
+ $t10[3] = $this->bornerValeur($t10[3] + $incrementBleu, $plancherBleu, $plafondBleu);
+
+ $newColorHexa = $this->getHexaColorFromA($t10);
+
+ return $newColorHexa;
+
+ }
+
+
+/**************************************************************
+Eclairci une couleur
+elle born\xE9 pa un plancher et un plafond pur \xE9vite le tout blanc ou tout blanc
+ou les blocage sur une couleur pur (ex #FF0000)
+***************************************************************/
+Function eclaircir($colorHexa, $plancher = 0, $plafond = 255){
+
+ $tMin = Array('', $plancher, $plancher, $plancher);
+ $tMax = Array('', $plafond, $plafond, $plafond);
+
+ $t10 = $this->hexa2rgbA($colorHexa);
+// echo "<hr>";
+// ext_echoArray($t10);
+ $max = $plancher;
+ For ($h = 1 ; $h <= 3 ; $h++){
+ If ($max < $t10[$h]) {
+ $max = $t10[$h];
+ }
+ }
+
+
+ $increment = $plafond - $max;
+
+// $t10[1] = $t10[1] + $increment;
+// $t10[2] = $t10[2] + $increment;
+// $t10[3] = $t10[3] + $increment;
+
+ $min = 0;
+ For ($h = 1 ; $h <= 3 ; $h++){
+ $t10[$h] = $t10[$h] + $increment;
+ If ($t10[$h] < $tMin[$h] && $min < ($tMin[$h] - $t10[$h])) {
+ $min = ($tMin[$h] - $t10[$h]);
+ }
+ }
+
+// echo "{$colorHexa}-{$plancher}-{$plafond}<br>";
+// echo "{$min}-{$max}-{$increment}<br>";
+
+ $t10[1] = $this->bornerValeur($t10[1] + $min, $plancher, $plafond);
+ $t10[2] = $this->bornerValeur($t10[2] + $min, $plancher, $plafond);
+ $t10[3] = $this->bornerValeur($t10[3] + $min, $plancher, $plafond);
+
+// ext_echoArray($t10);
+
+ $newColorHexa = $this->getHexaColorFromA($t10);
+// echo "colorHexa = {$newColorHexa}-{$colorHexa}<br>";
+ return $newColorHexa;
+}
+
+/**************************************************************
+Fonce une couleur
+elle born\xE9 pa un plancher et un plafond pur \xE9vite le tout blanc ou tout blanc
+ou les blocage sur une couleur pur (ex #FFFF00)
+***************************************************************/
+Function foncer($colorHexa, $plancher = 0, $plafond = 255){
+
+ $tMin = Array('', $plancher, $plancher, $plancher);
+ $tMax = Array('', $plafond, $plafond, $plafond);
+
+
+ $t10 = $this->hexa2rgbA($colorHexa);
+ $max = 255;
+
+ For ($h = 1 ; $h <= 3 ; $h++){
+ If ($max > $t10[$h]) {
+ $max = $t10[$h];
+ }
+ }
+
+ $increment = -$max;
+
+// $t10[1] = $t10[1] + $increment;
+// $t10[2] = $t10[2] + $increment;
+// $t10[3] = $t10[3] + $increment;
+
+ $min = 0;
+ For ($h = 1 ; $h <= 3 ; $h++){
+ $t10[$h] = $t10[$h] + $increment;
+ If ($t10[$h] > $tMax[$h] && $min < ($t10[$h] - $tMax[$h])) {
+ $min = ($t10[$h] - $tMax[$h]);
+ }
+ }
+
+ $t10[1] = $this->bornerValeur($t10[1] - $min, $plancher, $plafond);
+ $t10[2] = $this->bornerValeur($t10[2] - $min, $plancher, $plafond);
+ $t10[2] = $this->bornerValeur($t10[3] - $min, $plancher, $plafond);
+
+ $colorHexa = $this->getHexaColorFromA($t10);
+
+ return $colorHexa;
+
+}
+
+
+/**************************************************************
+Renvoi une couleur RGB en hexa a partir du tableau passe en parametr
+Description du tableau
+0 = doit contenir '#' ou ''
+1 = int red
+2 = int vert
+3 = int bleu
+***************************************************************/
+Function getHexaColorFromA($aColors) {
+
+ $tHex = array("","","","");
+
+ $tHex[0] = $aColors[0];
+ $tHex[1] = substr('00' . dechex($aColors[1]), -2);
+ $tHex[2] = substr('00' . dechex($aColors[2]), -2);
+ $tHex[3] = substr('00' . dechex($aColors[3]), -2);
+
+ $colorHexa = implode('', $tHex);
+ return $colorHexa;
+}
+
+/**************************************************************
+Transforme les composante d'une couleur en valeu hexa
+prefixe doit contenir '#' ou ''
+***************************************************************/
+Function rgb2hexa($r, $g, $b, $prefixe = ''){
+
+ $colorHexa = $this->getHexaColorFromA(Array($prefixe, $r, $g, $b));
+
+ return $colorHexa;
+
+}
+
+/**************************************************************
+renvoi un tableau d'entier des valeur rgbd d'une couleur a partir d'un hexa
+Description du tableau renvoy\xE9
+0 = contient '#' ou '' (selon premier cactere de la couleur hexa)
+1 = int red
+2 = int vert
+3 = int bleu
+***************************************************************/
+Function hexa2rgbA($colorHexa){
+
+ $t = array("","","","");
+
+ If (substr($colorHexa, 0, 1) == '#'){
+ $t[0] = '#';
+ $offsetCar = 1;
+ }else{
+ $t[0] = '';
+ $offsetCar = 0;
+ }
+
+ $t[1] = hexdec(substr($colorHexa, $offsetCar + 0, 2));
+ $t[2] = hexdec(substr($colorHexa, $offsetCar + 2, 2));
+ $t[3] = hexdec(substr($colorHexa, $offsetCar + 4, 2));
+
+ return $t;
+}
+
+/**************************************************************
+Renvoi les composante rgb d'une couleur par r\xE9f\xE9rence
+***************************************************************/
+Function hexa2rgb($colorHexa, &$r, &$v, &$b, &$diese){
+
+ $t = $this->hexa2rgbA($colorHexa);
+ $r = $t[1];
+ $v = $t[2];
+ $v = $t[3];
+ $diese = $t[0];
+
+ return true;
+}
+
+
+/**************************************************************
+Borne les valeurs max et min d'une valeur
+***************************************************************/
+Function bornerValeur($val, $min, $max){
+
+ If ($val < $min){
+ $val = $min;
+ } else if($val > $max){
+ $val = $max;
+ }
+
+ return $val;
+
+}
+
+//--------------------------------------------------------
+} // --- fin de la classe colors
+//--------------------------------------------------------
+
+
+?>
Modified: XoopsModules/extcal/branches/jjdai/extcal/class/event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/class/event.php 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/class/event.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -303,6 +303,8 @@
while(list($k,$v)=each($events)){
$ordre[] = intval($v['event_start']);
$this->formatEventDate($v, $extcalConfig['event_date_week']);
+ //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
+ $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'],180,250);
$eventArray[]= $v;
}
array_multisort($eventArray, SORT_ASC, SORT_NUMERIC, $ordre, SORT_ASC, SORT_NUMERIC);
@@ -1993,6 +1995,8 @@
while ($myrow = $xoopsDB->fetchArray($result)) {
$myrow['cat']['cat_name'] = $myrow['cat_name'];
$myrow['cat']['cat_color'] = $myrow['cat_color'];
+ $myrow['cat']['cat_light_color'] = eclaircirCouleur($myrow['cat']['cat_color'],180,250);
+
$ret[] = $myrow;
}
return $ret;
Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Critical.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Critical.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Help.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Help.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Info.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Info.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/extcal/css/images/Warning.png
===================================================================
(Binary files differ)
Property changes on: XoopsModules/extcal/branches/jjdai/extcal/css/images/Warning.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css (rev 0)
+++ XoopsModules/extcal/branches/jjdai/extcal/css/infobulle.css 2012-02-01 12:35:49 UTC (rev 8868)
@@ -0,0 +1,80 @@
+
+.tooltip {
+ border-bottom: 1px dotted #000000; color: #000000; outline: none;
+ cursor: help; text-decoration: none;
+ position: relative;
+}
+.tooltip span {
+ margin-left: -999em;
+ position: absolute;
+}
+.tooltip:hover span {
+ border-radius: 5px 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px;
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 5px 5px rgba(0, 0, 0, 0.1); -moz-box-shadow: 5px 5px rgba(0, 0, 0, 0.1);
+ font-family: Calibri, Tahoma, Geneva, sans-serif;
+ position: absolute; left: 1em; top: 2em; z-index: 99;
+ margin-left: 0; width: 300px;
+}
+
+
+
+.tooltip:hover span[width50] {
+ width: 50px;
+}
+.tooltip:hover span[width100] {
+ width: 100px;
+}
+.tooltip:hover span[width150] {
+ width: 150px;
+}
+.tooltip:hover span[width200] {
+ width: 200px;
+}
+.tooltip:hover span[width250] {
+ width: 250px;
+}
+.tooltip:hover span[width300] {
+ width: 300px;
+}
+.tooltip:hover span[width350] {
+ width: 350px;
+}
+.tooltip:hover span[width400] {
+ width: 400px;
+}
+
+
+.tooltip:hover img:first-child {
+ border: 0; margin: -10px 0 0 -55px;
+ float: left; position: absolute;
+}
+.tooltip:hover em {
+ font-family: Candara, Tahoma, Geneva, sans-serif; font-size: 1.2em; font-weight: bold;
+ display: block; padding: 0.2em 0 0.6em 0;
+}
+.classic { padding: 0.8em 1em; }
+.custom { padding: 0.5em 0.8em 0.8em 2em; }
+* html a:hover { background: transparent; }
+.classic {background: #FFFFAA; border: 1px solid #FFAD33; }
+.critical { background: #FFCCAA; border: 1px solid #FF3334; }
+.help { background: #9FDAEE; border: 1px solid #2BB0D7; }
+.info { background: #9FDAEE; border: 1px solid #2BB0D7; }
+.warning { background: #FFFFAA; border: 1px solid #FFAD33; }
+
+.custom img:first-child {
+src:url(images/Critical.png);
+ height:48px;
+ width:48px;
+}
+
+
+.tooltip:hover img[alinea] {
+margin-bottom: 5px;
+margin-right: 5px;
+position: relative;
+width:120px;
+align:left;
+float:left;
+ background-repeat: no-repeat;
+}
+
Modified: XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/docs/changelog.txt 2012-02-01 12:35:49 UTC (rev 8868)
@@ -1,3 +1,8 @@
+2012/01/31: Version 2.36 (JJD.fr)
+===================================
+- Fixed display
+- Replacement of infobulle by another model more pro
+
2012/01/21: Version 2.35 (JJD.fr)
===================================
- Réintrégation file update extcal_2_34.php omitted in the previous version
Modified: XoopsModules/extcal/branches/jjdai/extcal/edit_event.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/edit_event.php 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/edit_event.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -24,7 +24,7 @@
// Tooltips include
$xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/include/style.css');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
Modified: XoopsModules/extcal/branches/jjdai/extcal/header.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/header.php 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/header.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -28,7 +28,7 @@
//------------------------------------------------------
// Tooltips include
$xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/include/style.css');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
//////////////////////////////////////////////////////////////
Modified: XoopsModules/extcal/branches/jjdai/extcal/include/functions.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/include/functions.php 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/include/functions.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -368,7 +368,81 @@
/**************************************************************************/
+function eclaircirCouleur($color, $plancher, $plafond){
+include_once(XOOPS_ROOT_PATH . '/modules/extcal/class/colorTools.php');
+
+ $ct = new ColorTools();
+ return $ct->eclaircir($color,$plancher,$plafond);
+// if (substr($color,0,1) == "#"){
+// $color = substr($color,1);
+// $diese = "#";
+// }else{
+// $diese = "";
+// }
+//
+// $r16 = hexdec(substr($color,0,2)); //conversion du canal rouge
+// $v16 = hexdec(substr($color,2,4)); //conversion du canal vert
+// $b16 = hexdec(substr($color,4,6)); //conversion du canal bleu
+//
+//
+//
+// // Initialisation
+// $gain = 0.2; // 0.2 = 20%
+// $gain = 0.1;
+//
+// // Affichage
+// // echo "<div style='background-color:#",$r16,$v16,$b16,"'>";
+// // echo "composante 1 : ".$r16."<br />";
+// // echo "composante 2 : ".$v16."<br />";
+// // echo "composante 3 : ".$b16."<br />";
+// // echo "</div><br />";
+//
+// // Conversion HEX -> DEC
+// $r10 = hexdec($r16);
+// $v10 = hexdec($v16);
+// $b10 = hexdec($b16);
+//
+// // Eclaircissement
+// $r10 = floor($r10 * (0.5));
+// $v10 = floor($v10 * (0.5));
+// $b10 = floor($b10 * (0.5));
+// // $r10 = floor($r10 * (1 + $gain));
+// // $v10 = floor($v10 * (1 + $gain));
+// // $b10 = floor($b10 * (1 + $gain));
+//
+// // Limitations
+// if ($r10>255) $r10=255;
+// if ($v10>255) $v10=255;
+// if ($b10>255) $b10=255;
+//
+// if ($r10<0) $r10=0;
+// if ($v10<0) $v10=0;
+// if ($b10<0) $b10=0;
+//
+// // Conversion DEC -> HEX
+// // $r16 = dechex($r10);
+// // $v16 = dechex($v10);
+// // $b16 = dechex($b10);
+// $r16 = substr('00' . dechex($r10),-2);
+// $v16 = substr('00' . dechex($v10),-2);
+// $b16 = substr('00' . dechex($b10),-2);
+//
+// $newColor = strtoupper($diese.$r16.$v16.$b16);
+//
+// // Affichage
+// // echo "<div style='background-color:#",$r16,$v16,$b16,"'>";
+// // echo "<div>";
+// // echo "composante 1 : ".$r16."<br />";
+// // echo "composante 2 : ".$v16."<br />";
+// // echo "composante 3 : ".$b16."<br />";
+// // echo "</div>";
+// // echo "{$color} : {$newColor}<br>";
+//
+// //$newColor = strtoupper($diese.'220000');
+//
+// return $newColor;
+}
+/**************************************************************************/
-
?>
Modified: XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/language/french/changelog.txt 2012-02-01 12:35:49 UTC (rev 8868)
@@ -1,3 +1,8 @@
+2012/01/31: Version 2.36 (JJD.fr)
+===================================
+- Correction d'affichage
+- Remplacement des infobulle par une autre modèle plus pro
+
2012/01/21: Version 2.35 (JJD.fr)
===================================
- Réintrégation du fichier de mise à jour extcal_2_34.php omis dans la version précédente
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_event_list1.html 2012-02-01 12:35:49 UTC (rev 8868)
@@ -12,12 +12,7 @@
</td>
<td class="odd" style="vertical-align:middle;">
- <a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
- class="extcalTips infobulle"
- title="">
<{include file="db:extcal_info_bulle.html"}>
- <{$event.event_title}>
- </a>
</td>
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_info_bulle.html 2012-02-01 12:35:49 UTC (rev 8868)
@@ -3,7 +3,7 @@
<div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;" >
</div>
-
+<!--
<{if $event.event_picture1!=""}>
<span infoBulle_zone1>
<img align=left style="border:1px solid #333333;margin-right:6px" src="<{$xoops_url}>/uploads/extcal/<{$event.event_picture1}>" width="150px" height="150px" />
@@ -16,12 +16,31 @@
<{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
<b><{$smarty.const._MD_EXTCAL_START}></b> <{$event.formated_event_start}><br />
<b><{$smarty.const._MD_EXTCAL_END}></b> <{$event.formated_event_end}><br />
- <{$event.event_desc}>
</span>
+-->
+
+ <a class="tooltip" href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>">
+ <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
+ <span class="custom info" width350 style="background: #<{$event.cat.cat_light_color}>;">
+ <img src="css/images/Info.png" alt="Information" />
+ <em><{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}></em>
+ <{if $event.event_picture1!=""}>
+ <img src="<{$xoops_url}>/uploads/extcal/<{$event.event_picture1}>" alinea/>
+ <{/if}>
+ <{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.event_title}><br />
+ <b><{$smarty.const._MD_EXTCAL_START}></b> <{$event.formated_event_start}><br />
+ <b><{$smarty.const._MD_EXTCAL_END}></b> <{$event.formated_event_end}><br />
+
+ </span>
+ </a>
+
+
+
<{else}>
<div style="height:12px; width:12px; background-color:#<{$event.cat.cat_color}>; border:1px solid black; float:left; margin-right:5px;"
title='<{if $showId}>(#<{$event.event_id}>)<{/if}> <{$event.formated_event_start}> - <{$event.formated_event_end}> : <{$event.event_title}>'>
</div>
<{/if}>
+
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-day.html 2012-02-01 12:35:49 UTC (rev 8868)
@@ -42,13 +42,8 @@
<td class='<{$trancheHeure.class}>' style="border: 1px solid #808080;">
<{foreach item=event from=$jour.events}>
- <a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
- class="extcalTips infobulle"
- title="">
<{include file="db:extcal_info_bulle.html"}>
- <{$event.event_title}>
- </a>
- <br />
+ <br />
<{/foreach}>
</td>
<{/foreach}>
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_agenda-week.html 2012-02-01 12:35:49 UTC (rev 8868)
@@ -50,11 +50,7 @@
<{foreach item=jour from=$trancheHeure.jours}>
<td class='<{$trancheHeure.class}>' style="border: 1px solid #808080;" width='<{$params.colJourWidth}>%' <{$jour.bg}>>
<{foreach item=event from=$jour.events}>
- <a class='extcalTips infobulle'
- href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
- title="">
<{include file="db:extcal_info_bulle.html"}>
- </a>
<{/foreach}>
</td>
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-month.html 2012-02-01 12:35:49 UTC (rev 8868)
@@ -26,22 +26,20 @@
<{foreachq item=cell from=$row.week}>
<td class="<{if $cell.isEmpty}>even<{else}>odd<{/if}>"
style="width:14%; height:80px; vertical-align:top;<{if $cell.isSelected}> background-color:#B6CDE4;<{/if}>">
- <{if $cell.isEmpty}> <{else}><a
- href="<{$xoops_url}>/modules/extcal/view_day.php?year=<{$year}>&month=<{$month}>&day=<{$cell.number}>"><{$cell.number}></a><{/if}><br/>
- <{foreach item=event from=$cell.events}>
- <{if $event}>
-
- <a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
- class="extcalTips infobulle"
- title="">
-
- <{include file="db:extcal_info_bulle.html"}>
- <{$event.event_title}>
- </a>
-
- <div style="background-color:#<{$event.cat.cat_color}>; height:2px; font-size:2px;">
- </div>
+ <{if $cell.isEmpty}>
+ <{else}>
+ <a href="<{$xoops_url}>/modules/extcal/view_day.php?year=<{$year}>&month=<{$month}>&day=<{$cell.number}>"><{$cell.number}></a>
+ <br/>
<{/if}>
+
+ <{foreach item=event from=$cell.events}>
+ <{if $event}>
+
+ <{include file="db:extcal_info_bulle.html"}>
+
+ <div style="background-color:#<{$event.cat.cat_color}>; height:2px; font-size:2px;">
+ </div>
+ <{/if}>
<{/foreach}>
</td>
<{/foreach}>
Modified: XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/templates/extcal_view_calendar-week.html 2012-02-01 12:35:49 UTC (rev 8868)
@@ -26,12 +26,7 @@
<{foreach item=event from=$day.events}>
<{if $event}>
- <a href="<{$xoops_url}>/modules/extcal/event.php?event=<{$event.event_id}>"
- class="extcalTips infobulle"
- title="">
<{include file="db:extcal_info_bulle.html"}>
- <{$event.event_title}>
- </a>
<div style="background-color:#<{$event.cat.cat_color}>; height:2px; font-size:2px;">
</div>
Modified: XoopsModules/extcal/branches/jjdai/extcal/view_year.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/view_year.php 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/view_year.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -16,9 +16,8 @@
// Tooltips include
$xoTheme->addScript('modules/extcal/include/ToolTips.js');
-$xoTheme->addStylesheet('modules/extcal/include/style.css');
+$xoTheme->addStylesheet('modules/extcal/css/infobulle.css');
-
$form = new XoopsSimpleForm('', 'navigSelectBox', $params['file'], 'get');
$form->addElement(getListYears($year,$xoopsModuleConfig['agenda_nb_years_before'],$xoopsModuleConfig['agenda_nb_years_after']));
@@ -62,6 +61,9 @@
// // Sort event array by event start
// usort($eventsArray, "orderEvents");
+// $t=print_r($eventsArray,true);
+// echo "<pre>{$t}</pre>";
+
// Assigning events to the template
$xoopsTpl->assign('events', $eventsArray);
Modified: XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php
===================================================================
--- XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php 2012-02-01 09:41:46 UTC (rev 8867)
+++ XoopsModules/extcal/branches/jjdai/extcal/xoops_version.php 2012-02-01 12:35:49 UTC (rev 8868)
@@ -16,7 +16,7 @@
// @author Gregory Mage (Aka Mage)
//***************************************************************************************
$modversion['name'] = _MI_EXTCAL_NAME;
-$modversion['version'] = '2.35';
+$modversion['version'] = '2.36';
$modversion['description'] = _MI_EXTCAL_DESC;
$modversion['credits'] = 'Zoullou';
$modversion['author'] = 'Zoullou, Mage, Mamba, JJ Delalandre(JJDai)';
@@ -41,7 +41,7 @@
//about
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["release_date"] = "2012/01/22";
+$modversion["release_date"] = "2012/01/31";
$modversion['module_status'] = "Beta 2";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5.0";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-01 09:41:56
|
Revision: 8867
http://xoops.svn.sourceforge.net/xoops/?rev=8867&view=rev
Author: beckmi
Date: 2012-02-01 09:41:46 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
adding small version info
Modified Paths:
--------------
XoopsModules/waiting/trunk/waiting/docs/readme.txt
Modified: XoopsModules/waiting/trunk/waiting/docs/readme.txt
===================================================================
--- XoopsModules/waiting/trunk/waiting/docs/readme.txt 2012-02-01 08:40:13 UTC (rev 8866)
+++ XoopsModules/waiting/trunk/waiting/docs/readme.txt 2012-02-01 09:41:46 UTC (rev 8867)
@@ -1,8 +1,6 @@
README
===========
-[xlang:en]
-
- WAITING MODULE -
This module offers you an extensible waiting contents block into your XOOPS.
@@ -14,7 +12,10 @@
By installing this module and adding proper plug-ins only,
you as webmaster can confirm any approval waitings of any modules at one view.
+NEW FEATURE in 0.96
+Update to XOOPS 2.5.0 ModuleAdmin GUI
+
NEW FEATURE in 0.8
- plug-ins for waiting can be placed inside module's directory
@@ -56,9 +57,6 @@
This module is made by Ryuji (http://ryus.co.jp/)
If you can read Japanese, let's visit Ryuji's site!
-
-[/xlang:en]
-
PLUGINS:
-addresses (by gruessle)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
