Minor changes to remove redundant code, mis-labeled tab names, etc...

exponentcms · Jul 2, 2011 · 1c47e02 · 1c47e02
1 parent 1403769
commit 1c47e02
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/core_rss.php b/core_rss.php
@@ -719,7 +719,7 @@ function FeedDate($dateString="") {
 			$months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12);
 			$this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]);
 			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+				$tzOffset = (substr($matches[7],0,3) * 60 . substr($matches[7],-2)) * 60;
 			} else {
 				if (strlen($matches[7])==1) {
 					$oneHour = 3600;
@@ -743,7 +743,7 @@ function FeedDate($dateString="") {
 		if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) {
 			$this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
 			if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+				$tzOffset = (substr($matches[7],0,3) * 60 . substr($matches[7],-2)) * 60;
 			} else {
 				if ($matches[7]=="Z") {
 					$tzOffset = 0;

diff --git a/framework/modules/core/views/expModule/manage.tpl b/framework/modules/core/views/expModule/manage.tpl
@@ -79,7 +79,7 @@
                     <thead>
                         <tr>
                             <th>
-                                <a class="selectall" href="#" id="sa_conts" onclick="EXPONENT.selectAllCheckboxes('#tab1 input[type=checkbox]'); return false;">{"Select All"|gettext}</a> / <a class="selectnone" href="#" id="sa_conts" onclick="EXPONENT.unSelectAllCheckboxes('#tab1 input[type=checkbox]'); return false;">{"Select None"|gettext}</a>
+                                <a class="selectall" href="#" id="sa_conts" onclick="EXPONENT.selectAllCheckboxes('#tab1 input[type=checkbox]'); return false;">{"Select All"|gettext}</a> / <a class="selectnone" href="#" id="sn_conts" onclick="EXPONENT.unSelectAllCheckboxes('#tab1 input[type=checkbox]'); return false;">{"Select None"|gettext}</a>
                             </th>
                         </tr>
                     </thead>
@@ -111,7 +111,7 @@
                     <thead>
                         <tr>
                             <th>
-                                <a class="selectall" href="#" id="sa_conts" onclick="EXPONENT.selectAllCheckboxes('#tab2 input[type=checkbox]'); return false;">{"Select All"|gettext}</a> / <a class="selectnone" href="#" id="sa_conts" onclick="EXPONENT.unSelectAllCheckboxes('#tab2 input[type=checkbox]'); return false;">{"Select None"|gettext}</a>
+                                <a class="selectall" href="#" id="sa_conts1" onclick="EXPONENT.selectAllCheckboxes('#tab2 input[type=checkbox]'); return false;">{"Select All"|gettext}</a> / <a class="selectnone" href="#" id="sn_conts1" onclick="EXPONENT.unSelectAllCheckboxes('#tab2 input[type=checkbox]'); return false;">{"Select None"|gettext}</a>
                             </th>
                         </tr>
                     </thead>

diff --git a/framework/modules/ecommerce/views/ecomconfig/edit_discount.tpl b/framework/modules/ecommerce/views/ecomconfig/edit_discount.tpl
@@ -41,7 +41,7 @@
                     {control type="editor" name="body" label="Description"|gettext height=250 value=$discount->body}   
                     {*control type="text" name="priority" label="Priority"|gettext value=$discount->priority*}   
                 </div>
-                 <div id="tab3">
+                 <div id="tab2">
                     <h2>{"Usage Rules"|gettext}</h2>
                     {* control type="text" name="uses_per_coupon" label="Uses Per Coupon"|gettext value=$discount->uses_per_coupon}
                     {control type="text" name="uses_per_user" label="Uses Per Customer"|gettext value=$discount->uses_per_user *}
@@ -60,12 +60,12 @@
                         </div>
                     {/foreach}
                 </div>
-                <div id="tab2">
+                <div id="tab3">
                     <h2>{"Conditions"|gettext}</h2>
                     {* control type="dropdown" name="group_ids[]" label="Groups"|gettext items=$groups default=$selected_groups multiple=true size=10 *}   
                     {control type="text" name="minimum_order_amount" label="Minimum Order Amount"|gettext filter=money value=$discount->minimum_order_amount}                                        
                 </div>
-                <div id="tab3">
+                <div id="tab4">
                     <h2>{"Actions and Amounts"|gettext}</h2>                    
                     {control type="dropdown" name="action_type" label="Discount Action"|gettext items=$discount->actions default=$discount->action_type}
                     If you selected 'Precentage off entire cart', enter the precentage discount you would like applied with this coupon code here.                                                                                                                             

diff --git a/framework/modules/ecommerce/views/order/createReferenceOrder.tpl b/framework/modules/ecommerce/views/order/createReferenceOrder.tpl
@@ -115,7 +115,7 @@
         </tbody>
         </table>
         {* control id=submit_order_item_form name=submit_order_item_form type=buttongroup submit="Save Reference Order" cancel="Cancel"*}            
-        <div id="submit_order_item_formControl" class="control buttongroup"><input id="submit_order_item_form" class="submit button" type="submit" value="Save Reference Order" /><input class="cancel button" type="button" value="Cancel" onclick="javascript:history.back(1);" /></div>
+        <div id="submit_order_item_formControl" class="control buttongroup"><input id="submit_order_item_form" class="submit button" type="submit" value="Save Reference Order" /><input class="cancel button" type="button" value="Cancel" onclick="history.back(1);" /></div>
 
     {/form}
     </div>

diff --git a/framework/modules/ecommerce/views/order/create_new_order.tpl b/framework/modules/ecommerce/views/order/create_new_order.tpl
@@ -120,7 +120,7 @@
                         {control type="autocomplete" controller="order" action="search_external" name="related_items2" value="Search other customer name or email" schema="id,source,firstname,middlename,lastname,organization,email" searchmodel="addresses" searchoncol="firstname,lastname,organization,email" jsinject=$callbacks2}
 
                         {br}
-        <div id="submit_order_item_formControl" class="control buttongroup"><input id="submit_order_item_form" class="submit button" type="submit" value="Save New Order" /><input class="cancel button" type="button" value="Cancel" onclick="javascript:history.back(1);" /></div>
+        <div id="submit_order_item_formControl" class="control buttongroup"><input id="submit_order_item_form" class="submit button" type="submit" value="Save New Order" /><input class="cancel button" type="button" value="Cancel" onclick="history.back(1);" /></div>
 
     {/form}
     </div>

diff --git a/framework/modules/flowplayer/views/flowplayer/showall_playlist.tpl b/framework/modules/flowplayer/views/flowplayer/showall_playlist.tpl
@@ -70,7 +70,7 @@
 				wmode: 'opaque',
                 clip: {
                     url: '{/literal}{$page->records[0]->expFile.video[0]->url}{literal}', 
-					autoPlay:{/literal}{if $config.autoplay}true{else}false{/if}{literal},  
+					autoPlay: {/literal}{if $config.autoplay}true{else}false{/if}{literal},
                     autoBuffering: false  
                 }, 
                 plugins: {

diff --git a/modules/formmodule/js/form.validate.js b/modules/formmodule/js/form.validate.js
@@ -25,8 +25,7 @@ function validate(frm) {
 		//reqFieldTitleArray[n];
 	}
 	alert ('all good');
-	if (confirm('Are you sure you want to submit your form?')) return true;
-	else return false;
+	return confirm('Are you sure you want to submit your form?');
 }
 
 function showMessage(msg, field){

diff --git a/send_reminders.php b/send_reminders.php
@@ -451,7 +451,7 @@ function exponent_sorting_byEventStartAscending($a,$b) {
 	try {
 		$mail->addTo($recip);
 		$mail->send();
-	} catch (Error $e) {
+	} catch (Exception $e) {
 	}
 	$mail->flushRecipients();
 }