From: <luc...@us...> - 2012-07-30 20:23:51
|
Revision: 9949 http://xoops.svn.sourceforge.net/xoops/?rev=9949&view=rev Author: luciorota Date: 2012-07-30 20:23:44 +0000 (Mon, 30 Jul 2012) Log Message: ----------- Modified Paths: -------------- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php XoopsModules/xaddresses/trunk/xaddresses/include/config.php XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php Added Paths: ----------- XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php Removed Paths: ------------- XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extension/ Modified: XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-30 11:25:09 UTC (rev 9948) +++ XoopsModules/xaddresses/trunk/xaddresses/admin/admin_header.php 2012-07-30 20:23:44 UTC (rev 9949) @@ -27,32 +27,36 @@ */ include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; +$dirname = basename(dirname(dirname( __FILE__ ) )); // Include xoops admin header include_once XOOPS_ROOT_PATH . '/include/cp_header.php'; -include_once XOOPS_ROOT_PATH . '/include/config.php'; -include_once XOOPS_ROOT_PATH . '/include/functions.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'; xoops_load ('XoopsUserUtility'); +$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'); +$pathImageModule = XOOPS_URL . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/images'; + // Include module functions -include_once '../include/config.php'; -include_once '../include/functions.php'; +include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/config.php"; +include_once XOOPS_ROOT_PATH . "/modules/{$dirname}/include/functions.php"; - + +// Check and load moduleadmin classes $pathDir = $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin'); $globalLanguage = $GLOBALS['xoopsConfig']['language']; - if ( file_exists($pathDir . '/language/' . $globalLanguage . '/main.php')){ include_once $pathDir . '/language/' . $globalLanguage . '/main.php'; } else { include_once $pathDir . '/language/english/main.php'; } - if ( file_exists($pathDir . '/moduleadmin.php')){ include_once $pathDir . '/moduleadmin.php'; //return true; @@ -63,14 +67,6 @@ //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'); -$pathImageModule = XOOPS_URL . '/modules/'. $GLOBALS['xoopsModule']->getVar('dirname') .'/images'; - $myts =& MyTextSanitizer::getInstance(); // Get user groups Added: XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html (rev 0) +++ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/index.html 2012-07-30 20:23:44 UTC (rev 9949) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php (rev 0) +++ XoopsModules/xaddresses/trunk/xaddresses/extra/textsanitizer.extensions/xaddresses/xaddresses.php 2012-07-30 20:23:44 UTC (rev 9949) @@ -0,0 +1,76 @@ +<?php +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +class MytsXaddresses extends MyTextSanitizerExtension +{ + function encode($textarea_id) + { + $code = "<img src='" . XOOPS_URL . "/modules/xaddresses/images/map_button.gif' alt='" . _XOOPS_FORM_ALTMAP . "' onclick='xoopsCodeMap(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERMAP, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> "; + $code.= "<img src='" . XOOPS_URL . "/modules/xaddresses/images/map_button.gif' alt='" . _XOOPS_FORM_ALTLOC . "' onclick='xoopsCodeLoc(\"{$textarea_id}\",\"" . htmlspecialchars(_XOOPS_FORM_ENTERLOC, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"'/> "; + $javascript = <<<EOF + function xoopsCodeMap(id, enterMapPhrase) + { + var selection = xoopsGetSelect(id); + if (selection.length > 0) { + var text = selection; + } else { + var text = prompt(enterMapPhrase, ""); + } + var domobj = xoopsGetElementById(id); + if ( text.length > 0 ) { + var result = "[map]" + text + "[/map]"; + xoopsInsertText(domobj, result); + } + domobj.focus(); + } + function xoopsCodeLoc(id, enterLocPhrase) + { + var selection = xoopsGetSelect(id); + if (selection.length > 0) { + var text = selection; + } else { + var text = prompt(enterLocPhrase, ""); + } + var domobj = xoopsGetElementById(id); + if ( text.length > 0 ) { + var result = "[loc]" + text + "[/loc]"; + xoopsInsertText(domobj, result); + } + domobj.focus(); + } +EOF; + + return array( + $code , + $javascript); + } + + function load(&$ts) + { + $ts->patterns[] = "/\[map\](.*?)\[\/map\]/es"; + $ts->replacements[] = __CLASS__ . "::decodemap( '\\1' )"; + + $ts->patterns[] = "/\[mapcat\](.*?)\[\/mapcat\]/es"; + $ts->replacements[] = __CLASS__ . "::decodemapcat( '\\1' )"; + + + $ts->patterns[] = "/\[loc](.*)\[\/loc\]/sU"; + $ts->replacements[] = 'LOCATION \\1'; + $ts->patterns[] = "/\[location](.*)\[\/location\]/sU"; + $ts->replacements[] = 'LOCATION \\1'; + + return true; + } + + function decodemap($id) + { + $rp = "MAP {$id}"; + return $rp; + } + function decodemapcat($id) + { + $rp = "CATEGORY {$id}"; + return $rp; + } +} +?> \ No newline at end of file Modified: XoopsModules/xaddresses/trunk/xaddresses/include/config.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/include/config.php 2012-07-30 11:25:09 UTC (rev 9948) +++ XoopsModules/xaddresses/trunk/xaddresses/include/config.php 2012-07-30 20:23:44 UTC (rev 9949) @@ -27,11 +27,11 @@ */ if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ; -define("XADDRESSES_PATH", XOOPS_ROOT_PATH."/modules/xaddresses"); -define("XADDRESSES_URL", XOOPS_URL."/modules/xaddresses"); +define("XADDRESSES_PATH", XOOPS_ROOT_PATH . "/modules/xaddresses"); +define("XADDRESSES_URL", XOOPS_URL . "/modules/xaddresses"); // module information -$mod_img = XADDRESSES_URL."/images/luciorota.altervista.org/xoops_logo.png"; +$mod_img = XADDRESSES_URL . "/images/luciorota.altervista.org/xoops_logo.png"; $mod_copyright = "<a href='http://luciorota.altervista.org/xoops/' title='luciorota.altervista.org/xoops' target='_blank'> - <img src='".$mod_img."' alt='luciorota.altervista.org/xoops' /></a>"; + <img src='" . $mod_img . "' alt='luciorota.altervista.org/xoops' /></a>"; ?> \ No newline at end of file Modified: XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php =================================================================== --- XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-30 11:25:09 UTC (rev 9948) +++ XoopsModules/xaddresses/trunk/xaddresses/xoops_version.php 2012-07-30 20:23:44 UTC (rev 9949) @@ -16,9 +16,9 @@ $modversion['license'] = 'GNU GPL 2.0 see Licence'; $modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; -$modversion['release_info'] = "RC"; +$modversion['release_info'] = 'in progress'; $modversion['release_file'] = XOOPS_URL . "/modules/{$dirname}/docs/RC"; -$modversion['release_date'] = "2012/07/27"; // 'Y/m/d' +$modversion['release_date'] = "2012/07/30"; // 'Y/m/d' $modversion['manual'] = 'Help'; $modversion['manual_file'] = XOOPS_URL . "/modules/{$dirname}/docs/help.html"; @@ -35,23 +35,28 @@ $modversion['icons32'] = "modules/{$dirname}/images/icons/32x32"; // About -$modversion['demo_site_url'] = "IN PROGRESS"; -$modversion['demo_site_name'] = "IN PROGRESS"; -$modversion['forum_site_url'] = "IN PROGRESS"; -$modversion['forum_site_name'] = "IN PROGRESS"; -$modversion['module_website_url'] = "IN PROGRESS"; -$modversion['module_website_name'] = "IN PROGRESS"; +$modversion['demo_site_url'] = ''; +$modversion['demo_site_name'] = ''; +$modversion['forum_site_url'] = ''; +$modversion['forum_site_name'] = ''; +$modversion['module_website_url'] = ''; +$modversion['module_website_name'] = ''; //$modversion['support_site_url'] = "http://www.xoops.org"; //$modversion['support_site_name'] = "www.xoops.org"; $modversion['release'] = "release"; -$modversion['module_status'] = 'In progress'; //"Stable"; +$modversion['module_status'] = 'in progress'; //"Stable"; + + // Admin things $modversion['hasAdmin'] = true; // Admin system menu $modversion['system_menu'] = true; $modversion['adminindex'] = "admin/index.php"; $modversion['adminmenu'] = "admin/menu.php"; + + + // Mysql file $modversion['sqlfile']['mysql'] = "sql/mysql.sql"; // Tables created by sql file (without prefix!) @@ -67,11 +72,15 @@ // TO DO $modversion['tables'][7] = "xaddresses_marker"; + + // Scripts to run upon installation or update $modversion['onInstall'] = 'include/install_function.php'; //$modversion['onUpdate'] = 'include/update_function.php'; $modversion['onUninstall'] = 'include/uninstall_function.php'; + + // Main menu $modversion['hasMain'] = true; if (is_object($GLOBALS['xoopsModule']) && $GLOBALS['xoopsModule']->getVar('dirname') == $modversion['dirname']) { @@ -226,25 +235,9 @@ -// Preferences -// MAYBE FOR FUTURE XOOPS VERSIONS -/* +// Preferences/Config $i = 0; $i++; -$modversion['config']['category'][$i]['name'] = 'global'; -$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_GLOBAL_CONFIG; -$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_GLOBAL_CONFIG_DESC; -$i++; -$modversion['config']['category'][$i]['name'] = 'category'; -$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_CATEGORY_CONFIG; -$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_CATEGORY_CONFIG_DESC; -$i++; -$modversion['config']['category'][$i]['name'] = 'location'; -$modversion['config']['category'][$i]['title'] = _MI_XADDRESSES_LOCATION_CONFIG; -$modversion['config']['category'][$i]['description'] = _MI_XADDRESSES_LOCATION_CONFIG_DESC; -*/ -$i = 0; -$i++; $modversion['config'][$i]['name'] = 'google_apikey'; $modversion['config'][$i]['title'] = '_MI_XADDRESSES_GOOGLE_APIKEY'; $modversion['config'][$i]['description'] = '_MI_XADDRESSES_GOOGLE_APIKEY_DESC'; @@ -355,9 +348,6 @@ $modversion['config'][$i]['formtype'] = 'select'; $modversion['config'][$i]['valuetype'] = 'text'; $modversion['config'][$i]['default'] = 'dhtmltextarea'; -//xoops_load('xoopseditorhandler'); -//$editor_handler = XoopsEditorHandler::getInstance(); -//$modversion['config'][$i]['options'] = array_flip($editor_handler->getList()); $modversion['config'][$i]['options'] = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor'); $modversion['config'][$i]['category'] = 'global'; $i++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |