Changeset 601 for trunk/bin

Timestamp:

Apr 27, 2017 4:43:35 PM (7 years ago)

Author:

anonymous

Message:

Updated every instance of 'zero' date 0000-00-00 to use 1000-01-01 if mysql version >= 5.7.4

Location:

trunk/bin

Files:

• init_codebase_tables.cli.php (modified) (2 diffs)
• module_maker/list_template.cli.php (modified) (1 diff)
• module_maker/skel/public.php (modified) (3 diffs)

trunk/bin/init_codebase_tables.cli.php

@@ -146 +146 @@
             // Lock!
             require_once CODEBASE_PATH . '/lib/Lock.inc.php';
+            require_once CODEBASE_PATH . '/lib/Auth_SQL.inc.php';
             $lock =& Lock::getInstance(new Auth_SQL('codebase'));
             $lock->setParam(array('create_table' => true));
@@ -162 +163 @@
             // Version!
             require_once CODEBASE_PATH . '/lib/Version.inc.php';
+            require_once CODEBASE_PATH . '/lib/Auth_SQL.inc.php';
             $version = Version::getInstance(new Auth_SQL('codebase'));
             $version->setParam(array('create_table' => true));

trunk/bin/module_maker/list_template.cli.php

@@ -119 +119 @@
             $listrows[] = "<\x3fphp echo mb_strlen(\$list[\$i]['$field'])<50 \x3f oTxt(\$list[\$i]['$field'], true) : oTxt(trim(mb_substr(\$list[\$i]['$field'], 0, 50)) . '...'); \x3f>";
         } else if (preg_match('/.*(begin|start).*date.*/i', $field)) {
-            $listrows[] = "<\x3fphp echo '0000-00-00' == \$list[\$i]['$field'] ? '' : date(\$app->getParam('date_format'), strtotime(\$list[\$i]['$field'])); \x3f>";
+            $listrows[] = "<\x3fphp echo \$db->getParam('zero_date') == \$list[\$i]['$field'] ? '' : date(\$app->getParam('date_format'), strtotime(\$list[\$i]['$field'])); \x3f>";
         } else if (preg_match('/.*(end|expire).*date.*/i', $field)) {
             $listrows[] = "<\x3fphp echo '9999-12-31' == \$list[\$i]['$field'] ? '' : date(\$app->getParam('date_format'), strtotime(\$list[\$i]['$field'])); \x3f>";

trunk/bin/module_maker/skel/public.php

@@ -4 +4 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -11 +11 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -60 +60 @@
         WHERE %PRIMARY_KEY% = '" . $db->escapeString(getFormData('%PRIMARY_KEY%')) . "'
         AND publish = 'true'
-        __///__AND (publish_date <= CURDATE() OR publish_date = '0000-00-00')
-        __///__AND (expire_date > CURDATE() OR expire_date = '0000-00-00')
+        __///__AND (publish_date <= CURDATE() OR publish_date = '" . $db->escapeString($db->getParam('zero_date')) . "')
+        __///__AND (expire_date > CURDATE() OR expire_date = '" . $db->escapeString($db->getParam('zero_date')) . "')
     ");
     if (!$item = mysql_fetch_assoc($qid)) {