Menu
▾
▴
webschool-commit — Mailing list that describe new commits to the webschool project
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(183) |
Dec
(82) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(16) |
Feb
(3) |
Mar
|
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Matt M. <pro...@us...> - 2004-11-18 01:30:31
|
Update of /cvsroot/webschool/webschool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773 Modified Files: admin.php mod.php Log Message: Index: mod.php =================================================================== RCS file: /cvsroot/webschool/webschool/mod.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mod.php 17 Nov 2004 23:06:21 -0000 1.16 --- mod.php 18 Nov 2004 01:30:20 -0000 1.17 *************** *** 61,65 **** } else { $module = $modules[$_REQUEST['mod']]; ! include("mods/".$module['dirname']."/index.php"); } --- 61,69 ---- } else { $module = $modules[$_REQUEST['mod']]; ! if( $module['disabled'] != 1 ) { ! if( ($module['permission'] == 1 && $user['id'] != 1) || ($module['permissino'] == 0 )) { ! include("mods/".$module['dirname']."/index.php"); ! } ! } } Index: admin.php =================================================================== RCS file: /cvsroot/webschool/webschool/admin.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** admin.php 6 Nov 2004 19:09:19 -0000 1.29 --- admin.php 18 Nov 2004 01:30:20 -0000 1.30 *************** *** 42,45 **** --- 42,51 ---- } + if($_GET['action'] == "finduser") { + $smarty->display("admin.finduser.tpl"); + include("lib/footer.php"); + die(); + } + //recovering lost password if( $_GET['action'] == "lostpass" ) { |
|
From: Matt M. <pro...@us...> - 2004-11-18 01:30:31
|
Update of /cvsroot/webschool/webschool/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773/lib Modified Files: auth.php Log Message: Index: auth.php =================================================================== RCS file: /cvsroot/webschool/webschool/lib/auth.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** auth.php 10 Nov 2004 05:15:16 -0000 1.6 --- auth.php 18 Nov 2004 01:30:21 -0000 1.7 *************** *** 138,141 **** --- 138,143 ---- $smarty->register_function("ResolveUserID", "ResolveUserID"); } + + //[jsvoyager:] Changed this function so that it doesn't query the // database at least 4 times, which it has been. It desrupts a lot *************** *** 150,156 **** } if($pretty) { ! return Array("fname" => $users[$ID]['fname'], "lname" => $users[$ID]['lname']); } else { ! return $users[$ID]['username']; } --- 152,158 ---- } if($pretty) { ! return Array("fname" => $users[$ID['id']]['fname'], "lname" => $users[$ID['id']]['lname']); } else { ! return $users[$ID['id']]['username']; } |
|
From: Matt M. <pro...@us...> - 2004-11-18 01:30:31
|
Update of /cvsroot/webschool/webschool/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773/mysql Modified Files: webschool.sql Log Message: Index: webschool.sql =================================================================== RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** webschool.sql 17 Nov 2004 23:06:22 -0000 1.46 --- webschool.sql 18 Nov 2004 01:30:21 -0000 1.47 *************** *** 233,253 **** `permname` varchar(12) NOT NULL default '', `filename` varchar(25) NOT NULL default '', - `notified` tinyint(1) NOT NULL default 0, - `installedversion` varchar(6) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `id` (`id`) ) TYPE=MyISAM AUTO_INCREMENT=11 ; ! INSERT INTO `table_amods` VALUES (1, 'News', 'The News aModule', 'news', 'news.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (2, 'Articles', 'The Articles aModule', 'articles', 'articles.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (3, 'Menu', 'The Menu Editor', 'menu', 'menu.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (4, 'Pictures', 'The Pictures aModule', 'pictures', 'pictures.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (5, 'Pages', 'The Pages aModule', 'pages', 'pages.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (6, 'SOTM', 'The SOTM aModule', 'sotm', 'sotm.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (7, 'Newsletters', 'The Newsletters aModule', 'newsletters', 'newsletters.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (8, 'Users', 'The Users aModule', 'users', 'users.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (9, 'Sports', 'The Sports aModule', 'sports', 'sports.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (10, 'Config', 'The configuration editor', 'config', 'config.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (11, 'Academia', 'The Academia Editor', 'academia', 'academia.php', '0.0.6'); DROP TABLE IF EXISTS `table_mods`; --- 233,251 ---- `permname` varchar(12) NOT NULL default '', `filename` varchar(25) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `id` (`id`) ) TYPE=MyISAM AUTO_INCREMENT=11 ; ! INSERT INTO `table_amods` VALUES (1, 'News', 'The News aModule', 'news', 'news.php'); ! INSERT INTO `table_amods` VALUES (2, 'Articles', 'The Articles aModule', 'articles', 'articles.php'); ! INSERT INTO `table_amods` VALUES (3, 'Menu', 'The Menu Editor', 'menu', 'menu.php'); ! INSERT INTO `table_amods` VALUES (4, 'Pictures', 'The Pictures aModule', 'pictures', 'pictures.php'); ! INSERT INTO `table_amods` VALUES (5, 'Pages', 'The Pages aModule', 'pages', 'pages.php'); ! INSERT INTO `table_amods` VALUES (6, 'SOTM', 'The SOTM aModule', 'sotm', 'sotm.php'); ! INSERT INTO `table_amods` VALUES (7, 'Newsletters', 'The Newsletters aModule', 'newsletters', 'newsletters.php'); ! INSERT INTO `table_amods` VALUES (8, 'Users', 'The Users aModule', 'users', 'users.php'); ! INSERT INTO `table_amods` VALUES (9, 'Sports', 'The Sports aModule', 'sports', 'sports.php'); ! INSERT INTO `table_amods` VALUES (10, 'Config', 'The configuration editor', 'config', 'config.php'); ! INSERT INTO `table_amods` VALUES (11, 'Academia', 'The Academia Editor', 'academia', 'academia.php'); DROP TABLE IF EXISTS `table_mods`; *************** *** 257,261 **** `description` varchar(25) NOT NULL default '', `dirname` varchar(25) NOT NULL default '', - `installedversion` varchar(6) NOT NULL default '', `disabled` tinyint(1) NOT NULL default '', `permission` tinyint(1) NOT NULL default '', --- 255,258 ---- |
|
From: Matt M. <pro...@us...> - 2004-11-18 01:30:31
|
Update of /cvsroot/webschool/webschool/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773/admin Modified Files: newsletters.php Log Message: Index: newsletters.php =================================================================== RCS file: /cvsroot/webschool/webschool/admin/newsletters.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newsletters.php 31 Oct 2004 04:21:46 -0000 1.4 --- newsletters.php 18 Nov 2004 01:30:20 -0000 1.5 *************** *** 39,47 **** if( $_REQUEST['op'] == "add" ){ ! db(__FILE__,__LINE__, "SELECT * FROM "._USERS_." WHERE id!='1'"); ! while( $row = dbr() ){ ! $smarty->append("usersel", $row); } - $smarty->display("admin/newsletters.add.tpl"); } } --- 39,51 ---- if( $_REQUEST['op'] == "add" ){ ! if( !isset($_POST['name']) ){ ! db(__FILE__,__LINE__, "SELECT * FROM "._USERS_." WHERE id!='1'"); ! $smarty->display("admin/newsletters.add.tpl"); ! } else { ! db(__FILE__,__LINE__,"SELECT id FROM "._USERS_." WHERE username='".$_POST['moderator']."'"); ! $id = dbr(); ! dbn(__FILE__,__LINE__,"INSERT INTO "._NEWSLETTERS_." SET prettyname='".$_POST['name']."', moderator='".$id['id']."', shortdescription='".$_POST['description']."'"); ! header("LOCATION: "._AMOD_); } } } |
|
From: Matt M. <pro...@us...> - 2004-11-17 23:06:46
|
Update of /cvsroot/webschool/webschool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20058 Modified Files: mod.php Log Message: Nearing public release. Time to get buckling down! Index: mod.php =================================================================== RCS file: /cvsroot/webschool/webschool/mod.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mod.php 10 Nov 2004 00:41:16 -0000 1.15 --- mod.php 17 Nov 2004 23:06:21 -0000 1.16 *************** *** 35,72 **** if ( is_file(_fileroot_."mods/".$item)){ //what is a file doing here? - echo "Unknown file found!"; - } elseif ( is_dir(_fileroot_."mods/".$item) ){ - - foreach ($modules as $k=>$v) { - if ($v['dirname'] == $item) { - $modules[$k]['found'] = true; - } - } - foreach ($modules as $k=>$v) { ! if( $modules[$k]['found'] !== true ) { ! echo "PROBLEM in $v"; ! } } - } } } } else { error(__FILE__,__LINE__, "!Error opening modules!", "accessdenied", true); } - print_array($modules); - - if($_REQUEST['mod'] != "") { - - $mod = dbr(); - include("mods/".$modules[$_REQUEST['mod']]['dirname']."/index.php"); } include("lib/footer.php"); ?> \ No newline at end of file --- 35,67 ---- if ( is_file(_fileroot_."mods/".$item)){ //what is a file doing here? } elseif ( is_dir(_fileroot_."mods/".$item) ){ foreach ($modules as $k=>$v) { ! if ($v['dirname'] == $item) { ! $modules[$k]['found'] = 1; ! } } } } } + foreach ($modules as $k=>$v) { + if( $modules[$k]['found'] != true ) { + echo "A problem has occured in: ".$v['name']; + } + } } else { error(__FILE__,__LINE__, "!Error opening modules!", "accessdenied", true); } + if($_REQUEST['mod'] == "") { + echo "!NO MOD DECLARED!"; + } else { + $module = $modules[$_REQUEST['mod']]; + include("mods/".$module['dirname']."/index.php"); } + include("lib/footer.php"); ?> \ No newline at end of file |
|
From: Matt M. <pro...@us...> - 2004-11-17 23:06:32
|
Update of /cvsroot/webschool/webschool/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20058/mysql Modified Files: webschool.sql Log Message: Nearing public release. Time to get buckling down! Index: webschool.sql =================================================================== RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** webschool.sql 10 Nov 2004 00:41:17 -0000 1.45 --- webschool.sql 17 Nov 2004 23:06:22 -0000 1.46 *************** *** 258,273 **** `dirname` varchar(25) NOT NULL default '', `installedversion` varchar(6) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `id` (`id`) ) TYPE=MyISAM AUTO_INCREMENT=9 ; ! INSERT INTO `table_mods` VALUES (1, 'Academia', 'The Academia Module', 'Academia', ''); ! INSERT INTO `table_mods` VALUES (2, 'Articles', 'The Articles Module', 'Article', ''); ! INSERT INTO `table_mods` VALUES (3, 'Pages', 'The Pages Module', 'Pages', ''); ! INSERT INTO `table_mods` VALUES (4, 'SOTM', 'The SOTM Module', 'SOTM', ''); ! INSERT INTO `table_mods` VALUES (5, 'News', 'The News Module', 'News', ''); ! INSERT INTO `table_mods` VALUES (6, 'Newsletters', 'The Newsletter Module', 'Newsletters', ''); ! INSERT INTO `table_mods` VALUES (7, 'SC', 'The StudentCenter Index AddOn Module', 'StudentCenter', ''); ! INSERT INTO `table_mods` VALUES (8, 'TC', 'The TeacherCenter Index AddOn Module', 'TeacherCenter', ''); --- 258,275 ---- `dirname` varchar(25) NOT NULL default '', `installedversion` varchar(6) NOT NULL default '', + `disabled` tinyint(1) NOT NULL default '', + `permission` tinyint(1) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `id` (`id`) ) TYPE=MyISAM AUTO_INCREMENT=9 ; ! INSERT INTO `table_mods` VALUES (1, 'Academia', 'The Academia Module', 'Academia', 0, 0); ! INSERT INTO `table_mods` VALUES (2, 'Articles', 'The Articles Module', 'Article', 0 , 0); ! INSERT INTO `table_mods` VALUES (3, 'Pages', 'The Pages Module', 'Pages', 0, 0); ! INSERT INTO `table_mods` VALUES (4, 'SOTM', 'The SOTM Module', 'SOTM', 0, 0); ! INSERT INTO `table_mods` VALUES (5, 'News', 'The News Module', 'News', 0, 0); ! INSERT INTO `table_mods` VALUES (6, 'Newsletters', 'The Newsletter Module', 'Newsletters', 0, 0); ! INSERT INTO `table_mods` VALUES (7, 'SC', 'The StudentCenter Index AddOn Module', 'StudentCenter', 0, 0); ! INSERT INTO `table_mods` VALUES (8, 'TC', 'The TeacherCenter Index AddOn Module', 'TeacherCenter', 0, 0); |
|
From: jsvoyager <jsv...@us...> - 2004-11-10 05:15:25
|
Update of /cvsroot/webschool/webschool/theme/templates/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13763/theme/templates/admin Modified Files: academia.addclass.tpl academia.tpl Log Message: Work on academia aMod. No where near done, but decided to commit anyway. The structure is there, if someone would like to jump in and help Index: academia.tpl =================================================================== RCS file: /cvsroot/webschool/webschool/theme/templates/admin/academia.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** academia.tpl 2 Nov 2004 03:57:40 -0000 1.1 --- academia.tpl 10 Nov 2004 05:15:16 -0000 1.2 *************** *** 4,8 **** {else} <!-- Classes --> ! <p class="over-title">{if $perm.academia <= 1}{$lang.aca.your}{/if}{$lang.aca.classes}</p> <table cellpadding="0" cellspacing="0" border="0" width="100%"> <tr class="title"> --- 4,8 ---- {else} <!-- Classes --> ! <p class="over-title">{if $perm.academia <= 1}{$lang.aca.your} {/if}{$lang.aca.classes}</p> <table cellpadding="0" cellspacing="0" border="0" width="100%"> <tr class="title"> *************** *** 12,20 **** {/if} {if $perm.academia >= 3} ! <td width="75">{$lang.aca.modify}</td> ! <td width="75">{$lang.aca.delete}</td> {/if} ! <td>{$lang.aca.clear_assign}</td> ! <td width="100">{$lang.aca.clear_files}</td> </tr> --- 12,20 ---- {/if} {if $perm.academia >= 3} ! <td width="70">{$lang.aca.modify}</td> ! <td width="70">{$lang.aca.delete}</td> {/if} ! <td width="135">{$lang.aca.clear_assign}</td> ! <td width="90">{$lang.aca.clear_files}</td> </tr> *************** *** 22,48 **** <tr> <td class="field-title">{$classes[i].name}</td> <td>{$classes[i].teacher}</td> {if $perm.academia >= 3} <td><a href="{$AMOD}&op=modify&aid={$classes[i].aid}">{$lang.aca.modify_token}</a></td> <td><a href="{$AMOD}&op=delete&aid={$classes[i].aid}">{$lang.aca.delete_token}</a></td> {/if} ! <td><a href="{$AMOD}&op=clearassign&aid={$classes[i].aid}">{$lang.aca.clear_assign_token}</a></td> ! <td><a href="{$AMOD}&op=clearfiles&aid={$classes[i].aid}">{$lang.aca.clear_files_token}</td> </tr> {/section} ! {* Final "gloabals" section *} <tr bgcolor="#E6E6FA"> {if $perm.academia >= 3} <td colspan="4"><a href="{$AMOD}&op=addclass">{$lang.aca.add_class}...</a></td> <td><a href="{$AMOD}&op=clearassign">{$lang.aca.clear_all_assign}</a></td> ! <td><a href="{$AMOD}&op=clearfiles">{$lang.aca.clear_all_files}</a></td> {elseif $perm.academia == 2} <td colspan="2"> </td> <td><a href="{$AMOD}&op=clearassign">{$lang.aca.clear_all_assign}</a></td> ! <td><a href="{$AMOD}&op=clearfiles">{$lang.aca.clear_all_files}</a></td> {elseif $perm.academia <= 1} <td> </td> <td><a href="{$AMOD}&op=clearassign">{$lang.aca.clear_all_assign}</a></td> ! <td><a href="{$AMOD}&op=clearfiles">{$lang.aca.clear_all_files}</a></td> {/if} </tr> --- 22,50 ---- <tr> <td class="field-title">{$classes[i].name}</td> + {if $perm.academia >= 2} <td>{$classes[i].teacher}</td> + {/if} {if $perm.academia >= 3} <td><a href="{$AMOD}&op=modify&aid={$classes[i].aid}">{$lang.aca.modify_token}</a></td> <td><a href="{$AMOD}&op=delete&aid={$classes[i].aid}">{$lang.aca.delete_token}</a></td> {/if} ! <td><a href="{$AMOD}&op=clearassign&aid={$classes[i].aid}">{$lang.aca.clear_token}</a></td> ! <td><a href="{$AMOD}&op=clearfiles&aid={$classes[i].aid}">{$lang.aca.clear_token}</a></td> </tr> {/section} ! {* Finally, "gloabals" section *} <tr bgcolor="#E6E6FA"> {if $perm.academia >= 3} <td colspan="4"><a href="{$AMOD}&op=addclass">{$lang.aca.add_class}...</a></td> <td><a href="{$AMOD}&op=clearassign">{$lang.aca.clear_all_assign}</a></td> ! <td><a href="{$AMOD}&op=clearfile">{$lang.aca.clear_all_files}</a></td> {elseif $perm.academia == 2} <td colspan="2"> </td> <td><a href="{$AMOD}&op=clearassign">{$lang.aca.clear_all_assign}</a></td> ! <td><a href="{$AMOD}&op=clearfile">{$lang.aca.clear_all_files}</a></td> {elseif $perm.academia <= 1} <td> </td> <td><a href="{$AMOD}&op=clearassign">{$lang.aca.clear_all_assign}</a></td> ! <td><a href="{$AMOD}&op=clearfile">{$lang.aca.clear_all_files}</a></td> {/if} </tr> *************** *** 50,56 **** <!-- Assignments --> ! <!-- Submited Files --> {/if} --- 52,95 ---- <!-- Assignments --> + <p class="over-title">{if $perm.academia <= 1}{$lang.aca.your} {/if}{$lang.aca.assign}</p> + <table cellpadding="0" cellspacing="0" border="0" width="100%"> + <tr class="title"> + <td width="100">{$lang.aca.class_name}</td> + <td>{$lang.aca.title}</td> + <td width="100">{$lang.aca.due}</td> + <td width="70">{$lang.aca.modify}</td> + <td width="70">{$lang.aca.delete}</td> + <td width="100">{$lang.aca.clear_files}</td> + </tr> + {section name=i2 loop=$assigns} + <tr> + {if $assigns[i2].aid != $assigns[i2.index_prev].aid} + <td class="field-title">{$assigns[i2].classname}</td> + {else} + <td> </td> + {/if} + <td>{$assigns[i2].title}</td> + <td>{$assigns[i2].due|date_format:"%b %e, %Y"}</td> + <td><a href="{$AMOD}&op=modify&assign={$assigns[i2].id}">{$lang.aca.modify_token}</a></td> + <td><a href="{$AMOD}&op=delete&assign={$assigns[i2].id}">{$lang.aca.delete_token}</a></td> + <td><a href="{$AMOD}&op=clearassign&assign={$assigns[i2].id}">{$lang.aca.clear_token}</a></td> + </tr> + {/section} + {* "Globals" Section*} + <tr bgcolor="#E6E6FA"> + <td colspan="5"><a href="{$AMOD}&op=addassign">{$lang.aca.addassign}...</a></td> + <td colspan="5"><a href="{$AMOD}&op=clearfile">{$lang.aca.clear_all_files}</a></td> + </tr> ! </table> ! ! <!-- Student's Submited Files --> ! <p class="over-title">{$lang.aca.studfiles}</p> ! Hey, guess what...we haven't even started file submiition yet! ! ! <!-- Teacher's Attached Files --> ! <p class="over-title">{$lang.aca.teachfiles}</p> ! Hey, guess what...we haven't even started file submiition yet! {/if} Index: academia.addclass.tpl =================================================================== RCS file: /cvsroot/webschool/webschool/theme/templates/admin/academia.addclass.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** academia.addclass.tpl 2 Nov 2004 03:57:40 -0000 1.1 --- academia.addclass.tpl 10 Nov 2004 05:15:16 -0000 1.2 *************** *** 1,7 **** {include file="tablehead.tpl" tbtitle=$lang.aca.academia} {if $perm.academia < 3} {$lang.auth_denied} {else} ! I really did plan to work on this... {/if} {include file="tablefoot.tpl"} \ No newline at end of file --- 1,46 ---- + {* + GIANT NOTE: This template handles both adding a class and modifying one... + + *} {include file="tablehead.tpl" tbtitle=$lang.aca.academia} {if $perm.academia < 3} {$lang.auth_denied} {else} ! <form action="{$AMOD}&op=addclass" method="post"> ! {if $aid!=""} ! {* We've got a modification going on.... The addclass section of the academia.php script ! looks for this hidden element to know if we need to update or delete *} ! <input type="hidden" name="aid" value="{$aid}"> ! {/if} ! <table width="100%" border="0"> ! <tr> ! <td class="field-title" width="25%">{$lang.aca.class_name}:</td> ! <td><input type="text" name="name" value="{$name}" size="50" /></td> ! </tr> ! <tr> ! <td class="field-title">{$lang.aca.teacher}:</td> ! <td>{html_option_users where="role='instructor'" selected=$uid name="uid"}</td> ! </tr> ! <tr> ! <td class="field-title">{$lang.aca.grades}:</td> ! <td><input type="text" name="grades" value="{$grades}" size="30" /></td> ! </tr> ! <tr> ! <td class="field-title">{$lang.aca.credits}:</td> ! <td><input type="text" name="credits" value="{$credits}" size="30" /></td> ! </tr> ! <tr> ! <td class="field-title">{$lang.aca.short} {$lang.aca.desc}:</td> ! <td><input type="text" name="shortdesc" value="{$shortdesc}" size="50" /></td> ! </tr> ! <tr> ! <td class="field-title">{$lang.aca.long} {$lang.aca.desc}:</td> ! <td><textarea name="longdesc" rows="5" cols="49">{$longdesc}</textarea></td> ! </tr> ! <tr> ! <td colspan="2"><input type="submit" value="{if $aid!=""}{$lang.aca.modify_class}{else}{$lang.aca.add_class}{/if}" /></td> ! </tr> ! </table> ! </form> {/if} {include file="tablefoot.tpl"} \ No newline at end of file |
|
From: jsvoyager <jsv...@us...> - 2004-11-10 05:15:25
|
Update of /cvsroot/webschool/webschool/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13763/lib Modified Files: auth.php mainfile.php Log Message: Work on academia aMod. No where near done, but decided to commit anyway. The structure is there, if someone would like to jump in and help Index: auth.php =================================================================== RCS file: /cvsroot/webschool/webschool/lib/auth.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** auth.php 6 Nov 2004 19:09:21 -0000 1.5 --- auth.php 10 Nov 2004 05:15:16 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- Developers & Contributors: ProgrammerMatt Pro...@bl... + jsvoyager Gen...@gm... This program is free software; you can redistribute it and/or modify it under the *************** *** 28,31 **** --- 29,43 ---- $remoteip = getenv("REMOTE_ADDR"); + //initialize user*s* var, which is used with the + // ResolveUserID function + $query = "SELECT * FROM "._USERS_; + db(__FILE__,__LINE__, $query); + + while($user = dbr()){ + $users[$user['id']]['fname'] = $user['fname']; + $users[$user['id']]['lname'] = $user['lname']; + $users[$user['id']]['username'] = $user['username']; + } + //initialize user var $user = ""; *************** *** 126,130 **** --- 138,147 ---- $smarty->register_function("ResolveUserID", "ResolveUserID"); } + //[jsvoyager:] Changed this function so that it doesn't query the + // database at least 4 times, which it has been. It desrupts a lot + // of db related proccesses use function db() and dbr() plus taxes + // the database unessasarly Function ResolveUserID($ID, $pretty = false) { + global $users; ///Get the users array, manufactured above.... if( is_array($ID) ){ //coming from smarty, different handeling *************** *** 132,142 **** extract($ID); } - - db(__FILE__,__LINE__,"SELECT * FROM "._USERS_." WHERE id='".$ID."'"); - $result = dbr(); if($pretty) { ! return Array("fname" => $result['fname'], "lname" => $result['lname']); } else { ! return $result['username']; } --- 149,156 ---- extract($ID); } if($pretty) { ! return Array("fname" => $users[$ID]['fname'], "lname" => $users[$ID]['lname']); } else { ! return $users[$ID]['username']; } Index: mainfile.php =================================================================== RCS file: /cvsroot/webschool/webschool/lib/mainfile.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mainfile.php 6 Nov 2004 02:41:41 -0000 1.5 --- mainfile.php 10 Nov 2004 05:15:16 -0000 1.6 *************** *** 33,39 **** //load the all important config library! ! include("config.php"); //make sure it is installed and configured for the 0.0.3 version (future upgrade stuff) ! if( !_installed_ || _webschoolversion_ != "0.0.6a" ) { header("Location: install/install.php"); } --- 33,39 ---- //load the all important config library! ! include("lib/config.php"); //make sure it is installed and configured for the 0.0.3 version (future upgrade stuff) ! if( (!_installed_) || (_webschoolversion_ != "0.0.6a") ) { header("Location: install/install.php"); } *************** *** 88,90 **** --- 88,120 ---- } } + + ///This function, used in smarty, creates an option list with the names of user with given criteria + $smarty->register_function("html_option_users", "html_option_users"); + function html_option_users($args){ + //First get the users they wanted by getting the option they pased in the "where" arg + $query = "SELECT * FROM "._USERS_; + if (isset($args['where'])){ + $query .= " WHERE " . $args['where']; + } + db4(__FILE__,__LINE__,$query); + + $answer = "<select name=\"" . $args['name'] . "\" size=\"0\">"; + + + while ($curr_user = $dbr4()){ + //See if this is supposed to be selected... + if ($args['selected'] == $curr_user['id']){ + $select = " selected=\"selected\""; + }else{ + $select = ""; + } + + $answer .= "<option value=\"" . $curr_user['id'] . $select . "\">" . $curr_user['fname'] . " " . + $curr_user['lname'] . "</option>"; + + } + $answer .= "</select>"; + echo $answer; + return $answer; + } ?> \ No newline at end of file |
|
From: jsvoyager <jsv...@us...> - 2004-11-10 05:15:25
|
Update of /cvsroot/webschool/webschool/lang/english/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13763/lang/english/admin Modified Files: academia.lang.php Log Message: Work on academia aMod. No where near done, but decided to commit anyway. The structure is there, if someone would like to jump in and help Index: academia.lang.php =================================================================== RCS file: /cvsroot/webschool/webschool/lang/english/admin/academia.lang.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** academia.lang.php 2 Nov 2004 03:57:39 -0000 1.1 --- academia.lang.php 10 Nov 2004 05:15:16 -0000 1.2 *************** *** 1,9 **** <? ! $lang['aca']['academia'] = "Academia"; ! $lang['aca']['class_name'] = "Class's Name"; ! $lang['aca']['teacher'] = "Instructor"; ! $lang['aca']['grades'] = "Grades"; ! $lang['aca']['credits'] = "Credits"; ! $lang['aca']['desc'] = "Description"; $lang['aca']['modify'] = "Modify"; $lang['aca']['modify_token'] = "Modify"; --- 1,4 ---- <? ! //General $lang['aca']['modify'] = "Modify"; $lang['aca']['modify_token'] = "Modify"; *************** *** 11,16 **** $lang['aca']['delete_token'] = "X"; $lang['aca']['clear_assign'] = "Clear Assignments"; - $lang['aca']['clear_assign_token'] = "Clear"; $lang['aca']['clear_files'] = "Clear Files"; $lang['aca']['clear_files_token'] = "Clear"; $lang['aca']['your'] = "Your"; --- 6,21 ---- $lang['aca']['delete_token'] = "X"; $lang['aca']['clear_assign'] = "Clear Assignments"; $lang['aca']['clear_files'] = "Clear Files"; + $lang['aca']['clear_token'] = "Clear"; + + //Classes + $lang['aca']['academia'] = "Academia"; + $lang['aca']['class_name'] = "Class's Name"; + $lang['aca']['teacher'] = "Instructor"; + $lang['aca']['grades'] = "Grades"; + $lang['aca']['credits'] = "Credits"; + $lang['aca']['short'] = "Short"; //Only used with Description, so make mask/fem for the word "description" + $lang['aca']['long'] = "Long"; //Only used with Description, so make mask/fem for the word "description" + $lang['aca']['desc'] = "Description"; $lang['aca']['clear_files_token'] = "Clear"; $lang['aca']['your'] = "Your"; *************** *** 18,22 **** --- 23,43 ---- $lang['aca']['add_class'] = "Add Class"; $lang['aca']['clear_all_assign'] = "Clear All Assignments"; + $lang['aca']['modify_class'] = "Modify Class"; + $lang['aca']['add_class'] = "Add Class"; + + //Assignments + $lang['aca']['assign'] = "Assignments"; + $lang['aca']['due'] = "Date Due"; + $lang['aca']['title'] = "Title"; + $lang['aca']['download'] = "Download Students' Files"; + $lang['aca']['download_token'] = "Download"; + $lang['aca']['addassign'] = "Add Assignment"; $lang['aca']['clear_all_files'] = "Clear All Files"; + //Student's Submited Files + $lang['aca']['studfiles'] = "Student's Submitted Files"; + + //Teacher's Attached Files + $lang['aca']['teachfiles'] = "Teacher's Attached Files"; + ?> \ No newline at end of file |
|
From: jsvoyager <jsv...@us...> - 2004-11-10 05:15:24
|
Update of /cvsroot/webschool/webschool/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13763/install Modified Files: install.php Log Message: Work on academia aMod. No where near done, but decided to commit anyway. The structure is there, if someone would like to jump in and help Index: install.php =================================================================== RCS file: /cvsroot/webschool/webschool/install/install.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** install.php 30 Oct 2004 02:59:35 -0000 1.11 --- install.php 10 Nov 2004 05:15:15 -0000 1.12 *************** *** 26,30 **** if (!isset($_COOKIE['install_usr'])){ //They haven't verified yet...so let's do that ! if (!file_exists("../config.php") ){ //No config file, they're legit, so let them go setinstallcookie(); --- 26,30 ---- if (!isset($_COOKIE['install_usr'])){ //They haven't verified yet...so let's do that ! if (!file_exists("../lib/config.php") ){ //No config file, they're legit, so let them go setinstallcookie(); *************** *** 33,37 **** } ! include("../config.php"); if (isset($_POST['admin_pass'])){ //Now we need to get the admin's pass to let them go on --- 33,37 ---- } ! include("../lib/config.php"); if (isset($_POST['admin_pass'])){ //Now we need to get the admin's pass to let them go on |
|
From: jsvoyager <jsv...@us...> - 2004-11-10 05:15:24
|
Update of /cvsroot/webschool/webschool/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13763/admin Modified Files: academia.php Log Message: Work on academia aMod. No where near done, but decided to commit anyway. The structure is there, if someone would like to jump in and help Index: academia.php =================================================================== RCS file: /cvsroot/webschool/webschool/admin/academia.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** academia.php 2 Nov 2004 03:57:38 -0000 1.1 --- academia.php 10 Nov 2004 05:15:15 -0000 1.2 *************** *** 37,56 **** // do... ////////////////////////// ! if ($_GET['op'] == "addclass"){ ! if (isset($_POST['classname'])){ ! //Add Class to DB }else{ //Show the add class page $smarty->display("admin/academia.addclass.tpl"); } ! } //+++Logic for academia.tpl+++ ! //Get all classes from database $query = "SELECT * FROM "._ACADEMIA_; if ($perm['academia'] <= 1){ ! $query .= " WHERE id='" . $user[id] . "'"; } db3(__FILE__,__LINE__,$query); --- 37,135 ---- // do... ////////////////////////// ! if ($_GET['op'] == "addclass" && $perm['academia'] >= 3){ ! //Add Class ! if (isset($_POST['name'])){ ! //Add Class to DB/Update class ! $modify = false; ! if (isset($_POST['aid'])){ ! $modify = true; ! } ! ! //Prepare the Query ! if ($modify){ ! $query = "UPDATE "._ACADEMIA_." SET "; ! }else{ ! $query = "INSERT INTO "._ACADEMIA_." (classname, instructor, grades, shortdescription, " . ! "credits, longdescription) VALUES ('"; ! } ! if ($modify){ ! $query .= "classname='" . $_POST['name'] . "', instructor='" . $_POST['uid'] . "', grades='" . ! $_POST['grades'] . "', shortdescription='" . $_POST['shortdesc'] . "', credits='" . ! $_POST['credits'] . "', longdescription='" . $_POST['longdesc'] . "' WHERE id='" . ! $_POST['aid'] . "'"; ! }else{ ! $query .= $_POST['name'] . "','" . $_POST['uid'] . "','" . $_POST['grades'] . "','" . ! $_POST['shortdesc'] . "','" . $_POST['credits'] . "','" . $_POST['longdesc'] . "')"; ! } ! ! dbn(__FILE__,__LINE__,$query); ! ! Header("Location: {$AMOD}"); }else{ //Show the add class page $smarty->display("admin/academia.addclass.tpl"); } ! }elseif ($_GET['op'] == "addassign"){ ! //Add assignment ! ! //(As of current, assignments are added by TeacherCenter. UhOh. We might change ! // this latter. For right now, direct to TC's utility) ! Header("Location: mod.php?mod=TC&op=addassign"); ! }elseif ($_GET['op'] == "modify"){ ! if (isset($_GET['aid'])){ ! //Modify a class ! $query = "SELECT * FROM "._ACADEMIA_." WHERE id='". $_GET['aid'] . "' LIMIT 0,1"; ! db2(__FILE__,__LINE__,$query); ! ! $class = dbr2(); ! $smarty->assign("aid", $class['id']); ! $smarty->assign("name", $class['classname']); ! $smarty->assign("uid", $class['instructor']); ! $smarty->assign("grades", $class['grades']); ! $smarty->assign("shortdesc", $class['shortdescription']); ! $smarty->assign("credits", $class['credits']); ! $smarty->assign("longdesc", $class['longdescription']); ! $smarty->display("admin/academia.addclass.tpl"); //Updating handeled by addclass above ! }elseif (isset($_GET['assign'])){ ! //Modify an assignment ! }else{ ! error(__FILE__,__LINE__,"Unknown: What to modify", -1, true); ! } ! }elseif ($_GET['op'] == "delete"){ ! if (isset($_GET['aid'])){ ! //Delete a class ! }elseif (isset($_GET['assign'])){ ! //Delete an assignment ! }else{ ! error(__FILE__,__LINE__,"Unknown: What to delete", -1, true); ! } ! }elseif ($_GET['op'] == "clearassign"){ ! if (isset($_GET['aid'])){ ! //Delete all assignments from a class ! }elseif (isset($_GET['assign'])){ ! //Delete a single assignments ! }else{ ! //No specific given, so clear all assignments from all (owned) classes ! } ! }elseif ($_GET['op'] == "clearfile"){ ! if (isset($_GET['aid'])){ ! //Delete all files from a class ! }elseif (isset($_GET['assign'])){ ! //Delete all files associated with a give assignenment ! }elseif (isset($_GET['file'])){ ! //Delete a specific file ! }else{ ! //No specific given, so clear all files from all (owned) classes ! } } //+++Logic for academia.tpl+++ ! ///////////////////////////////// ! //Get classes from database ! //////////////////////////////// $query = "SELECT * FROM "._ACADEMIA_; if ($perm['academia'] <= 1){ ! $query .= " WHERE instructor='" . $user[id] . "'"; } db3(__FILE__,__LINE__,$query); *************** *** 63,66 **** --- 142,146 ---- $name = $name['fname'] . " " . $name['lname']; $classes[$i]['teacher'] = $name; + $assignment_classes[$class['id']] = $class['classname']; //Use below in the assignments section $i++; *************** *** 68,71 **** --- 148,177 ---- $smarty->assign("classes", $classes); + + ///////////////////////////////// + //Get assignments from database + //////////////////////////////// + $query = "SELECT * FROM "._ASSIGNMENTS_; + if ($perm['academia'] <= 1){ + $query .= " WHERE aid='"; + foreach($assignment_classes as $aid => $classname){ + $query .= $aid . ","; + } + $query .= $assignment_classes[0] . "'"; + } + $query .= " ORDER BY aid ASC"; + db2(__FILE__,__LINE__, $query); + + $i = 0; + while ($assign = dbr2()){ + $assigns[$i]['id'] = $assign['id']; + $assigns[$i]['aid'] = $assign['aid']; + $assigns[$i]['classname'] = $assignment_classes[$assign['aid']]; + $assigns[$i]['due'] = strtotime($assign['due']); + $assigns[$i]['title'] = $assign['title']; + $i++; + } + $smarty->assign("assigns", $assigns); + } |
|
From: Matt M. <pro...@us...> - 2004-11-10 00:41:30
|
Update of /cvsroot/webschool/webschool/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22992/mysql Modified Files: webschool.sql Log Message: not much starting new module loader now... Index: webschool.sql =================================================================== RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** webschool.sql 8 Nov 2004 08:37:04 -0000 1.44 --- webschool.sql 10 Nov 2004 00:41:17 -0000 1.45 *************** *** 233,236 **** --- 233,237 ---- `permname` varchar(12) NOT NULL default '', `filename` varchar(25) NOT NULL default '', + `notified` tinyint(1) NOT NULL default 0, `installedversion` varchar(6) NOT NULL default '', PRIMARY KEY (`id`), *************** *** 238,252 **** ) TYPE=MyISAM AUTO_INCREMENT=11 ; ! INSERT INTO `table_amods` VALUES (1, 'News', 'The News aModule', 'news', 'news.php', ''); ! INSERT INTO `table_amods` VALUES (2, 'Articles', 'The Articles aModule', 'articles', 'articles.php', ''); ! INSERT INTO `table_amods` VALUES (3, 'Menu', 'The Menu Editor', 'menu', 'menu.php', ''); ! INSERT INTO `table_amods` VALUES (4, 'Pictures', 'The Pictures aModule', 'pictures', 'pictures.php', ''); ! INSERT INTO `table_amods` VALUES (5, 'Pages', 'The Pages aModule', 'pages', 'pages.php', ''); ! INSERT INTO `table_amods` VALUES (6, 'SOTM', 'The SOTM aModule', 'sotm', 'sotm.php', ''); ! INSERT INTO `table_amods` VALUES (7, 'Newsletters', 'The Newsletters aModule', 'newsletters', 'newsletters.php', ''); ! INSERT INTO `table_amods` VALUES (8, 'Users', 'The Users aModule', 'users', 'users.php', ''); ! INSERT INTO `table_amods` VALUES (9, 'Sports', 'The Sports aModule', 'sports', 'sports.php', ''); ! INSERT INTO `table_amods` VALUES (10, 'Config', 'The configuration editor', 'config', 'config.php', ''); ! INSERT INTO `table_amods` VALUES (11, 'Academia', 'The Academia Editor', 'academia', 'academia.php', ''); DROP TABLE IF EXISTS `table_mods`; --- 239,253 ---- ) TYPE=MyISAM AUTO_INCREMENT=11 ; ! INSERT INTO `table_amods` VALUES (1, 'News', 'The News aModule', 'news', 'news.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (2, 'Articles', 'The Articles aModule', 'articles', 'articles.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (3, 'Menu', 'The Menu Editor', 'menu', 'menu.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (4, 'Pictures', 'The Pictures aModule', 'pictures', 'pictures.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (5, 'Pages', 'The Pages aModule', 'pages', 'pages.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (6, 'SOTM', 'The SOTM aModule', 'sotm', 'sotm.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (7, 'Newsletters', 'The Newsletters aModule', 'newsletters', 'newsletters.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (8, 'Users', 'The Users aModule', 'users', 'users.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (9, 'Sports', 'The Sports aModule', 'sports', 'sports.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (10, 'Config', 'The configuration editor', 'config', 'config.php', '0.0.6'); ! INSERT INTO `table_amods` VALUES (11, 'Academia', 'The Academia Editor', 'academia', 'academia.php', '0.0.6'); DROP TABLE IF EXISTS `table_mods`; *************** *** 300,302 **** `month` int(11) NOT NULL default '', PRIMARY KEY (`id`) ! ) TYPE=MyISAM AUTO_INCREMENT=1;; --- 301,303 ---- `month` int(11) NOT NULL default '', PRIMARY KEY (`id`) ! ) TYPE=MyISAM AUTO_INCREMENT=1; |
|
From: Matt M. <pro...@us...> - 2004-11-10 00:41:25
|
Update of /cvsroot/webschool/webschool/mods/SOTM In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22992/mods/SOTM Modified Files: index.php Log Message: not much starting new module loader now... Index: index.php =================================================================== RCS file: /cvsroot/webschool/webschool/mods/SOTM/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.php 31 Oct 2004 04:21:47 -0000 1.5 --- index.php 10 Nov 2004 00:41:17 -0000 1.6 *************** *** 41,45 **** $thedate = mktime(0,0,0,date("m"),1,date("Y")); $smarty->assign("thedate", $thedate); ! db(__FILE__,__LINE__, "Select * From sotm Where date='".$thedate."'"); $res = dbr(); $smarty->assign("fname", $res['fname']); --- 41,45 ---- $thedate = mktime(0,0,0,date("m"),1,date("Y")); $smarty->assign("thedate", $thedate); ! db(__FILE__,__LINE__, "Select * From "._SOTM_." Where date='".$thedate."'"); $res = dbr(); $smarty->assign("fname", $res['fname']); *************** *** 51,55 **** $smarty->assign("thedate", $thedate); ! db(__FILE__,__LINE__, "Select * From sotm Where date='".$thedate."'"); $res = dbr(); $smarty->assign("fname", $res['fname']); --- 51,55 ---- $smarty->assign("thedate", $thedate); ! db(__FILE__,__LINE__, "Select * From "._SOTM_." Where date='".$thedate."'"); $res = dbr(); $smarty->assign("fname", $res['fname']); *************** *** 58,62 **** $smarty->assign("sename", $res['sename']); } ! db(__FILE__,__LINE__,"Select date From sotm"); $i = 0; $months = ""; --- 58,62 ---- $smarty->assign("sename", $res['sename']); } ! db(__FILE__,__LINE__,"Select date From "._SOTM_.""); $i = 0; $months = ""; *************** *** 73,77 **** Function getpic() { ! db(__FILE__,__LINE__,"Select ".$_GET['grade']."pic, ".$_GET['grade']."type From sotm Where date='".$_GET['date']."'"); $res = dbr(); header("Content-Type: " . $res[''.$_GET['grade'].'type']); --- 73,77 ---- Function getpic() { ! db(__FILE__,__LINE__,"Select ".$_GET['grade']."pic, ".$_GET['grade']."type From "._SOTM_." Where date='".$_GET['date']."'"); $res = dbr(); header("Content-Type: " . $res[''.$_GET['grade'].'type']); |
|
From: Matt M. <pro...@us...> - 2004-11-10 00:41:25
|
Update of /cvsroot/webschool/webschool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22992 Modified Files: mod.php Log Message: not much starting new module loader now... Index: mod.php =================================================================== RCS file: /cvsroot/webschool/webschool/mod.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mod.php 31 Oct 2004 04:21:46 -0000 1.14 --- mod.php 10 Nov 2004 00:41:16 -0000 1.15 *************** *** 20,29 **** include("lib/header.php"); ! if($_REQUEST['mod'] != "") { ! db(__FILE__,__LINE__,"Select * FROM "._MODS_." Where name='".$_REQUEST['mod']."'"); ! $mod = dbr(); ! include("mods/".$mod['dirname']."/index.php"); } --- 20,70 ---- include("lib/header.php"); ! //scan all mods ! // doesn't make a lot of sense just yet. Just believe me! ! db(__FILE__,__LINE__,"Select * FROM "._MODS_); ! while( $row = dbr() ) { ! $modules[$row['name']] = $row; ! } ! if ($handle = opendir(_fileroot_."mods/")) { ! ! while (false !== ( $item = readdir($handle) ) ) { ! if($item != "index.html" && $item != "." && $item != ".." && $item != "CVS") { ! ! if ( is_file(_fileroot_."mods/".$item)){ ! //what is a file doing here? ! echo "Unknown file found!"; ! ! } elseif ( is_dir(_fileroot_."mods/".$item) ){ ! ! foreach ($modules as $k=>$v) { ! ! if ($v['dirname'] == $item) { ! $modules[$k]['found'] = true; ! } ! } ! ! foreach ($modules as $k=>$v) { ! if( $modules[$k]['found'] !== true ) { ! echo "PROBLEM in $v"; ! } ! } ! ! } ! ! } ! } ! } else { ! error(__FILE__,__LINE__, "!Error opening modules!", "accessdenied", true); ! } ! ! print_array($modules); ! ! if($_REQUEST['mod'] != "") { ! ! $mod = dbr(); ! ! include("mods/".$modules[$_REQUEST['mod']]['dirname']."/index.php"); } |
|
From: 13r <pri...@us...> - 2004-11-08 09:52:29
|
Update of /cvsroot/webschool/webschool/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24509/webschool/admin Modified Files: menu.php Log Message: Adding items to menu partially fixed, must be added option "Tree" and "Tree Item". Index: menu.php =================================================================== RCS file: /cvsroot/webschool/webschool/admin/menu.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** menu.php 29 Oct 2004 23:08:33 -0000 1.3 --- menu.php 8 Nov 2004 09:52:09 -0000 1.4 *************** *** 68,78 **** }elseif ($_REQUEST['op'] == "additem") { $newplace = $_POST['lastplace'] + 1; ! $pretty = $_POST['add_prettytitle']; ! $url = $_POST['add_url']; ! ! dbn(__FILE__, __LINE__, "INSERT INTO "._MENU_." ( `id` , `place` , `prettytitle` , `url` ) VALUES ('', '".$newplace."', '".$pretty."', '".$url."')"); header("Location: "._AMOD_); ! ! }elseif ($_REQUEST['op'] == "delete") { --- 68,92 ---- }elseif ($_REQUEST['op'] == "additem") { $newplace = $_POST['lastplace'] + 1; ! $mode = $_POST['add_mode']; ! ! switch($mode) ! { ! case '<[TEXT]>': ! $pretty = $_POST['add_prettytitle']; ! $url = $_POST['add_url']; ! break; ! case '<[SEPERATOR]>': ! $pretty = "<[SEPERATOR]>"; ! $url = "javascript:void"; ! break; ! default: ! //TODO: option "Tree" and "Tree Item". ! echo "Option Tree and Tree Item not implemented."; ! die(); ! break; ! } ! dbn(__FILE__, __LINE__, "INSERT INTO "._MENU_." ( `id` , `place` , `mode` , `prettytitle` , `url` , `tree` ) VALUES ('', '".$newplace."', '".$mode."', '".$pretty."', '".$url."', '')"); header("Location: "._AMOD_); ! }elseif ($_REQUEST['op'] == "delete") { |
|
From: 13r <pri...@us...> - 2004-11-08 09:52:29
|
Update of /cvsroot/webschool/webschool/theme/templates/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24509/webschool/theme/templates/admin Modified Files: menu.tpl Log Message: Adding items to menu partially fixed, must be added option "Tree" and "Tree Item". Index: menu.tpl =================================================================== RCS file: /cvsroot/webschool/webschool/theme/templates/admin/menu.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** menu.tpl 30 Oct 2004 17:49:56 -0000 1.2 --- menu.tpl 8 Nov 2004 09:52:09 -0000 1.3 *************** *** 63,66 **** --- 63,74 ---- <p class="over-title">{$lang.menu.addnew}</p> <input type="hidden" name="lastplace" value="{$lastplace}" /> + + <span class="field-title">{$lang.menu.type}:</span><select name="add_mode"> + <option value="<[TEXT]>" >Text</option> + <option value="<[SEPERATOR]>">Seperator</option> + <option value="<[TREE]>">Tree</option> + <option value="<[TREEITEM]>">Tree Item</option> + </select><br> + <span class="field-title">{$lang.menu.prettytitle}:</span> <input type="text" name="add_prettytitle" /><br> <span class="field-title">{$lang.menu.url}:</span> <input type="text" size="50" name="add_url" /><br> |
|
From: 13r <pri...@us...> - 2004-11-08 08:37:18
|
Update of /cvsroot/webschool/webschool/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8069/webschool/mysql Modified Files: webschool.sql Log Message: Fixes. Index: webschool.sql =================================================================== RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** webschool.sql 7 Nov 2004 23:55:57 -0000 1.43 --- webschool.sql 8 Nov 2004 08:37:04 -0000 1.44 *************** *** 298,302 **** `unixdate` varchar(25) NOT NULL default '', `event_type` varchar(15) NOT NULL default '', ! `month` int(11) NOT NULL defaul '', PRIMARY KEY (`id`) ) TYPE=MyISAM AUTO_INCREMENT=1;; --- 298,302 ---- `unixdate` varchar(25) NOT NULL default '', `event_type` varchar(15) NOT NULL default '', ! `month` int(11) NOT NULL default '', PRIMARY KEY (`id`) ) TYPE=MyISAM AUTO_INCREMENT=1;; |
|
From: 13r <pri...@us...> - 2004-11-08 08:37:18
|
Update of /cvsroot/webschool/webschool/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8069/webschool/install Modified Files: step3.php Log Message: Fixes. Index: step3.php =================================================================== RCS file: /cvsroot/webschool/webschool/install/step3.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** step3.php 6 Nov 2004 02:41:39 -0000 1.22 --- step3.php 8 Nov 2004 08:37:03 -0000 1.23 *************** *** 247,250 **** --- 247,251 ---- $query = eregi_replace("table_assignments", $_REQUEST['dbprefix']."assignments", $query); $query = eregi_replace("table_user_academia", $_REQUEST['dbprefix']."user_academia", $query); + $query = eregi_replace("table_calender", $_REQUEST['dbprefix']."calender", $query); return $query; } |
|
From: Matt M. <pro...@us...> - 2004-11-07 23:56:37
|
Update of /cvsroot/webschool/webschool/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/mysql Modified Files: webschool.sql Log Message: not much starting new module loader now... Index: webschool.sql =================================================================== RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** webschool.sql 7 Nov 2004 19:04:41 -0000 1.42 --- webschool.sql 7 Nov 2004 23:55:57 -0000 1.43 *************** *** 291,292 **** --- 291,302 ---- INSERT INTO `table_user_academia` VALUES (3, 2, '2'); INSERT INTO `table_user_academia` VALUES (3, 3, '3'); + + + DROP TABLE IF EXISTS `table_calender`; + CREATE TABLE `table_calender` ( + `id` int(11) NOT NULL default '', + `unixdate` varchar(25) NOT NULL default '', + `event_type` varchar(15) NOT NULL default '', + `month` int(11) NOT NULL defaul '', + PRIMARY KEY (`id`) + ) TYPE=MyISAM AUTO_INCREMENT=1;; |
|
From: Matt M. <pro...@us...> - 2004-11-07 23:56:09
|
Update of /cvsroot/webschool/webschool/theme In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/theme Modified Files: theme.css Log Message: not much starting new module loader now... Index: theme.css =================================================================== RCS file: /cvsroot/webschool/webschool/theme/theme.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** theme.css 2 Nov 2004 03:57:40 -0000 1.2 --- theme.css 7 Nov 2004 23:55:59 -0000 1.3 *************** *** 7,11 **** } .WS-menuitem { ! background-image: url(images/menu-item.gif); } .WS-table { --- 7,11 ---- } .WS-menuitem { ! } .WS-table { |
|
From: Matt M. <pro...@us...> - 2004-11-07 23:56:09
|
Update of /cvsroot/webschool/webschool/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/admin Added Files: calender.php Log Message: not much starting new module loader now... --- NEW FILE: calender.php --- <?PHP /* Webschool Copyright (C) 2004 ProgrammerMatt Developers & Contributors: ProgrammerMatt Pro...@bl... jsvoyager Gen...@gm... This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. (license.txt) */ if( !defined("_AUTHLOADED_") ){ die(); } define("_AMOD_", "admin.php?amod=Calender"); $smarty->assign("AMOD", "admin.php?amod=Calender"); //assign language file include(_fileroot_."/lang/".$config['lang']."/admin/calender.lang.php"); $smarty->assign("lang", $lang); ?> |
|
From: Matt M. <pro...@us...> - 2004-11-07 23:56:09
|
Update of /cvsroot/webschool/webschool/theme/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/theme/images Modified Files: menu-head.gif Added Files: menu-head.psd Log Message: not much starting new module loader now... Index: menu-head.gif =================================================================== RCS file: /cvsroot/webschool/webschool/theme/images/menu-head.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsbzYUtO and /tmp/cvs7INy2K differ --- NEW FILE: menu-head.psd --- (This appears to be a binary file; contents omitted.) |
|
From: Matt M. <pro...@us...> - 2004-11-07 23:56:09
|
Update of /cvsroot/webschool/webschool/theme/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/theme/templates Modified Files: menu.tpl Log Message: not much starting new module loader now... Index: menu.tpl =================================================================== RCS file: /cvsroot/webschool/webschool/theme/templates/menu.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** menu.tpl 5 Nov 2004 02:56:46 -0000 1.5 --- menu.tpl 7 Nov 2004 23:55:58 -0000 1.6 *************** *** 1,4 **** <table summary="Menu" width="130" align="top" cellpadding="0" cellspacing="0" border="0" bordercolor="#333399"> ! <tr class="WS-menuhead"><td><center><span color="Yellow">Menu</span></center></td></tr> {foreach from=$menuarray item=curr_menu} --- 1,4 ---- <table summary="Menu" width="130" align="top" cellpadding="0" cellspacing="0" border="0" bordercolor="#333399"> ! <tr class="WS-top" cellpadding="0" cellspacing="0" ><td class="header" valign="top" align="center">Menu</td></tr> {foreach from=$menuarray item=curr_menu} *************** *** 25,32 **** <form method="post" action="admin.php?action=login"> <tr><td> ! <table bgcolor="Teal" width="100%"> <tr><td> <span style="font-family: sans; font-size: -1; font-weight: bold; ">Username:</span><br> ! <center><input size="12" type="text" name="username"></center><br> <span style="font-size: -1; font-weight: bold; font-family: sans;">Password:</span><br> <center><input size="12" type="password" name="pass"></center><br> --- 25,32 ---- <form method="post" action="admin.php?action=login"> <tr><td> ! <table width="100%"> <tr><td> <span style="font-family: sans; font-size: -1; font-weight: bold; ">Username:</span><br> ! <center><input size="12" type="text" name="username" id="username"></center><br> <span style="font-size: -1; font-weight: bold; font-family: sans;">Password:</span><br> <center><input size="12" type="password" name="pass"></center><br> |
|
From: 13r <pri...@us...> - 2004-11-07 19:04:50
|
Update of /cvsroot/webschool/webschool/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29282/webschool/mysql Modified Files: webschool.sql Log Message: install/step4.php - Fixed the change from md5 to sha1 in the installation. mysql/webschool.sql - Fixed the creation of users that was using 12 rows while table only has 11 rows. Index: webschool.sql =================================================================== RCS file: /cvsroot/webschool/webschool/mysql/webschool.sql,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** webschool.sql 6 Nov 2004 19:09:21 -0000 1.41 --- webschool.sql 7 Nov 2004 19:04:41 -0000 1.42 *************** *** 184,191 **** ) TYPE=MyISAM AUTO_INCREMENT=5 ; ! INSERT INTO `table_users` VALUES (1, 'Guest', 'Annoymous', '','', '', 0, '', "none", 0, 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); ! INSERT INTO `table_users` VALUES (3, 'Student', 'Matt', 'Student','', '', 0, '', "student", 0, 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); ! INSERT INTO `table_users` VALUES (2, 'Administrator', 'Tom', 'Jinger', '', '', 0, '', "administrator", 0, 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); ! INSERT INTO `table_users` VALUES (4, 'Teacher', 'Mr. John', 'Smith','', '', 0, '', "instructor", 0, 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); --- 184,191 ---- ) TYPE=MyISAM AUTO_INCREMENT=5 ; ! INSERT INTO `table_users` VALUES (1, 'Guest', 'Annoymous', '','', '', 0, '', "none", 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); ! INSERT INTO `table_users` VALUES (3, 'Student', 'Matt', 'Student','', '', 0, '', "student", 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); ! INSERT INTO `table_users` VALUES (2, 'Administrator', 'Tom', 'Jinger', '', '', 0, '', "administrator", 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); ! INSERT INTO `table_users` VALUES (4, 'Teacher', 'Mr. John', 'Smith','', '', 0, '', "instructor", 'da39a3ee5e6b4b0d3255bfef95601890afd80709', ""); |
|
From: 13r <pri...@us...> - 2004-11-07 19:04:49
|
Update of /cvsroot/webschool/webschool/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29282/webschool/install Modified Files: step4.php Log Message: install/step4.php - Fixed the change from md5 to sha1 in the installation. mysql/webschool.sql - Fixed the creation of users that was using 12 rows while table only has 11 rows. Index: step4.php =================================================================== RCS file: /cvsroot/webschool/webschool/install/step4.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** step4.php 6 Nov 2004 02:41:39 -0000 1.7 --- step4.php 7 Nov 2004 19:04:40 -0000 1.8 *************** *** 30,34 **** $db = db_connect(_db_server_, _db_user_, _db_pass_, _db_, _db_type_, _db_perfmon_, _db_persistent_, _db_debug_) or die();; ! dbn(__FILE__,__FILE__,"Update "._USERS_." SET password='".md5($_POST['pass'])."' WHERE id='2'"); header("Location: install.php?step=5"); } else { --- 30,34 ---- $db = db_connect(_db_server_, _db_user_, _db_pass_, _db_, _db_type_, _db_perfmon_, _db_persistent_, _db_debug_) or die();; ! dbn(__FILE__,__FILE__,"Update "._USERS_." SET password='".sha1($_POST['pass'])."' WHERE id='2'"); header("Location: install.php?step=5"); } else { |
