Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9722] XoopsModules/wflink/trunk/htdocs/modules/wflinks
|
From: <be...@us...> - 2012-06-26 02:30:17
|
Revision: 9722
http://xoops.svn.sourceforge.net/xoops/?rev=9722&view=rev
Author: beckmi
Date: 2012-06-26 02:30:10 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
- changed editor list selection to dynamic (mamba)
- replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine)
- fixed bug related to $wfmyts constructor overriding (mamba)
Modified Paths:
--------------
XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php
XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html
XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/admin/main.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -133,9 +133,25 @@
ob_end_clean();
// Link description form
- $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 );
- $sform -> addElement($editor, false);
+// $editor = wfl_getWysiwygForm( _AM_WFL_LINK_DESCRIPTION, 'descriptionb', $descriptionb, 15, 60 );
+// $sform -> addElement($editor, false);
+ $optionsTrayNote = new XoopsFormElementTray(_AM_WFL_LINK_DESCRIPTION, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'descriptionb';
+ $options['value'] = $descriptionb;
+ $options['rows'] = 5;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $descriptionb = new XoopsFormEditor('', $xoopsModuleConfig['form_options'], $options, $nohtml = FALSE, $onfailure = 'textarea');
+ $optionsTrayNote->addElement($descriptionb);
+ } else {
+ $descriptionb = new XoopsFormDhtmlTextArea('', 'descriptionb', $item->getVar('descriptionb', 'e'), '100%', '100%');
+ $optionsTrayNote->addElement($descriptionb);
+ }
+ $sform->addElement($optionsTrayNote, FALSE);
+
// Meta keywords form
$keywords = new XoopsFormTextArea( _AM_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false );
$keywords -> setDescription( "<small>" . _AM_WFL_KEYWORDS_NOTE . "</small>");
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/class/myts_extended.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -11,8 +11,6 @@
*/
class wflTextSanitizer extends MyTextSanitizer
{
- function wflTextSanitizer() {
- }
function htmlSpecialCharsStrip( $text )
{
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/docs/changelog.txt 2012-06-26 02:30:10 UTC (rev 9722)
@@ -1,6 +1,14 @@
-======================================================
-24-06-2012 1.09 Beta
-============================================================
+=========================================================
+25-06-2012 1.09 Beta 2
+=========================================================
+
+- changed editor list selection to dynamic (mamba)
+- replace http://mozshot.nemui.org with http://open.thumbshots.org for screenshots (Shine)
+- fixed bug related to $wfmyts constructor overriding
+
+=========================================================
+24-06-2012 1.09 Beta 1
+=========================================================
Shine and Mamba:
Fixed: Admin section:
- missing image: Frameworks/moduleclasses/icons/16/folder_add.png
@@ -11,7 +19,7 @@
2012-04-25 1.08 Beta 1
=========================================================
-- converted to XOOPS 2.5.x Admin GUI (mamba)-
+- converted to XOOPS 2.5.x Admin GUI (mamba)
===========================================================
23-6-2012 1.07 Final
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/include/linkloadinfo.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -71,6 +71,7 @@
$link['updated'] = formatTimestamp( $time, $xoopsModuleConfig['dateformat'] );
$description = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 );
+
$link['description'] = xoops_substr( $description, 0, $xoopsModuleConfig['totalchars'], '...' );
$link['submitter'] = xoops_getLinkedUnameFromId( $link_arr['submitter'] );
@@ -152,5 +153,4 @@
$link['showpagerank'] = $xoopsModuleConfig['showpagerank'];
$link['quickview'] = $xoopsModuleConfig['quickview'];
$link['comment_rules'] = $xoopsModuleConfig['com_rule'];
-$link['autoscrshot'] = $xoopsModuleConfig['useautothumb'];
-?>
\ No newline at end of file
+$link['autoscrshot'] = $xoopsModuleConfig['useautothumb'];
\ No newline at end of file
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/singlelink.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -54,7 +54,7 @@
$xoopsTpl -> assign('tagbar', tagBar($link_arr['lid'], 0));
}
-$link['imageheader'] = wfl_imageheader();
+//$link['imageheader'] = wfl_imageheader();
$link['id'] = $link_arr['lid'];
$link['cid'] = $link_arr['cid'];
$link['description2'] = $wfmyts -> displayTarea( $link_arr['description'], 1, 1, 1, 1, 1 );
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/submit.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -274,9 +274,26 @@
ob_end_clean();
// Link description form
- $editor = wfl_getWysiwygForm( _MD_WFL_DESCRIPTIONC, 'descriptionb', $descriptionb, 15, 60 );
- $sform -> addElement($editor,false);
+// $editor = wfl_getWysiwygForm( _MD_WFL_DESCRIPTIONC, 'descriptionb', $descriptionb, 15, 60 );
+// $sform -> addElement($editor,false);
+$optionsTrayNote = new XoopsFormElementTray(_MD_WFL_DESCRIPTIONC, '<br />');
+ if (class_exists('XoopsFormEditor')) {
+ $options['name'] = 'descriptionb';
+ $options['value'] = $descriptionb;
+ $options['rows'] = 5;
+ $options['cols'] = '100%';
+ $options['width'] = '100%';
+ $options['height'] = '200px';
+ $editor = new XoopsFormEditor('', $xoopsModuleConfig['form_optionsuser'], $options, $nohtml = FALSE, $onfailure = 'textarea');
+ $optionsTrayNote->addElement($editor);
+ } else {
+ $editor = new XoopsFormDhtmlTextArea('', 'descriptionb', $item->getVar('descriptionb', 'e'), '100%', '100%');
+ $optionsTrayNote->addElement($editor);
+ }
+
+ $sform->addElement($optionsTrayNote, FALSE);
+
// Keywords form
$keywords = new XoopsFormTextArea( _MD_WFL_KEYWORDS, 'keywords', $keywords, 7, 60, false );
$keywords -> setDescription( "<small>" . _MD_WFL_KEYWORDS_NOTE . "</small>");
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/templates/wflinks_linkload.html 2012-06-26 02:30:10 UTC (rev 9722)
@@ -25,7 +25,7 @@
<td width="65%" valign="top"> <{if $wfllink.autoscrshot == 0}> <{if $show_screenshot == true}> <{if $wfllink.screenshot_full != ''}>
<div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="<{$wfllink.screenshot_thumb}>" alt="" hspace="7" vspace="3" border="0" align="right" /></a> </div>
<{/if}> <{/if}> <{/if}>
-<{if $wfllink.autoscrshot == 1}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="http://mozshot.nemui.org/shot/128x128?<{$wfllink.url}>" align="right" /></a> </div> <{/if}>
+ <{if $wfllink.autoscrshot == 1}> <div> <a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank"><img src="http://open.thumbshots.org/image.pxf?url=<{$wfllink.url}>" align="right" /></a> </div> <{/if}>
<div style="margin-left: 6px;" align="left">
<a href="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/visit.php?cid=<{$wfllink.cid}>&lid=<{$wfllink.id}>" target="_blank">
<img src="<{$xoops_url}>/modules/<{$wfllink.module_dir}>/images/icon/links.gif" alt="" align="absmiddle" />
Modified: XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php
===================================================================
--- XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-25 19:19:10 UTC (rev 9721)
+++ XoopsModules/wflink/trunk/htdocs/modules/wflinks/xoops_version.php 2012-06-26 02:30:10 UTC (rev 9722)
@@ -50,10 +50,10 @@
$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
//about
-$modversion['release_date'] = '2012/06/23';
+$modversion['release_date'] = '2012/06/25';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Beta 1";
+$modversion["module_status"] = "Beta 2";
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = "2.5";
$modversion['min_admin'] = '1.1';
@@ -285,38 +285,67 @@
$modversion['config'][$i]['formtype'] = 'yesno';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0;
+//--------------------------------------------------------------------
+//$i++;
+//$modversion['config'][$i]['name'] = 'form_options';
+//$modversion['config'][$i]['title'] = '_MI_WFL_EDITOR';
+//$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICE';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'dhtml';
+//$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
+// _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
+// _MI_WFL_FORM_COMPACT => 'textarea',
+// _MI_WFL_FORM_HTMLAREA => 'htmlarea',
+// _MI_WFL_FORM_KOIVI => 'koivi',
+// _MI_WFL_FORM_FCK => 'fck',
+// _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
+// _MI_WFL_FORM_TINYMCE => 'tinymce'
+// );
+//$i++;
+//$modversion['config'][$i]['name'] = 'form_optionsuser';
+//$modversion['config'][$i]['title'] = '_MI_WFL_EDITORUSER';
+//$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICEUSER';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'dhtml';
+//$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
+// _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
+// _MI_WFL_FORM_COMPACT => 'textarea',
+// _MI_WFL_FORM_HTMLAREA => 'htmlarea',
+// _MI_WFL_FORM_KOIVI => 'koivi',
+// _MI_WFL_FORM_FCK => 'fck',
+// _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
+// _MI_WFL_FORM_TINYMCE => 'tinymce'
+// );
+//--------------------------------------------------------------------
$i++;
-$modversion['config'][$i]['name'] = 'form_options';
-$modversion['config'][$i]['title'] = '_MI_WFL_EDITOR';
-$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICE';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'dhtml';
-$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
- _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
- _MI_WFL_FORM_COMPACT => 'textarea',
- _MI_WFL_FORM_HTMLAREA => 'htmlarea',
- _MI_WFL_FORM_KOIVI => 'koivi',
- _MI_WFL_FORM_FCK => 'fck',
- _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
- _MI_WFL_FORM_TINYMCE => 'tinymce'
- );
+xoops_load('XoopsEditorHandler');
+$editor_handler = XoopsEditorHandler::getInstance();
+$editorList = array_flip($editor_handler->getList());
+
+$modversion['config'][$i] = array(
+ 'name' => 'form_options',
+ 'title' => '_MI_WFL_EDITOR',
+ 'description' => '_MI_WFL_EDITORCHOICE',
+ 'formtype' => 'select',
+ 'valuetype' => 'text',
+ 'options' => $editorList,
+ 'default' => 'dhtmltextarea'
+);
+
+
$i++;
-$modversion['config'][$i]['name'] = 'form_optionsuser';
-$modversion['config'][$i]['title'] = '_MI_WFL_EDITORUSER';
-$modversion['config'][$i]['description'] = '_MI_WFL_EDITORCHOICEUSER';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'dhtml';
-$modversion['config'][$i]['options'] = array( _MI_WFL_FORM_DHTML => 'dhtml',
- _MI_WFL_FORM_DHTMLEXT => 'dhtmlext',
- _MI_WFL_FORM_COMPACT => 'textarea',
- _MI_WFL_FORM_HTMLAREA => 'htmlarea',
- _MI_WFL_FORM_KOIVI => 'koivi',
- _MI_WFL_FORM_FCK => 'fck',
- _MI_WFL_FORM_TINYEDITOR => 'tinyeditor',
- _MI_WFL_FORM_TINYMCE => 'tinymce'
- );
+$modversion['config'][$i] = array(
+ 'name' => 'form_optionsuser',
+ 'title' => '_MI_WFL_EDITORUSER',
+ 'description' => '_MI_WFL_EDITORCHOICEUSER',
+ 'formtype' => 'select',
+ 'valuetype' => 'text',
+ 'options' => $editorList,
+ 'default' => 'dhtmltextarea'
+);
+
$i++;
$modversion['config'][$i]['name'] = 'screenshot';
$modversion['config'][$i]['title'] = '_MI_WFL_USESHOTS';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
