------------------------------------------------------------
revno: 1106
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Tue 2012-02-21 21:12:26 +0100
message:
corrections in upgrader and installer
modified:
assets/apps/installer/installer.php
assets/apps/installer/library.php
assets/apps/upgrader/library.php
assets/themes/default/installer_upgrader.css
libs/Util.php
--
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 'assets/apps/installer/installer.php'
--- assets/apps/installer/installer.php 2012-02-20 18:42:56 +0000
+++ assets/apps/installer/installer.php 2012-02-21 20:12:26 +0000
@@ -339,7 +339,7 @@
if ( !$revisionNumber ){
$revisionNumber = 1099; // installer revision
}
- $db->query("INSERT INTO `aiki`.`aiki_configs` (`config_id`, `config_name`, `config_value`, `config_selector`, `config_important`, `config_weight`) VALUES (NULL, 'AIKI-REVISION', 'i:$revisionNumber;', '*', '1', '10000');");
+ $db->query("INSERT INTO aiki_configs (config_id, config_name, config_value, config_selector, config_important, config_weight) VALUES (NULL, 'AIKI-REVISION', 'i:$revisionNumber;', '*', '1', '10000');");
}
break;
@@ -378,6 +378,8 @@
"<div class='message'><p>" . $t->t("Please, copy this code, create file and paste.")."</p><textarea class='filedump'>". $config_file . "</textarea></div>";
$help = "<div class='help'>" . $t->t("Check permission in directory")."</div>";
}
+
+
break;
case 5:
=== modified file 'assets/apps/installer/library.php'
--- assets/apps/installer/library.php 2012-02-21 13:47:35 +0000
+++ assets/apps/installer/library.php 2012-02-21 20:12:26 +0000
@@ -232,14 +232,12 @@
function sqls(){
global $config, $AIKI_ROOT_DIR;
- $SQLS_DELIMITER = "-- ------------------------------------------------------";
-
$config["ADMIN_PASSWORD"] = substr(md5(uniqid(rand(),true)),1,8);
$config["ADMIN_PASSWORD_MD5_MD5"]= md5(md5($config["ADMIN_PASSWORD"]));
$replace = array (
- "@AIKI_SITE_URL_LEN@"=> strlen($config['$AIKI_SITE_URL']),
- "@AIKI_SITE_URL@" => $config['$AIKI_SITE_URL'],
+ "@AIKI_SITE_URL_LEN@"=> strlen($config['AIKI_SITE_URL']),
+ "@AIKI_SITE_URL@" => $config['AIKI_SITE_URL'],
"@PKG_DATA_DIR_LEN@" => strlen($AIKI_ROOT_DIR),
"@PKG_DATA_DIR@" => $AIKI_ROOT_DIR,
"@ADMIN_USER@"=> $config["ADMIN_USER"],
@@ -257,14 +255,7 @@
"$AIKI_ROOT_DIR/sql/CreateTablesSite.sql",
"$AIKI_ROOT_DIR/sql/InsertDefaultsSite.sql",
"$AIKI_ROOT_DIR/sql/InsertVariable-inSite.sql" );
+
+ return Util::get_sqls_statements($files, $replace, true);
- foreach ($files as $file ){
- if ( file_exists($file) ){
- $ret.= $SQLS_DELIMITER . "\n". preg_replace ("#/\*.*\*/#Us","",@file_get_contents($file));
- // remove coments
- }
- }
-
- return explode($SQLS_DELIMITER, strtr ($ret, $replace));
- // note: files can contain sql_delimeters,
}
=== modified file 'assets/apps/upgrader/library.php'
--- assets/apps/upgrader/library.php 2012-02-06 14:54:24 +0000
+++ assets/apps/upgrader/library.php 2012-02-21 20:12:26 +0000
@@ -107,7 +107,12 @@
<a href='#license' class='toggle'>". $t->t("License") ."</a>
<a href='#authors' class='toggle'>". $t->t("Authors") ."</a>
</div>
- <div id='changelog' class='toggle'>" . Util::get_changelog($revision) ."</div>
+ <div id='changelog' class='toggle'>
+ <div id='revisions'>".
+ $t->t("Last revision").": " . Util::get_last_revision()."<br>".
+ $t->t("Installed revision"). ": " . config("AIKI-REVISION",0,"*") . "
+ </div>".
+ Util::get_changelog($revision) ."</div>
<div id='license' class='toggle'><pre>" . Util::get_license() ."</pre></div>
<div id='authors' class='toggle'><h3>". $t->t("Authors")."</h3>". Util::get_authors("list")."</div>".
select_language() .
@@ -209,7 +214,7 @@
function clean_url($url){
$top= strpos( $url, "/assets/apps/upgrader");
- return ( $top ? substr($url,0,$top) ."/" : $url . "/");
+ return ( $top !== false ? substr($url,0,$top) ."/" : $url . "/");
}
@@ -266,11 +271,14 @@
$ret = "<strong>". $t->t("Update Aiki & Site Data") . "</strong>";
foreach ($files as $file => $message ){
- if ( $sqls = Util::get_sqls_statements($file) ) {
+ if ( $sqls = Util::get_sqls_statements($file,$replaces) ) {
$result = "";
foreach ( $sqls as $i=>$sql ){
+ if ( trim($sql) =="") {
+ continue;
+ }
$db->last_error = false;
- $db->query ( strtr( $sql, $replaces));
+ $db->query ($sql);
if ($db->last_error ){
$result .= "- in $i statement ".substr($sql,0,35) ."...<br>";
}
=== modified file 'assets/themes/default/installer_upgrader.css'
--- assets/themes/default/installer_upgrader.css 2012-02-03 20:26:59 +0000
+++ assets/themes/default/installer_upgrader.css 2012-02-21 20:12:26 +0000
@@ -22,10 +22,8 @@
select,
input {
font: normal normal normal 14px/18px sans-serif ;
-
}
-
#page {
margin: 40px auto;
width: 600px;
@@ -246,8 +244,19 @@
#welcome {
line-height: 1.4em;
padding:12px;
- margin-bottom: 24px;
-}
+ margin-bottom: 12px;
+}
+
+#revisions {
+ color: #000;
+ padding:4px 0px 4px 12px;
+ border-bottom: 1px dashed #000;
+ width: 350px;
+ position: relative;
+ left:-12px;
+ margin-bottom:4px;
+}
+
div.links {
position: relative;
=== modified file 'libs/Util.php'
--- libs/Util.php 2012-02-05 17:33:06 +0000
+++ libs/Util.php 2012-02-21 20:12:26 +0000
@@ -16,7 +16,7 @@
* @filesource
*/
-if(!defined('IN_AIKI')) {
+if(!defined('IN_AIKI')) {
die('No direct script access allowed');
}
@@ -256,17 +256,41 @@
/**
* Returns sql statements contained in the input file. Statements must be
- * separated by a "-- ------------------------------------------------------"
+ * separated by a "-- --[-]*"
*
* @return array of false if file doesn't exist
*/
- public static function get_sqls_statements ( $file ){
+ public static function get_sqls_statements ( $files, $replaces=NULL, $asArray=true) {
$delimiters= "-- ------------------------------------------------------";
- if ( file_exists($file) ) {
- return explode($delimiters, preg_replace ("#/\*.*\*/#Us","" , @file_get_contents($file) ));
- }
- return false;
+
+ if ( !is_array($files) ) {
+ $files = array($files);
+ }
+
+ foreach ( $files as $file ){
+
+ if ( file_exists($file) ) {
+ $sqls .= preg_replace(
+ array(
+ "#^-- --[-]*\$#" , // all delimiters will be corrected..
+ "#^\s*/\*.*\*/#Us" , // initial comments like /* .. */
+ "#^-- [A-z].*\$#Um", // msyql comments like -- some thing
+ "#^--\$#Um"), // msyql comments like --
+ array ( $delimiters ) , // first regex will be replaced by "-- --", rest by "";
+ @file_get_contents($file)).
+ "\n$delimiters";
+ }
+
+ }
+ if ( !is_null( $replaces) ){
+ $sqls = strtr( $sqls, $replaces);
+ }
+ if ( $asArray ) {
+ return explode($delimiters,$sqls);
+ }
+
+ return $sqls;
}
/**
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
