------------------------------------------------------------
revno: 856
committer: Steven Garcia <steven@satellite>
branch nick: aikiframework
timestamp: Fri 2011-06-17 17:53:41 -0700
message:
Added updater related constants. Changed phpDoc comments in config.php to
compact style. Bumped fix-number.
modified:
src/aiki.php
src/configs/config.php
src/configs/defs.inc
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'src/aiki.php'
--- src/aiki.php 2011-06-16 02:07:53 +0000
+++ src/aiki.php 2011-06-18 00:53:41 +0000
@@ -25,7 +25,7 @@
* When the MAJOR number changes, the MINOR number should reset to zero.
* When the MAJOR number is zero, this indicates an alpha or beta type
* release. Each number can, but should probably not exceed 99 */
-define('AIKI_VERSION','0.8.22');
+define('AIKI_VERSION','0.8.23');
/**
* Used to test for script access
=== modified file 'src/configs/config.php'
--- src/configs/config.php 2011-06-14 21:09:57 +0000
+++ src/configs/config.php 2011-06-18 00:53:41 +0000
@@ -1,6 +1,6 @@
<?php
-/**
- * Aiki Framework (PHP)
+
+/** Aiki Framework (PHP)
*
* Global configuration options
*
@@ -15,8 +15,7 @@
* @link http://aikiframework.org
* @category Aiki
* @package Aiki
- * @filesource
- */
+ * @filesource */
/** @see defs.php */
require_once("$AIKI_ROOT_DIR/configs/defs.php");
@@ -33,235 +32,169 @@
define("AIKI_SITE_URL", "@AIKI_SITE_URL@");
}
-/**
- * Used to store global configuration options
- * @global array $config
- */
+/** Used to store global configuration options
+ * @global array $config */
$config = array();
-/**
- * Set the database type such as mysql
- * @global string $config["db_type"]
- */
+/** Set the database type such as mysql
+ * @global string $config["db_type"] */
$config["db_type"] = DB_TYPE;
-/**
- * Set the database name
- * @global string $config["db_name"]
- */
+
+/** Set the database name
+ * @global string $config["db_name"] */
$config["db_name"] = DB_NAME;
-/**
- * Set the database user name
- * @global string $config["db_user"]
- */
+
+/** Set the database user name
+ * @global string $config["db_user"] */
$config["db_user"] = DB_USER;
-/**
- * Set the database user password
- * @global string $config["db_pass"]
- */
+
+/** Set the database user password
+ * @global string $config["db_pass"] */
$config["db_pass"] = DB_PASS;
-/**
- * Set the database host server
- * @global string $config["db_host"]
- */
+
+/** Set the database host server
+ * @global string $config["db_host"] */
$config["db_host"] = DB_HOST;
-/**
- * Set the database encoding such as utf8
- * @global string $config["db_encoding"]
- */
+
+/** Set the database encoding such as utf8
+ * @global string $config["db_encoding"] */
$config["db_encoding"] = DB_ENCODE;
-/**
- * Enable use of mysql set charset
- * @global bool $config["db_use_mysql_set_charset"]
- */
+
+/** Enable use of mysql set charset
+ * @global bool $config["db_use_mysql_set_charset"] */
$config["db_use_mysql_set_charset"] = false;
-/**
- * Set the full path for SQLite and sqlite PDO
- * @global string $config["db_path"]
- */
+/** Set the full path for SQLite and sqlite PDO
+ * @global string $config["db_path"] */
$config["db_path"] = '';
-/**
- * sqlite PDO only
- * @global string $config["db_dsn"]
- */
+/** sqlite PDO only
+ * @global string $config["db_dsn"] */
$config["db_dsn"] = '';
-/**
- * Set time out for deleting db cached queries - in hours
- * @global integer $config["db_cache_timeout"]
- */
+/** Set time out for deleting db cached queries - in hours
+ * @global integer $config["db_cache_timeout"] */
$config["db_cache_timeout"] = 24;
-/**
- * db caching directory
- * @global string $config["cache_dir"]
- */
+/** db caching directory
+ * @global string $config["cache_dir"] */
$config["cache_dir"] = "cache";
-/**
- * if set to true will cache the results of sql queries to files
- * @global bool $config["enable_query_cache"]
- */
+/** if set to true will cache the results of sql queries to files
+ * @global bool $config["enable_query_cache"] */
$config["enable_query_cache"] = false;
-/**
- * enable multi databases connections
- * @global bool $config["allow_multiple_databases"]
- */
+/** enable multi databases connections
+ * @global bool $config["allow_multiple_databases"] */
$config["allow_multiple_databases"] = false;
-/**
- * use html tidy php extension to format the html output
- * @global bool $config["html_tidy"]
- */
+/** use html tidy php extension to format the html output
+ * @global bool $config["html_tidy"] */
$config["html_tidy"] = false;
-/**
- * enable html tidy compression
- * @global bool $config["tidy_compress"]
- */
+
+/** enable html tidy compression
+ * @global bool $config["tidy_compress"] */
$config["tidy_compress"] = false;
-/**
- * html tidy default configuration
- * @global array $config["html_tidy_config"]
- */
+
+/** html tidy default configuration
+ * @global array $config["html_tidy_config"] */
$config["html_tidy_config"] = array(
'indent' => true,
'output-xhtml' => true,
'wrap' => '0',
);
-/**
- * Remove empty spaces and lines and have the whole html on one line
- * @global bool $config["compress_output"]
- */
+/** Remove empty spaces and lines and have the whole html on one line
+ * @global bool $config["compress_output"] */
$config["compress_output"] = false;
-/**
- * Cache each widget individually in its own file
- * @global bool $config["widget_cache"]
- */
+/** Cache each widget individually in its own file
+ * @global bool $config["widget_cache"] */
$config["widget_cache"] = false;
-/**
- * Full path to widgets cache directory in case $config["widget_cache"]
+/** Full path to widgets cache directory in case $config["widget_cache"]
* was true
- * @global string $config["widget_cache_dir"]
- */
+ * @global string $config["widget_cache_dir"] */
$config["widget_cache_dir"] = '';
-/**
- * Enable caching of css
- * @global bool $config["css_cache"]
- */
+/** Enable caching of css
+ * @global bool $config["css_cache"] */
$config["css_cache"] = true;
-/**
- * CSS cache timeout
- * @global integer $config["css_cache_timeout"]
- */
+
+/** CSS cache timeout
+ * @global integer $config["css_cache_timeout"] */
$config["css_cache_timeout"] = 24;
-/**
- * CSS cache file name
- * @global string $config["css_cache_file"]
- */
+
+/** CSS cache file name
+ * @global string $config["css_cache_file"] */
$config["css_cache_file"] = "";
-/**
- * This will store each page in its own file.
+/** This will store each page in its own file.
* full html cache with full path to cache
- * @global bool $config["html_cache"]
- */
+ * @global bool $config["html_cache"] */
$config["html_cache"] = false;
-/**
- * Time out for pages cache, in milliseconds
- * @global integer $config["cache_timeout"]
- */
+/** Time out for pages cache, in milliseconds
+ * @global integer $config["cache_timeout"] */
$config["cache_timeout"] = "86400";
-/**
- * Session lifetime before auto log out if no activities from the logged
+/** Session lifetime before auto log out if no activities from the logged
* in user - in milliseconds
- * @global integer $config["session_timeout"]
- */
+ * @global integer $config["session_timeout"] */
$config["session_timeout"] = 7200;
-/**
- * If true will allow same username and password to login from two different IPs
- * @global bool $config["allow_multiple_sessions"]
- */
+/** If true will allow same username and password to login from two different IPs
+ * @global bool $config["allow_multiple_sessions"] */
$config["allow_multiple_sessions"] = false;
-/**
- * Register guests sessions for tracking how many users are currently
+/** Register guests sessions for tracking how many users are currently
* visiting the site
- * @global bool $config["allow_guest_sessions"]
- */
+ * @global bool $config["allow_guest_sessions"] */
$config["allow_guest_sessions"] = false;
-/**
- * Enable version control system this will store each change for any sql
+/** Enable version control system this will store each change for any sql
* UPDATE command in aiki_revisions
- * @global bool $config["save_revision_history"]
- */
+ * @global bool $config["save_revision_history"] */
$config["save_revision_history"] = false;
-/**
- * Store information about not found pages in aiki_redirects so admin can
+/** Store information about not found pages in aiki_redirects so admin can
* later add redirects
- * @global bool $config["register_errors"]
- */
+ * @global bool $config["register_errors"] */
$config["register_errors"] = false;
-/**
- * Custom 404 error page
- * @global string $config["error_404"]
- */
+/** Custom 404 error page
+ * @global string $config["error_404"] */
$config["error_404"] = "<h1>404 Page Not Found</h1>
<p>This page is not found</p>
<p>Please visit <a href=\"".AIKI_SITE_URL."\">Home page</a> so you may find what you are looking for.</p>";
-/**
- * Your default timezone. Before code had "America/Los_Angeles", should try
+/** Your default timezone. Before code had "America/Los_Angeles", should try
* defaults first. If one has set this, then it overrides the system.
- * @global string $config["timezone"]
- */
+ * @global string $config["timezone"] */
$config["timezone"] = '';
-/**
- * Show admin widgets or not?
- * @global bool $config["admin_widgets_display"]
- */
+/** Show admin widgets or not?
+ * @global bool $config["admin_widgets_display"] */
$config["admin_widgets_display"] = false;
-/**
- * Enable debug mode
- * @global bool $config["debug"]
- */
+/** Enable debug mode
+ * @global bool $config["debug"] */
$config["debug"] = false;
-/**
- * Set the aiki log directory
- * @global string $config["log_dir"]
- */
+/** Set the aiki log directory
+ * @global string $config["log_dir"] */
$config["log_dir"] = AIKI_LOG_DIR;
-/**
- * Set the aiki log file name
- * @global string $config["log_file"]
- */
+/** Set the aiki log file name
+ * @global string $config["log_file"] */
$config["log_file"] = AIKI_LOG_FILE;
-/**
- * Set the aiki host profile name
- * @global string $config["log_profile"]
- */
+/** Set the aiki host profile name
+ * @global string $config["log_profile"] */
$config["log_profile"] = AIKI_LOG_PROFILE;
-/**
- * Set the aiki log level
- * @global string $config["log_level"]
- */
+/** Set the aiki log level
+ * @global string $config["log_level"] */
$config["log_level"] = AIKI_LOG_LEVEL;
?>
=== modified file 'src/configs/defs.inc'
--- src/configs/defs.inc 2011-06-16 02:07:53 +0000
+++ src/configs/defs.inc 2011-06-18 00:53:41 +0000
@@ -56,6 +56,36 @@
// **** Begin non-generated constants **** //
+/** Aiki directory that stores the backup files used to revert from update */
+define("AIKI_BACKUP_DIR", "backups");
+
+/** Aiki directory that stores the update scripts */
+define("AIKI_UPDATE_DIR", "updates");
+
+/** Aiki Update URL with update information and requirements */
+define("AIKI_UPDATE_URL", "http://aikiframework.org/files/update";);
+
+/** Whether or not to check for update after admin login */
+define("AIKI_UPDATE_CHECK", true);
+
+/** Aiki Update URL to the update package excluding filename */
+define("AIKI_UPDATE_PATH", "http://aikiframework.org/files/";);
+
+/** First part of the update package filename excluding version and extension */
+define("AIKI_UPDATE_PREFIX", "aiki-src-");
+
+/** Last part of the update package filename indicating file format */
+define("AIKI_UPDATE_EXT", ".zip");
+
+/** Retry to download or validate the downloaded update package
+ * this number of times if failed. Do NOT put the following value in quotes. */
+define("AIKI_UPDATE_RETRY", 3);
+
+/** Whether or not this update involves changes to the Aiki
+ * configuration (aiki_config table, config.php or .htaccess)
+ * Do NOT put the following value (TRUE or FALSE) in quotes. */
+define("AIKI_UPDATE_CONFIG", false);
+
/* the following error related constants
* are built-in on newer versions of PHP */
if (!defined("E_RECOVERABLE_ERROR")) {
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
