diff --git a/INSTALL/pragyan_structure.sql b/INSTALL/pragyan_structure.sql index b58f0d45..b3853121 100755 --- a/INSTALL/pragyan_structure.sql +++ b/INSTALL/pragyan_structure.sql @@ -1419,7 +1419,7 @@ CREATE TABLE IF NOT EXISTS `events_confirmed_participants` ( -- CREATE TABLE IF NOT EXISTS `events_details` ( -`event_id` int(10) NOT NULL, +`event_id` int(10) NOT NULL AUTO_INCREMENT PRIMARY KEY, `event_name` varchar(100) NOT NULL, `event_start_time` time NOT NULL, `event_end_time` time NOT NULL, @@ -1445,8 +1445,8 @@ CREATE TABLE IF NOT EXISTS `events_details` ( -- -- AUTO_INCREMENT for table `events_details` -- -ALTER TABLE `events_details` - MODIFY `event_id` int(10) NOT NULL AUTO_INCREMENT; +-- ALTER TABLE `events_details` +-- MODIFY `event_id` int(10) NOT NULL AUTO_INCREMENT; -- -- Table structure for table `events_edited_form` diff --git a/README.markdown b/README.markdown index 48f69374..af845ae4 100755 --- a/README.markdown +++ b/README.markdown @@ -33,5 +33,6 @@ Contributors - Sriram Sundarraj (ssundarraj) - Amal (amal1293) - Sarwesh Krishnan (baxiz) +- Gokul Srinivas (gokulsrinivas) - Shravan Murali (shravan97) - (this could be you...) diff --git a/cms/modules/prhospi/accommodation.php b/cms/modules/prhospi/accommodation.php index 780eeca1..80dd3884 100755 --- a/cms/modules/prhospi/accommodation.php +++ b/cms/modules/prhospi/accommodation.php @@ -233,8 +233,8 @@ function addUserToRoomAjax($userId,$roomId,$mcid,$checkedInBy,$stay,$registeredB $insertDetailsQuery = "INSERT INTO `prhospi_accomodation_status` (page_modulecomponentid,hospi_room_id,user_id,hospi_actual_checkin,hospi_checkedin_by,hospi_cash_recieved,user_registered_by) VALUES ($mcid,$roomId,$userId,'{$time}','{$checkedInBy}',{$amtRecieved},'{$registeredBy}')"; - (page_modulecomponentid,hospi_room_id,user_id,hospi_actual_checkin,hospi_checkedin_by,hospi_cash_recieved) - VALUES ($mcid,$roomId,$userId,'{$time}','{$checkedInBy}',{$amtRecieved})"; + //(page_modulecomponentid,hospi_room_id,user_id,hospi_actual_checkin,hospi_checkedin_by,hospi_cash_recieved) + //VALUES ($mcid,$roomId,$userId,'{$time}','{$checkedInBy}',{$amtRecieved})"; $insertDetailsRes = mysql_query($insertDetailsQuery) or die(mysql_error()); $availableRoomNo=getAvailableRooms($mcid); return "Success {$availableRoomNo}"; diff --git a/cms/modules/prhospi/prhospi_common.php b/cms/modules/prhospi/prhospi_common.php index b727b5cc..68487a3f 100755 --- a/cms/modules/prhospi/prhospi_common.php +++ b/cms/modules/prhospi/prhospi_common.php @@ -1016,25 +1016,25 @@ function blockRoomNo($roomId,$mcid) { } -function blockRoomNo($roomId,$mcid) { - $roomId = escape($roomId); - $blockRoomQuery = "SELECT `hospi_blocked` FROM `prhospi_hostel` WHERE `hospi_blocked`=0 AND `page_modulecomponentid`={$mcid} AND `hospi_room_id`={$roomId}"; - $blockRoomQueryRes = mysqli_query($GLOBALS["___mysqli_ston"], $blockRoomQuery) or displayerror(((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))); - if(!mysqli_num_rows($blockRoomQueryRes)) { - displayerror("Room Does Not exist"); - return; - } - $res = mysqli_fetch_assoc($blockRoomQueryRes); - if($res['hospi_blocked']!=0) { - displaywarning("Room Blocked Already"); - return; - } - $blockRoomQuery = "UPDATE `prhospi_hostel` SET `hospi_blocked`=1 WHERE `page_modulecomponentid`={$mcid} AND `hospi_room_id`={$roomId}"; - $blockRoomQueryRes = mysqli_query($GLOBALS["___mysqli_ston"], $blockRoomQuery) or displayerror(((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))); - if($blockRoomQueryRes) displayinfo("Room Blocked "); - else displayinfo("There is a Error.Please contact System Administrator for Details"); - return; -} +//function blockRoomNo($roomId,$mcid) { +// $roomId = escape($roomId); +// $blockRoomQuery = "SELECT `hospi_blocked` FROM `prhospi_hostel` WHERE `hospi_blocked`=0 AND `page_modulecomponentid`={$mcid} AND `hospi_room_id`={$roomId}"; +// $blockRoomQueryRes = mysqli_query($GLOBALS["___mysqli_ston"], $blockRoomQuery) or displayerror(((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))); +// if(!mysqli_num_rows($blockRoomQueryRes)) { +// displayerror("Room Does Not exist"); +// return; +// } +// $res = mysqli_fetch_assoc($blockRoomQueryRes); +// if($res['hospi_blocked']!=0) { +// displaywarning("Room Blocked Already"); +// return; +// } +// $blockRoomQuery = "UPDATE `prhospi_hostel` SET `hospi_blocked`=1 WHERE `page_modulecomponentid`={$mcid} AND `hospi_room_id`={$roomId}"; +// $blockRoomQueryRes = mysqli_query($GLOBALS["___mysqli_ston"], $blockRoomQuery) or displayerror(((is_object($GLOBALS["___mysqli_ston"])) ? mysqli_error($GLOBALS["___mysqli_ston"]) : (($___mysqli_res = mysqli_connect_error()) ? $___mysqli_res : false))); +// if($blockRoomQueryRes) displayinfo("Room Blocked "); +// else displayinfo("There is a Error.Please contact System Administrator for Details"); +// return; +//} function unBlockRoomNo($roomId,$mcid) { $roomId = escape($roomId); @@ -1053,4 +1053,4 @@ function unBlockRoomNo($roomId,$mcid) { return; } -?> \ No newline at end of file +?> diff --git a/cms/modules/qaos1/excel/excel_reader2.php b/cms/modules/qaos1/excel/excel_reader2.php index e1b4041a..c0be1b0c 100755 --- a/cms/modules/qaos1/excel/excel_reader2.php +++ b/cms/modules/qaos1/excel/excel_reader2.php @@ -913,7 +913,7 @@ function _format_value($format,$num,$f) { * Some basic initialisation */ function Spreadsheet_Excel_Reader($file='',$store_extended_info=true,$outputEncoding='') { - $this->_ole =& new OLERead(); + $this->_ole = new OLERead(); $this->setUTFEncoder('iconv'); if ($outputEncoding != '') { $this->setOutputEncoding($outputEncoding); diff --git a/cms/modules/search/admin/spiderfuncs.php b/cms/modules/search/admin/spiderfuncs.php index 17b45f08..59588065 100755 --- a/cms/modules/search/admin/spiderfuncs.php +++ b/cms/modules/search/admin/spiderfuncs.php @@ -736,7 +736,7 @@ function check_include($link, $inc, $not_inc) { if (substr($str, 0, 1) == '*') { if (preg_match(substr($str, 1), $link)) { $include = true; - break 2; + break; } } else { if (strpos($link, $str) !== false) { diff --git a/cms/openid/Services/Yadis/XRDS.php b/cms/openid/Services/Yadis/XRDS.php index 55674c40..45cfecfa 100755 --- a/cms/openid/Services/Yadis/XRDS.php +++ b/cms/openid/Services/Yadis/XRDS.php @@ -292,7 +292,7 @@ function _parse() $services = $this->parser->evalXPath('xrd:Service', $this->xrdNode); foreach ($services as $node) { - $s =& new Services_Yadis_Service(); + $s = new Services_Yadis_Service(); $s->element = $node; $s->parser =& $this->parser; @@ -415,4 +415,4 @@ function services($filters = null, } } -?> \ No newline at end of file +?>