Merge remote branch 'origin/develop' into develop

exponent.php

@@ -7,7 +7,7 @@
  *  Software Foundation; either version 2 of the
  *  License, or (at your option) any later version.
  *
- * The file thats holds the expRecord class
+ * The file that initializes everything
  *
  * @link http://www.gnu.org/licenses/gpl.txt GPL http://www.gnu.org/licenses/gpl.txt
  * @package Exponent-CMS
@@ -93,24 +93,24 @@
 
 // Initialize permissions variables
 exponent_permissions_initialize();
-// initialize the expRouter
 /**
+ * initialize the expRouter
  * the routing/link/url object
  * @global expRouter $router
  * @name $router
  */
 $router = new expRouter();
 
-// initialize this users cart if they have ecomm installed.
 /**
+ * initialize this users cart if they have ecomm installed.
  * the shopping cart/order object
  * @global order $order
  * @name $order
  */
 if (controllerExists('cart')) $order = order::getUserCart();
 
-//Initialize the navigation heirarchy
 /**
+ * Initialize the navigation hierarchy
  * the list of sections/pages for the site
  * @global array $sections
  * @name $sections

framework/modules/banners/controllers/bannerController.php

@@ -19,7 +19,7 @@
 
 class bannerController extends expController {
     //public $basemodel_name = '';
-    public $remove_configs = array('aggregation', 'comments', 'files','rss');
+    public $remove_configs = array('aggregation', 'comments', 'files','rss','tags');
     public $useractions = array('showall'=>'Display Banner(s)');
 	public $codequality = 'beta';
 

framework/modules/blog/controllers/blogController.php

@@ -25,7 +25,7 @@ class blogController extends expController {
         'dates'=>"Dates",
     );
 
-    public $remove_configs = array('ealerts');
+    public $remove_configs = array('ealerts','tags');
     //public $add_permissions = array('approve');
     public $codequality = 'beta';
 

framework/modules/company/controllers/companyController.php

@@ -26,7 +26,7 @@ class companyController extends expController {
         'comments',
         //'files',
         'rss',
-        //'tags'
+        'tags'
     );
 
 	function name() { return $this->displayname(); } //for backwards compat with old modules

framework/modules/filedownloads/controllers/filedownloadController.php

@@ -26,6 +26,7 @@ class filedownloadController extends expController {
         'ealerts',
         'files',
         'rss',
+		'tags'
     );
     public $codequality = 'beta';
 

install/pages/upgrade-1.php

@@ -28,8 +28,13 @@
 "); ?>
 </p>
 <p>
+<?php //echo gt("
+//Next, we'll <a href=\"http://docs.exponentcms.org/docs/current/install-tables\" target=\"_blank\">Install Tables</a>, and run through any upgrade scripts needed to bring your code and database up to date.
+//"); ?>
+<!--</p>-->
+<!--<a class="awesome large green" href="?page=upgrade-2">--><?php //echo gt("Continue to Install Tables"); ?><!--</a>-->
 <?php echo gt("
-Next, we'll run through any upgrade scripts needed to bring your code and database up to date.
+Next, we'll <a href=\"http://docs.exponentcms.org/docs/current/install-tables\" target=\"_blank\">Install Tables</a>, and run through any upgrade scripts needed to bring your code and database up to date.
 "); ?>
 </p>
 <a class="awesome large green" href="?page=upgrade-3"><?php echo gt('Continue Upgrade') ?></a>

install/pages/upgrade-2.php

@@ -122,9 +122,11 @@
 <tbody>
 <?php 
 $row = "even";
+$line = 0;
 foreach ($tables as $table => $statusnum) {
+	if ($statusnum != TMP_TABLE_EXISTED) {
 ?>
-    
+
 <tr class="<?php echo $row ?>">
 	<td>
 		 <?php echo gt($table) ?>
@@ -153,10 +155,18 @@
         <?php } ?>
 	</td>
 </tr>
-<?php 
-$row  = $row == "even" ? "odd" : "even";
-} ?>
+<?php
+	$row = $row == "even" ? "odd" : "even";
+	$line++;
+	}
+?>
  <tbody>
 </table>
+<?php
+}
+if ($line == 0) {
+	echo "<b>No Tables Were Changed!</b>";
+}
+?>
 
 <a class="awesome large green" href="?page=upgrade-3"><?php echo gt('Continue Upgrade') ?></a>

install/upgrades/clear_cache.php

@@ -20,12 +20,56 @@ class clear_cache extends upgradescript {
 	protected $from_version = '1.99.0';
 //	protected $to_version = '1.99.2';
 
-	function name() { return "Clear the Cache"; }
+	function name() { return "Clear the Caches"; }
 
 	function upgrade() {
-		$files = exponent_theme_remove_smarty_cache();
-		return count($files['removed'])." files were removed from the cache.";
+		// work our way through all the tmp files and remove them
+		if (!defined('SYS_FILES')) include_once(BASE.'subsystems/files.php');
+		$files = array(
+			BASE.'tmp/cache',
+//			BASE.'tmp/css',  // css cache??
+			BASE.'tmp/mail',
+			BASE.'tmp/minify', // minify cache
+			BASE.'tmp/pods',
+		    BASE.'tmp/rsscache',
+		    BASE.'tmp/views_c',  // smarty cache
+		);
 
+        // delete the files.
+        $removed = 0;
+        $errors = 0;
+		foreach ($files as $file) {
+			$files = exponent_files_remove_files_in_directory($file);
+			$removed += count($files['removed']);
+			$errors += count($files['not_removed']);
+		}
+
+		// delete the entire img_cache and recreate the folder
+		if (file_exists(BASE.'tmp/img_cache')) $this->cleardir_recursive(BASE.'tmp/img_cache');
+
+		return "Caches were cleared.<br>".$errors." files could not be removed.";
+	}
+
+	/**
+	 * recursively clear a directories contents, but leave the directory
+	 * @param $dir
+	 */
+	function cleardir_recursive($dir) {
+		$files = scandir($dir);
+		array_shift($files);    // remove '.' from array
+		array_shift($files);    // remove '..' from array
+		foreach ($files as $file) {
+			if (substr($file, 0, 1) != '.') {  // don't remove dot files
+				$file = $dir . '/' . $file;
+				if (is_dir($file)) {
+					cleardir_recursive($file);
+					rmdir($file);
+				} else {
+					unlink($file);
+				}
+			}
+		}
+		// rmdir($dir);
 	}
 }
 

