[Xoops-svn] SF.net SVN: xoops-svn:[12739] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/mylinks

[<be...@us...>]

Revision: 12739
          http://sourceforge.net/p/xoops/svn/12739
Author:   beckmi
Date:     2014-08-14 09:31:07 +0000 (Thu, 14 Aug 2014)
Log Message:
-----------
replaced dirname(__FILE__) with __DIR__

Modified Paths:
--------------
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/about.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/admin_header.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/index.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/main.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/menu.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblockform.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblocksadmin.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygroupperm.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygrouppermform.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsadmin.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsform.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/atom.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_rand.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_top.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/brokenlink.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/category.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/thumbplugin.interface.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/utility.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/docs/changelog.txt
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/footer.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/chinese.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/font/makefont/makefont.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/gif.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/japanese.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/korean.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/english.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/french.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/japanese.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/korean.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/schinese.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/tchinese.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/makepdf_class.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/header.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/blocksadmin.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/data.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feeddata.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feedfunc.new.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/functions.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/gtickets.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/notification.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/oninstall.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/onupdate.inc.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/language/english/admin.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/pda.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/rss.php
    XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/xoops_version.php

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/about.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/about.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -17,7 +17,7 @@
  * @author::     XOOPS Devolopment Team
  * @version::	 $Id $
 **/
-include_once dirname(__FILE__) . '/admin_header.php';
+include_once __DIR__ . '/admin_header.php';
 
 xoops_cp_header();
 
@@ -26,4 +26,4 @@
 echo $aboutAdmin->addNavigation('about.php');
 echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
 
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/admin_header.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/admin_header.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -18,7 +18,7 @@
  * @version::    $Id $
 **/
 
-$path = dirname(dirname(dirname(dirname(__FILE__))));
+$path = dirname(dirname(dirname(__DIR__)));
 include_once $path . '/mainfile.php';
 include_once $path . '/include/cp_functions.php';
 require_once $path . '/include/cp_header.php';
@@ -26,7 +26,7 @@
 global $xoopsModule;
 
 $thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-$thisModulePath = dirname(dirname(__FILE__));
+$thisModulePath = dirname(__DIR__);
 
 // Load language files
 xoops_loadLanguage('admin', $thisModuleDir);

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/index.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/index.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -36,7 +36,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 // ------------------------------------------------------------------------- //
 
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
 xoops_cp_header();
 
 $indexAdmin = new ModuleAdmin();
@@ -87,4 +87,4 @@
 echo $indexAdmin->addNavigation('index.php');
 echo $indexAdmin->renderIndex();
 
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/main.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/main.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -36,7 +36,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 // ------------------------------------------------------------------------- //
 
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
 xoops_loadLanguage('main', $xoopsModule->getVar('dirname'));
 include_once '../class/utility.php';
 //xoops_load('utility', $xoopsModule->getVar('dirname'));
@@ -123,7 +123,7 @@
     }
         echo "</table>\n";
 
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 }
 
 function linksConfigMenu()
@@ -269,7 +269,7 @@
             ."</table>\n"
             ."<br />\n";
     }
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 }
 
 function modLink()
@@ -425,7 +425,7 @@
         ."    </td>\n"
         ."  </tr>\n"
         ."</table>\n";
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 }
 
 function delVote()
@@ -535,7 +535,7 @@
     }
 
     echo "</td></tr></table>";
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 }
 
 function delBrokenLinks()
@@ -712,7 +712,7 @@
     echo "    </td>\n"
         ."  </tr>\n"
         ."</table>\n";
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 }
 
 function changeModReq()
@@ -875,7 +875,7 @@
     echo "    </td>\n"
         ."  </tr>\n"
         ."</table>\n";
-    include 'admin_footer.php';
+    include_once __DIR__ . '/admin_footer.php';
 }
 
 function modCatS()
@@ -992,7 +992,7 @@
     } else {
         xoops_cp_header();
         xoops_confirm(array('op' => 'delCat', 'cid' => $cid, 'ok' => 1), 'main.php', _MD_MYLINKS_WARNING);
-        include 'admin_footer.php';
+        include_once __DIR__ . '/admin_footer.php';
     }
 }
 
