oops: Fix upgrade crash

Also, * use current year when no company name exists (yet) * log a `created` timestamp for new files * drop table %group during the upgrade
osTicket · Jul 22, 2015 · 07c1d79 · 07c1d79
1 parent 33f18c5
commit 07c1d79
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 5 deletions.
diff --git a/include/class.file.php b/include/class.file.php
@@ -386,6 +386,7 @@ static function create(&$file, $ft='T', $deduplicate=true) {
             'key' => $file['key'],
             'ft' => $ft ?: 'T',
             'signature' => $file['signature'],
+            'created' => SqlFunction::NOW(),
         ));
 
         if (isset($file['size']))

diff --git a/include/staff/login.tpl.php b/include/staff/login.tpl.php
@@ -47,7 +47,7 @@
 
     <div id="company">
         <div class="content">
-            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company); ?>
+            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company) ?: date('Y'); ?>
         </div>
     </div>
 </div>

diff --git a/include/staff/pwreset.login.php b/include/staff/pwreset.login.php
@@ -29,7 +29,7 @@
 
     <div id="company">
         <div class="content">
-            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company); ?>
+            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company) ?: date('Y'); ?>
         </div>
     </div>
 </div>

diff --git a/include/staff/pwreset.php b/include/staff/pwreset.php
@@ -27,7 +27,7 @@
 
     <div id="company">
         <div class="content">
-            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company); ?>
+            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company) ?: date('Y'); ?>
         </div>
     </div>
 </div>

diff --git a/include/staff/pwreset.sent.php b/include/staff/pwreset.sent.php
@@ -25,7 +25,7 @@
 
     <div id="company">
         <div class="content">
-            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company); ?>
+            <?php echo __('Copyright'); ?> &copy; <?php echo Format::htmlchars($ost->company) ?: date('Y'); ?>
         </div>
     </div>
 </div>

diff --git a/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql b/include/upgrader/streams/core/0d6099a6-98ad7d55.cleanup.sql
@@ -6,6 +6,7 @@
  */
 
 DROP TABLE IF EXISTS `%TABLE_PREFIX%group_dept_access`;
+DROP TABLE IF EXISTS `%TABLE_PREFIX%group`;
 
 -- Drop `updated` if it exists (it stayed in the install script after it was
 -- removed from the update path

diff --git a/include/upgrader/streams/core/15b30765-dd0022fb.task.php b/include/upgrader/streams/core/15b30765-dd0022fb.task.php
@@ -245,6 +245,7 @@ function saveAttachment($file) {
             'hash' => $file['hash'],
             'bk' => '6',
             'attrs' => $file['path'],
+            'created' => date('Y-m-d H:i:s', Misc::dbtime(filemtime($file['path']))),
         ));
     }
 }

diff --git a/include/upgrader/streams/core/1ee831c8-36f6b328.patch.sql b/include/upgrader/streams/core/1ee831c8-36f6b328.patch.sql
@@ -26,6 +26,7 @@ ALTER TABLE `%TABLE_PREFIX%staff`
     ADD `role_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `dept_id`;
 
 ALTER TABLE  `%TABLE_PREFIX%groups`
+    RENAME TO `%TABLE_PREFIX%group`,
     CHANGE  `group_id`  `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
     ADD  `role_id` INT UNSIGNED NOT NULL DEFAULT  '0' AFTER  `id`;
 

diff --git a/include/upgrader/streams/core/1ee831c8-36f6b328.task.php b/include/upgrader/streams/core/1ee831c8-36f6b328.task.php
@@ -1,5 +1,5 @@
 <?php
-define('GROUP_TABLE', TABLE_PREFIX.'groups');
+define('GROUP_TABLE', TABLE_PREFIX.'group');
 define('GROUP_DEPT_TABLE', TABLE_PREFIX.'group_dept_access');
 class Group extends VerySimpleModel {
     static $meta = array(