install/upgrades/install_tables.php

@@ -125,7 +125,9 @@ function upgrade() {
 <tbody>
 <?php
 $row = "even";
+$line = 0;
 foreach ($tables as $table => $statusnum) {
+	if ($statusnum != TMP_TABLE_EXISTED) {
 ?>
 
 <tr class="<?php echo $row ?>">
@@ -157,12 +159,17 @@ function upgrade() {
 	</td>
 </tr>
 <?php
-$row  = $row == "even" ? "odd" : "even";
-} ?>
+$row = $row == "even" ? "odd" : "even";
+$line++;
+}
+?>
  <tbody>
 </table>
 <?php
+		}
+		if ($line == 0) {
+			echo "<p class=\"success\">No Tables Were Changed!</p>";
+		}
 	}
 }
-
 ?>

install/upgrades/remove_headlinecontroller.php

@@ -17,8 +17,9 @@
 ##################################################
 
 class remove_headlinecontroller extends upgradescript {
-	protected $from_version = '1.99.0';
-	protected $to_version = '2.0.1';
+// TODO next two lines are commented out to disable this script
+//	protected $from_version = '1.99.0';
+//	protected $to_version = '2.0.1';
 
 	function name() { return "Remove the (deprecated) Headline Controller"; }
 
@@ -79,9 +80,6 @@ function upgrade() {
 			$headlines_converted += 1;
 		}
 
-// FIXME - remove when final
-return "TEST - We're NOT removing the headline table nor the files yet...<br>".$modules_converted." Headline modules were converted.<br>".$headlines_converted." Headlines were converted.<br>";
-
 		// delete headline table
 		$db->dropTable('headline');