arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Quick patches:

Browse Source 
- wording changes for creating an account and recovering passwords
 - updated rollover script to copy the conference logo
This commit is contained in:
jacob 2012-02-15 16:36:52 +00:00
parent 680528d387
commit f61b4b94f3
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.inc.php
View File

@ -158,7 +158,7 @@ if(isset($_SESSION['roles']) && $_SESSION['username']) {
<?=i18n("Password")?>:</td><td><input type="password" size="18" name="password" /> <?=i18n("Password")?>:</td><td><input type="password" size="18" name="password" />
</td></tr> </td></tr>
<tr><td style="text-align: center;" colspan="2"> <tr><td style="text-align: center;" colspan="2">
<a href="register.php"><?=i18n("Register")?></a> <a href="register.php"><?=i18n("Create Account")?></a>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<input type="submit" value=<?=i18n("Login")?> /> <input type="submit" value=<?=i18n("Login")?> />
</td></tr> </td></tr>

17
super/conferences.php
View File

@ -399,6 +399,7 @@ function wizard_close(){
<script type=\"text/javascript\"> <script type=\"text/javascript\">
wizard.dialog('close'); wizard.dialog('close');
wizard.remove(); wizard.remove();
$('#conferences').load('conferences.php?action=loadTable');
</script> </script>
"; ";
} }
@ -519,7 +520,7 @@ function build_select_conference_step(){
echo '<div style="margin:1em">'; echo '<div style="margin:1em">';
echo "<table><tr><td colspan=\"2\">"; echo "<table><tr><td colspan=\"2\">";
echo "<select id=\"mastercopy\">"; echo "<select id=\"mastercopy\">";
$query = mysql_query("SELECT * FROM conferences ORDER BY id DESC"); $query = mysql_query("SELECT * FROM conferences WHERE status != 'deleted' ORDER BY id DESC");
while($row = mysql_fetch_assoc($query)){ while($row = mysql_fetch_assoc($query)){
$id = $row['id']; $id = $row['id'];
if($id == $selectedID) $selected = " SELECTED "; if($id == $selectedID) $selected = " SELECTED ";
@ -726,6 +727,7 @@ function copy_conference($params){
rollDates => increment the dates by a year rollDates => increment the dates by a year
name => the new name name => the new name
}*/ }*/
global $config;
// start a list of all tables that have been updated // start a list of all tables that have been updated
$completedTables = array(); $completedTables = array();
@ -952,6 +954,19 @@ function copy_conference($params){
$completedTables[] = 'user_roles'; $completedTables[] = 'user_roles';
if($errorMessage != 'ok'){ wizard_draw_step('error', 'SQL error before line #' . __LINE__ . ': <br/>' . $errorMessage); rollback($newConfId, $completedTables); return false; } if($errorMessage != 'ok'){ wizard_draw_step('error', 'SQL error before line #' . __LINE__ . ': <br/>' . $errorMessage); rollback($newConfId, $completedTables); return false; }
// copy the logo files over as well
$imgPath = $_SERVER['DOCUMENT_ROOT'] . $config['SFIABDIRECTORY'] . "/data";
$listing = scandir($imgPath);
$digits = strlen($oldConfId);
foreach($listing as $fname){
if(preg_match("/^$oldConfId-logo/", $fname)){
$newName = $newConfId . substr($fname, $digits);
shell_exec("cp $imgPath/$fname $imgPath/$newName");
}
}
// WHEW! If we've made it this far, the conference has successfully been copied // WHEW! If we've made it this far, the conference has successfully been copied
// end the previous conference if applicable // end the previous conference if applicable

3
user_login.php
View File

@ -233,8 +233,7 @@ if(isset($_SESSION['accounts_id'])) {
</form> </form>
<br /> <br />
<div style="font-size: 0.75em;"> <?=i18n("<a href=\"$recover_link\">Forgot your password?</a>")?><br />
<?=i18n("If you have lost or forgotten your password, or have misplaced the email with your initial password, please <a href=\"$recover_link\">click here to recover it</a>")?>.</div><br />
<br /> <br />
<? <?
switch($reg_open) { switch($reg_open) {