@@ -1105,7 +1105,7 @@
     } else {
         xoops_cp_header();
         xoops_confirm(array('op' => 'importCats', 'ok' => 1), 'main.php', _MD_MYLINKS_CATWARNING);
-        include 'admin_footer.php';
+        include_once __DIR__ . '/admin_footer.php';
     }
 }
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/menu.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/menu.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -25,9 +25,9 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
-$dirname = basename(dirname(dirname(__FILE__)));
+$dirname = basename(dirname(__DIR__));
 $module_handler = xoops_gethandler('module');
 $module = $module_handler->getByDirname($dirname);
 $pathIcon32 = $module->getInfo('icons32');

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblockform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblockform.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblockform.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -25,7 +25,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-if(!defined('XOOPS_ROOT_PATH')) exit;
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 $usespaw = empty($_GET['usespaw']) ? false : true;
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblocksadmin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblocksadmin.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/myblocksadmin.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -6,7 +6,7 @@
 // ------------------------------------------------------------------------- //
 
 include_once '../../../include/cp_header.php';
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
 //include_once XOOPS_ROOT_PATH."/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
 
 include_once 'mygrouppermform.php';
@@ -118,4 +118,4 @@
 }
 
 list_groups();
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygroupperm.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygroupperm.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygroupperm.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('XOOPS_ROOT_PATH')) exit;
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 function myDeleteByModule($DB, $gperm_modid, $gperm_name = null, $gperm_itemid = null)
 {

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygrouppermform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygrouppermform.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mygrouppermform.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -29,7 +29,7 @@
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
 
-if (!defined('XOOPS_ROOT_PATH')) exit;
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
 
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
 require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsadmin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsadmin.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsadmin.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -6,7 +6,7 @@
 // ------------------------------------------------------------------------- //
 
 include_once '../../../include/cp_header.php';
-include 'admin_header.php';
+include_once __DIR__ . '/admin_header.php';
 //include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/class/admin.php";
 include_once '../include/gtickets.php';
 include_once XOOPS_ROOT_PATH . '/class/template.php';
@@ -308,7 +308,7 @@
   ."  </table>\n"
   ."</form>\n";
 // end of table & form
-include 'admin_footer.php';
+include_once __DIR__ . '/admin_footer.php';
 
 function get_fingerprint( $lines )
 {

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsform.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsform.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/admin/mytplsform.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -9,9 +9,9 @@
 include_once '../include/gtickets.php';
 include_once XOOPS_ROOT_PATH . '/class/template.php';
 
-include_once dirname(dirname(__FILE__)).'/class/Text_Diff.php';
-include_once dirname(dirname(__FILE__)).'/class/Text_Diff_Renderer.php';
-include_once dirname(dirname(__FILE__)).'/class/Text_Diff_Renderer_unified.php';
+include_once dirname(__DIR__).'/class/Text_Diff.php';
+include_once dirname(__DIR__).'/class/Text_Diff_Renderer.php';
+include_once dirname(__DIR__).'/class/Text_Diff_Renderer_unified.php';
 
 $xoops_system_path = XOOPS_ROOT_PATH . '/modules/system';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/atom.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/atom.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/atom.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -4,7 +4,7 @@
 include_once XOOPS_ROOT_PATH . '/class/template.php';
 error_reporting(0);
 
-$modulename = basename(dirname(__FILE__));
+$modulename = basename(__DIR__);
 include_once XOOPS_ROOT_PATH . "/modules/{$modulename}/include/feedfunc.new.php";
 
 $param_array = array('show'  => 10,

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_rand.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_rand.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_rand.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -24,7 +24,7 @@
 function b_mylinks_random_show()
 {
     global $xoopsDB, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsUser;
-    $mylinksDir = basename(dirname(dirname(__FILE__)));
+    $mylinksDir = basename(dirname(__DIR__));
     $myts =& MyTextSanitizer::getInstance();
 
     $block = array();

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_top.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_top.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/blocks/mylinks_top.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -37,7 +37,7 @@
     global $xoopsDB;
     $block = array();
     //ver2.5
-    $modulename = basename(dirname(dirname(__FILE__)));
+    $modulename = basename(dirname(__DIR__));
     $myts =& MyTextSanitizer::getInstance();
     $result = $xoopsDB->query("SELECT lid, cid, title, date, hits FROM " . $xoopsDB->prefix("mylinks_links") . " WHERE status>0 ORDER BY " . $options[0] . " DESC",$options[1],0);
     while ($myrow = $xoopsDB->fetchArray($result)) {

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/brokenlink.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/brokenlink.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/brokenlink.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -52,7 +52,7 @@
     }
     $newid = $xoopsDB->genId($xoopsDB->prefix("mylinks_broken") . "_reportid_seq");
     $sql = sprintf("INSERT INTO %s (reportid, lid, sender, ip) VALUES (%u, %u, %u, '%s')", $xoopsDB->prefix("mylinks_broken"), $newid, $lid, $sender, $ip);
-    $xoopsDB->query($sql) or exit();
+    $xoopsDB->query($sql) || exit();
     $tags = array();
     $tags['BROKENREPORTS_URL'] = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/index.php?op=listBrokenLinks';
     $notification_handler =& xoops_gethandler('notification');

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/category.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/category.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/category.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -20,7 +20,7 @@
  * @version::    $Id$
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 $mylinksDir = basename( dirname( dirname( __FILE__ ) ) );
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/thumbplugin.interface.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/thumbplugin.interface.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/thumbplugin.interface.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -11,7 +11,7 @@
  * @since::     File available since Release 3.11
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 /**
  * MylinksThumbPluginInterface

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/utility.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/utility.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/class/utility.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -12,7 +12,7 @@
  * @since::     File available since Release 3.11
  */
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 /**
  * MylinksUtility

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/docs/changelog.txt	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/docs/changelog.txt	2014-08-14 09:31:07 UTC (rev 12739)
@@ -1,7 +1,12 @@
-3.11 RC 5       2014-04-23
+3.11 RC 5       NOT RELEASED
 =================================
 + moved all images, CSS, and JS files to /assets (mamba)
 + renamed .html Smarty templates to .tpl (mamba)
++ fixed wrong url for images folder (cesag)
++ renamed html links to tpl links (cesag)
++ replacing (!result) with (!$result) (cesag)
++ deleting obsolete bookmarks (cesag)
++ replaced dirname(__FILE__) with __DIR__ (mamba)
 
 3.11 RC4 [2013/07/03]
 =================================

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/footer.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/footer.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -25,7 +25,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 if (is_object($xoopsTpl) && ($mylinks_right_wide_theme === true)) {
     $xoopsTpl->assign('xoops_showrblock', 0);

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/chinese.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/chinese.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/chinese.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -1,5 +1,5 @@
 <?php
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require_once 'fpdf.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/font/makefont/makefont.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/font/makefont/makefont.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/font/makefont/makefont.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -8,7 +8,7 @@
 function ReadMap($enc)
 {
   //Read a map file
-  $file=dirname(__FILE__).'/'.strtolower($enc).'.map';
+  $file=__DIR__.'/'.strtolower($enc).'.map';
   $a=file($file);
   if(empty($a))
     die('<B>Error:</B> encoding not found: '.$enc);
@@ -276,9 +276,9 @@
 }
 
 /*******************************************************************************
-* $fontfile : chemin du fichier TTF (ou cha\xEEne vide si pas d'incorporation)    *
+* $fontfile : chemin du fichier TTF (ou chaîne vide si pas d'incorporation)    *
 * $afmfile :  chemin du fichier AFM                                            *
-* $enc :      encodage (ou cha\xEEne vide si la police est symbolique)            *
+* $enc :      encodage (ou chaîne vide si la police est symbolique)            *
 * $patch :    patch optionnel pour l'encodage                                  *
 * $type :     type de la police si $fontfile est vide                          *
 *******************************************************************************/

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -28,7 +28,7 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 define('NEWS_FPDF_PATH',XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/fpdf');
 define('FPDF_FONTPATH',NEWS_FPDF_PATH.'/font/');

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/fpdf.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -8,7 +8,7 @@
 *                                                                              *
 * You may use and modify this software as you wish.                            *
 *******************************************************************************/
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 if (!class_exists('FPDF')) {
 define('FPDF_VERSION','1.53');
@@ -1019,8 +1019,8 @@
 
 function _getfontpath()
 {
-  if(!defined('FPDF_FONTPATH') && is_dir(dirname(__FILE__).'/font'))
-    define('FPDF_FONTPATH',dirname(__FILE__).'/font/');
+  if(!defined('FPDF_FONTPATH') && is_dir(__DIR__.'/font'))
+    define('FPDF_FONTPATH',__DIR__.'/font/');
 
   return defined('FPDF_FONTPATH') ? FPDF_FONTPATH : '';
 }

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/gif.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/gif.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/gif.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -13,7 +13,7 @@
 // <bool> = gif_outputAsJpeg(<gif>, filename, [bgcolor]) - Requires cjpeg
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 function gif_loadFile($lpszFileName, $iIndex = 0)
 {

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/japanese.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/japanese.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/japanese.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -1,5 +1,5 @@
 <?php
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require 'fpdf.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/korean.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/korean.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/korean.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -1,5 +1,5 @@
 <?php
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require 'fpdf.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/english.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/english.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/english.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -30,7 +30,7 @@
 // ------------------------------------------------------------------------- //
 
 // For end users
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 $valid_pfd_charset = 'ISO-8859-1';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/french.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/french.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/french.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -30,7 +30,7 @@
 // ------------------------------------------------------------------------- //
 
 // For end users
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 $valid_pfd_charset = 'ISO-8859-1';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/japanese.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/japanese.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/japanese.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -28,7 +28,7 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require NEWS_FPDF_PATH.'/japanese.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/korean.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/korean.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/korean.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -28,7 +28,7 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require NEWS_FPDF_PATH.'/korean.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/schinese.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/schinese.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/schinese.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -28,7 +28,7 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require NEWS_FPDF_PATH.'/chinese.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/tchinese.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/tchinese.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/language/tchinese.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -28,7 +28,7 @@
 // URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ //
 // Project: The XOOPS Project                                                //
 // ------------------------------------------------------------------------- //
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 require NEWS_FPDF_PATH.'/chinese.php';
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/makepdf_class.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/makepdf_class.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/fpdf/makepdf_class.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -27,11 +27,11 @@
 // based on:
 // -------------------------------------------------
 // St@neCold
-// HTML2PDF by Cl\xE9ment Lavoillotte
+// HTML2PDF by Clément Lavoillotte
 // ac....@no...
 // web...@st...
 // http://www.streetpc.tk
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
 //function hex2dec
 //returns an associative array (keys: R,G,B) from

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/header.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/header.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -75,7 +75,7 @@
     }
 }
 //wanikoo
-$modulename = basename(dirname(__FILE__));
+$modulename = basename(__DIR__);
 
 define('XOOPSMYLINKURL', XOOPS_URL . "/modules/{$modulename}");
 define('XOOPSMYLINKPATH', XOOPS_ROOT_PATH . "/modules/{$modulename}");

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/blocksadmin.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/blocksadmin.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/blocksadmin.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -117,7 +117,7 @@
     $block['is_custom'] = true;
     $block['cachetime'] = intval($bcachetime);
     echo '<a href="myblocksadmin.php">'. _AM_MYLINKS_BADMIN .'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . $block['form_title'] . '<br /><br />';
-    include dirname(__FILE__) . '/../admin/myblockform.php'; //GIJ
+    include __DIR__ . '/../admin/myblockform.php'; //GIJ
     //echo '<a href="admin.php?fct=blocksadmin">'. _AM_MYLINKS_BADMIN .'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.$block['form_title'].'<br /><br />';
     //include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blockform.php';
     $xoopsGTicket->addTicketXoopsFormElement($form, __LINE__, 1800, 'myblocksadmin'); //GIJ
@@ -368,7 +368,7 @@
     $block = array('form_title' => _AM_EDITBLOCK, 'name' => $myblock->getVar('name'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'title' => $myblock->getVar('title','E'), 'content' => $myblock->getVar('content','n'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'update', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'), 'submit_button' => _SUBMIT);
 
     echo '<a href="myblocksadmin.php">' . _AM_MYLINKS_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_EDITBLOCK . '<br /><br />';
-    include dirname(__FILE__) . '/../admin/myblockform.php'; //GIJ
+    include __DIR__ . '/../admin/myblockform.php'; //GIJ
     $xoopsGTicket->addTicketXoopsFormElement($form, __LINE__, 1800, 'myblocksadmin'); //GIJ
     $form->display();
     // end of edit_block() GIJ
@@ -390,7 +390,7 @@
     $is_custom = ('C' == $myblock->getVar('block_type') || 'E' == $myblock->getVar('block_type')) ? true : false;
     $block = array('form_title' => _AM_CLONEBLOCK, 'name' => $myblock->getVar('name'), 'side' => $myblock->getVar('side'), 'weight' => $myblock->getVar('weight'), 'visible' => $myblock->getVar('visible'), 'content' => $myblock->getVar('content', 'N'), 'title' => $myblock->getVar('title','E'), 'modules' => $modules, 'is_custom' => $is_custom, 'ctype' => $myblock->getVar('c_type'), 'cachetime' => $myblock->getVar('bcachetime'), 'op' => 'clone_ok', 'bid' => $myblock->getVar('bid'), 'edit_form' => $myblock->getOptions(), 'template' => $myblock->getVar('template'), 'options' => $myblock->getVar('options'), 'submit_button' => _CLONE);
     echo '<a href="myblocksadmin.php">' . _AM_MYLINKS_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'. _AM_CLONEBLOCK . '<br /><br />';
-    include dirname(__FILE__) . '/../admin/myblockform.php';
+    include __DIR__ . '/../admin/myblockform.php';
     $xoopsGTicket->addTicketXoopsFormElement($form, __LINE__, 1800, 'myblocksadmin'); //GIJ
     $form->display();
     xoops_cp_footer();

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/data.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/data.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/data.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -22,7 +22,7 @@
     global $xoopsDB;
 
     $myts =& MyTextSanitizer::getInstance();
-    $dirname = basename(dirname(dirname(__FILE__)));
+    $dirname = basename(dirname(__DIR__));
     $moduleURL = XOOPS_URL . "/modules/{$dirname}";
 
     $limit  = (intval( $limit) > 0) ? intval( $limit) : 0;
@@ -70,7 +70,7 @@
 function mylinks_data($limit=0, $offset=0)
 {
     global $xoopsDB;
-    $dirname = basename(dirname(dirname(__FILE__)));
+    $dirname = basename(dirname(__DIR__));
 
     $limit  = (intval($limit) > 0) ? intval($limit) : 0;
     $offset = (intval($offset) > 0) ? intval($offset) : 0;

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feeddata.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feeddata.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feeddata.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -4,7 +4,7 @@
     global $xoopsDB;
 
     $myts =& MyTextSanitizer::getInstance();
-    $dirname = basename(dirname(dirname(__FILE__)));
+    $dirname = basename(dirname(__DIR__));
     $moduleURL = XOOPS_URL . "/modules/{$dirname}";
 
     $limit = (intval($limit)>0) ? intval($limit) : 0;

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feedfunc.new.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feedfunc.new.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/feedfunc.new.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -2,7 +2,7 @@
 
 function mylinks_get_new($param)
 {
-    $modulename = basename(dirname(dirname(__FILE__)));
+    $modulename = basename(dirname(__DIR__));
     include_once(XOOPS_ROOT_PATH . "/modules/{$modulename}/include/feeddata.inc.php");
 
     // parameter
@@ -43,7 +43,7 @@
 
 function wani_make_html_title( $title )
 {
-    if ( !isset($title) or empty($title) ) {
+    if ( !isset($title) || empty($title) ) {
         return '';
     }
     $title = strip_tags($title);

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/functions.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/functions.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -189,7 +189,7 @@
     $finalrating = number_format($finalrating, 4);
 */
         $query =  "UPDATE " . $xoopsDB->prefix("mylinks_links") . " SET rating={$finalrating}, votes={$votesDB} WHERE lid = {$sel_id}";
-        $xoopsDB->query($query) or exit();
+        $xoopsDB->query($query) || exit();
     }
 }
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/gtickets.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/gtickets.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/gtickets.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -16,8 +16,8 @@
 
         // language file
         if (defined('XOOPS_ROOT_PATH') && !empty($xoopsConfig['language']) && !strstr($xoopsConfig['language'], '/')) {
-            if (file_exists(dirname(dirname(__FILE__)) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml')) {
-                include dirname(dirname(__FILE__)) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml';
+            if (file_exists(dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml')) {
+                include dirname(__DIR__) . '/language/' . $xoopsConfig['language'] . '/gticket_messages.phtml';
             }
         }
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/notification.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/notification.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/notification.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -28,7 +28,7 @@
 function mylinks_notify_iteminfo($category, $item_id)
 {
     global $xoopsModule, $xoopsModuleConfig, $xoopsConfig, $xoopsDB;
-    $dirname = basename(dirname(dirname(__FILE__)));
+    $dirname = basename(dirname(__DIR__));
 
     $item_id = (isset($item_id) && (intval($item_id) > 0)) ? intval($item_id) : 0;
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/oninstall.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/oninstall.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/oninstall.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -16,7 +16,7 @@
  * @since::     File available since Release 3.11
  */
 
-$mylinksDir = basename(dirname(dirname(__FILE__)));
+$mylinksDir = basename(dirname(__DIR__));
 
 function xoops_module_pre_install_mylinks_base(&$xoopsModule)
 {

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/onupdate.inc.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/onupdate.inc.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/include/onupdate.inc.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -15,9 +15,9 @@
  * @version::   $Id$
  * @since::     File available since Release 3.11
  */
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
-$mylinksDir = basename(dirname(dirname(__FILE__)));
+$mylinksDir = basename(dirname(__DIR__));
 
 function xoops_module_update_mylinks_base(&$xoopsModule, $prev_version)
 {

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/language/english/admin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/language/english/admin.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/language/english/admin.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -20,7 +20,7 @@
  * ****************************************************************************
  */
 //3.1
-$admin_mydirname = basename(dirname(dirname(dirname(__FILE__))));
+$admin_mydirname = basename(dirname(dirname(__DIR__)));
 
 define('_AM_MYLINKS_ERROR_MODADMIN',"Error: Frameworks \"moduleadmin\" is not installed. Please install this Framework");
 

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/pda.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/pda.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/pda.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -3,7 +3,7 @@
 include '../../mainfile.php';
 include_once XOOPS_ROOT_PATH . '/class/template.php';
 error_reporting(0);
-$modulename = basename(dirname(__FILE__));
+$modulename = basename(__DIR__);
 include_once XOOPS_ROOT_PATH . "/modules/{$modulename}/include/feedfunc.new.php";
 
 // for debug

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/rss.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/rss.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/rss.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -3,7 +3,7 @@
 include '../../mainfile.php';
 include_once XOOPS_ROOT_PATH . '/class/template.php';
 error_reporting(0);
-$modulename = basename(dirname(__FILE__));
+$modulename = basename(__DIR__);
 include_once XOOPS_ROOT_PATH . "/modules/{$modulename}/include/feedfunc.new.php";
 
 $param_array = array(

Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/xoops_version.php	2014-08-13 20:28:36 UTC (rev 12738)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/mylinks/xoops_version.php	2014-08-14 09:31:07 UTC (rev 12739)
@@ -25,11 +25,11 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA //
 //  ------------------------------------------------------------------------ //
 
-if (!defined('XOOPS_ROOT_PATH')) exit;
-$module_dirname = basename(dirname(__FILE__));
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
+$module_dirname = basename(__DIR__);
 global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig;
 
-$modversion['dirname']     = basename( dirname( __FILE__ ) );
+$modversion['dirname']     = basename(__DIR__);
 $modversion['name']        = _MI_MYLINKS_NAME;
 $modversion['version']     = 3.11;
 $modversion['description'] = _MI_MYLINKS_DESC;