Thread: [xoops-svn] SF.net SVN: xoops-svn:[10264] XoopsCore/branches/2.5.x/2.5.6/htdocs

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10264
          http://sourceforge.net/p/xoops/svn/10264
Author:   beckmi
Date:     2012-11-21 04:52:11 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Updating for compatibility with PHP 5.4

Modified Paths:
--------------
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php
    XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php
===================================================================

--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/file.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -137,8 +137,9 @@
      * @return boolean True if the data was succesfully cached, false on failure
      * @access public
      */
-    function write($key, $data = null, $duration = null)
+    function write($key, $value = null, $duration = null)
     {
+        $data = $value;
         if (!isset($data) || ! $this->init) {
             return false;
         }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/cache/xoopscache.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -66,7 +66,7 @@
      * @return object
      * @access public
      */
-    function &getInstance()
+    static function &getInstance()
     {
         static $instance;
         if (!isset($instance)) {
@@ -257,7 +257,7 @@
      * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
      * @access public
      */
-    function read($key, $config = null)
+    static function read($key, $config = null)
     {
         $key = substr(md5(XOOPS_URL), 0, 8) . '_' . $key;
         $_this =& XoopsCache::getInstance();
@@ -438,7 +438,7 @@
      * @return boolean True if the data was succesfully cached, false on failure
      * @access public
      */
-    function write($key, &$value, $duration)
+    function write($key, $value = null, $duration = null)
     {
         trigger_error(sprintf(__('Method write() not implemented in %s', true), get_class($this)), E_USER_ERROR);
     }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/database/mysqldatabase.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -56,13 +56,13 @@
      * @param bool $selectdb select the database now?
      * @return bool successful?
      */
-    function connect($selectdb = true)
+    function connect($selectdb = TRUE)
     {
         static $db_charset_set;
 
         if (!extension_loaded('mysql')) {
             trigger_error('notrace:mysql extension not loaded', E_USER_ERROR);
-            return false;
+            return FALSE;
         }
 
         $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
@@ -75,12 +75,12 @@
 
         if (!$this->conn) {
             $this->logger->addQuery('', $this->error(), $this->errno());
-            return false;
+            return FALSE;
         }
-        if ($selectdb != false) {
+        if ($selectdb != FALSE) {
             if (!mysql_select_db(XOOPS_DB_NAME)) {
                 $this->logger->addQuery('', $this->error(), $this->errno());
-                return false;
+                return FALSE;
             }
         }
         if (!isset($db_charset_set) && defined('XOOPS_DB_CHARSET') && XOOPS_DB_CHARSET) {
@@ -88,7 +88,7 @@
         }
         $db_charset_set = 1;
         $this->queryF("SET SQL_BIG_SELECTS = 1");
-        return true;
+        return TRUE;
     }
 
     /**
@@ -256,13 +256,13 @@
         $this->logger->startTime('query_time');
         $result = mysql_query($sql, $this->conn);
         $this->logger->stopTime('query_time');
-        $query_time = $this->logger->dumpTime('query_time', true);
+        $query_time = $this->logger->dumpTime('query_time', TRUE);
         if ($result) {
-            $this->logger->addQuery($sql, null, null, $query_time);
+            $this->logger->addQuery($sql, NULL, NULL, $query_time);
             return $result;
         } else {
             $this->logger->addQuery($sql, $this->error(), $this->errno(), $query_time);
-            return false;
+            return FALSE;
         }
     }
 
@@ -289,7 +289,7 @@
      */
     function queryFromFile($file)
     {
-        if (false !== ($fp = fopen($file, 'r'))) {
+        if (FALSE !== ($fp = fopen($file, 'r'))) {
             include_once XOOPS_ROOT_PATH . '/class/database/sqlutility.php';
             $sql_queries = trim(fread($fp, filesize($file)));
             SqlUtility::splitMySqlFile($pieces, $sql_queries);
@@ -297,13 +297,13 @@
                 // [0] contains the prefixed query
                 // [4] contains unprefixed table name
                 $prefixed_query = SqlUtility::prefixQuery(trim($query), $this->prefix());
-                if ($prefixed_query != false) {
+                if ($prefixed_query != FALSE) {
                     $this->query($prefixed_query[0]);
                 }
             }
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -395,7 +395,7 @@
         $sql = ltrim($sql);
         if (!$this->allowWebChanges && strtolower(substr($sql, 0, 6)) != 'select') {
             trigger_error('Database updates are not allowed during processing of a GET request', E_USER_WARNING);
-            return false;
+            return FALSE;
         }
 
         return $this->queryF($sql, $limit, $start);

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/file/xoopsfile.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -64,7 +64,7 @@
      * @param string $name
      * @return
      */
-    function load($name = 'file')
+    static function load($name = 'file')
     {
         switch ($name) {
             case 'folder':
@@ -102,7 +102,7 @@
      * @param mixed $mode
      * @return
      */
-    function getHandler($name = 'file', $path = false, $create = false, $mode = null)
+    static function getHandler($name = 'file', $path = false, $create = false, $mode = null)
     {
         $handler = null;
         XoopsFile::load($name);

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/logger/xoopslogger.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -84,7 +84,7 @@
      *
      * @return object XoopsLogger  reference to the only instance
      */
-    function &getInstance()
+    static function &getInstance()
     {
         static $instance;
         if (!isset($instance)) {

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/preload.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -65,7 +65,7 @@
      *
      * @return object
      */
-    function &getInstance()
+    static function &getInstance()
     {
         static $instance = false;
         if (!$instance) {

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopslists.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -126,7 +126,7 @@
         /**
          * gets list of all files in a directory
          */
-        function getFileListAsArray($dirname, $prefix = '')
+        static function getFileListAsArray($dirname, $prefix = '')
         {
             $filelist = array();
             if (substr($dirname, - 1) == '/') {

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/class/xoopsload.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -24,7 +24,7 @@
     //static  $loaded;
     //static  $configs;
     
-    function load($name, $type = "core")
+    static function load($name, $type = "core")
     {
         static $loaded;
         static $deprecated;
@@ -83,7 +83,7 @@
      *
      * @access private
      */
-    function loadCore($name)
+    static function loadCore($name)
     {
         static $configs;
 
@@ -149,7 +149,7 @@
      *
      * @return
      */
-    function loadCoreConfig()
+    static function loadCoreConfig()
     {
         return $configs = array(
             'xoopsuserutility' => XOOPS_ROOT_PATH . '/class/userutility.php',

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/language/english/calendar.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -4,39 +4,72 @@
 // _CHARSET : UTF-8
 // Translator: XOOPS Translation Team
 // more examples: http://php.net/manual/en/function.date.php
-
+// 
+// Revision by TXMod Xoops - Added shot text: 30/06/2012
+//
 //%%%%%     Time Zone   %%%%
 define("_CAL_FORMAT","Y-m-d");
+//%%%%%     JQuery Calendar Time Zone   %%%%
+define("_CAL_JQUERY_FORMAT","yy/mm/dd");
+// Week Mini Text
+define("_CAL_MIN_SUNDAY", "Su");
+define("_CAL_MIN_MONDAY", "Mo");
+define("_CAL_MIN_TUESDAY", "Tu");
+define("_CAL_MIN_WEDNESDAY", "We");
+define("_CAL_MIN_THURSDAY", "Th");
+define("_CAL_MIN_FRIDAY", "Fr");
+define("_CAL_MIN_SATURDAY", "Sa");
+// Week Short Text
+define("_CAL_SHORT_SUNDAY", "Sun");
+define("_CAL_SHORT_MONDAY", "Mon");
+define("_CAL_SHORT_TUESDAY", "Tue");
+define("_CAL_SHORT_WEDNESDAY", "Wed");
+define("_CAL_SHORT_THURSDAY", "Thu");
+define("_CAL_SHORT_FRIDAY", "Fri");
+define("_CAL_SHORT_SATURDAY", "Sat");
 
-define("_CAL_SUNDAY","Sunday");
-define("_CAL_MONDAY","Monday");
-define("_CAL_TUESDAY","Tuesday");
-define("_CAL_WEDNESDAY","Wednesday");
-define("_CAL_THURSDAY","Thursday");
-define("_CAL_FRIDAY","Friday");
-define("_CAL_SATURDAY","Saturday");
-define("_CAL_JANUARY","January");
-define("_CAL_FEBRUARY","February");
-define("_CAL_MARCH","March");
-define("_CAL_APRIL","April");
-define("_CAL_MAY","May");
-define("_CAL_JUNE","June");
-define("_CAL_JULY","July");
-define("_CAL_AUGUST","August");
-define("_CAL_SEPTEMBER","September");
-define("_CAL_OCTOBER","October");
-define("_CAL_NOVEMBER","November");
-define("_CAL_DECEMBER","December");
-define("_CAL_TGL1STD","Toggle first day of week");
-define("_CAL_PREVYR","Prev. year (hold for menu)");
-define("_CAL_PREVMNTH","Prev. month (hold for menu)");
-define("_CAL_GOTODAY","Go Today");
-define("_CAL_NXTMNTH","Next month (hold for menu)");
-define("_CAL_NEXTYR","Next year (hold for menu)");
-define("_CAL_SELDATE","Select date");
-define("_CAL_DRAGMOVE","Drag to move");
-define("_CAL_TODAY","Today");
-define("_CAL_DISPM1ST","Display Monday first");
-define("_CAL_DISPS1ST","Display Sunday first");
-
+define("_CAL_SHORT_JANUARY", "January");
+define("_CAL_SHORT_FEBRUARY", "February");
+define("_CAL_SHORT_MARCH", "March");
+define("_CAL_SHORT_APRIL", "April");
+define("_CAL_SHORT_MAY", "May");
+define("_CAL_SHORT_JUNE", "June");
+define("_CAL_SHORT_JULY", "July");
+define("_CAL_SHORT_AUGUST", "August");
+define("_CAL_SHORT_SEPTEMBER", "September");
+define("_CAL_SHORT_OCTOBER", "October");
+define("_CAL_SHORT_NOVEMBER", "November");
+define("_CAL_SHORT_DECEMBER", "December");
+// Normal Text
+define("_CAL_SUNDAY", "Sunday");
+define("_CAL_MONDAY", "Monday");
+define("_CAL_TUESDAY", "Tuesday");
+define("_CAL_WEDNESDAY", "Wednesday");
+define("_CAL_THURSDAY", "Thursday");
+define("_CAL_FRIDAY", "Friday");
+define("_CAL_SATURDAY", "Saturday");
+define("_CAL_JANUARY", "January");
+define("_CAL_FEBRUARY", "February");
+define("_CAL_MARCH", "March");
+define("_CAL_APRIL", "April");
+define("_CAL_MAY", "May");
+define("_CAL_JUNE", "June");
+define("_CAL_JULY", "July");
+define("_CAL_AUGUST", "August");
+define("_CAL_SEPTEMBER", "September");
+define("_CAL_OCTOBER", "October");
+define("_CAL_NOVEMBER", "November");
+define("_CAL_DECEMBER", "December");
+// Others
+define("_CAL_TGL1STD", "Toggle first day of week");
+define("_CAL_PREVYR", "Prev. year (hold for menu)");
+define("_CAL_PREVMNTH", "Prev. month (hold for menu)");
+define("_CAL_GOTODAY", "Go Today");
+define("_CAL_NXTMNTH", "Next month (hold for menu)");
+define("_CAL_NEXTYR", "Next year (hold for menu)");
+define("_CAL_SELDATE", "Select date");
+define("_CAL_DRAGMOVE", "Drag to move");
+define("_CAL_TODAY", "Today");
+define("_CAL_DISPM1ST", "Display Monday first");
+define("_CAL_DISPS1ST", "Display Sunday first");
 ?>
\ No newline at end of file

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/protector/preloads/core.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -28,7 +28,7 @@
  */
 class ProtectorCorePreload extends XoopsPreloadItem
 {
-    function eventCoreIncludeCommonStart($args)
+    static function eventCoreIncludeCommonStart($args)
     {
         include XOOPS_TRUST_PATH . '/modules/protector/include/precheck.inc.php';
     }

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/modules/system/admin/modulesadmin/main.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -806,6 +806,7 @@
                         $confobj->setVar('conf_title', $config['title'], true);
                         $confobj->setVar('conf_desc', $config['description'], true);
                         $confobj->setVar('conf_formtype', $config['formtype']);
+                        if (isset( $config['valuetype']))
                         $confobj->setVar('conf_valuetype', $config['valuetype']);
                         if (isset($config_old[$config['name']]['value']) && $config_old[$config['name']]['formtype'] == $config['formtype'] && $config_old[$config['name']]['valuetype'] == $config['valuetype']) {
                             // preserver the old value if any

Modified: XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php	2012-11-21 04:40:56 UTC (rev 10263)
+++ XoopsCore/branches/2.5.x/2.5.6/htdocs/xoops_lib/modules/protector/class/protector.php	2012-11-21 04:52:11 UTC (rev 10264)
@@ -113,7 +113,7 @@
 }
 
 
-function &getInstance()
+static function &getInstance()
 {
 	static $instance ;
 	if( ! isset( $instance ) ) {





Thread: [xoops-svn] SF.net SVN: xoops-svn:[10264] XoopsCore/branches/2.5.x/2.5.6/htdocs

The world's leading content management systems (CMS) written in PHP

xoops-svn