|
From: <be...@us...> - 2013-09-20 23:13:08
|
Revision: 12074
http://sourceforge.net/p/xoops/svn/12074
Author: beckmi
Date: 2013-09-20 23:13:05 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
xGarage old Beta 5
Modified Paths:
--------------
XoopsModules/xgarage/trunk/xgarage/admin/functions.php
XoopsModules/xgarage/trunk/xgarage/admin/garageperms.php
XoopsModules/xgarage/trunk/xgarage/admin/index.php
XoopsModules/xgarage/trunk/xgarage/garage.php
XoopsModules/xgarage/trunk/xgarage/image_uploader.php
XoopsModules/xgarage/trunk/xgarage/include/functions.php
XoopsModules/xgarage/trunk/xgarage/index.php
XoopsModules/xgarage/trunk/xgarage/language/english/admin.php
XoopsModules/xgarage/trunk/xgarage/language/english/main.php
XoopsModules/xgarage/trunk/xgarage/readme.txt
XoopsModules/xgarage/trunk/xgarage/sql/garage.sql
XoopsModules/xgarage/trunk/xgarage/templates/cat_index.html
XoopsModules/xgarage/trunk/xgarage/templates/view_garage.html
XoopsModules/xgarage/trunk/xgarage/xoops_version.php
Added Paths:
-----------
XoopsModules/xgarage/trunk/xgarage/admin/docs_admin.php
XoopsModules/xgarage/trunk/xgarage/admin/docs_credits.php
XoopsModules/xgarage/trunk/xgarage/admin/docs_user.php
XoopsModules/xgarage/trunk/xgarage/admin/error_log
XoopsModules/xgarage/trunk/xgarage/admin/upgrade.php
Removed Paths:
-------------
XoopsModules/xgarage/trunk/xgarage/docs/
XoopsModules/xgarage/trunk/xgarage/install.txt
Added: XoopsModules/xgarage/trunk/xgarage/admin/docs_admin.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/docs_admin.php (rev 0)
+++ XoopsModules/xgarage/trunk/xgarage/admin/docs_admin.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -0,0 +1,45 @@
+<?php
+include_once '../../../include/cp_header.php';
+include_once("functions.php");
+ xoops_cp_header();
+ adminMenu(0, _AM_XG_DOCUMENTATION);
+echo "
+<h1>Garages Module for XOOPS 2.0 Administration Manual </h1>
+<hr />
+<br /><br />
+<a href=\"docs_credits.php\"><strong>Credits</strong></a> <a href=\"docs_user.php\"><strong>Users</strong></a>
+<br /><br />
+
+<p><b>Setting up the Garage Module</b>
+<ul>
+ <li>Once installed go into the module preferences and set them to your liking.</li>
+ <li>If you set it to use categories in the preferences, the next thing you need to do is add your categories.</li>
+ <li>After you create the categories you must go to the permissions section of the modules admin and set the permissions by group and category.<br /> There are 2 permissions to set for each category in each group, 'view permissions' and 'submit permissions'.</li>
+</ul>
+</p><br />
+
+<p><b>Creating Categories</b><br /><br />
+<ul>
+ <li>Right now there is only one option when creating a category, that is whether or not you want to show the race times in this category. There may be more in the future.</li>
+</ul>
+</p><br />
+
+<p><b>Setting Permissions</b><br /><br />
+<ul>
+ <li>If you are using categories you will see a tab for Permissions, click on it.
+<br />You will see a drop down box that says view permissions and all the categories you created.
+<br />Check the categories you want to have view permissions for each group.</li>
+<li>Next you need to change the drop down box so it reads 'submit permissions'.
+<br />Check the categories you want to have submit permissions for each group.
+</ul>
+</p><br />
+
+
+<p><b>Other admin functions</b><br /><br />
+<ul>
+ <li>Approving New Garages</li><br>
+ <li>Disable Garage</li><br>
+ <li>Enable Garage</li><br>
+</p>";
+xoops_cp_footer();
+?>
\ No newline at end of file
Property changes on: XoopsModules/xgarage/trunk/xgarage/admin/docs_admin.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/xgarage/trunk/xgarage/admin/docs_credits.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/docs_credits.php (rev 0)
+++ XoopsModules/xgarage/trunk/xgarage/admin/docs_credits.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -0,0 +1,39 @@
+<?php
+include_once '../../../include/cp_header.php';
+include_once("functions.php");
+ xoops_cp_header();
+ adminMenu(0, _AM_XG_DOCUMENTATION);
+
+echo "<h1>Garage Module for XOOPS 2.0 Credits </h1>
+<hr />
+
+
+<br /><br /><div>
+<a href=\"docs_admin.php\"><strong>"._AM_XG_ADMIN."</strong></a> <a href=\"docs_user.php\"><strong>"._AM_XG_USERS."</strong></a></div>
+<br /><br />
+
+
+
+
+<p><strong>"._AM_XG_CODEDBY." by Northern / Script_fu / jlm69 / mowaffak</strong><br><a href=\"http://www.calibernation.com/\"><strong>http://www.calibernation.com/</strong></a><a href=\"http://www.xgarage.org/\"><br><strong>http://www.xgarage.org/</strong></a><a href=\"http://www.jlmzone.com/\"><br><strong>http://www.jlmzone.com/</strong></a><a href=\"http://www.arabxoops.com/\"><br><strong>http://www.arabxoops.com/</strong></a></p>
+<p>XOOPS - <a href=\"http://www.xoops.org/\">http://www.xoops.org/ </a></p>
+<p>Script_fu - for his encouragement to get this module done. </p>
+<p>gtop00 - thanks for the debaits, on how we should get this working. </p>
+<p>exbanious - You inspired many to make or ask for a garage module. </p>
+<p>Mudnuts4x4 - he was the original person to ask for a module like the phpBB garage,<br>
+ Sorry, its not phpbb, but its close, without a lawsuite. and its original to xoops, and no-one else.</p>
+
+<p><br>
+ <strong>"._AM_XG_TRANSLATORS."</strong></p>
+<p>English - Northern <br>
+ German - <br>
+ Japanese - <br>
+Portuguese - <br>
+Greek - <br>
+French - <br>
+Dutch -<br>
+Danish - <br>
+</p>
+<p> </p>";
+xoops_cp_footer();
+?>
\ No newline at end of file
Property changes on: XoopsModules/xgarage/trunk/xgarage/admin/docs_credits.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/xgarage/trunk/xgarage/admin/docs_user.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/docs_user.php (rev 0)
+++ XoopsModules/xgarage/trunk/xgarage/admin/docs_user.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -0,0 +1,21 @@
+<?php
+include_once '../../../include/cp_header.php';
+include_once("functions.php");
+ xoops_cp_header();
+ adminMenu(0, _AM_XG_DOCUMENTATION);
+
+echo "<h1>Garages Module for XOOPS 2.0 User's Manual </h1>
+<hr>
+<br /><br />
+<a href=\"docs_credits.php\"><strong>Credits</strong></a> <a href=\"docs_admin.php\"><strong>Administration</strong></a>
+<br /><br />
+
+<p>Add new garage: </p>
+<p>Name and Description are required.<br>
+ To upload an image, edit your garage afer its adde, if site allows image uploads. </p>
+<p>Edit Garage:</p>
+<p>In some web sites, changes must be requested.</p>
+<p> </p>";
+echo("</div>");
+xoops_cp_footer();
+?>
\ No newline at end of file
Property changes on: XoopsModules/xgarage/trunk/xgarage/admin/docs_user.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/xgarage/trunk/xgarage/admin/error_log
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/error_log (rev 0)
+++ XoopsModules/xgarage/trunk/xgarage/admin/error_log 2013-09-20 23:13:05 UTC (rev 12074)
@@ -0,0 +1,9 @@
+[07-Oct-2007 15:21:06] PHP Warning: main(XOOPS_ROOT_PATH/include/cp_header.php) [<a href='function.main'>function.main</a>]: failed to open stream: No such file or directory in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 2
+[07-Oct-2007 15:21:06] PHP Warning: main() [<a href='function.include'>function.include</a>]: Failed opening 'XOOPS_ROOT_PATH/include/cp_header.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 2
+[07-Oct-2007 15:21:06] PHP Fatal error: Call to undefined function: xoops_cp_header() in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 4
+[07-Oct-2007 15:22:30] PHP Warning: main(XOOPS_ROOT_PATH/include/cp_header.php) [<a href='function.main'>function.main</a>]: failed to open stream: No such file or directory in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 2
+[07-Oct-2007 15:22:30] PHP Warning: main() [<a href='function.include'>function.include</a>]: Failed opening 'XOOPS_ROOT_PATH/include/cp_header.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 2
+[07-Oct-2007 15:22:30] PHP Fatal error: Call to undefined function: xoops_cp_header() in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 4
+[07-Oct-2007 15:23:13] PHP Warning: main(XOOPS_ROOT_PATH/include/cp_header.php) [<a href='function.main'>function.main</a>]: failed to open stream: No such file or directory in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 2
+[07-Oct-2007 15:23:13] PHP Warning: main() [<a href='function.include'>function.include</a>]: Failed opening 'XOOPS_ROOT_PATH/include/cp_header.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 2
+[07-Oct-2007 15:23:13] PHP Fatal error: Call to undefined function: xoops_cp_header() in /home/searchwa/public_html/dev/modules/garage/admin/credits.php on line 4
Modified: XoopsModules/xgarage/trunk/xgarage/admin/functions.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/functions.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/admin/functions.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1,7 +1,7 @@
<?php
function getCats($gid){
global $xoopsDB;
- $sql = "SELECT cid,name FROM " . $xoopsDB->prefix("garage_cats") . " WHERE gid = '$gid' ORDER BY name";
+ $sql = "SELECT cid,name,racing FROM " . $xoopsDB->prefix("garage_cats") . " WHERE gid = '$gid' ORDER BY name";
if ( !$result = $xoopsDB->query($sql) ) {
exit("$sql > SQL Error in function :: getCats($gid)");
} else {
@@ -23,11 +23,11 @@
return ($name);
}
}
-function addCat($name,$gid){
+function addCat($name,$racing,$gid){
global $xoopsDB;
- $sql = "INSERT INTO " . $xoopsDB->prefix("garage_cats") . " (name,gid) VALUES ('$name',$gid)";
+ $sql = "INSERT INTO " . $xoopsDB->prefix("garage_cats") . " (name,racing,gid) VALUES ('$name','$racing',$gid)";
if ( !$result = $xoopsDB->query($sql) ) {
- exit("$sql > SQL Error in function :: addCat($name,$gid)");
+ exit("$sql > SQL Error in function :: addCat($name,$racing,$gid)");
return 0;
} else {
return 1;
@@ -102,7 +102,7 @@
}
function getActiveGarages(){
global $xoopsDB;
- $sql = ("SELECT id,name,viewable FROM " . $xoopsDB->prefix("garage") . " WHERE disabled='0' AND approved='1' ORDER BY name");
+ $sql = ("SELECT id,viewable,name,year,make,model,style FROM " . $xoopsDB->prefix("garage") . " WHERE disabled='0' AND approved='1' ORDER BY name");
$result=$xoopsDB->query($sql);
$rows = array();
while($row = $xoopsDB->fetchArray($result)) {
@@ -135,7 +135,7 @@
function adminMenu ($currentoption = 0, $breadcrumb = '')
{
-
+
/* Nice buttons styles */
echo "
<style type='text/css'>
@@ -157,29 +157,35 @@
";
// global $xoopsDB, $xoopsModule, $xoopsConfig, $xoopsModuleConfig;
- global $xoopsModule, $xoopsConfig;
+ global $xoopsModule, $xoopsConfig, $xoopsModuleConfig;
$myts =& MyTextSanitizer::getInstance();
- $tblColors = Array();
- $tblColors[0] = $tblColors[1] = $tblColors[2] = $tblColors[3] = $tblColors[4] = $tblColors[5] = $tblColors[6] = $tblColors[7] = $tblColors[8] = '';
+ $tblColors = array();
+ $tblColors[0] = $tblColors[1] = $tblColors[2] = $tblColors[3] = $tblColors[4] = $tblColors[5] = $tblColors[6] = '';
$tblColors[$currentoption] = 'current';
echo "<div id='buttontop'>";
echo "<table style=\"width: 100%; padding: 0; \" cellspacing=\"0\"><tr>";
//echo "<td style=\"width: 45%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"../../system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid') . "\">" . _AM_SCLIENT_OPTS . "</a> | <a href=\"../index.php\">" . _AM_SCLIENT_GOMOD . "</a> | <a href=\"import.php\">" . _AM_SCLIENT_IMPORT . "</a> | <a href='" . smartclient_getHelpPath() ."' target=\"_blank\">" . _AM_SCLIENT_HELP . "</a> | <a href=\"about.php\">" . _AM_SCLIENT_ABOUT . "</a></td>";
- echo "<td style=\"width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"../../system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid') . "\">" . _AM_GARAGES_OPTS . "</a> | <a href=\"../index.php\">" . _AM_GARAGES_GOMOD . "</a> | <a href=\"index.php?op=documentation\">" . _AM_GARAGES_DOCS . "</a> | <a href=\"index.php?op=support\">" . _AM_GARAGES_SUPPORT . "</a> | <a href=\"index.php?op=donations\">" . _AM_GARAGES_DONATIONS . "</a></td>";
+ echo "<td style=\"width: 70%; font-size: 10px; text-align: left; color: #2F5376; padding: 0 6px; line-height: 18px;\"><a class=\"nobutton\" href=\"../../system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid') . "\">" . _AM_GARAGES_OPTS . "</a> | <a href=\"../index.php\">" . _AM_GARAGES_GOMOD . "</a> | <a href=\"index.php?op=support\">" . _AM_GARAGES_SUPPORT . "</a> | <a href=\"index.php?op=donations\">" . _AM_GARAGES_DONATIONS . "</a></td>";
echo "<td style=\"width: 30%; font-size: 10px; text-align: right; color: #2F5376; padding: 0 6px; line-height: 18px;\"><b>" . $myts->displayTarea($xoopsModule->name()) . " " . _AM_GARAGES_MODADMIN . "</b> " . $breadcrumb . "</td>";
echo "</tr></table>";
echo "</div>";
echo "<div id='buttonbar'>";
echo "<ul>";
- echo "<li id='" . $tblColors[0] . "'><a href=\"../garage.php?op=add\"><span>" . _AM_GARAGES_ADDNEWGARAGE . "</span></a></li>";
+ echo "<li id='" . $tblColors[0] . "'><a href=\"index.php?op=documentation\"><span>" . _AM_GARAGES_DOCS . "</span></a></li>";
echo "<li id='" . $tblColors[1] . "'><a href=\"index.php\"><span>" . _AM_GARAGES_INDEX . "</span></a></li>";
echo "<li id='" . $tblColors[2] . "'><a href=\"index.php?op=view_new\"><span>" . _AM_GARAGES_APPROVE . "</span></a></li>";
echo "<li id='" . $tblColors[3] . "'><a href=\"index.php?op=view_disabled\"><span>" . _AM_GARAGES_DISABLED . "</span></a></li>";
+if($xoopsModuleConfig['usecats']){
echo "<li id='" . $tblColors[4] . "'><a href=\"index.php?op=cats\"><span>" . _AM_GARAGES_CATEGORIES . "</span></a></li>";
echo "<li id='" . $tblColors[5] . "'><a href=\"garageperms.php\"><span>" . _AM_GARAGES_PERMISSIONS . "</span></a></li>";
+}
+
echo "</ul></div>";
+
}
+
+
?>
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/admin/garageperms.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/garageperms.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/admin/garageperms.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -90,4 +90,4 @@
unset ($permform);
xoops_cp_footer();
-?>
+?>
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/admin/index.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/index.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/admin/index.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -120,11 +120,13 @@
//echo("testing123");
//adminMenu(4, _AM_GARAGES_CATEGORIES);
if($_POST['catname']){
- $success = addCat($_POST['catname'],$_POST['gid']);
+ $cid = $_POST['cid'];
+ if(!isset($_POST['racing'])) $_POST['racing'] = 0;
+ $success = addCat($_POST['catname'],$_POST['racing'],$_POST['gid']);
if($success){
- redirect_header("index.php?op=cats&cid=$cid", 1, _AM_CATEGORYADDED);
+ redirect_header("index.php?op=cats&cid=$cid", 5, _AM_CATEGORYADDED);
exit;
- } else redirect_header("index.php?op=cats&cid=$cid", 1, _AM_CATEGORYADDERROR);
+ } else redirect_header("index.php?op=cats&cid=$cid", 5, _AM_CATEGORYADDERROR);
}
break;
@@ -251,6 +253,7 @@
echo("<form method='post' action='index.php'>");
echo(_AM_NEWCATNAME."<input type='text' name='catname'><br/>"._AM_PARENT);
$cattree->makeMySelBox("name","",$cid,true,"gid");
+ echo("<br/>"._AM_XG_RACING."<input type='checkbox' name='racing' value='1'>");
echo("<input type='hidden' name='cid' value='$cid'>");
echo("<input type='hidden' name='op' value='add_cat'>");
echo("<br/><input type='submit' value='"._AM_ADDNEWCAT."'>");
@@ -294,11 +297,16 @@
break;
case "documentation":
xoops_cp_header();
- adminMenu(5, _AM_GARAGES_DOCUMENTATION);
+ adminMenu(0, _AM_XG_DOCUMENTATION);
- echo("<div style='text-align:center;'>"._AM_DOCS."<br/><br/><br/>");
-
- echo("<br/><br/><br/><a href='http://www.xgarage.org'>Live Docs and support at X-Garage</a>");
+ echo("<div style='text-align:center;'>"._AM_GARAGES_DOCS."<br/><br/><br/>");
+ echo "<h1>"._AM_XG_DOC_HEAD."</h1>";
+echo "<hr>
+<p><a href="."docs_credits.php".">"._AM_XG_CREDITS."</a></p>
+<p><a href="."docs_admin.php".">"._AM_XG_ADMIN_MAN."</a> </p>
+<p><a href="."docs_user.php".">"._AM_XG_USER_MAN."</a></p>
+<p> </p>";
+ echo("<br/><br/><br/><a href='http://www.xgarage.org'>"._AM_XG_DOC_SUPPORT."</a>");
echo("</div>");
@@ -311,7 +319,7 @@
echo("<div style='text-align:center;'>"._AM_SUPPORT."<br/><br/><br/>"._AM_SUPPORT_REGISTERED);
- echo("<br/><br/><br/><a href='http://www.xgarage.org/modules/newbb/'>Garages Module for XOOPS Support Forum</a>");
+ echo("<br/><br/><br/><a href='http://www.xgarage.org/modules/newbb/'>"._AM_XG_DOC_FORUM."</a>");
echo("</div>");
@@ -346,7 +354,7 @@
for($x=0;$x<count($names);$x++){
if($names[$x]['viewable']) $viewable="color:#000000;";
else $viewable="color:#cccccc;";
- echo("<div style=\"margin-left:100px;\"><a style='$viewable' href=\"../index.php?op=view&gid=".$names[$x]['id']."\">".$names[$x]['name']."</a></div>");
+ echo("<div style=\"margin-left:100px;\"><a style='$viewable' href=\"../index.php?op=view&gid=".$names[$x]['id']."\">".$names[$x]['year']." - ".$names[$x]['make']." - ".$names[$x]['model']." - ".$names[$x]['style']."</a></div>");
}
else echo("<div>"._AM_NONEACTIVE."</div>");
break;
Added: XoopsModules/xgarage/trunk/xgarage/admin/upgrade.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/admin/upgrade.php (rev 0)
+++ XoopsModules/xgarage/trunk/xgarage/admin/upgrade.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -0,0 +1,27 @@
+<?php
+
+include_once '../../../include/cp_header.php';
+xoops_cp_header();
+include_once XOOPS_ROOT_PATH.'/modules/garage/include/functions.php';
+
+
+if (is_object($xoopsUser) && $xoopsUser->isAdmin($xoopsModule->mid())) {
+ $errors=0;
+
+ // 2.1) Add the new fields to the topic table
+ if (!garage_FieldExists('racing',$xoopsDB->prefix('garage_cats'))) {
+ garage_AddField("racing TINYINT( 1 ) DEFAULT '0' NOT NULL AFTER name",$xoopsDB->prefix('garage_cats'));
+ }
+
+ // At the end, if there was errors, show them or redirect user to the module's upgrade page
+ if($errors) {
+ echo '<H1>' . _AM_XG_UPGRADEFAILED . '</H1>';
+ echo '<br />' . _AM_XG_UPGRADEFAILED0;
+ } else {
+ echo _AM_XG_UPGRADECOMPLETE." - <a href='".XOOPS_URL."/modules/system/admin.php?fct=modulesadmin&op=update&module=garage'>"._AM_XG_UPDATEMODULE."</a>";
+ }
+} else {
+ printf("<h2>%s</h2>\n",_AM_NEWS_UPGR_ACCESS_ERROR);
+}
+xoops_cp_footer();
+?>
Property changes on: XoopsModules/xgarage/trunk/xgarage/admin/upgrade.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/xgarage/trunk/xgarage/garage.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/garage.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/garage.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1,41 +1,47 @@
<?php
-require('header.php');
-global $xoopsModuleConfig, $xoopsUser;
+include("header.php");
-//Group Perms added by jlm69
-if ($xoopsModuleConfig['usecats']) {
+$mydirname = basename( dirname( __FILE__ ) ) ;
+require_once( XOOPS_ROOT_PATH."/modules/$mydirname/include/gtickets.php" ) ;
+
+$myts =& MyTextSanitizer::getInstance();
$module_id = $xoopsModule->getVar('mid');
if (is_object($xoopsUser)) {
-$groups = $xoopsUser->getGroups();
+ $groups = $xoopsUser->getGroups();
} else {
-$groups = XOOPS_GROUP_ANONYMOUS;
+ $groups = XOOPS_GROUP_ANONYMOUS;
}
+
$gperm_handler =& xoops_gethandler('groupperm');
+
if (isset($_POST['item_id'])) {
-$perm_itemid = intval($_POST['item_id']);
+ $perm_itemid = intval($_POST['item_id']);
} else {
-$perm_itemid = 0;
+ $perm_itemid = 0;
}
//If no access
if (!$gperm_handler->checkRight("garage_submit", $perm_itemid, $groups, $module_id)) {
- redirect_header(XOOPS_URL."/index.php", 3, _NOPERM);
-exit();
- }
- }
+ redirect_header(XOOPS_URL."/index.php", 3, _NOPERM);
+ exit();
+}
+
// End Group Perms
-
require(XOOPS_ROOT_PATH.'/header.php');
include("include/functions.php");
+settype($uid, "string");
+settype($xgid, "string");
settype($cid, "integer");
+settype($cats, "array");
settype($url, "string");
settype($name, "string");
settype($image, "string");
-settype($imagechoice, "string");
+settype($imagechoice, "string");//jlm69
+settype($uploadimage, "string");//jlm69
settype($location, "string");
settype($year, "string");
settype($make, "string");
@@ -63,10 +69,9 @@
settype($notifypub, "string");
settype($nohtml, "string");
settype($nosmiley, "string");
+settype($descript2, "string");//jlm69
+settype($linkgarage, "string");//jlm69
-global $xoopsModuleConfig;
-global $xoopsUser;
-
$userIsAdmin = userIsAdmin($xoopsUser);
if(!$xoopsUser) redirect_header("/user.php",2,_MD_XG_MUSTLOGIN);
$uid = $xoopsUser->uid();
@@ -105,7 +110,7 @@
$cid = $myts->makeTboxData4Save($_POST['cid']);
$name = $myts->makeTboxData4Save($_POST['name']);
$image = $myts->makeTboxData4Save($_POST['image']);
-
+ $imagechoice = $myts->makeTboxData4Save($_POST['imagechoice']);
$url = $myts->makeTboxData4Save($_POST['url']);
$location = $myts->makeTboxData4Save($_POST['location']);
$year = $myts->makeTboxData4Save($_POST['year']);
@@ -129,16 +134,16 @@
$mrims = $myts->makeTareaData4Save($_POST['mrims']);
$maudio = $myts->makeTareaData4Save($_POST['maudio']);
$mfuture = $myts->makeTareaData4Save($_POST['mfuture']);
- $descript2 = $myts->makeTareaData4Save($_POST['descript2']);
- $linkgarage = $myts->makeTareaData4Save($_POST['linkgarage']);
+ if($xoopsModuleConfig['usedescript2']) $descript2 = $myts->makeTareaData4Save($_POST['descript2']);
+ if($xoopsModuleConfig['linkgarage']) $linkgarage = $myts->makeTareaData4Save($_POST['linkgarage']);
if($url == "http://") $url = "";
if($image) $image = "[img align=right]".$image."[/img]";
include("image_uploader.php");
- $success = addGarage($a,$uid,$cid,$name,$image,$imageupload,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage);
+ $success = addGarage($a,$uid,$cid,$name,$image,$uploadimage,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage);
-
+//jlm69
if($success) {
$notification_handler =& xoops_gethandler('notification');
$id = $xoopsDB->getInsertId();
@@ -160,9 +165,9 @@
$notification_handler->triggerEvent ('listing', $gid, 'new_listing', $tags );
-}
+}//end jlm69
- if($success) redirect_header("index.php",8,_MD_XG_ADDSUCCESS);
+ if($success) redirect_header("index.php",2,_MD_XG_ADDSUCCESS);
else redirect_header("index.php",2,_MD_XG_ADDFAILURE);
} else redirect_header("index.php",2,_MD_XG_ADDFAILURE);
break;
@@ -179,6 +184,12 @@
$garage = getGarage($gid);
$puid = $garage['uid'];
+ if ($xoopsModuleConfig['usecats'] != 0) {
+ $catopts = getCatOptions($cid);
+ $timetrials = $catopts['racing'];
+ } else {
+ $timetrials = '';
+ }
$ouid = $myts->makeTboxData4Save($_POST['ouid']);
$viewable = $myts->makeTboxData4Save($_POST['viewable']);
$cid = $myts->makeTboxData4Save($_POST['cid']);
@@ -194,6 +205,8 @@
$style = $myts->makeTboxData4Save($_POST['style']);
$engine = $myts->makeTboxData4Save($_POST['engine']);
$color = $myts->makeTboxData4Save($_POST['color']);
+
+ if(isset($timetrials)) {
$rt = $myts->makeTboxData4Save($_POST['rt']);
$sixty = $myts->makeTboxData4Save($_POST['sixty']);
$three = $myts->makeTboxData4Save($_POST['three']);
@@ -202,6 +215,18 @@
$thou = $myts->makeTboxData4Save($_POST['thou']);
$quart = $myts->makeTboxData4Save($_POST['quart']);
$quartm = $myts->makeTboxData4Save($_POST['quartm']);
+
+ } else {
+ $rt = '';
+ $sixty = '';
+ $three = '';
+ $eigth = '';
+ $eigthm = '';
+ $thou = '';
+ $quart = '';
+ $quartm = '';
+ }
+
$list = $myts->makeTboxData4Save($_POST['list']);
$mengine = $myts->makeTareaData4Save($_POST['mengine']);
$mexterior = $myts->makeTareaData4Save($_POST['mexterior']);
@@ -209,8 +234,8 @@
$mrims = $myts->makeTareaData4Save($_POST['mrims']);
$maudio = $myts->makeTareaData4Save($_POST['maudio']);
$mfuture = $myts->makeTareaData4Save($_POST['mfuture']);
- $descript2 = $myts->makeTareaData4Save($_POST['descript2']);
- $linkgarage = $myts->makeTareaData4Save($_POST['linkgarage']);
+ if($xoopsModuleConfig['usedescript2']) $descript2 = $myts->makeTareaData4Save($_POST['descript2']);
+ if($xoopsModuleConfig['linkgarage']) $linkgarage = $myts->makeTareaData4Save($_POST['linkgarage']);
if($url == "http://") $url = "";
if($image) $image = "[img align=right]".$image."[/img]";
@@ -242,9 +267,12 @@
redirect_header($redirect_url,2,$redirect_msg);
exit;
}
- if(!$xoopsModuleConfig['multiplegarages'] && !$userIsAdmin){
- if($xgid = doesGarageExist($uid)){
- $redirect_url = "index.php?op=view&gid=$xgid";
+
+ if($xoopsModuleConfig['multiplegarage'] = 1){
+
+
+ if($gid = doesGarageExist($uid)) {
+ $redirect_url = "index.php?op=view&gid=$uid";
$redirect_msg = _MD_XG_CANNOTADDMULTIPLE;
redirect_header($redirect_url,2,$redirect_msg);
exit;
@@ -254,12 +282,15 @@
if(!$url) $url = "http://";
include XOOPS_ROOT_PATH."/class/xoopsformloader.php";
$sform = new XoopsThemeForm(_MD_XG_ADDGARAGE, "garageform", xoops_getenv('PHP_SELF'));
+ $sform->setExtra("enctype='multipart/form-data'");
$sform->addElement(new XoopsFormHidden('aa',$xoopsModuleConfig['autoapprove']), false);
$sform->addElement(new XoopsFormHidden('op','post'), false);
- if ($xoopsModuleConfig['usecats']) {
+ if ($xoopsModuleConfig['usecats'] != 0) {
+ $catopts = getCatOptions($cid);
+ $timetrials = $catopts['racing'];
+
include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
$cattree = new XoopsTree($xoopsDB->prefix("garage_cats"),"cid","gid");
-
//$sform->addElement(new XoopsFormSelect(_MD_XG_CATEGORY, 'cid', $cid, 3), true);
ob_start();
//$sform->addElement(new XoopsFormHidden('cid', 'gid'));
@@ -267,7 +298,7 @@
$sform->addElement(new XoopsFormLabel(_MD_XG_CATEGORY, ob_get_contents()));
ob_end_clean();
} else $sform->addElement(new XoopsFormHidden('cid',0), false);
-
+ $timetrials = '';
$sform->addElement(new XoopsFormText(_MD_XG_NAME, 'name', 50, 50, $name), true);
if($xoopsModuleConfig['addimages']){
$sform->addElement(new XoopsFormText(_MD_XG_IMAGE, 'image', 50, 255, $image), false);
@@ -288,6 +319,8 @@
$sform->addElement(new XoopsFormText(_MD_XG_STYLE, 'style', 50, 75, $style), false);
$sform->addElement(new XoopsFormText(_MD_XG_ENGINE, 'engine', 50, 75, $engine), false);
$sform->addElement(new XoopsFormText(_MD_XG_COLOR, 'color', 50, 75, $color), false);
+
+ if($timetrials) {
$sform->addElement(new XoopsFormText(_MD_XG_RT, 'rt', 50, 75, $rt), false);
$sform->addElement(new XoopsFormText(_MD_XG_SIXTY, 'sixty', 50, 75, $sixty), false);
$sform->addElement(new XoopsFormText(_MD_XG_THREE, 'three', 50, 75, $three), false);
@@ -296,6 +329,22 @@
$sform->addElement(new XoopsFormText(_MD_XG_THOU, 'thou', 50, 75, $thou), false);
$sform->addElement(new XoopsFormText(_MD_XG_QUART, 'quart', 50, 75, $quart), false);
$sform->addElement(new XoopsFormText(_MD_XG_QUARTM, 'quartm', 50, 75, $quartm), false);
+
+ } else {
+
+ $sform->addElement(new XoopsFormHidden('rt',$rt), false);
+ $sform->addElement(new XoopsFormHidden('sixty',$sixty), false);
+ $sform->addElement(new XoopsFormHidden('three',$three), false);
+ $sform->addElement(new XoopsFormHidden('eigth',$eigth), false);
+ $sform->addElement(new XoopsFormHidden('eigthm',$eigthm), false);
+ $sform->addElement(new XoopsFormHidden('thou',$thou), false);
+ $sform->addElement(new XoopsFormHidden('quart',$quart), false);
+ $sform->addElement(new XoopsFormHidden('quartm',$quartm), false);
+}
+
+
+
+
$sform->addElement(new XoopsFormText($xoopsModuleConfig['listname'], 'list', 50, 255, $list), false);
$sform->addElement(getEditor(_MD_XG_MENGINE, 'mengine', $mengine, 10, 40), false);
$sform->addElement(getEditor(_MD_XG_MEXTERIOR, 'mexterior', $mexterior, 10, 40), false);
@@ -303,7 +352,8 @@
$sform->addElement(getEditor(_MD_XG_MRIMS, 'mrims', $mrims, 10, 40), false);
$sform->addElement(getEditor(_MD_XG_MAUDIO, 'maudio', $maudio, 10, 40), false);
$sform->addElement(getEditor(_MD_XG_MFUTURE, 'mfuture', $mfuture, 10, 40), false);
- if($xoopsModuleConfig['usedescript2']) $sform->addElement(getEditor(_MD_XG_DESCRIPT2, 'descript2', $descript2, 10, 40), false);
+ if($xoopsModuleConfig['usedescript2']) $sform->addElement(getEditor(_MD_XG_DESCRIPT2, 'descript2', $descript2, 10, 40), false);
+
if($xoopsModuleConfig['linkgarage']){
$linkgarage_choice = new XoopsFormRadio(_MD_XG_LINKGARAGE,'linkgarage',$linkgarage);
$linkgarage_choice->addOption(0,_MD_XG_NOLINKTOUSER);
@@ -366,7 +416,9 @@
if ($userIsAdmin) $sform->addElement(new XoopsFormText(_MD_XG_OWNERUID, 'ouid', 50, 50, $puid), true);
else $sform->addElement(new XoopsFormHidden('ouid',$puid), true);
$sform->addElement(new XoopsFormRadioYN(_MD_XG_VIEWABLE, 'viewable',$viewable), true);
- if ($xoopsModuleConfig['usecats']) {//$sform->addElement(new XoopsFormSelect(_MD_XG_CATEGORY, 'cid', $cid, 3), true);
+ if ($xoopsModuleConfig['usecats'] != 0) {//$sform->addElement(new XoopsFormSelect(_MD_XG_CATEGORY, 'cid', $cid, 3), true);
+ $catopts = getCatOptions($cid);
+ $timetrials = $catopts['racing'];
include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
$cattree = new XoopsTree($xoopsDB->prefix("garage_cats"),"cid","gid");
@@ -377,6 +429,7 @@
$sform->addElement(new XoopsFormLabel(_MD_XG_CATEGORY, ob_get_contents()));
ob_end_clean();
} else $sform->addElement(new XoopsFormHidden('cid',0), false);
+ $timetrials = '';
$sform->addElement(new XoopsFormText(_MD_XG_NAME, 'name', 50, 50, $name), true);
$sform->addElement(new XoopsFormText(_MD_XG_IMAGE, 'image', 50, 255, $image), false);
if ($xoopsModuleConfig['useruploads'] || $userIsAdmin)
@@ -398,6 +451,8 @@
$sform->addElement(new XoopsFormText(_MD_XG_STYLE, 'style', 50, 75, $style), false);
$sform->addElement(new XoopsFormText(_MD_XG_ENGINE, 'engine', 50, 75, $engine), false);
$sform->addElement(new XoopsFormText(_MD_XG_COLOR, 'color', 50, 75, $color), false);
+
+ if(isset($timetrials)) {
$sform->addElement(new XoopsFormText(_MD_XG_RT, 'rt', 50, 75, $rt), false);
$sform->addElement(new XoopsFormText(_MD_XG_SIXTY, 'sixty', 50, 75, $sixty), false);
$sform->addElement(new XoopsFormText(_MD_XG_THREE, 'three', 50, 75, $three), false);
@@ -406,14 +461,16 @@
$sform->addElement(new XoopsFormText(_MD_XG_THOU, 'thou', 50, 75, $thou), false);
$sform->addElement(new XoopsFormText(_MD_XG_QUART, 'quart', 50, 75, $quart), false);
$sform->addElement(new XoopsFormText(_MD_XG_QUARTM, 'quartm', 50, 75, $quartm), false);
+ }
+
$sform->addElement(new XoopsFormText($xoopsModuleConfig['listname'], 'list', 50, 255, $list), false);
- $sform->addElement(getEditor(_MD_XG_MENGINE, 'mengine', $mengine, 20, 40), false);
- $sform->addElement(getEditor(_MD_XG_MEXTERIOR, 'mexterior', $mexterior, 20, 40), false);
- $sform->addElement(getEditor(_MD_XG_MINTERIOR, 'minterior', $minterior, 20, 40), false);
- $sform->addElement(getEditor(_MD_XG_MRIMS, 'mrims', $mrims, 20, 40), false);
- $sform->addElement(getEditor(_MD_XG_MAUDIO, 'maudio', $maudio, 20, 40), false);
- $sform->addElement(getEditor(_MD_XG_MFUTURE, 'mfuture', $mfuture, 20, 40), false);
- if($xoopsModuleConfig['usedescript2']) $sform->addElement(getEditor(_MD_XG_DESCRIPT2, 'descript2', $descript2, 20, 40), false);
+ $sform->addElement(getEditor(_MD_XG_MENGINE, 'mengine', $mengine, 10, 40), false);
+ $sform->addElement(getEditor(_MD_XG_MEXTERIOR, 'mexterior', $mexterior, 10, 40), false);
+ $sform->addElement(getEditor(_MD_XG_MINTERIOR, 'minterior', $minterior, 10, 40), false);
+ $sform->addElement(getEditor(_MD_XG_MRIMS, 'mrims', $mrims, 10, 40), false);
+ $sform->addElement(getEditor(_MD_XG_MAUDIO, 'maudio', $maudio, 10, 40), false);
+ $sform->addElement(getEditor(_MD_XG_MFUTURE, 'mfuture', $mfuture, 10, 40), false);
+ if($xoopsModuleConfig['usedescript2']) $sform->addElement(getEditor(_MD_XG_DESCRIPT2, 'descript2', $descript2, 10, 40), false);
if($xoopsModuleConfig['linkgarage']){
$linkgarage_choice = new XoopsFormRadio(_MD_XG_LINKGARAGE,'linkgarage',$linkgarage);
$linkgarage_choice->addOption(0,_MD_XG_NOLINKTOUSER);
@@ -436,7 +493,7 @@
$redirect_url = "index.php";
$redirect_msg = _MD_XG_CANNOTCHANGE;
}
- redirect_header($redirect_url,8,$redirect_msg);
+ redirect_header($redirect_url,3,$redirect_msg);
exit;
}
}
Modified: XoopsModules/xgarage/trunk/xgarage/image_uploader.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/image_uploader.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/image_uploader.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1,8 +1,9 @@
<?php
+ $uploadimage = '';
//image uploader
if($_FILES['uploadimage']['name'] <> ""){
include_once '../../class/uploader.php';
-
+ $date = time();
$upload_path = XOOPS_UPLOAD_PATH . "/" . "garage";
if(!is_dir($upload_path)) mkdir($upload_path);
$allowed_mimetypes = array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png');
@@ -16,7 +17,7 @@
$errmsg = $uploader->getErrors();
} else {
//echo '<h4>File uploaded successfully!</h4>';
- $msg = '<h4>'._MD_PR_UPLOADSUCCESS.'</h4>';
+ $msg = '<h4>'._MD_XG_UPLOADSUCCESS.'</h4>';
//echo 'Saved as: ' . $uploader->getSavedFileName() . '<br />';
$uploadimage = $uploader->getSavedFileName();
Modified: XoopsModules/xgarage/trunk/xgarage/include/functions.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/include/functions.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/include/functions.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -2,7 +2,7 @@
function getRoster($cid){
global $xoopsDB;
- $sql = "SELECT id,name FROM " . $xoopsDB->prefix("garage") . " WHERE (approved=1 AND viewable=1 AND disabled=0) AND cid=$cid ORDER BY name";
+ $sql = "SELECT id,name FROM " . $xoopsDB->prefix("garage") . " WHERE (approved=1 AND viewable=1 AND disabled=0) AND cid='$cid' ORDER BY name";
if ( !$result = $xoopsDB->query($sql) ) {
return;
//exit("SQL Error in function :: getRoster($cid)");
@@ -16,40 +16,40 @@
function getGarage($gid){
global $xoopsDB;
- $sql = "SELECT id,approved,viewable,disabled,uid,cid,name,image,uploadimage,imagechoice,url,location,year,make,model,style,engine,color,rt,sixty,three,eigth,eigthm,thou,quart,quartm,list,mengine,mexterior,minterior,mrims,maudio,mfuture,descript2,linkGarage FROM " . $xoopsDB->prefix("garage") . " WHERE id = $gid";
+ $sql = "SELECT id,approved,viewable,disabled,uid,cid,name,image,uploadimage,imagechoice,url,location,year,make,model,style,engine,color,rt,sixty,three,eigth,eigthm,thou,quart,quartm,list,mengine,mexterior,minterior,mrims,maudio,mfuture,descript2,linkgarage FROM " . $xoopsDB->prefix("garage") . " WHERE id = '$gid'";
if ( !$result = $xoopsDB->query($sql) ) {
exit("$sql > SQL Error in function :: getGarage()");
}
- $Garage = array();
+ $garage = array();
while ( $row = $xoopsDB->fetchArray($result) ) {
- $Garage = $row;
+ $garage = $row;
}
- return $Garage;
+ return $garage;
}
-function addGarage($aa,$uid,$cid,$name,$image,$uploadimage,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkGarage){
+function addGarage($aa,$uid,$cid,$name,$image,$uploadimage,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage){
global $xoopsDB;
- $sql = "INSERT INTO " . $xoopsDB->prefix("garage") . " (approved,uid,cid,name,image,uploadimage,imagechoice,url,location,year,make,model,style,engine,color,rt,sixty,three,eigth,eigthm,thou,quart,quartm,list,mengine,mexterior,minterior,mrims,maudio,mfuture,descript2,linkGarage) VALUES ($aa,$uid,$cid,'$name','$image','$uploadimage','$imagechoice','$url','$location','$year','$make','$model','$style','$engine','$color','$rt','$sixty','$three','$eigth','$eigthm','$thou','$quart','$quartm','$list','$mengine','$mexterior','$minterior','$mrims','$maudio','$mfuture','$descript2','$linkGarage')";
+ $sql = "INSERT INTO " . $xoopsDB->prefix("garage") . " (approved,uid,cid,name,image,uploadimage,imagechoice,url,location,year,make,model,style,engine,color,rt,sixty,three,eigth,eigthm,thou,quart,quartm,list,mengine,mexterior,minterior,mrims,maudio,mfuture,descript2,linkgarage) VALUES ($aa,$uid,$cid,'$name','$image','$uploadimage','$imagechoice','$url','$location','$year','$make','$model','$style','$engine','$color','$rt','$sixty','$three','$eigth','$eigthm','$thou','$quart','$quartm','$list','$mengine','$mexterior','$minterior','$mrims','$maudio','$mfuture','$descript2','$linkgarage')";
if ( !$result = $xoopsDB->query($sql) ) {
- exit("$sql > SQL Error in function :: addGarage($aa,$uid,$cid,$name,$image,$uploadimage,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkGarage)");
+ exit("$sql > SQL Error in function :: addGarage($aa,$uid,$cid,$name,$image,$uploadimage,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage)");
} else {
return 1;
}
}
-function updateGarage($gid,$uid,$cid,$viewable,$name,$image,$imagechoice="0",$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkGarage){
+function updateGarage($gid,$uid,$cid,$viewable,$name,$image,$imagechoice="0",$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage){
global $xoopsDB;
- $sql = "UPDATE " . $xoopsDB->prefix("garage") . " SET uid=$uid,cid=$cid,viewable=$viewable,name='$name',image='$image',imagechoice='$imagechoice',url='$url',location='$location',year='$year',make='$make',model='$model',style='$style',engine='$engine',color='$color',rt='$rt',sixty='$sixty',three='$three',eigth='$eigth',eigthm='$eigthm',thou='$thou',quart='$quart',quartm='$quartm',list='$list',mengine='$mengine',mexterior='$mexterior',minterior='$minterior',mrims='$mrims',maudio='$maudio',mfuture='$mfuture',descript2='$descript2',linkGarage='$linkGarage' WHERE id = $gid";
+ $sql = "UPDATE " . $xoopsDB->prefix("garage") . " SET uid=$uid,cid=$cid,viewable=$viewable,name='$name',image='$image',imagechoice='$imagechoice',url='$url',location='$location',year='$year',make='$make',model='$model',style='$style',engine='$engine',color='$color',rt='$rt',sixty='$sixty',three='$three',eigth='$eigth',eigthm='$eigthm',thou='$thou',quart='$quart',quartm='$quartm',list='$list',mengine='$mengine',mexterior='$mexterior',minterior='$minterior',mrims='$mrims',maudio='$maudio',mfuture='$mfuture',descript2='$descript2',linkgarage='$linkgarage' WHERE id = $gid";
if ( !$result = $xoopsDB->query($sql) ) {
- exit("$sql > SQL Error in function :: updateGarage($gid,$uid,$cid,$viewable,$name,$image,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkGarage)");
+ exit("$sql > SQL Error in function :: updateGarage($gid,$uid,$cid,$viewable,$name,$image,$imagechoice,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage)");
} else {
return 1;
}
}
-function updateGaragePlusUpload($gid,$uid,$cid,$viewable,$name,$image,$uploadimage,$imagechoice="0",$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkGarage){
+function updateGaragePlusUpload($gid,$uid,$cid,$viewable,$name,$image,$uploadimage,$imagechoice="0",$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list,$mengine,$mexterior,$minterior,$mrims,$maudio,$mfuture,$descript2,$linkgarage){
global $xoopsDB;
- $sql = "UPDATE " . $xoopsDB->prefix("garage") . " SET uid=$uid,cid=$cid,viewable=$viewable,name='$name',image='$image',uploadimage='$uploadimage',imagechoice='$imagechoice',url='$url',location='$location',year='$year',make='$make',model='$model',style='$style',engine='$egine',color='$color',rt='$rt',sixty='$sixty',three='$three',eigth='$eigth',eigthm='$eigthm',thou='$thou',quart='$quart',quartm='$quartm',list='$list',mengine='$mengine',mexterior='$mexterior',minterior='$minterior',mrims='$mrims',maudio='$maudio',mfuture='$mfuture',descript2='$descript2',linkGarage='$linkGarage' WHERE id = $gid";
+ $sql = "UPDATE " . $xoopsDB->prefix("garage") . " SET uid=$uid,cid=$cid,viewable=$viewable,name='$name',image='$image',uploadimage='$uploadimage',imagechoice='$imagechoice',url='$url',location='$location',year='$year',make='$make',model='$model',style='$style',engine='$engine',color='$color',rt='$rt',sixty='$sixty',three='$three',eigth='$eigth',eigthm='$eigthm',thou='$thou',quart='$quart',quartm='$quartm',list='$list',mengine='$mengine',mexterior='$mexterior',minterior='$minterior',mrims='$mrims',maudio='$maudio',mfuture='$mfuture',descript2='$descript2',linkgarage='$linkgarage' WHERE id = $gid";
if ( !$result = $xoopsDB->query($sql) ) {
exit("$sql > SQL Error in function :: updateGaragePlusUpload($gid,$cid,$viewable,$name,$image,$url,$location,$year,$make,$model,$style,$engine,$color,$rt,$sixty,$three,$eigth,$eigthm,$thou,$quart,$quartm,$list)");
@@ -60,7 +60,7 @@
function doesGarageExist($uid){
global $xoopsDB;
- $sql = "SELECT id FROM " . $xoopsDB->prefix("garage") . " WHERE uid=$uid LIMIT 1";
+ $sql = "SELECT id FROM " . $xoopsDB->prefix("garage") . " WHERE uid = '$uid' LIMIT 1";
if ( !$result = $xoopsDB->query($sql) ) {
exit("SQL Error in function :: doesGarageExist()");
}
@@ -68,9 +68,37 @@
return $xgid;
}
+//Added by jlm69
+function getCatOptions($cid){
+ global $xoopsDB;
+ $sql = "SELECT cid,name,racing FROM " . $xoopsDB->prefix("garage_cats") . " WHERE cid = '$cid' ORDER BY name";
+ if ( !$result = $xoopsDB->query($sql) ) {
+ exit("$sql > SQL Error in function :: getCatOptions($cid)");
+ }
+ $cat_racing = array();
+ while ( $row = $xoopsDB->fetchArray($result) ) {
+ $cat_racing = $row;
+ }
+ return $cat_racing;
+
+}
+
+function getCatName($cid){
+ global $xoopsDB;
+ $sql = "SELECT name FROM " . $xoopsDB->prefix("garage_cats") . " WHERE cid= '$cid'";
+ if ( !$result = $xoopsDB->query($sql) ) {
+ return;
+ //exit("SQL Error in function :: getRoster($cid)");
+ }
+ $category_name = $xoopsDB->fetchArray($result);
+ return $category_name;
+}
+
+//end add
+
function getCats($gid){
global $xoopsDB;
- $sql = "SELECT cid,name FROM " . $xoopsDB->prefix("garage_cats") . " WHERE gid = $gid ORDER BY name";
+ $sql = "SELECT cid,name,racing FROM " . $xoopsDB->prefix("garage_cats") . " WHERE gid = $gid ORDER BY name";
if ( !$result = $xoopsDB->query($sql) ) {
exit("$sql > SQL Error in function :: getCats($gid)");
} else {
@@ -260,4 +288,18 @@
return $editor;
}
+function garage_FieldExists($fieldname,$table)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF("SHOW COLUMNS FROM $table LIKE '$fieldname'");
+ return($xoopsDB->getRowsNum($result) > 0);
+}
+
+function garage_AddField($field, $table)
+{
+ global $xoopsDB;
+ $result=$xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field;");
+ return $result;
+}
+
?>
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/index.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/index.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/index.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1,51 +1,55 @@
<?php
//if (!defined('XOOPS_XMLRPC')) define('XOOPS_XMLRPC', 1);
-require('header.php');
+include("header.php");
-global $xoopsModuleConfig, $xoopsUser;
+$mydirname = basename( dirname( __FILE__ ) ) ;
+global $xoopsModuleConfig, $xoopsModule, $xoopsUser;
+require_once( XOOPS_ROOT_PATH."/modules/$mydirname/include/gtickets.php" ) ;
-// Group Permissions added by jlm69
-if($xoopsModuleConfig['usecats']){
+if($xoopsModuleConfig['usecats']) {
+$myts =& MyTextSanitizer::getInstance();
+
+
$module_id = $xoopsModule->getVar('mid');
if (is_object($xoopsUser)) {
-$groups = $xoopsUser->getGroups();
+ $groups = $xoopsUser->getGroups();
} else {
-$groups = XOOPS_GROUP_ANONYMOUS;
+ $groups = XOOPS_GROUP_ANONYMOUS;
}
+
$gperm_handler =& xoops_gethandler('groupperm');
if (isset($_POST['item_id'])) {
-$perm_itemid = intval($_POST['item_id']);
+ $perm_itemid = intval($_POST['item_id']);
} else {
-$perm_itemid = 0;
+ $perm_itemid = 0;
}
+
//If no access
if (!$gperm_handler->checkRight("garage_view", $perm_itemid, $groups, $module_id)) {
-redirect_header(XOOPS_URL."/index.php", 3, _NOPERM);
-exit();
- }
-
- }
+ redirect_header(XOOPS_URL."/index.php", 3, _NOPERM);
+ exit();
+}
+}
// End Group Permissions
-//require(XOOPS_ROOT_PATH.'/header.php');
-
+require(XOOPS_ROOT_PATH.'/header.php');
include("include/functions.php");
+
settype($op,"string");
+settype($subop,"string");//added by jlm69
settype($uid,"integer");
settype($garage,"array");
+settype($cats,"array");//added by jlm69
settype($itemTotal,"string");
-$self = $_SERVER['PHP_SELF'];
+$self = $_SERVER['PHP_SELF'];//added by jlm69
-global $xoopsModuleConfig;
-global $xoopsUser;
-
$userIsAdmin = userIsAdmin($xoopsUser);
$cid = isset($_GET['cid']) ? intval($_GET['cid']) : 0;
@@ -60,18 +64,18 @@
case "view":
$xoopsOption['template_main'] = "view_garage.html";
include XOOPS_ROOT_PATH."/header.php";
+
+
+
+
+
if($gid){
$garage = getGarage($gid);
- if($garage['imagechoice']) {
-$garage['image'] = "[img align=right]". XOOPS_UPLOAD_URL. "/" . "garage/".$garage['uploadimage']."[/img]";
+ if($garage['imagechoice'] == 1) {
+$garage['image'] = "[img align=center]". XOOPS_UPLOAD_URL. "/" . "garage/".$garage['uploadimage']."[/img]";
}
}
-
-
-
-
-
$myts =& MyTextSanitizer::getInstance(); // MyTextSanitizer object
$garage['mengine'] = $myts->displayTarea($garage['mengine'], 1, 1, 1, 1, 1);
$garage['mexterior'] = $myts->displayTarea($garage['mexterior'], 1, 1, 1, 1, 1);
@@ -128,7 +132,7 @@
}
}
- $garage['uname'] = xoops_getLinkedUnameFromId($garage['uid']);
+ $garage['uname'] = xoops_getLinkedUnameFromId($garage['uid']);//added by jlm69
if(($uid == $garage['uid'] && $xoopsModuleConfig['canuseredit']) || ($xoopsModuleConfig['canadminsedit'] && $userIsAdmin)){
$xoopsTpl->assign('panel', true);
@@ -144,19 +148,19 @@
$xoopsTpl->assign('deletegarage',_MD_XG_DELETEGARAGE);
}
}
-
+ $cid = $garage['cid'];
if($xoopsModuleConfig['usecats']){
include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
$cattree = new XoopsTree($xoopsDB->prefix("garage_cats"),"cid","gid");
$path = $cattree->getNicePathFromId($cid, "name", $self."?op=default");
$xoopsTpl->assign('path',$path);
- }
+
+ }
-
$xoopsTpl->assign('allowcomments', $xoopsModuleConfig['allowcomments']);
$xoopsTpl->assign('gid', $gid);
$xoopsTpl->assign('gname', _MD_XG_GNAME);
- $xoopsTpl->assign('ownername', _MD_XG_USERNAME);
+ $xoopsTpl->assign('ownername', _MD_XG_USERNAME);//added by jlm69
$xoopsTpl->assign('garage', $garage);
$xoopsTpl->assign('list', $xoopsModuleConfig['listname']);
$xoopsTpl->assign('website', _MD_XG_PWEBSITE);
@@ -183,14 +187,20 @@
$xoopsTpl->assign('mrims',_MD_XG_MRIMS);
$xoopsTpl->assign('maudio',_MD_XG_MAUDIO);
$xoopsTpl->assign('mfuture',_MD_XG_MFUTURE);
- $xoopsTpl->assign('garage_of',_MD_XG_GARAGEOF);
-
+ $xoopsTpl->assign('garage_of',_MD_XG_GARAGEOF);//added by jlm69
+ $xoopsTpl->assign('owner_info',_MD_XG_OWNERINFO);//added by jlm69
+ $xoopsTpl->assign('garage_info',_MD_XG_GARAGE_INFO);//added by jlm69
+ $xoopsTpl->assign('modifications',_MD_XG_MODIFICATIONS);//added by jlm69
+ $xoopsTpl->assign('time_trials',_MD_XG_TIME_TRIALS);//added by jlm69
+ $xoopsTpl->assign('garage_profile',_MD_XG_PROFILE);//added by jlm69
+
if($xoopsModuleConfig['allowcomments']) include XOOPS_ROOT_PATH.'/include/comment_view.php';
break;
case "default":
default:
+
$xoopsOption['template_main'] = "cat_index.html";
include XOOPS_ROOT_PATH."/header.php";
//$xoopsOption['template_main'] = "roster.html";
@@ -217,7 +227,11 @@
$path = $cattree->getNicePathFromId($cid, "name", $self."?op=default");
$xoopsTpl->assign('path',$path);
$xoopsTpl->assign('cid',$cid);
+ if ($cid != 0) {
+ $xoopsTpl->assign('show_add',true);
+ }
$cats = getCats($cid);
+
//$xoopsTpl->assign('cats', $cats);
for($i=0;$i<count($cats);$i++){
//$result = getCount($cats[$i]['cid']);
@@ -229,7 +243,7 @@
$xoopsTpl->append('cats', $cats[$i]);
}
//var_dump($cats);
- }
+ } else $xoopsTpl->assign('show_add',true);
$names = getRoster($cid);
Deleted: XoopsModules/xgarage/trunk/xgarage/install.txt
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/install.txt 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/install.txt 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1 +0,0 @@
-Upload the garage folder inside of modules
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/language/english/admin.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/language/english/admin.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/language/english/admin.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -8,7 +8,7 @@
define("_AM_GARAGES_APPROVE", "Approve");
define("_AM_GARAGES_DISABLED", "Disabled");
define("_AM_GARAGES_CATEGORIES", "Categories");
-define("_AM_GARAGES_DOCUMENTATION", "Documentation");
+
define("_AM_GARAGES_SUPPORT", "Support");
define("_AM_GARAGES_DONATIONS", "Donations");
define("_AM_DOCS","Garages Module Documentation");
@@ -69,8 +69,27 @@
define("_AM_GARAGES_CAT2GROUPDESC" , "Check categories which you allow to access" ) ;
define("_AM_GARAGES_GROUPPERMDESC" , "Select group(s) allowed to submit listings." ) ;
define("MI_GARAGES_GROUPPERM", "Submit Permissions");
+define("_AM_GARAGES_VIEWFORM", "View Permissions");
define("_AM_GARAGES_SUBMITFORM", "Submit Permissions");
+define("_AM_GARAGES_VIEWFORM_DESC", "Select, who can view a category");
define("_AM_GARAGES_SUBMITFORM_DESC", "Select, who can submit a listing");
-define("_AM_GARAGES_VIEWFORM", "View Permissions");
-define("_AM_GARAGES_VIEWFORM_DESC", "Select, who can view listings");
+
+//Changes and additions by jlm69 v .05
+define("_AM_XG_RACING", "Show racing times in this category");
+define("_AM_XG_DOCUMENTATION", "Documentation");
+define("_AM_XG_CREDITS", "Credits");
+define("_AM_XG_ADMIN_MAN", "Administration Manual");
+define("_AM_XG_USER_MAN", "User Manual");
+define("_AM_XG_DOC_SUPPORT", "Live Docs and support at X-Garage");
+define("_AM_XG_DOC_HEAD", "Garages Module for XOOPS 2.0 Documentation");
+define("_AM_XG_DOC_FORUM", "Garages Module for XOOPS Support Forum");
+define("_AM_XG_ADMIN", "Administration");
+define("_AM_XG_USERS", "Users");
+define("_AM_XG_CODEDBY", "Concept, Coded and Maintained");
+define("_AM_XG_TRANSLATORS", "Translators: ");
+define("_AM_XG_UPDATEMODULE", "Update the Module Now");
+define("_AM_XG_UPGR_ACCESS_ERROR", "Error, to use the upgrade script, you must be an admin on this module");
+define("_AM_XG_UPGRADECOMPLETE", "Upgrade Complete");
+define('_AM_XG_UPGRADEFAILED', 'Upgrade Failed');
+define('_AM_XG_UPGRADEFAILED0', "Please note the messages and try to correct the problems with phpMyadmin and the sql definition's file available in the 'sql' folder of the garage module");
?>
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/language/english/main.php
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/language/english/main.php 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/language/english/main.php 2013-09-20 23:13:05 UTC (rev 12074)
@@ -27,11 +27,11 @@
define("_MD_XG_MAINLINK","Main");
-define("_MD_XG_NONEYET","There are no garage yet.");
+define("_MD_XG_NONEYET","There are no garages yet.");
-define("_MD_XG_HOWTOADDGARAGE","Follow these intructions to get your garage added to this site.");
+define("_MD_XG_HOWTOADDGARAGE","Follow these instructions to get your garage added to this site.");
define("_MD_XG_USERCANNOTSUBMIT","Contact the webmaster for more information on adding a garage.");
-define("_MD_XG_HOWTOCHANGEGARAGE","Follow these intructions to get your garage changed.");
+define("_MD_XG_HOWTOCHANGEGARAGE","Follow these instructions to get your garage changed.");
define("_MD_XG_USERCANNOTCHANGE","Contact the webmaster for more information on changing your garage.");
define("_MD_XG_ADDGARAGE","Add a New Garage");
@@ -106,8 +106,13 @@
define("_MD_XG_MAUDIO","Audio/Video");
define("_MD_XG_MFUTURE","Future");
+//added by jlm69
define("_MD_XG_USERNAME","Username ");
define("_MD_XG_STYLE","Body Style");
define("_MD_XG_GARAGEOF","The Garage of ::");
-
+define("_MD_XG_OWNERINFO","Owner Info");
+define("_MD_XG_GARAGE_INFO","Garage Info");
+define("_MD_XG_MODIFICATIONS","Modifications");
+define("_MD_XG_TIME_TRIALS","Time Trials");
+define("_MD_XG_PROFILE","XGarage Car Profile");
?>
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/readme.txt
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/readme.txt 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/readme.txt 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1,2 +1,27 @@
-Garage Beta #1
-Use at your own risk!
\ No newline at end of file
+Garage .05 Beta
+Use at your own risk!
+
+
+Upgrading to version .05 beta
+
+
+To upgrade from any previous version you will need to run the upgrade.php script.
+
+Point your browser to this URL.
+
+http:www/yoursite/modules/garage/admin/upgrade.php
+
+You will come to a page that reads ' Upgrade Complete - Update the Module Now '
+Click on 'Update the Module Now' to take you to the module update page.
+
+You are finished.
+
+You may need to remove the template files for the garage in the folder templates_c.
+
+
+
+You can remove this file after you upgrade or not.
+
+
+
+jlm69
\ No newline at end of file
Modified: XoopsModules/xgarage/trunk/xgarage/sql/garage.sql
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/sql/garage.sql 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/sql/garage.sql 2013-09-20 23:13:05 UTC (rev 12074)
@@ -15,9 +15,10 @@
`imagechoice` tinyint(4) NOT NULL default '0',
`url` varchar(255) NOT NULL default '',
`location` varchar(75) NOT NULL default '',
- `mark` varchar(75) NOT NULL default '',
+ `year` varchar(75) NOT NULL default '',
+ `make` varchar(75) NOT NULL default '',
`model` varchar(75) NOT NULL default '',
- `year` varchar(75) NOT NULL default '',
+ `style` varchar(75) NOT NULL default '',
`engine` varchar(75) NOT NULL default '',
`color` varchar(75) NOT NULL default '',
`rt` varchar(75) NOT NULL default '',
@@ -29,7 +30,7 @@
`quart` varchar(75) NOT NULL default '',
`quartm` varchar(75) NOT NULL default '',
`mengine` text NOT NULL,
- `meterior` text NOT NULL,
+ `mexterior` text NOT NULL,
`minterior` text NOT NULL,
`mrims` text NOT NULL,
`mfuture` text NOT NULL,
@@ -47,6 +48,7 @@
CREATE TABLE `garage_cats` (
`cid` int(11) NOT NULL auto_increment,
`name` varchar(75) NOT NULL default '',
+ `racing` tinyint(1) NOT NULL default '0',
`gid` int(11) NOT NULL default '0',
UNIQUE KEY `ID` (`cid`)
) TYPE=MyISAM COMMENT='garage categories';
Modified: XoopsModules/xgarage/trunk/xgarage/templates/cat_index.html
===================================================================
--- XoopsModules/xgarage/trunk/xgarage/templates/cat_index.html 2013-09-20 23:12:04 UTC (rev 12073)
+++ XoopsModules/xgarage/trunk/xgarage/templates/cat_index.html 2013-09-20 23:13:05 UTC (rev 12074)
@@ -1,6 +1,9 @@
<div style="font-size:small;">
<a href="index.php"><img src="images/icons/index.png" align="middle" title="[<{$index}>]" alt="[<{$index}>]"></a>
-<{if $addnewgarage}><a href="garage.php?op=add<{if $cid}>&cid=<{$cid}><{/if}>"><img src="images/icons/add.png" align="middle" title="[<{$addnewgarage}>]" alt="[<{$addnewgarage}>]"></a><{/if}>
+
+
+<{if $show_add}>
+<{if $addnewgarage}><a href="garage.php?op=add<{if $cid}>&cid=<{$cid}><{/if}>"><img src="images/icons/add.png" align="middle" title="[<{$addnewgarage}>]" alt="[<{$addnewgarage}>]"></a><{/if}><{/if}>
<{if $panel == true}>
<{if $adminlink}><a href="../../modules/garage/admin/index.php"><img src="images/icons/admin.png" align="middle" title="[<{$adminli...
[truncated message content] |