------------------------------------------------------------
revno: 1128
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Tue 2012-03-06 21:43:52 +0100
message:
bug 947810 Notices(error) in upgrader corrected
modified:
assets/apps/upgrader/library.php
assets/apps/upgrader/upgrader.php
libs/membership.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/upgrader/library.php'
--- assets/apps/upgrader/library.php 2012-02-21 20:12:26 +0000
+++ assets/apps/upgrader/library.php 2012-03-06 20:43:52 +0000
@@ -95,6 +95,8 @@
function template($step) {
global $t, $UPGRADER_WELCOME_TEXT;
+ $revision= config("AIKI-REVISION",0,"*");
+
switch ( $step ) {
case 0:
return "<div class='error'>" . $t->t("Update canceled")."</div><div class='error'>%s</div>";
@@ -109,8 +111,8 @@
</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,"*") . "
+ $t->t("Last revision") . ": " . Util::get_last_revision()."<br>".
+ $t->t("Installed revision"). ": " . $revision . "
</div>".
Util::get_changelog($revision) ."</div>
<div id='license' class='toggle'><pre>" . Util::get_license() ."</pre></div>
@@ -176,11 +178,13 @@
break;
case 3:
-
+
$username = stripslashes($_REQUEST["login"] );
$password = md5(md5(stripslashes($_REQUEST["password"] )));
- if ( md5($_REQUEST["captcha"]) != $_SESSION['captcha_key'] ){
+ if (!isset($_REQUEST["captcha"]) ||
+ !isset($_SESSION['captcha_key']) ||
+ md5($_REQUEST["captcha"]) != $_SESSION['captcha_key'] ){
$step=2;
return $t->t("Wrong captcha");
}
@@ -198,12 +202,12 @@
return $t->t("Wrong user name" );
}
- session_start(); // don't remove this line. IT'S NECESSARY
+ session_start(); // don't remove..it necessary.
$_SESSION["updater_is_root"]=1;
return "";
case 4:
- case 5:
+ case 5:
if ( !isset($_SESSION["updater_is_root"])){
$step=2;
}
@@ -218,8 +222,6 @@
}
-
-
function upgradeDB (){
global $t, $AIKI_ROOT_DIR;
@@ -292,7 +294,7 @@
include_once "upgrades.php"; // creates $upgrades array
// filter revision
foreach ( $upgrades as $revision=>$sql ){
- if ( $revision > $REVISION ) {
+ if ( $revision > $lastRevision ) {
$sqls[$revision]= $sql;
}
}
=== modified file 'assets/apps/upgrader/upgrader.php'
--- assets/apps/upgrader/upgrader.php 2012-02-06 14:54:24 +0000
+++ assets/apps/upgrader/upgrader.php 2012-03-06 20:43:52 +0000
@@ -51,11 +51,14 @@
*
*/
-session_start();
+error_reporting(E_ALL);
+
+session_start();
if ( !defined('IN_AIKI') ) {
// upgrader can be called directly.
include ("../../../bootstrap.php");
-}
+}
+
require_once ( "$AIKI_ROOT_DIR/config.php");
require_once ( "$AIKI_ROOT_DIR/libs/Util.php");
@@ -80,7 +83,7 @@
***********************************************************************/
// SET STEP
-$step = (int) $_REQUEST['step'];
+$step = isset( $_REQUEST['step'] ) ? (int) $_REQUEST['step']:0;
if ( $step<0 || $step > steps(-1) ) {
$step=0;
}
=== modified file 'libs/membership.php'
--- libs/membership.php 2012-02-24 02:58:57 +0000
+++ libs/membership.php 2012-03-06 20:43:52 +0000
@@ -89,7 +89,7 @@
$allowGuestSessions = isset($config["allow_guest_sessions"]) &&
$config["allow_guest_sessions"] ;
- if ( $allowGuestSessions || @$_COOKIE["PHPSESSID"] ) {
+ if ( ($allowGuestSessions || @$_COOKIE["PHPSESSID"] ) && !session_id() ) {
session_start();
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
